From ade0f7fdd8365702ea46f32882c9b5f5a876868b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 27 Mar 2025 13:19:04 -0500 Subject: [PATCH] localized: Move some more apps to by-name Fix eval failure #1 --- .../bl/blackfire/package.nix} | 0 .../bl}/blackfire/php-probe.nix | 0 .../tools => by-name/ca}/cadre/Gemfile | 0 .../tools => by-name/ca}/cadre/Gemfile.lock | 4 ++-- .../tools => by-name/ca}/cadre/gemset.nix | 12 ++++++++-- .../ca/cadre/package.nix} | 0 .../co/coder/package.nix} | 0 .../tools => by-name/co}/coder/update.sh | 0 .../st/stlink/package.nix} | 0 .../configurable-usb-modeswitch.patch | 0 .../us}/usb-modeswitch/data.nix | 0 .../us/usb-modeswitch/package.nix} | 0 .../us}/usb-modeswitch/pkg-config.patch | 0 .../xc}/xcode-install/Gemfile | 0 .../xc}/xcode-install/Gemfile.lock | 8 ++++--- .../xc}/xcode-install/gemset.nix | 23 ++++++++++++++----- .../xc/xcode-install/package.nix} | 0 .../tools => by-name/xc}/xcpretty/Gemfile | 0 .../xc}/xcpretty/Gemfile.lock | 2 +- .../tools => by-name/xc}/xcpretty/gemset.nix | 4 ++-- .../xc/xcpretty/package.nix} | 0 pkgs/top-level/all-packages.nix | 16 ++----------- pkgs/top-level/php-packages.nix | 2 +- 23 files changed, 40 insertions(+), 31 deletions(-) rename pkgs/{development/tools/misc/blackfire/default.nix => by-name/bl/blackfire/package.nix} (100%) rename pkgs/{development/tools/misc => by-name/bl}/blackfire/php-probe.nix (100%) rename pkgs/{development/tools => by-name/ca}/cadre/Gemfile (100%) rename pkgs/{development/tools => by-name/ca}/cadre/Gemfile.lock (89%) rename pkgs/{development/tools => by-name/ca}/cadre/gemset.nix (72%) rename pkgs/{development/tools/cadre/default.nix => by-name/ca/cadre/package.nix} (100%) rename pkgs/{development/tools/coder/default.nix => by-name/co/coder/package.nix} (100%) rename pkgs/{development/tools => by-name/co}/coder/update.sh (100%) rename pkgs/{development/tools/misc/stlink/default.nix => by-name/st/stlink/package.nix} (100%) rename pkgs/{development/tools/misc => by-name/us}/usb-modeswitch/configurable-usb-modeswitch.patch (100%) rename pkgs/{development/tools/misc => by-name/us}/usb-modeswitch/data.nix (100%) rename pkgs/{development/tools/misc/usb-modeswitch/default.nix => by-name/us/usb-modeswitch/package.nix} (100%) rename pkgs/{development/tools/misc => by-name/us}/usb-modeswitch/pkg-config.patch (100%) rename pkgs/{development/tools => by-name/xc}/xcode-install/Gemfile (100%) rename pkgs/{development/tools => by-name/xc}/xcode-install/Gemfile.lock (98%) rename pkgs/{development/tools => by-name/xc}/xcode-install/gemset.nix (97%) rename pkgs/{development/tools/xcode-install/default.nix => by-name/xc/xcode-install/package.nix} (100%) rename pkgs/{development/tools => by-name/xc}/xcpretty/Gemfile (100%) rename pkgs/{development/tools => by-name/xc}/xcpretty/Gemfile.lock (88%) rename pkgs/{development/tools => by-name/xc}/xcpretty/gemset.nix (82%) rename pkgs/{development/tools/xcpretty/default.nix => by-name/xc/xcpretty/package.nix} (100%) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/by-name/bl/blackfire/package.nix similarity index 100% rename from pkgs/development/tools/misc/blackfire/default.nix rename to pkgs/by-name/bl/blackfire/package.nix diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix similarity index 100% rename from pkgs/development/tools/misc/blackfire/php-probe.nix rename to pkgs/by-name/bl/blackfire/php-probe.nix diff --git a/pkgs/development/tools/cadre/Gemfile b/pkgs/by-name/ca/cadre/Gemfile similarity index 100% rename from pkgs/development/tools/cadre/Gemfile rename to pkgs/by-name/ca/cadre/Gemfile diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/by-name/ca/cadre/Gemfile.lock similarity index 89% rename from pkgs/development/tools/cadre/Gemfile.lock rename to pkgs/by-name/ca/cadre/Gemfile.lock index 5d22e69f31c0..4e2b9a3b35a5 100644 --- a/pkgs/development/tools/cadre/Gemfile.lock +++ b/pkgs/by-name/ca/cadre/Gemfile.lock @@ -6,7 +6,7 @@ GEM tilt (> 1.0) valise (~> 1.2) thor (0.20.3) - tilt (2.0.9) + tilt (2.6.0) valise (1.2.1) PLATFORMS @@ -16,4 +16,4 @@ DEPENDENCIES cadre (= 1.0.4) BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/by-name/ca/cadre/gemset.nix similarity index 72% rename from pkgs/development/tools/cadre/gemset.nix rename to pkgs/by-name/ca/cadre/gemset.nix index 3219fa88c12c..7319ed4dbb0b 100644 --- a/pkgs/development/tools/cadre/gemset.nix +++ b/pkgs/by-name/ca/cadre/gemset.nix @@ -5,6 +5,8 @@ "tilt" "valise" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "07q60s1bm2xar46g00ls5fjkn6dm2kfxhsz9ayblc31x5kr8d83a"; @@ -13,6 +15,8 @@ version = "1.0.4"; }; thor = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; @@ -21,14 +25,18 @@ version = "0.20.3"; }; tilt = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.0.9"; + version = "2.6.0"; }; valise = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5"; diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/by-name/ca/cadre/package.nix similarity index 100% rename from pkgs/development/tools/cadre/default.nix rename to pkgs/by-name/ca/cadre/package.nix diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/by-name/co/coder/package.nix similarity index 100% rename from pkgs/development/tools/coder/default.nix rename to pkgs/by-name/co/coder/package.nix diff --git a/pkgs/development/tools/coder/update.sh b/pkgs/by-name/co/coder/update.sh similarity index 100% rename from pkgs/development/tools/coder/update.sh rename to pkgs/by-name/co/coder/update.sh diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/by-name/st/stlink/package.nix similarity index 100% rename from pkgs/development/tools/misc/stlink/default.nix rename to pkgs/by-name/st/stlink/package.nix diff --git a/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch b/pkgs/by-name/us/usb-modeswitch/configurable-usb-modeswitch.patch similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch rename to pkgs/by-name/us/usb-modeswitch/configurable-usb-modeswitch.patch diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch/data.nix similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/data.nix rename to pkgs/by-name/us/usb-modeswitch/data.nix diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/by-name/us/usb-modeswitch/package.nix similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/default.nix rename to pkgs/by-name/us/usb-modeswitch/package.nix diff --git a/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch b/pkgs/by-name/us/usb-modeswitch/pkg-config.patch similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch rename to pkgs/by-name/us/usb-modeswitch/pkg-config.patch diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/by-name/xc/xcode-install/Gemfile similarity index 100% rename from pkgs/development/tools/xcode-install/Gemfile rename to pkgs/by-name/xc/xcode-install/Gemfile diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/by-name/xc/xcode-install/Gemfile.lock similarity index 98% rename from pkgs/development/tools/xcode-install/Gemfile.lock rename to pkgs/by-name/xc/xcode-install/Gemfile.lock index d9bbc5cc8cb3..ff44c187b2e2 100644 --- a/pkgs/development/tools/xcode-install/Gemfile.lock +++ b/pkgs/by-name/xc/xcode-install/Gemfile.lock @@ -11,13 +11,14 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1068.0) - aws-sdk-core (3.220.1) + aws-partitions (1.1075.0) + aws-sdk-core (3.221.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) + logger aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) @@ -160,6 +161,7 @@ GEM json (2.10.2) jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) @@ -213,7 +215,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/by-name/xc/xcode-install/gemset.nix similarity index 97% rename from pkgs/development/tools/xcode-install/gemset.nix rename to pkgs/by-name/xc/xcode-install/gemset.nix index 115647dd9c29..3b1531131812 100644 --- a/pkgs/development/tools/xcode-install/gemset.nix +++ b/pkgs/by-name/xc/xcode-install/gemset.nix @@ -55,10 +55,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; + sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i"; type = "gem"; }; - version = "1.1068.0"; + version = "1.1075.0"; }; aws-sdk-core = { dependencies = [ @@ -67,15 +67,16 @@ "aws-sigv4" "base64" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; + sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy"; type = "gem"; }; - version = "3.220.1"; + version = "3.221.0"; }; aws-sdk-kms = { dependencies = [ @@ -683,6 +684,16 @@ }; version = "2.10.1"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; mini_magick = { groups = [ "default" ]; platforms = [ ]; @@ -1058,10 +1069,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; + sha256 = "14iqgwrdfzc00b3dc5pal4gm9n7w5hn3wdgmsvirwn7n47km0k5i"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/by-name/xc/xcode-install/package.nix similarity index 100% rename from pkgs/development/tools/xcode-install/default.nix rename to pkgs/by-name/xc/xcode-install/package.nix diff --git a/pkgs/development/tools/xcpretty/Gemfile b/pkgs/by-name/xc/xcpretty/Gemfile similarity index 100% rename from pkgs/development/tools/xcpretty/Gemfile rename to pkgs/by-name/xc/xcpretty/Gemfile diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/by-name/xc/xcpretty/Gemfile.lock similarity index 88% rename from pkgs/development/tools/xcpretty/Gemfile.lock rename to pkgs/by-name/xc/xcpretty/Gemfile.lock index d56a9587d70d..bd6ab78bd446 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/by-name/xc/xcpretty/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: rouge (3.28.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) PLATFORMS diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/by-name/xc/xcpretty/gemset.nix similarity index 82% rename from pkgs/development/tools/xcpretty/gemset.nix rename to pkgs/by-name/xc/xcpretty/gemset.nix index b9dd45abfbbb..2ebf614ef3f3 100644 --- a/pkgs/development/tools/xcpretty/gemset.nix +++ b/pkgs/by-name/xc/xcpretty/gemset.nix @@ -15,9 +15,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; + sha256 = "14iqgwrdfzc00b3dc5pal4gm9n7w5hn3wdgmsvirwn7n47km0k5i"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; } diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/by-name/xc/xcpretty/package.nix similarity index 100% rename from pkgs/development/tools/xcpretty/default.nix rename to pkgs/by-name/xc/xcpretty/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966a08bebffb..6a5dc5d9c62c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2701,8 +2701,7 @@ with pkgs; inherit (nodePackages) uppy-companion; - usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; - usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; + usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { }; persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; @@ -7438,8 +7437,6 @@ with pkgs; black = with python3Packages; toPythonApplication black; - blackfire = callPackage ../development/tools/misc/blackfire { }; - black-macchiato = with python3Packages; toPythonApplication black-macchiato; buck = callPackage ../development/tools/build-managers/buck { @@ -7474,8 +7471,6 @@ with pkgs; bundlewrap = with python3.pkgs; toPythonApplication bundlewrap; - cadre = callPackage ../development/tools/cadre { }; - # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: # replaceStdenv = { pkgs }: pkgs.ccacheStdenv; @@ -7524,8 +7519,6 @@ with pkgs; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; - coder = callPackage ../development/tools/coder { }; - cookiecutter = with python3Packages; toPythonApplication cookiecutter; corundum = callPackage ../development/tools/corundum { }; @@ -8129,8 +8122,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; - xcode-install = callPackage ../development/tools/xcode-install { }; - xcbuild = callPackage ../by-name/xc/xcbuild/package.nix { stdenv = # xcbuild is included in the SDK. Avoid an infinite recursion by using a bootstrap stdenv. @@ -8147,8 +8138,6 @@ with pkgs; xcodebuild = xcbuild; - xcpretty = callPackage ../development/tools/xcpretty { }; - xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; xxdiff-tip = xxdiff; @@ -10339,8 +10328,7 @@ with pkgs; sqlite-interactive = (sqlite.override { interactive = true; }).bin; - stlink = callPackage ../development/tools/misc/stlink { }; - stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; + stlink-gui = callPackage ../by-name/st/stlink/package.nix { withGUI = true; }; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 05b44363eabb..7faa603b591b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -280,7 +280,7 @@ lib.makeScope pkgs.newScope ( ast = callPackage ../development/php-packages/ast { }; - blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { }; + blackfire = callPackage ../by-name/bl/blackfire/php-probe.nix { }; couchbase = callPackage ../development/php-packages/couchbase { };