diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![hackage release](https://img.shields.io/hackage/v/cabal2nix.svg?label=hackage)](http://hackage.haskell.org/package/cabal2nix) [![stackage LTS package](http://stackage.org/package/cabal2nix/badge/lts)](http://stackage.org/lts/package/cabal2nix) [![stackage Nightly package](http://stackage.org/package/cabal2nix/badge/nightly)](http://stackage.org/nightly/package/cabal2nix) -[![travis build status](https://img.shields.io/travis/NixOS/cabal2nix/master.svg?label=travis+build)](https://travis-ci.org/NixOS/cabal2nix) +![Continous Integration](https://github.com/NixOS/cabal2nix/workflows/Haskell-CI/badge.svg) `cabal2nix` converts a single Cabal file into a single Nix build expression. For example: diff --git a/cabal2nix.cabal b/cabal2nix.cabal --- a/cabal2nix.cabal +++ b/cabal2nix.cabal @@ -1,5 +1,5 @@ name: cabal2nix -version: 2.16.0 +version: 2.17.0 synopsis: Convert Cabal files into Nix build instructions. description: Convert Cabal files into Nix build instructions. Users of Nix can install the latest @@ -70,7 +70,7 @@ , containers >= 0.5.9 , deepseq >= 1.4 , directory - , distribution-nixpkgs >= 1.4.0 + , distribution-nixpkgs >= 1.5.0 , filepath , hackage-db >= 2.0.1 , hopenssl >= 2 diff --git a/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs b/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs --- a/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs +++ b/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs @@ -19,6 +19,7 @@ | name == "bustle" = [disable "hgettext"] -- https://gitlab.freedesktop.org/bustle/bustle/issues/13 | name == "cabal-plan" = [enable "exe"] | name == "cassava" = [disable "bytestring--lt-0_10_4"] + | name == "cryptohash-sha256" = [enable "use-cbits"] -- https://github.com/haskell-hvr/cryptohash-sha256/issues/11 | name == "darcs" = [enable "library", enable "force-char8-encoding"] | name == "diagrams-builder" = [enable "cairo", enable "svg", enable "ps", enable "rasterific"] | name == "fltkhs" = [enable "opengl"] diff --git a/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs b/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs --- a/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs +++ b/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs @@ -18,17 +18,17 @@ fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License fromCabalLicense (GPL Nothing) = Unknown (Just "GPL") -fromCabalLicense (GPL (Just (versionNumbers -> [2]))) = Known "lib.licenses.gpl2" -fromCabalLicense (GPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.gpl3" -fromCabalLicense (GPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.gpl3" +fromCabalLicense (GPL (Just (versionNumbers -> [2]))) = Known "lib.licenses.gpl2Only" +fromCabalLicense (GPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.gpl3Only" +fromCabalLicense (GPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.gpl3Only" fromCabalLicense (LGPL Nothing) = Unknown (Just "LGPL") -fromCabalLicense (LGPL (Just (versionNumbers -> [2,1]))) = Known "lib.licenses.lgpl21" -fromCabalLicense (LGPL (Just (versionNumbers -> [2]))) = Known "lib.licenses.lgpl2" -fromCabalLicense (LGPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.lgpl3" -fromCabalLicense (LGPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.lgpl3" +fromCabalLicense (LGPL (Just (versionNumbers -> [2,1]))) = Known "lib.licenses.lgpl21Only" +fromCabalLicense (LGPL (Just (versionNumbers -> [2]))) = Known "lib.licenses.lgpl2Only" +fromCabalLicense (LGPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.lgpl3Only" +fromCabalLicense (LGPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.lgpl3Only" fromCabalLicense (AGPL Nothing) = Unknown (Just "AGPL") -fromCabalLicense (AGPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.agpl3" -fromCabalLicense (AGPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.agpl3" +fromCabalLicense (AGPL (Just (versionNumbers -> [3]))) = Known "lib.licenses.agpl3Only" +fromCabalLicense (AGPL (Just (versionNumbers -> [3,0]))) = Known "lib.licenses.agpl3Only" fromCabalLicense (MPL (versionNumbers -> [2,0])) = Known "lib.licenses.mpl20" fromCabalLicense BSD2 = Known "lib.licenses.bsd2" fromCabalLicense BSD3 = Known "lib.licenses.bsd3" @@ -57,7 +57,7 @@ case lid of SPDX.AFL_2_1 -> Known "lib.licenses.afl21" SPDX.AFL_3_0 -> Known "lib.licenses.afl3" - SPDX.AGPL_3_0_only -> Known "lib.licenses.agpl3" + SPDX.AGPL_3_0_only -> Known "lib.licenses.agpl3Only" SPDX.AGPL_3_0_or_later -> Known "lib.licenses.agpl3Plus" SPDX.APSL_2_0 -> Known "lib.licenses.apsl20" SPDX.Artistic_1_0 -> Known "lib.licenses.artistic1" @@ -95,13 +95,13 @@ SPDX.EPL_1_0 -> Known "lib.licenses.epl10" SPDX.EPL_2_0 -> Known "lib.licenses.epl20" SPDX.EUPL_1_1 -> Known "lib.licenses.eupl11" - SPDX.GFDL_1_2_only -> Known "lib.licenses.fdl12" - SPDX.GFDL_1_3_only -> Known "lib.licenses.fdl13" - SPDX.GPL_1_0_only -> Known "lib.licenses.gpl1" + SPDX.GFDL_1_2_only -> Known "lib.licenses.fdl12Only" + SPDX.GFDL_1_3_only -> Known "lib.licenses.fdl13Only" + SPDX.GPL_1_0_only -> Known "lib.licenses.gpl1Only" SPDX.GPL_1_0_or_later -> Known "lib.licenses.gpl1Plus" - SPDX.GPL_2_0_only -> Known "lib.licenses.gpl2" + SPDX.GPL_2_0_only -> Known "lib.licenses.gpl2Only" SPDX.GPL_2_0_or_later -> Known "lib.licenses.gpl2Plus" - SPDX.GPL_3_0_only -> Known "lib.licenses.gpl3" + SPDX.GPL_3_0_only -> Known "lib.licenses.gpl3Only" SPDX.GPL_3_0_or_later -> Known "lib.licenses.gpl3Plus" SPDX.HPND -> Known "lib.licenses.hpnd" SPDX.IJG -> Known "lib.licenses.ijg" @@ -109,11 +109,11 @@ SPDX.IPA -> Known "lib.licenses.ipa" SPDX.IPL_1_0 -> Known "lib.licenses.ipl10" SPDX.ISC -> Known "lib.licenses.isc" - SPDX.LGPL_2_0_only -> Known "lib.licenses.lgpl2" + SPDX.LGPL_2_0_only -> Known "lib.licenses.lgpl2Only" SPDX.LGPL_2_0_or_later -> Known "lib.licenses.lgpl2Plus" - SPDX.LGPL_2_1_only -> Known "lib.licenses.lgpl21" + SPDX.LGPL_2_1_only -> Known "lib.licenses.lgpl21Only" SPDX.LGPL_2_1_or_later -> Known "lib.licenses.lgpl21Plus" - SPDX.LGPL_3_0_only -> Known "lib.licenses.lgpl3" + SPDX.LGPL_3_0_only -> Known "lib.licenses.lgpl3Only" SPDX.LGPL_3_0_or_later -> Known "lib.licenses.lgpl3Plus" SPDX.Libpng -> Known "lib.licenses.libpng" SPDX.Libtiff -> Known "lib.licenses.libtiff" diff --git a/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs b/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs --- a/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs +++ b/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs @@ -38,6 +38,7 @@ fromString "i686-linux" = Platform I386 Linux fromString "x86_64-linux" = Platform X86_64 Linux fromString "x86_64-darwin" = Platform X86_64 OSX + fromString "aarch64-linux" = Platform AArch64 Linux fromString "armv7l-linux" = Platform (OtherArch "armv7l") Linux fromString s = error ("fromString: " ++ show s ++ " is not a valid platform") diff --git a/test/Main.hs b/test/Main.hs --- a/test/Main.hs +++ b/test/Main.hs @@ -93,7 +93,7 @@ (\ref new -> ["diff", "-u", ref, new]) goldenFile nixFile - (callCommand (unwords ["env LANG=en_US.UTF-8", exe, "--sha256=deadbeef", "--system=x86_64-linux", "--compiler=ghc-8.2", "--", cabalFile, ">"++nixFile])) + (callCommand (unwords ["env LANG=C.UTF-8", exe, "--sha256=deadbeef", "--system=x86_64-linux", "--compiler=ghc-8.2", "--", cabalFile, ">"++nixFile])) ------------------------------------------------------------------------------- -- * Helper functions diff --git a/test/golden-test-cases/BioHMM.nix.golden b/test/golden-test-cases/BioHMM.nix.golden --- a/test/golden-test-cases/BioHMM.nix.golden +++ b/test/golden-test-cases/BioHMM.nix.golden @@ -11,5 +11,5 @@ filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; description = "Libary for Hidden Markov Models in HMMER3 format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/bbdb.nix.golden b/test/golden-test-cases/bbdb.nix.golden --- a/test/golden-test-cases/bbdb.nix.golden +++ b/test/golden-test-cases/bbdb.nix.golden @@ -7,5 +7,5 @@ testHaskellDepends = [ base hspec parsec ]; homepage = "https://github.com/henrylaxen/bbdb"; description = "Ability to read, write, and modify BBDB files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/blosum.nix.golden b/test/golden-test-cases/blosum.nix.golden --- a/test/golden-test-cases/blosum.nix.golden +++ b/test/golden-test-cases/blosum.nix.golden @@ -16,5 +16,5 @@ ]; homepage = "http://github.com/GregorySchwartz/blosum#readme"; description = "BLOSUM generator"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; } diff --git a/test/golden-test-cases/brittany.nix.golden b/test/golden-test-cases/brittany.nix.golden --- a/test/golden-test-cases/brittany.nix.golden +++ b/test/golden-test-cases/brittany.nix.golden @@ -34,5 +34,5 @@ ]; homepage = "https://github.com/lspitzner/brittany/"; description = "Haskell source code formatter"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; } diff --git a/test/golden-test-cases/clumpiness.nix.golden b/test/golden-test-cases/clumpiness.nix.golden --- a/test/golden-test-cases/clumpiness.nix.golden +++ b/test/golden-test-cases/clumpiness.nix.golden @@ -5,5 +5,5 @@ sha256 = "deadbeef"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/drawille.nix.golden b/test/golden-test-cases/drawille.nix.golden --- a/test/golden-test-cases/drawille.nix.golden +++ b/test/golden-test-cases/drawille.nix.golden @@ -9,5 +9,5 @@ testHaskellDepends = [ base containers hspec QuickCheck ]; homepage = "https://github.com/yamadapc/haskell-drawille#readme"; description = "A port of asciimoo's drawille to haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/funcmp.nix.golden b/test/golden-test-cases/funcmp.nix.golden --- a/test/golden-test-cases/funcmp.nix.golden +++ b/test/golden-test-cases/funcmp.nix.golden @@ -7,5 +7,5 @@ libraryHaskellDepends = [ base filepath process ]; homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/gsasl.nix.golden b/test/golden-test-cases/gsasl.nix.golden --- a/test/golden-test-cases/gsasl.nix.golden +++ b/test/golden-test-cases/gsasl.nix.golden @@ -7,5 +7,5 @@ libraryPkgconfigDepends = [ gsasl ]; homepage = "https://john-millikin.com/software/haskell-gsasl/"; description = "Bindings for GNU libgsasl"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/mnist-idx.nix.golden b/test/golden-test-cases/mnist-idx.nix.golden --- a/test/golden-test-cases/mnist-idx.nix.golden +++ b/test/golden-test-cases/mnist-idx.nix.golden @@ -9,5 +9,5 @@ testHaskellDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/mnist-idx/"; description = "Read and write IDX data that is used in e.g. the MNIST database."; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; } diff --git a/test/golden-test-cases/network-protocol-xmpp.nix.golden b/test/golden-test-cases/network-protocol-xmpp.nix.golden --- a/test/golden-test-cases/network-protocol-xmpp.nix.golden +++ b/test/golden-test-cases/network-protocol-xmpp.nix.golden @@ -11,5 +11,5 @@ ]; homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/once.nix.golden b/test/golden-test-cases/once.nix.golden --- a/test/golden-test-cases/once.nix.golden +++ b/test/golden-test-cases/once.nix.golden @@ -10,5 +10,5 @@ ]; homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-once.git"; description = "memoization for IO actions and functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/openexr-write.nix.golden b/test/golden-test-cases/openexr-write.nix.golden --- a/test/golden-test-cases/openexr-write.nix.golden +++ b/test/golden-test-cases/openexr-write.nix.golden @@ -12,5 +12,5 @@ testHaskellDepends = [ base bytestring directory hspec vector ]; homepage = "https://github.com/pavolzetor/openexr-write#readme"; description = "Library for writing images in OpenEXR HDR file format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; } diff --git a/test/golden-test-cases/tree-fun.nix.golden b/test/golden-test-cases/tree-fun.nix.golden --- a/test/golden-test-cases/tree-fun.nix.golden +++ b/test/golden-test-cases/tree-fun.nix.golden @@ -5,5 +5,5 @@ sha256 = "deadbeef"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for functions pertaining to tree exploration and manipulation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }