b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.distribution-nixpkgs: 1.6.2 -> 1.7.0

Browse source 
Since stable cabal2nix now supports the release, we can finally upgrade.
This commit is contained in:
sternenseemann 2022-07-20 12:05:09 +02:00
parent 6a445e1717
commit 8080821eee
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -85,8 +85,6 @@ default-package-overrides:
- http-client-restricted < 0.0.5
# Needs dhall 1.41.*, Stackage LTS 19 has 1.40
- dhall-nix < 1.1.24
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
- distribution-nixpkgs < 1.7.0
# patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet
- patch < 0.0.7
- reflex < 0.8.2.1

20
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -82320,25 +82320,6 @@ self: {
}) {};
"distribution-nixpkgs" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, deepseq, hspec, language-nix, lens, pretty, process, split
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.6.2";
sha256 = "0kq4pf5dalifxd8qxz75fazfjspn36q0cmp8d1jd7w9zlzc3c4dz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq language-nix lens
pretty process split
];
testHaskellDepends = [ base deepseq hspec lens ];
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.peti ];
}) {};
"distribution-nixpkgs_1_7_0" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, deepseq, directory, hspec, language-nix, lens, pretty, process
}:
@ -82356,7 +82337,6 @@ self: {
];
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.peti ];
}) {};

4
pkgs/development/haskell-modules/non-hackage-packages.nix
View file

@ -13,9 +13,7 @@ self: super: {
# Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
# from the latest master instead of the current version on Hackage.
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix {
distribution-nixpkgs = self.distribution-nixpkgs_1_7_0;
};
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };