commit 794bc5e9ed7ebb17822b510f24dcc607e727484d · pyrox.dev/nixpkgs

+2 -2

maintainers/scripts/haskell/regenerate-hackage-packages.sh

···

       1
        
       #! /usr/bin/env nix-shell

     

       2
       -
       #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-latest -I nixpkgs=.

     

       3
        
       

     

       4
        
       # This script is used to regenerate nixpkgs' Haskell package set, using a tool

     

       5
        
       # called hackage2nix. hackage2nix looks at

     
···

       9
        
       # companion tool cabal2nix.

     

       10
        
       #

     

       11
        
       # Related scripts are update-hackage.sh, for updating the snapshot of the

     

       12
       -
       # Hackage database used by hackage2nix, and update-cabal2nix-latest.sh,

     

       13
        
       # for updating the version of hackage2nix used to perform this task.

     

       14
        
       

     

       15
        
       set -euo pipefail

···

       1
        
       #! /usr/bin/env nix-shell

     

       2
       +
       #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable -I nixpkgs=.

     

       3
        
       

     

       4
        
       # This script is used to regenerate nixpkgs' Haskell package set, using a tool

     

       5
        
       # called hackage2nix. hackage2nix looks at

     
···

       9
        
       # companion tool cabal2nix.

     

       10
        
       #

     

       11
        
       # Related scripts are update-hackage.sh, for updating the snapshot of the

     

       12
       +
       # Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh,

     

       13
        
       # for updating the version of hackage2nix used to perform this task.

     

       14
        
       

     

       15
        
       set -euo pipefail

-17

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

···

       1
       -
       #! /usr/bin/env nix-shell

     

       2
       -
       #! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-latest -I nixpkgs=.

     

       3
       -
       

     

       4
       -
       # Updates cabal2nix-latest to the latest master of the nixos/cabal2nix repository.

     

       5
       -
       # See regenerate-hackage-packages.sh for details on the purpose of this script.

     

       6
       -
       

     

       7
       -
       set -euo pipefail

     

       8
       -
       

     

       9
       -
       # fetch current master HEAD from Github

     

       10
       -
       head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/NixOS/cabal2nix/branches/master)"

     

       11
       -
       # extract commit hash

     

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

     

       13
       -
       # extract commit timestamp and convert to date

     

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

     

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

     

       16
       -
       echo '# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-latest.nix

     

       17
       -
       cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix

+17

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

···

       1
       +
       #! /usr/bin/env nix-shell

     

       2
       +
       #! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.

     

       3
       +
       

     

       4
       +
       # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.

     

       5
       +
       # See regenerate-hackage-packages.sh for details on the purpose of this script.

     

       6
       +
       

     

       7
       +
       set -euo pipefail

     

       8
       +
       

     

       9
       +
       # fetch current master HEAD from Github

     

       10
       +
       head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/NixOS/cabal2nix/branches/master)"

     

       11
       +
       # extract commit hash

     

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

     

       13
       +
       # extract commit timestamp and convert to date

     

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

     

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

     

       16
       +
       echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix

     

       17
       +
       cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix

+1 -1

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

···

       1
       -
       # This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.

     

       2
        
       { mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal

     

       3
        
       , containers, deepseq, directory, distribution-nixpkgs, fetchzip

     

       4
        
       , filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib

···

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

     

       2
        
       { mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal

     

       3
        
       , containers, deepseq, directory, distribution-nixpkgs, fetchzip

     

       4
        
       , filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib

+2 -2

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

···

       1793
        
         # https://github.com/obsidiansystems/database-id/issues/1

     

       1794
        
         database-id-class = doJailbreak super.database-id-class;

     

       1795
        
       

     

       1796
       -
         cabal2nix-latest = overrideCabal super.cabal2nix-latest {

     

       1797
       -
           passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-latest.sh;

     

       1798
        
         };

     

       1799
        
       

     

       1800
        
         # Too strict version bounds on base and optparse-applicative

···

       1793
        
         # https://github.com/obsidiansystems/database-id/issues/1

     

       1794
        
         database-id-class = doJailbreak super.database-id-class;

     

       1795
        
       

     

       1796
       +
         cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {

     

       1797
       +
           passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;

     

       1798
        
         };

     

       1799
        
       

     

       1800
        
         # Too strict version bounds on base and optparse-applicative

+1 -1

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

···

       13
        
       

     

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

     

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

     

       16
       -
         cabal2nix-latest = self.callPackage ./cabal2nix-latest.nix { };

     

       17
        
       

     

       18
        
         # https://github.com/channable/vaultenv/issues/1

     

       19
        
         vaultenv = self.callPackage ../tools/haskell/vaultenv { };

···

       13
        
       

     

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

     

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

     

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

     

       17
        
       

     

       18
        
         # https://github.com/channable/vaultenv/issues/1

     

       19
        
         vaultenv = self.callPackage ../tools/haskell/vaultenv { };