From aa7b27c5363e03d8e575a63a33ef63d6e4f996fb Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 8 Feb 2024 00:19:49 +0100 Subject: [PATCH] Revert "sbcl: move to /pkgs/by-name" This reverts commit 0a3dab4af34e4d086931d82827bfc8760c3e3150 After doing some improvements to the `pkgs/by-name` check I discovered that sbcl shouldn't have been allowed in `pkgs/by-name` after all as is. Specifically, the requirement is that if `pkgs/by-name/sb/sbcl` exists, the definition of the `sbcl` attribute must look like sbcl = callPackage ../by-name/sb/sbcl/package.nix { ... }; However it currently is an alias like sbcl = sbcl_2_4_1; This wasn't detected before because `sbcl_2_4_1` was semantically defined using `callPackage`: sbcl_2_4_1 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; However this doesn't syntactically match what is required. In https://github.com/NixOS/nixpkgs/pull/285089 I introduced syntactic checks for exactly this, but they were only used for packages not already in `pkgs/by-name`. Only now that I'm doing the refactoring to also use this check for `pkgs/by-name` packages this problem is noticed. While introducing this new check is technically an increase in strictness, and therefore would justify adding a new ratchet, I consider this case to be rare enough that we don't need to do that. This commit also introduces a test to prevent such regressions in the future --- .../sb => development/compilers}/sbcl/bootstrap.nix | 0 .../package.nix => development/compilers/sbcl/default.nix} | 0 .../compilers}/sbcl/fix-2.4.0-aarch64-darwin.patch | 0 .../non-syntactical-callPackage-by-name/all-packages.nix | 6 ++++++ .../tests/non-syntactical-callPackage-by-name/default.nix | 1 + .../pkgs/by-name/fo/foo/package.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 7 files changed, 10 insertions(+), 2 deletions(-) rename pkgs/{by-name/sb => development/compilers}/sbcl/bootstrap.nix (100%) rename pkgs/{by-name/sb/sbcl/package.nix => development/compilers/sbcl/default.nix} (100%) rename pkgs/{by-name/sb => development/compilers}/sbcl/fix-2.4.0-aarch64-darwin.patch (100%) create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/all-packages.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/default.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/pkgs/by-name/fo/foo/package.nix diff --git a/pkgs/by-name/sb/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix similarity index 100% rename from pkgs/by-name/sb/sbcl/bootstrap.nix rename to pkgs/development/compilers/sbcl/bootstrap.nix diff --git a/pkgs/by-name/sb/sbcl/package.nix b/pkgs/development/compilers/sbcl/default.nix similarity index 100% rename from pkgs/by-name/sb/sbcl/package.nix rename to pkgs/development/compilers/sbcl/default.nix diff --git a/pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch b/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch similarity index 100% rename from pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch rename to pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/all-packages.nix new file mode 100644 index 000000000000000..3e0ea20c2281098 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/all-packages.nix @@ -0,0 +1,6 @@ +self: super: { + + bar = (x: x) self.callPackage ./pkgs/by-name/fo/foo/package.nix { someFlag = true; }; + foo = self.bar; + +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/default.nix new file mode 100644 index 000000000000000..861260cdca4b259 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/default.nix @@ -0,0 +1 @@ +import { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/pkgs/by-name/fo/foo/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 000000000000000..5ad6ea5e24d665a --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv, someFlag }: someDrv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 441a1439b1c1a05..b66b781acb3d42b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25939,12 +25939,12 @@ with pkgs; # Steel Bank Common Lisp sbcl_2_4_0 = wrapLisp { - pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.0"; }; + pkg = callPackage ../development/compilers/sbcl { version = "2.4.0"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; sbcl_2_4_1 = wrapLisp { - pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.1"; }; + pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; };