lol

haskellPackages.distribution-nixpkgs: 1.6.2 -> 1.7.0

Since stable cabal2nix now supports the release, we can finally upgrade.

+1 -25
-2
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
··· 85 85 - http-client-restricted < 0.0.5 86 86 # Needs dhall 1.41.*, Stackage LTS 19 has 1.40 87 87 - dhall-nix < 1.1.24 88 - # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version 89 - - distribution-nixpkgs < 1.7.0 90 88 # patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet 91 89 - patch < 0.0.7 92 90 - reflex < 0.8.2.1
-20
pkgs/development/haskell-modules/hackage-packages.nix
··· 82321 82321 82322 82322 "distribution-nixpkgs" = callPackage 82323 82323 ({ mkDerivation, aeson, base, bytestring, Cabal, containers 82324 - , deepseq, hspec, language-nix, lens, pretty, process, split 82325 - }: 82326 - mkDerivation { 82327 - pname = "distribution-nixpkgs"; 82328 - version = "1.6.2"; 82329 - sha256 = "0kq4pf5dalifxd8qxz75fazfjspn36q0cmp8d1jd7w9zlzc3c4dz"; 82330 - enableSeparateDataOutput = true; 82331 - libraryHaskellDepends = [ 82332 - aeson base bytestring Cabal containers deepseq language-nix lens 82333 - pretty process split 82334 - ]; 82335 - testHaskellDepends = [ base deepseq hspec lens ]; 82336 - description = "Types and functions to manipulate the Nixpkgs distribution"; 82337 - license = lib.licenses.bsd3; 82338 - maintainers = [ lib.maintainers.peti ]; 82339 - }) {}; 82340 - 82341 - "distribution-nixpkgs_1_7_0" = callPackage 82342 - ({ mkDerivation, aeson, base, bytestring, Cabal, containers 82343 82324 , deepseq, directory, hspec, language-nix, lens, pretty, process 82344 82325 }: 82345 82326 mkDerivation { ··· 82356 82337 ]; 82357 82338 description = "Types and functions to manipulate the Nixpkgs distribution"; 82358 82339 license = lib.licenses.bsd3; 82359 - hydraPlatforms = lib.platforms.none; 82360 82340 maintainers = [ lib.maintainers.peti ]; 82361 82341 }) {}; 82362 82342
+1 -3
pkgs/development/haskell-modules/non-hackage-packages.nix
··· 13 13 14 14 # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated 15 15 # from the latest master instead of the current version on Hackage. 16 - cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { 17 - distribution-nixpkgs = self.distribution-nixpkgs_1_7_0; 18 - }; 16 + cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; 19 17 20 18 # https://github.com/channable/vaultenv/issues/1 21 19 vaultenv = self.callPackage ../tools/haskell/vaultenv { };