commit 8a0284dcd27afa1fc9542c03ce0a80e5d83cd04d · pyrox.dev/nixpkgs

+12 -4

maintainers/scripts/haskell/update-cabal2nix-unstable.sh

···

       12
       12
        
       commit="$(jq -r .commit.sha <<< "$head_info")"

     

       13
       13
        
       # extract commit timestamp and convert to date

     

       14
       14
        
       date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"

     

       15
       15
       +
       

     

       15
       16
        
       # generate nix expression from cabal file, replacing the version with the commit date

     

       16
       16
       -
       output=pkgs/development/haskell-modules/cabal2nix-unstable.nix

     

       17
       17
       -
       echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > "$output"

     

       18
       18
       -
       cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -Ee 's/version = "(.*)"/version = "\1-unstable-'"$date"'"/' >> "$output"

     

       19
       19
       -
       nixfmt "$output"

     

       17
       17
       +
       function mkPackage() {

     

       18
       18
       +
         output=pkgs/development/haskell-modules/cabal2nix-unstable/$1.nix

     

       19
       19
       +
         echo "# This file defines $1-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh." > "$output"

     

       20
       20
       +
         cabal2nix --subpath "$1" "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -Ee 's/version = "(.*)"/version = "\1-unstable-'"$date"'"/' >> "$output"

     

       21
       21
       +
         nixfmt "$output"

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       mkPackage "cabal2nix"

     

       25
       25
       +
       mkPackage "distribution-nixpkgs"

     

       26
       26
       +
       mkPackage "hackage-db"

     

       27
       27
       +
       mkPackage "language-nix"

pkgs/development/haskell-modules/cabal2nix-unstable.nix pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix

+53

pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix

···

       1
       1
       +
       # This file defines distribution-nixpkgs-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.

     

       2
       2
       +
       {

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         aeson,

     

       5
       5
       +
         base,

     

       6
       6
       +
         bytestring,

     

       7
       7
       +
         Cabal,

     

       8
       8
       +
         containers,

     

       9
       9
       +
         deepseq,

     

       10
       10
       +
         directory,

     

       11
       11
       +
         fetchzip,

     

       12
       12
       +
         hspec,

     

       13
       13
       +
         language-nix,

     

       14
       14
       +
         lens,

     

       15
       15
       +
         lib,

     

       16
       16
       +
         pretty,

     

       17
       17
       +
         process,

     

       18
       18
       +
       }:

     

       19
       19
       +
       mkDerivation {

     

       20
       20
       +
         pname = "distribution-nixpkgs";

     

       21
       21
       +
         version = "1.7.1.1-unstable-2025-09-09";

     

       22
       22
       +
         src = fetchzip {

     

       23
       23
       +
           url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";

     

       24
       24
       +
           sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";

     

       25
       25
       +
         };

     

       26
       26
       +
         postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";

     

       27
       27
       +
         enableSeparateDataOutput = true;

     

       28
       28
       +
         libraryHaskellDepends = [

     

       29
       29
       +
           aeson

     

       30
       30
       +
           base

     

       31
       31
       +
           bytestring

     

       32
       32
       +
           Cabal

     

       33
       33
       +
           containers

     

       34
       34
       +
           deepseq

     

       35
       35
       +
           language-nix

     

       36
       36
       +
           lens

     

       37
       37
       +
           pretty

     

       38
       38
       +
           process

     

       39
       39
       +
         ];

     

       40
       40
       +
         testHaskellDepends = [

     

       41
       41
       +
           aeson

     

       42
       42
       +
           base

     

       43
       43
       +
           Cabal

     

       44
       44
       +
           deepseq

     

       45
       45
       +
           directory

     

       46
       46
       +
           hspec

     

       47
       47
       +
           language-nix

     

       48
       48
       +
           lens

     

       49
       49
       +
         ];

     

       50
       50
       +
         homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";

     

       51
       51
       +
         description = "Types and functions to manipulate the Nixpkgs distribution";

     

       52
       52
       +
         license = lib.licenses.bsd3;

     

       53
       53
       +
       }

+44

pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix

···

       1
       1
       +
       # This file defines hackage-db-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.

     

       2
       2
       +
       {

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         aeson,

     

       5
       5
       +
         base,

     

       6
       6
       +
         bytestring,

     

       7
       7
       +
         Cabal,

     

       8
       8
       +
         containers,

     

       9
       9
       +
         directory,

     

       10
       10
       +
         exceptions,

     

       11
       11
       +
         fetchzip,

     

       12
       12
       +
         filepath,

     

       13
       13
       +
         lib,

     

       14
       14
       +
         tar,

     

       15
       15
       +
         time,

     

       16
       16
       +
         utf8-string,

     

       17
       17
       +
       }:

     

       18
       18
       +
       mkDerivation {

     

       19
       19
       +
         pname = "hackage-db";

     

       20
       20
       +
         version = "2.1.3-unstable-2025-09-09";

     

       21
       21
       +
         src = fetchzip {

     

       22
       22
       +
           url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";

     

       23
       23
       +
           sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";

     

       24
       24
       +
         };

     

       25
       25
       +
         postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";

     

       26
       26
       +
         isLibrary = true;

     

       27
       27
       +
         isExecutable = true;

     

       28
       28
       +
         libraryHaskellDepends = [

     

       29
       29
       +
           aeson

     

       30
       30
       +
           base

     

       31
       31
       +
           bytestring

     

       32
       32
       +
           Cabal

     

       33
       33
       +
           containers

     

       34
       34
       +
           directory

     

       35
       35
       +
           exceptions

     

       36
       36
       +
           filepath

     

       37
       37
       +
           tar

     

       38
       38
       +
           time

     

       39
       39
       +
           utf8-string

     

       40
       40
       +
         ];

     

       41
       41
       +
         homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";

     

       42
       42
       +
         description = "Access cabal-install's Hackage database via Data.Map";

     

       43
       43
       +
         license = lib.licenses.bsd3;

     

       44
       44
       +
       }

+32

pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix

···

       1
       1
       +
       # This file defines language-nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.

     

       2
       2
       +
       {

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         base,

     

       5
       5
       +
         deepseq,

     

       6
       6
       +
         fetchzip,

     

       7
       7
       +
         lens,

     

       8
       8
       +
         lib,

     

       9
       9
       +
         parsec-class,

     

       10
       10
       +
         pretty,

     

       11
       11
       +
         QuickCheck,

     

       12
       12
       +
       }:

     

       13
       13
       +
       mkDerivation {

     

       14
       14
       +
         pname = "language-nix";

     

       15
       15
       +
         version = "2.2.0-unstable-2025-09-09";

     

       16
       16
       +
         src = fetchzip {

     

       17
       17
       +
           url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";

     

       18
       18
       +
           sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";

     

       19
       19
       +
         };

     

       20
       20
       +
         postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";

     

       21
       21
       +
         libraryHaskellDepends = [

     

       22
       22
       +
           base

     

       23
       23
       +
           deepseq

     

       24
       24
       +
           lens

     

       25
       25
       +
           parsec-class

     

       26
       26
       +
           pretty

     

       27
       27
       +
           QuickCheck

     

       28
       28
       +
         ];

     

       29
       29
       +
         homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";

     

       30
       30
       +
         description = "Data types and functions to represent the Nix language";

     

       31
       31
       +
         license = lib.licenses.bsd3;

     

       32
       32
       +
       }

+4

pkgs/development/haskell-modules/configuration-common.nix

···

       171
       171
        
               ];

     

       172
       172
        
       

     

       173
       173
        
               cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay;

     

       174
       174
       +
               distribution-nixpkgs-unstable = super.distribution-nixpkgs-unstable.overrideScope cabalInstallOverlay;

     

       175
       175
       +
               hackage-db-unstable = super.hackage-db-unstable.overrideScope cabalInstallOverlay;

     

       174
       176
        
             }

     

       175
       177
        
           )

     

       176
       178
        
           cabal-install

     

       177
       179
        
           cabal-install-solver

     

       178
       180
        
           guardian

     

       179
       181
        
           cabal2nix-unstable

     

       182
       182
       +
           distribution-nixpkgs-unstable

     

       183
       183
       +
           hackage-db-unstable

     

       180
       184
        
           ;

     

       181
       185
        
       

     

       182
       186
        
         # Expected test output for these accidentally checks the absolute location of the source directory

+17 -15

pkgs/development/haskell-modules/configuration-darwin.nix

···

       354
       354
        
           # after verifying they are indeed erroneous (e.g. cabal2nix) or just disable

     

       355
       355
        
           # the check, sticking with the status quo. Ideally there'll be zero cases of

     

       356
       356
        
           # the latter in the future!

     

       357
       357
       -
           inherit

     

       358
       358
       -
             (lib.mapAttrs (

     

       359
       359
       -
               _:

     

       360
       360
       -
               overrideCabal (old: {

     

       361
       361
       -
                 postInstall = ''

     

       362
       362
       -
                   remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"

     

       363
       363
       -
                   # Note: The `data` output is needed at runtime.

     

       364
       364
       -
                   remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"

     

       357
       357
       +
           cabal2nix = overrideCabal (old: {

     

       358
       358
       +
             postInstall = ''

     

       359
       359
       +
               remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"

     

       360
       360
       +
               # Note: The `data` output is needed at runtime.

     

       361
       361
       +
               remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"

     

       365
       362
        
       

     

       366
       366
       -
                   ${old.postInstall or ""}

     

       367
       367
       -
                 '';

     

       368
       368
       -
               })

     

       369
       369
       -
             ) super)

     

       370
       370
       -
             cabal2nix

     

       371
       371
       -
             cabal2nix-unstable

     

       372
       372
       -
             ;

     

       363
       363
       +
               ${old.postInstall or ""}

     

       364
       364
       +
             '';

     

       365
       365
       +
           }) super.cabal2nix;

     

       366
       366
       +
           cabal2nix-unstable = overrideCabal (old: {

     

       367
       367
       +
             postInstall = ''

     

       368
       368
       +
               remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"

     

       369
       369
       +
               # Note: The `data` output is needed at runtime.

     

       370
       370
       +
               remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "$out/bin/hackage2nix"

     

       371
       371
       +
       

     

       372
       372
       +
               ${old.postInstall or ""}

     

       373
       373
       +
             '';

     

       374
       374
       +
           }) super.cabal2nix-unstable;

     

       373
       375
        
       

     

       374
       376
        
           # https://github.com/fpco/unliftio/issues/87

     

       375
       377
        
           unliftio = dontCheck super.unliftio;

