From b117131ade13571a827f7811e1f1e5d87b065fbf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 11 May 2025 14:41:23 +0000 Subject: [PATCH 1/2] ledger-web: migrate to by-name --- pkgs/{applications/office => by-name/le}/ledger-web/Gemfile | 0 .../{applications/office => by-name/le}/ledger-web/Gemfile.lock | 0 pkgs/{applications/office => by-name/le}/ledger-web/gemset.nix | 0 .../default.nix => by-name/le/ledger-web/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/office => by-name/le}/ledger-web/Gemfile (100%) rename pkgs/{applications/office => by-name/le}/ledger-web/Gemfile.lock (100%) rename pkgs/{applications/office => by-name/le}/ledger-web/gemset.nix (100%) rename pkgs/{applications/office/ledger-web/default.nix => by-name/le/ledger-web/package.nix} (100%) diff --git a/pkgs/applications/office/ledger-web/Gemfile b/pkgs/by-name/le/ledger-web/Gemfile similarity index 100% rename from pkgs/applications/office/ledger-web/Gemfile rename to pkgs/by-name/le/ledger-web/Gemfile diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/by-name/le/ledger-web/Gemfile.lock similarity index 100% rename from pkgs/applications/office/ledger-web/Gemfile.lock rename to pkgs/by-name/le/ledger-web/Gemfile.lock diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/by-name/le/ledger-web/gemset.nix similarity index 100% rename from pkgs/applications/office/ledger-web/gemset.nix rename to pkgs/by-name/le/ledger-web/gemset.nix diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/by-name/le/ledger-web/package.nix similarity index 100% rename from pkgs/applications/office/ledger-web/default.nix rename to pkgs/by-name/le/ledger-web/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb4bfd837e90..7f7aca7ab0fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13224,8 +13224,6 @@ with pkgs; libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; - ledger-web = callPackage ../applications/office/ledger-web { }; - linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; lmms = libsForQt5.callPackage ../applications/audio/lmms { From 27aa7ba6609df8fe1ada9ba66e04ec82947c1d0b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 11 May 2025 14:59:55 +0000 Subject: [PATCH 2/2] ledger-web: update gems to latest versions --- pkgs/by-name/le/ledger-web/Gemfile | 2 + pkgs/by-name/le/ledger-web/Gemfile.lock | 24 ++++++------ pkgs/by-name/le/ledger-web/gemset.nix | 50 +++++++++++++++---------- 3 files changed, 45 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/le/ledger-web/Gemfile b/pkgs/by-name/le/ledger-web/Gemfile index 77e8024da3a3..451f1a3168be 100644 --- a/pkgs/by-name/le/ledger-web/Gemfile +++ b/pkgs/by-name/le/ledger-web/Gemfile @@ -1,3 +1,5 @@ source 'https://rubygems.org' gem 'ledger_web' + +gem "csv", "~> 3.3" diff --git a/pkgs/by-name/le/ledger-web/Gemfile.lock b/pkgs/by-name/le/ledger-web/Gemfile.lock index 18a02b079f6c..abb76c81552c 100644 --- a/pkgs/by-name/le/ledger-web/Gemfile.lock +++ b/pkgs/by-name/le/ledger-web/Gemfile.lock @@ -24,14 +24,15 @@ GEM benchmark (0.4.0) bigdecimal (3.1.9) concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.3) + csv (3.3.4) database_cleaner (2.1.0) database_cleaner-active_record (>= 2, < 3) database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - diff-lcs (1.6.0) + diff-lcs (1.6.1) directory_watcher (1.5.1) drb (2.2.1) i18n (1.14.7) @@ -46,18 +47,18 @@ GEM sinatra sinatra-contrib sinatra-session - logger (1.6.6) - minitest (5.25.4) + logger (1.7.0) + minitest (5.25.5) multi_json (1.15.0) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) pg (1.5.9) - rack (3.1.12) + rack (3.1.14) rack-protection (4.1.1) base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.1.0) + rack-session (2.1.1) base64 (>= 0.1.0) rack (>= 3.0.0) rspec (3.13.0) @@ -66,16 +67,16 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) + rspec-mocks (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.2) + rspec-support (3.13.3) ruby2_keywords (0.0.5) securerandom (0.4.1) - sequel (5.90.0) + sequel (5.92.0) bigdecimal sinatra (4.1.1) logger (>= 1.6.0) @@ -102,7 +103,8 @@ PLATFORMS ruby DEPENDENCIES + csv (~> 3.3) ledger_web BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/by-name/le/ledger-web/gemset.nix b/pkgs/by-name/le/ledger-web/gemset.nix index c2df04b0176f..67e7c8d3383d 100644 --- a/pkgs/by-name/le/ledger-web/gemset.nix +++ b/pkgs/by-name/le/ledger-web/gemset.nix @@ -94,10 +94,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; + }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9"; + type = "gem"; + }; + version = "3.3.4"; }; database_cleaner = { dependencies = [ "database_cleaner-active_record" ]; @@ -139,10 +149,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1"; + sha256 = "1m3cv0ynmxq93axp6kiby9wihpsdj42y6s3j8bsf5a1p7qzsi98j"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; directory_watcher = { groups = [ "default" ]; @@ -201,20 +211,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.0"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.25.4"; + version = "5.25.5"; }; multi_json = { groups = [ "default" ]; @@ -252,10 +262,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; + sha256 = "0i2bjh42cmlkwxjrldqj8g5sfrasdp64xhfr25kvp4ziilm3qqc4"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.14"; }; rack-protection = { dependencies = [ @@ -281,10 +291,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23"; + sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rspec = { dependencies = [ @@ -321,10 +331,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + sha256 = "1n7cb6szws90hxbzqrfybs4rj1xb0vhn24xa4l5r1vnzcnblahsf"; type = "gem"; }; - version = "3.13.3"; + version = "3.13.4"; }; rspec-mocks = { dependencies = [ @@ -335,20 +345,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + sha256 = "14xr5bq7s80hm97fcp3pvk4v515qfw3lrlsf20idalwwf6h5icbb"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.4"; }; rspec-support = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; + sha256 = "0hrzdcklbl8pv721cq906yfl38fmqmlnh33ff8l752z1ys9y6q9a"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.3"; }; ruby2_keywords = { groups = [ "default" ]; @@ -376,10 +386,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz"; + sha256 = "0ga49hliy5alb1x42mvpkmasqv71rhm4081zv5gpwr5q8lcsc1nb"; type = "gem"; }; - version = "5.90.0"; + version = "5.92.0"; }; sinatra = { dependencies = [