public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cabal2nix: 2.17.0 -> 2.18.0 

https://github.com/NixOS/cabal2nix/blob/v2.18.0/CHANGELOG.md

2.18.0 mostly brings bug fixes, especially the one fixing the unclear
error message if a cabal file was missing (which was forgotten in the
changelog). It is not technically a non-breaking change since the
Haskell API changed.

Since there shouldn't be any breakage for users and all known reverse
dependencies of cabal2nix have been broken for a while, the benefits
of backporting outweigh the risks.
This commit is contained in:
sternenseemann 2021-08-04 11:41:08 +02:00
parent ae42a59565
commit 259f027a4b
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -49,5 +49,11 @@ self: super: {
arion-compose = self.callPackage ../../applications/virtualization/arion/arion-compose.nix {}; arion-compose = self.callPackage ../../applications/virtualization/arion/arion-compose.nix {};
# cabal2nix cabal://ap-normalize-0.1.0.1 # cabal2nix cabal://ap-normalize-0.1.0.1
ap-normalize = self.callPackage ../misc/haskell/ap-normalize {}; ap-normalize = self.callPackage ../misc/haskell/ap-normalize {};
# cabal2nix cabal://distribution-nixpkgs
distribution-nixpkgs_1_6_0 = self.callPackage ../misc/haskell/distribution-nixpkgs.nix {};
# cabal2nix cabal://cabal2nix-2.18.0
cabal2nix = self.callPackage ../misc/haskell/cabal2nix.nix {
distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
};
} }

35
pkgs/development/misc/haskell/cabal2nix.nix Normal file
View File

@ -0,0 +1,35 @@
{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
, containers, deepseq, directory, distribution-nixpkgs, filepath
, hackage-db, hopenssl, hpack, language-nix, lens, lib, monad-par
, monad-par-extras, mtl, optparse-applicative, pretty, process
, split, tasty, tasty-golden, text, time, transformers, yaml
}:
mkDerivation {
pname = "cabal2nix";
version = "2.18.0";
sha256 = "4b90602dc0878c2e4a3e7def2c2ae0e99782b2f0d53d8e3914adaa43038b1f86";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base bytestring Cabal containers deepseq
directory distribution-nixpkgs filepath hackage-db hopenssl hpack
language-nix lens optparse-applicative pretty process split text
time transformers yaml
];
executableHaskellDepends = [
aeson base bytestring Cabal containers directory
distribution-nixpkgs filepath hopenssl language-nix lens monad-par
monad-par-extras mtl optparse-applicative pretty
];
testHaskellDepends = [
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions";
license = lib.licenses.bsd3;
}

19
pkgs/development/misc/haskell/distribution-nixpkgs.nix Normal file
View File

@ -0,0 +1,19 @@
{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
, hspec, language-nix, lens, lib, pretty, process, split
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.6.0";
sha256 = "d1804dcb731858d40859f1cf55ea81b3f6bc63a353437c1009c158e0f9e03354";
revision = "1";
editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq language-nix lens
pretty process split
];
testHaskellDepends = [ base deepseq hspec lens ];
homepage = "https://github.com/NixOS/distribution-nixpkgs";
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.licenses.bsd3;
}