diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-04 13:38:29 +0200 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-04 13:38:46 +0200 |
| commit | 794bc5e9ed7ebb17822b510f24dcc607e727484d (patch) | |
| tree | 03f8e5d80404427958f42ed8ef97e7558b6391c3 /maintainers/scripts | |
| parent | e30cf42f0cd541763671baf57d084d89face9463 (diff) | |
| download | nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar.gz nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar.bz2 nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar.lz nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar.xz nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.tar.zst nixpkgs-794bc5e9ed7ebb17822b510f24dcc607e727484d.zip | |
haskellPackages.cabal2nix-unstable: rename from cabal2nix-latest
Diffstat (limited to 'maintainers/scripts')
| -rwxr-xr-x | maintainers/scripts/haskell/regenerate-hackage-packages.sh | 4 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/update-cabal2nix-unstable.sh (renamed from maintainers/scripts/haskell/update-cabal2nix-latest.sh) | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 2408d893dae..a56d8a0a0e2 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-latest -I nixpkgs=. +#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable -I nixpkgs=. # This script is used to regenerate nixpkgs' Haskell package set, using a tool # called hackage2nix. hackage2nix looks at @@ -9,7 +9,7 @@ # companion tool cabal2nix. # # Related scripts are update-hackage.sh, for updating the snapshot of the -# Hackage database used by hackage2nix, and update-cabal2nix-latest.sh, +# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, # for updating the version of hackage2nix used to perform this task. set -euo pipefail diff --git a/maintainers/scripts/haskell/update-cabal2nix-latest.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index e8018e1384d..41583704560 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-latest.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-latest -I nixpkgs=. +#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=. -# Updates cabal2nix-latest to the latest master of the nixos/cabal2nix repository. +# Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. # See regenerate-hackage-packages.sh for details on the purpose of this script. set -euo pipefail @@ -13,5 +13,5 @@ commit="$(jq -r .commit.sha <<< "$head_info")" # extract commit timestamp and convert to date date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)" # generate nix expression from cabal file, replacing the version with the commit date -echo '# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-latest.nix -cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix +echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix +cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix |