tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

cabal2nix: synchronize state with master @ daa03b0229ea77c34530cbadf60b4126a979fae5

Peter Simons 014223bd 26b6957d

+6 -6
unified split
+2 -2
pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
··· 6 6 7 7 mkDerivation rec { 8 8 pname = "cabal2nix"; 9 - version = "20151217"; 9 + version = "20160308"; 10 10 src = fetchFromGitHub { 11 11 owner = "nixos"; 12 12 repo = "cabal2nix"; 13 13 rev = "v${version}"; 14 - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; 14 + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; 15 15 }; 16 16 postUnpack = "sourceRoot+=/${pname}"; 17 17 isLibrary = false;
+2 -2
pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
··· 11 11 src = fetchFromGitHub { 12 12 owner = "nixos"; 13 13 repo = "cabal2nix"; 14 - rev = "v20151217"; 15 - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; 14 + rev = "v20160308"; 15 + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; 16 16 }; 17 17 postUnpack = "sourceRoot+=/${pname}"; 18 18 libraryHaskellDepends = [
+2 -2
pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
··· 7 7 8 8 mkDerivation rec { 9 9 pname = "hackage2nix"; 10 - version = "20151217"; 10 + version = "20160308"; 11 11 src = fetchFromGitHub { 12 12 owner = "nixos"; 13 13 repo = "cabal2nix"; 14 14 rev = "v${version}"; 15 - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; 15 + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; 16 16 }; 17 17 postUnpack = "sourceRoot+=/${pname}"; 18 18 isLibrary = false;