From f9369208ac89f74d7fccfa4eb1a0664d9136f1ff Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Jan 2026 00:20:21 +0100 Subject: [PATCH] cabal2nix: add pname and version, also move to by-name --- pkgs/by-name/ca/cabal2nix/package.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 -------------- 2 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/ca/cabal2nix/package.nix diff --git a/pkgs/by-name/ca/cabal2nix/package.nix b/pkgs/by-name/ca/cabal2nix/package.nix new file mode 100644 index 000000000000..91493bc558f3 --- /dev/null +++ b/pkgs/by-name/ca/cabal2nix/package.nix @@ -0,0 +1,21 @@ +{ + lib, + symlinkJoin, + cabal2nix-unwrapped, + makeWrapper, + nix-prefetch-scripts, +}: + +symlinkJoin { + inherit (cabal2nix-unwrapped) pname version meta; + nativeBuildInputs = [ makeWrapper ]; + paths = [ cabal2nix-unwrapped ]; + postBuild = '' + wrapProgram $out/bin/cabal2nix \ + --prefix PATH ":" "${ + lib.makeBinPath [ + nix-prefetch-scripts + ] + }" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01921036db84..3bfec81bdb4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1653,20 +1653,6 @@ with pkgs; haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix ); - cabal2nix = symlinkJoin { - inherit (cabal2nix-unwrapped) name meta; - nativeBuildInputs = [ buildPackages.makeWrapper ]; - paths = [ cabal2nix-unwrapped ]; - postBuild = '' - wrapProgram $out/bin/cabal2nix \ - --prefix PATH ":" "${ - lib.makeBinPath [ - nix-prefetch-scripts - ] - }" - ''; - }; - stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (_: {