From e9550f73a288b05ebf9987f3d821bd0a91efb9ac Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 24 Nov 2025 14:01:25 +0000 Subject: [PATCH 1/3] asmrepl: migrate to pkgs/by-name Moves asmrepl from pkgs/development/interpreters/asmrepl to pkgs/by-name/as/asmrepl following the new directory structure. Also renames default.nix to package.nix as per by-name conventions. --- pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile | 0 .../interpreters => by-name/as}/asmrepl/Gemfile.lock | 0 .../{development/interpreters => by-name/as}/asmrepl/gemset.nix | 0 .../asmrepl/default.nix => by-name/as/asmrepl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile (100%) rename pkgs/{development/interpreters => by-name/as}/asmrepl/Gemfile.lock (100%) rename pkgs/{development/interpreters => by-name/as}/asmrepl/gemset.nix (100%) rename pkgs/{development/interpreters/asmrepl/default.nix => by-name/as/asmrepl/package.nix} (100%) diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/by-name/as/asmrepl/Gemfile similarity index 100% rename from pkgs/development/interpreters/asmrepl/Gemfile rename to pkgs/by-name/as/asmrepl/Gemfile diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock similarity index 100% rename from pkgs/development/interpreters/asmrepl/Gemfile.lock rename to pkgs/by-name/as/asmrepl/Gemfile.lock diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/by-name/as/asmrepl/gemset.nix similarity index 100% rename from pkgs/development/interpreters/asmrepl/gemset.nix rename to pkgs/by-name/as/asmrepl/gemset.nix diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/by-name/as/asmrepl/package.nix similarity index 100% rename from pkgs/development/interpreters/asmrepl/default.nix rename to pkgs/by-name/as/asmrepl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a786b2e13f0..038fe38695fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1542,8 +1542,6 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; - asmrepl = callPackage ../development/interpreters/asmrepl { }; - avahi-compat = callPackage ../by-name/av/avahi/package.nix { withLibdnssdCompat = true; }; From 6be281212cdeafddce4e3b80a874b29d128df9d8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 24 Nov 2025 14:15:50 +0000 Subject: [PATCH 2/3] asmrepl: update bundler dependencies - Update Gemfile.lock with racc and rbs dependencies - Modernize meta attribute usage (remove 'with lib') --- pkgs/by-name/as/asmrepl/Gemfile | 6 ++++-- pkgs/by-name/as/asmrepl/Gemfile.lock | 13 ++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/as/asmrepl/Gemfile b/pkgs/by-name/as/asmrepl/Gemfile index 0b617ffb90b2..84934b784f2f 100644 --- a/pkgs/by-name/as/asmrepl/Gemfile +++ b/pkgs/by-name/as/asmrepl/Gemfile @@ -1,3 +1,5 @@ -source 'https://rubygems.org' do +source 'https://rubygems.org' gem 'asmrepl' -end + # Extra dependencies + gem 'racc', '~> 1.8' + gem 'rbs', '~> 3.9' diff --git a/pkgs/by-name/as/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock index f845e91b6c90..f549336a9a59 100644 --- a/pkgs/by-name/as/asmrepl/Gemfile.lock +++ b/pkgs/by-name/as/asmrepl/Gemfile.lock @@ -1,18 +1,21 @@ -GEM - specs: - GEM remote: https://rubygems.org/ specs: asmrepl (1.0.3) fisk (~> 2) fisk (2.3.0) + logger (1.7.0) + racc (1.8.1) + rbs (3.9.5) + logger PLATFORMS ruby DEPENDENCIES - asmrepl! + asmrepl + racc (~> 1.8) + rbs (~> 3.9) BUNDLED WITH - 2.2.24 + 2.7.2 From c2f61dddda94cb6f6fde53e104ca375fb1d5b5ba Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 12 Feb 2026 10:08:44 -0600 Subject: [PATCH 3/3] asmrepl: 1.0.3 -> 1.2.0 --- pkgs/by-name/as/asmrepl/Gemfile.lock | 10 +++--- pkgs/by-name/as/asmrepl/gemset.nix | 52 +++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/as/asmrepl/Gemfile.lock b/pkgs/by-name/as/asmrepl/Gemfile.lock index f549336a9a59..1fcbecc5cfee 100644 --- a/pkgs/by-name/as/asmrepl/Gemfile.lock +++ b/pkgs/by-name/as/asmrepl/Gemfile.lock @@ -1,13 +1,15 @@ GEM remote: https://rubygems.org/ specs: - asmrepl (1.0.3) - fisk (~> 2) - fisk (2.3.0) + asmrepl (1.2.0) + fisk (~> 2.3.1) + fisk (2.3.2) logger (1.7.0) racc (1.8.1) - rbs (3.9.5) + rbs (3.10.3) logger + tsort + tsort (0.2.0) PLATFORMS ruby diff --git a/pkgs/by-name/as/asmrepl/gemset.nix b/pkgs/by-name/as/asmrepl/gemset.nix index f3455e515023..277e70efd539 100644 --- a/pkgs/by-name/as/asmrepl/gemset.nix +++ b/pkgs/by-name/as/asmrepl/gemset.nix @@ -5,19 +5,63 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6"; + sha256 = "0qvkqn34ldlip2yz3kdckqmvniyydswcclwdcalcpdwnahg25xjw"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.0"; }; fisk = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd"; + sha256 = "0zypl29fpqd5pqkp8j67xnq9b2dwhl8kn01fyw1kxy9l2676dlmh"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + racc = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rbs = { + dependencies = [ + "logger" + "tsort" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19nsjb0wkb1zk274q0zy41hfzqraanar3jg6akak8q8134wpyqkh"; + type = "gem"; + }; + version = "3.10.3"; + }; + tsort = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n"; + type = "gem"; + }; + version = "0.2.0"; }; }