+10 -1

pkgs/development/haskell-modules/non-hackage-packages.nix

···

       28
       28
        
       

     

       29
       29
        
         # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated

     

       30
       30
        
         # from the latest master instead of the current version on Hackage.

     

       31
       31
       -
         cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };

     

       31
       31
       +
         cabal2nix-unstable = self.callPackage ./cabal2nix-unstable/cabal2nix.nix {

     

       32
       32
       +
           distribution-nixpkgs = self.distribution-nixpkgs-unstable;

     

       33
       33
       +
           hackage-db = self.hackage-db-unstable;

     

       34
       34
       +
           language-nix = self.language-nix-unstable;

     

       35
       35
       +
         };

     

       36
       36
       +
         distribution-nixpkgs-unstable = self.callPackage ./cabal2nix-unstable/distribution-nixpkgs.nix {

     

       37
       37
       +
           language-nix = self.language-nix-unstable;

     

       38
       38
       +
         };

     

       39
       39
       +
         hackage-db-unstable = self.callPackage ./cabal2nix-unstable/hackage-db.nix { };

     

       40
       40
       +
         language-nix-unstable = self.callPackage ./cabal2nix-unstable/language-nix.nix { };

     

       32
       41
        
       

     

       33
       42
        
         ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { };

     

       34
       43