From a2a9650037bdd8e19a0973ee2afbb0c2fa1a9f04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:34:36 +0100 Subject: [PATCH 01/88] Drop all obsolete versions of the Haskell Platform. --- .../haskell/haskell-platform/2009.2.0.2.nix | 27 -- .../haskell/haskell-platform/2010.1.0.0.nix | 28 -- .../haskell/haskell-platform/2010.2.0.0.nix | 27 -- .../haskell/haskell-platform/2011.2.0.0.nix | 29 -- .../haskell/haskell-platform/2011.2.0.1.nix | 39 --- .../haskell/haskell-platform/2011.4.0.0.nix | 40 --- .../haskell/haskell-platform/2012.2.0.0.nix | 40 --- .../haskell/haskell-platform/2012.4.0.0.nix | 42 --- .../haskell/haskell-platform/2013.2.0.0.nix | 44 --- .../haskell/haskell-platform/Setup.hs | 10 - .../haskell/haskell-platform/default.nix | 314 ------------------ .../haskell-platform-2011.2.0.1.cabal | 90 ----- .../haskell-platform-2011.4.0.0.cabal | 90 ----- .../haskell-platform-2012.2.0.0.cabal | 89 ----- .../haskell-platform-2012.4.0.0.cabal | 113 ------- .../haskell-platform-2013.2.0.0.cabal | 118 ------- .../libraries/haskell/hoogle/local.nix | 2 +- pkgs/top-level/all-packages.nix | 3 - 18 files changed, 1 insertion(+), 1144 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/Setup.hs delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/default.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix deleted file mode 100644 index 1da301e50aeb..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline, - haskellSrc, html, parallel, regexBase, regexCompat, regexPosix, - stm, time, xhtml, zlib, parsec, network, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2009.2.0.2"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "e0469fac9b1d091d8299ae16a4e2e7fcd504285bba066b17153a0f0104a049bd"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline - haskellSrc html parallel regexBase regexCompat regexPosix - stm time xhtml zlib parsec network - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix deleted file mode 100644 index 9f157a51962a..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, parsec, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.1.0.0"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "0cadj0ql2i5d5njwcbhmjkf4qrkfmxirg5vjv1wlx3ayzbynbrp4"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib parsec - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # The source code is no longer available from haskell.org. - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix deleted file mode 100644 index 9462d1304b7d..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ /dev/null @@ -1,27 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, mtl, parsec, deepseq, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.2.0.0"; - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz"; - sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib mtl parsec deepseq - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix deleted file mode 100644 index dff683a40966..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix +++ /dev/null @@ -1,29 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.0"; - src = fetchurl { - # url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix deleted file mode 100644 index 7c6d206fd7d5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix +++ /dev/null @@ -1,39 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.1"; - cabalFile = ./haskell-platform-2011.2.0.1.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix deleted file mode 100644 index d44b6011320e..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix +++ /dev/null @@ -1,40 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.4.0.0"; - cabalFile = ./haskell-platform-2011.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix deleted file mode 100644 index 268298a927aa..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix +++ /dev/null @@ -1,40 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.2.0.0"; - cabalFile = ./haskell-platform-2012.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix deleted file mode 100644 index 035777d1b5e0..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix +++ /dev/null @@ -1,42 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl, - haskellSrc, html, network, parallel, parsec, primitive, - regexBase, regexCompat, regexPosix, - split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.4.0.0"; - cabalFile = ./haskell-platform-2012.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl - haskellSrc html network parallel parsec primitive - regexBase regexCompat regexPosix - split stm syb deepseq text transformers mtl vector xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix deleted file mode 100644 index 07ecb4575467..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ cabal, fetchurl -, async, attoparsec, caseInsensitive, cgi, fgl, GLUT, GLURaw, haskellSrc -, hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel -, parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm -, syb, text, transformers, unorderedContainers, vector, xhtml, zlib -, cabalInstall, alex, happy, primitive, ghc -}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2013.2.0.0"; - cabalFile = ./haskell-platform-2013.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc - hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel - parsec QuickCheck random regexBase regexCompat regexPosix split stm - syb text transformers unorderedContainers vector xhtml zlib - cabalInstall alex happy primitive ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs b/pkgs/development/libraries/haskell/haskell-platform/Setup.hs deleted file mode 100644 index 47fd3a5c71b1..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs +++ /dev/null @@ -1,10 +0,0 @@ -import Distribution.Simple -import Distribution.Simple.Program - -main = defaultMainWithHooks simpleUserHooks { hookedPrograms = [cabal] } - -cabal :: Program -cabal = (simpleProgram "cabal-install") { - programFindLocation = \x -> findProgramLocation x "cabal", - programFindVersion = findProgramVersion "--numeric-version" id -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix deleted file mode 100644 index 2de2809cf53b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ /dev/null @@ -1,314 +0,0 @@ -{ pkgs }: - -let - haskellPlatformPackages_2013_2_0_0 = pkgs.haskell.packages_ghc763.override { - extension = self : super : { - async = self.async_2_0_1_4; - attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_0_0_1; - cgi = self.cgi_3001_1_7_5; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; - GLURaw = self.GLURaw_1_3_0_0; - haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_1_2_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_8; - HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_2; - network = self.network_2_4_1_2; - OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_6; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_2; - stm = self.stm_2_4_2; - syb = self.syb_0_4_0; - text = self.text_0_11_3_1; - transformers = self.transformers_0_3_0_0; - unorderedContainers = self.unorderedContainers_0_2_3_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_16_0_2; - alex = self.alex_3_0_5; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_4_0_0 = pkgs.haskell.packages_ghc742.override { - extension = self : super : { - async = self.async_2_0_1_3; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = super.HTTP_4000_2_5.override { network = self.network_2_3_1_0; }; - HUnit = self.HUnit_1_2_5_1; - mtl = self.mtl_2_1_2; - network = self.network_2_3_1_0; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_5_1_1; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_1_1; - stm = self.stm_2_4; - syb = self.syb_0_3_7; - text = self.text_0_11_2_3; - transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_0; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_2; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_2_0_0 = pkgs.haskell.packages_ghc742.override { - ghcPath = ../../../compilers/ghc/7.4.1.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_3; - HUnit = self.HUnit_1_2_4_2; - mtl = self.mtl_2_1_1; - network = self.network_2_3_0_13; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_2; - parsec = self.parsec_3_1_2; - QuickCheck = self.QuickCheck_2_4_2; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_3; - syb = self.syb_0_3_6_1; - text = self.text_0_11_2_0; - transformers = self.transformers_0_3_0_0; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_3_3; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_1; - happy = self.happy_1_18_9; - }; - }; - - haskellPlatformPackages_2011_4_0_0 = pkgs.haskell.packages_ghc704.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_4_2; - network = self.network_2_3_0_5; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3_3; - xhtml = self.xhtml_3000_2_0_4; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_2; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_1_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_1 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.3.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_6; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_0 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.2.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2010_2_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_3; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_1; - mtl = self.mtl_1_1_0_2; - network = self.network_2_2_1_7; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_2_1_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_2; - stm = self.stm_2_1_2_1; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_2_0; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - text = self.text_0_11_0_5; - cabalInstall = self.cabalInstall_0_8_2; - alex = self.alex_2_3_3; - happy = self.happy_1_18_5; - }; - }; - - haskellPlatformPackages_2010_1_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - fgl = self.fgl_5_4_2_2; - cabalInstall = self.cabalInstall_0_8_0; - GLUT = self.GLUT_2_1_2_1; - OpenGL = self.OpenGL_2_2_3_0; - zlib = self.zlib_0_5_2_0; - alex = self.alex_2_3_2; - cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_1_1; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - HUnit = self.HUnit_1_2_2_1; - network = self.network_2_2_1_7; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - regexBase = self.regexBase_0_93_1; - regexCompat = self.regexCompat_0_92; - regexPosix = self.regexPosix_0_94_1; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - - haskellPlatformPackages_2009_2_0_2 = pkgs.haskell.packages_ghc6104.override { - extension = self : super : { - time = self.time_1_1_2_4; - cgi = self.cgi_3001_1_7_1; - editline = self.editline_0_2_1_0; - fgl = self.fgl_5_4_2_2; - GLUT = self.GLUT_2_1_1_2; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_0_3; - network = self.network_2_2_1_4; - OpenGL = self.OpenGL_2_2_1_1; - parallel = self.parallel_1_1_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_1_2_0_0; - regexBase = self.regexBase_0_72_0_2; - regexCompat = self.regexCompat_0_71_0_1; - regexPosix = self.regexPosix_0_72_0_3; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_0_0; - HTTP = self.HTTP_4000_0_6; - cabalInstall = self.cabalInstall_0_6_2; - alex = self.alex_2_3_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - -in -{ - "2013_2_0_0" = haskellPlatformPackages_2013_2_0_0.callPackage ./2013.2.0.0.nix {}; - - "2012_4_0_0" = haskellPlatformPackages_2012_4_0_0.callPackage ./2012.4.0.0.nix {}; - - "2012_2_0_0" = haskellPlatformPackages_2012_2_0_0.callPackage ./2012.2.0.0.nix {}; - - "2011_4_0_0" = haskellPlatformPackages_2011_4_0_0.callPackage ./2011.4.0.0.nix {}; - - "2011_2_0_1" = haskellPlatformPackages_2011_2_0_1.callPackage ./2011.2.0.1.nix {}; - - "2011_2_0_0" = haskellPlatformPackages_2011_2_0_0.callPackage ./2011.2.0.0.nix {}; - - "2010_2_0_0" = haskellPlatformPackages_2010_2_0_0.callPackage ./2010.2.0.0.nix {}; - - "2010_1_0_0" = haskellPlatformPackages_2010_1_0_0.callPackage ./2010.1.0.0.nix {}; - - "2009_2_0_2" = haskellPlatformPackages_2009_2_0_2.callPackage ./2009.2.0.2.nix {}; -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal deleted file mode 100644 index fa09cb039dab..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.2.0.1 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.6 -build-type: Custom -tested-with: GHC ==7.0.3 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.1.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.3, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.2.3, - network ==2.3.0.2, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.0.1, - regex-base ==0.93.2, - regex-compat ==0.93.1, - regex-posix ==0.94.4, - stm ==2.2.0.1, - syb ==0.3, - xhtml ==3000.2.0.1, - zlib ==0.5.3.1, - HTTP ==4000.1.1, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.0.6, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal deleted file mode 100644 index 56414de90c5b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.0.4 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.2.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.4.2, - network ==2.3.0.5, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.2.0.1, - syb ==0.3.3, - xhtml ==3000.2.0.4, - zlib ==0.5.3.1, - HTTP ==4000.1.2, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.1.5, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal deleted file mode 100644 index 264d636f9942..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ /dev/null @@ -1,89 +0,0 @@ -name: haskell-platform -version: 2012.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.1 - -library - build-depends: - -- ghc ==7.4.1, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.4.0.0, - -- base ==4.5.0.0, - -- bytestring ==0.9.2.1, - -- Cabal ==1.14.0, - -- containers ==0.4.2.1, - -- deepseq ==1.3.0.0, - -- directory ==1.1.0.2, - -- extensible-exceptions ==0.1.1.4, - -- filepath ==1.3.0.0, - -- haskell2010 ==1.1.0.1, - -- haskell98 ==2.0.0.1, - -- hpc ==0.5.1.1, - -- old-locale ==1.0.0.4, - -- old-time ==1.1.0.0, - -- pretty ==1.1.1.0, - -- process ==1.1.0.1, - -- template-haskell ==2.7.0.0, - -- time ==1.4, - -- unix ==2.5.1.0, - -- Win32 ==2.2.2.0, - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.3, - HUnit ==1.2.4.2, - mtl ==2.1.1, - network ==2.3.0.13, - OpenGL ==2.2.3.1, - parallel ==3.2.0.2, - parsec ==3.1.2, - QuickCheck ==2.4.2, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.3, - syb ==0.3.6.1, - text ==0.11.2.0, - transformers ==0.3.0.0, - xhtml ==3000.2.1, - zlib ==0.5.3.3 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.1, - happy ==1.18.9 - -- hscolour ==1.19 - -- haddock ==2.10.0 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal deleted file mode 100644 index 23d1f7a0a7d9..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ /dev/null @@ -1,113 +0,0 @@ -name: haskell-platform -version: 2012.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.2 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.4.2, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.0, - base ==4.5.1.0, - bytestring ==0.9.2.1, - Cabal ==1.14.0, - containers ==0.4.2.1, - deepseq ==1.3.0.0, - directory ==1.1.0.2, - extensible-exceptions ==0.1.1.4, - filepath ==1.3.0.0, - haskell2010 ==1.1.0.1, - haskell98 ==2.0.0.1, - hpc ==0.5.1.1, - old-locale ==1.0.0.4, - old-time ==1.1.0.0, - pretty ==1.1.1.0, - process ==1.1.0.1, - template-haskell ==2.7.0.0, - time ==1.4 - if !os(windows) - build-depends: - unix ==2.5.1.1 - -- end core packages - else - build-depends: - Win32 ==2.2.2.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.3, - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.5, - HUnit ==1.2.5.1, - mtl ==2.1.2, - network ==2.3.1.0, - OpenGL ==2.2.3.1, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.5.1.1, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.1.1, - stm ==2.4, - syb ==0.3.7, - text ==0.11.2.3, - transformers ==0.3.0.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.0, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.2, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.19 -- ??? - -- haddock ==2.11.0 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal deleted file mode 100644 index cf676ab1d6e0..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal +++ /dev/null @@ -1,118 +0,0 @@ -name: haskell-platform -version: 2013.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.6.3 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.6.3, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.1, - base ==4.6.0.1, - bytestring ==0.10.0.2, - Cabal ==1.16.0, - containers ==0.5.0.0, - deepseq ==1.3.0.1, - directory ==1.2.0.1, - filepath ==1.3.0.1, - haskell2010 ==1.1.1.0, - haskell98 ==2.0.0.2, - hpc ==0.6.0.0, - old-locale ==1.0.0.5, - old-time ==1.1.0.1, - pretty ==1.1.1.0, - process ==1.1.0.2, - template-haskell ==2.8.0.0, - time ==1.4.0.1 - if !os(windows) - build-depends: - unix ==2.6.0.1 - -- end core packages - else - build-depends: - Win32 ==2.3.0.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.4, - attoparsec ==0.10.4.0, - case-insensitive ==1.0.0.1, - cgi ==3001.1.7.5, - fgl ==5.4.2.4, - GLUT ==2.4.0.0, - GLURaw ==1.3.0.0, - haskell-src ==1.0.1.5, - hashable ==1.1.2.5, - html ==1.0.1.2, - HTTP ==4000.2.8, - HUnit ==1.2.5.2, - mtl ==2.1.2, - network ==2.4.1.2, - OpenGL ==2.8.0.0, - OpenGLRaw ==1.3.0.0, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.6, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.2, - stm ==2.4.2, - syb ==0.4.0, - text ==0.11.3.1, - transformers ==0.3.0.0, - unordered-containers ==0.2.3.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.1, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==1.16.0.2, - alex ==3.0.5, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.20.3 -- ??? - -- haddock ==2.13.2 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index ba907948b14a..822c2bdd82ea 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -24,7 +24,7 @@ # refer to their documentation via symlink so they are not garbage collected. { stdenv, hoogle, rehoo -, haskellPlatform, ghc, packages ? [ haskellPlatform ghc.ghc ] +, ghc, packages ? [ ghc.ghc ] }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86c7d34130f..0032e89740a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3275,7 +3275,6 @@ let ) haskell)); haskellPackages = haskellPackages_ghc783; - haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3288,8 +3287,6 @@ let haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; - haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); - haxe = callPackage ../development/compilers/haxe { }; hhvm = callPackage ../development/compilers/hhvm { }; From 26e9ed86b5d9c85d58e0fe0ab09b22edb3dc721e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:53:35 +0100 Subject: [PATCH 02/88] haskell-aeson: drop obsolete version 0.7.0.6 --- .../libraries/haskell/aeson/0.7.0.6.nix | 28 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix deleted file mode 100644 index b5626f63932a..000000000000 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit -, mtl, QuickCheck, scientific, syb, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, time -, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson"; - version = "0.7.0.6"; - sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; - buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb - text time unorderedContainers vector - ]; - testDepends = [ - attoparsec HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time unorderedContainers vector - ]; - meta = { - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8966683e7a48..391c6dce1512 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -144,7 +144,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AES = callPackage ../development/libraries/haskell/AES {}; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; - aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; aeson_0_8_0_2 = callPackage ../development/libraries/haskell/aeson/0.8.0.2.nix { blazeBuilder = null; }; aeson = self.aeson_0_8_0_2; From a7b529d57e4743155414e5adfa8d6d73bc950a70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:54:27 +0100 Subject: [PATCH 03/88] haskell-async: drop obsolete version 2.0.1.3 --- .../libraries/haskell/async/2.0.1.3.nix | 19 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/async/2.0.1.3.nix diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix deleted file mode 100644 index a60830309e78..000000000000 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "async"; - version = "2.0.1.3"; - sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; - buildDepends = [ stm ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - jailbreak = true; - meta = { - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 391c6dce1512..1288f781b08b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -189,7 +189,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; - async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {}; async = self.async_2_0_1_6; From 124e62d9d44a9dca85674a7574079a801e035b7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:55:26 +0100 Subject: [PATCH 04/88] haskell-attoparsec: drop obsolete version 0.11.3.4 --- .../libraries/haskell/attoparsec/0.11.3.4.nix | 22 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix deleted file mode 100644 index e322f6de4ce0..000000000000 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, QuickCheck, scientific, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "attoparsec"; - version = "0.11.3.4"; - sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; - buildDepends = [ deepseq scientific text ]; - testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1288f781b08b..1ba808eb7875 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -201,7 +201,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; - attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {}; attoparsec = self.attoparsec_0_12_1_2; From 34c6c614fa1c71114d8e993bf59ca52c68d2b812 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:56:17 +0100 Subject: [PATCH 05/88] haskell-binary: drop obsolete version 0.6.1.0 --- .../libraries/haskell/binary/0.6.1.0.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/binary/0.6.1.0.nix diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix deleted file mode 100644 index 06aca17cde3f..000000000000 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "binary"; - version = "0.6.1.0"; - sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js"; - meta = { - homepage = "https://github.com/kolmodin/binary"; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1ba808eb7875..da86679832a4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -244,7 +244,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; binary_0_7_2_2 = callPackage ../development/libraries/haskell/binary/0.7.2.2.nix {}; binary = null; # core package since ghc >= 7.2.x From a88c077acc368189cf01820ce587c052b3cd2522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:57:43 +0100 Subject: [PATCH 06/88] haskell-Cabal: drop obsolete version 1.14.0 --- .../libraries/haskell/Cabal/1.14.0.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.14.0.nix diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix deleted file mode 100644 index a905017472f6..000000000000 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "Cabal"; - version = "1.14.0"; - sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; - buildDepends = [ filepath ]; - testDepends = [ - extensibleExceptions filepath HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index da86679832a4..8e2c81b3975d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -343,7 +343,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in c2hsc = callPackage ../development/libraries/haskell/c2hsc {}; - Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; From 0fd7525fb3040d1f9067c8a57d062f297b6e4cbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:58:52 +0100 Subject: [PATCH 07/88] haskell-case-insensitive: drop obsolete version 1.1.0.3 --- .../haskell/case-insensitive/1.1.0.3.nix | 20 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix deleted file mode 100644 index 3f75b41bb630..000000000000 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, hashable, HUnit, testFramework -, testFrameworkHunit, text -}: - -cabal.mkDerivation (self: { - pname = "case-insensitive"; - version = "1.1.0.3"; - sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ HUnit testFramework testFrameworkHunit text ]; - meta = { - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8e2c81b3975d..a01d3c99b858 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -373,7 +373,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {}; caseInsensitive = self.caseInsensitive_1_2_0_1; From 9c6be179b7ea408cb11f0066a5876eb363302a31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:00:20 +0100 Subject: [PATCH 08/88] haskell-cgi: drop obsolete versions 3001.1.7.1 3001.1.7.2, 3001.1.7.3, 3001.1.7.4, and 3001.1.8.5 --- .../libraries/haskell/cgi/3001.1.7.1.nix | 16 ---------------- .../libraries/haskell/cgi/3001.1.7.2.nix | 16 ---------------- .../libraries/haskell/cgi/3001.1.7.3.nix | 17 ----------------- .../libraries/haskell/cgi/3001.1.7.4.nix | 17 ----------------- .../libraries/haskell/cgi/3001.1.8.5.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 89 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix deleted file mode 100644 index 068d1b7dadfa..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.1"; - sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix deleted file mode 100644 index c10fa2416f71..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.2"; - sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix deleted file mode 100644 index 7cb7e77dd778..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.3"; - sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix deleted file mode 100644 index 6071ecc7597e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.4"; - sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix deleted file mode 100644 index 31d523717c5e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.8.5"; - sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6"; - buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a01d3c99b858..c08b4b681d85 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -386,12 +386,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in certificate = callPackage ../development/libraries/haskell/certificate {}; - cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; - cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; - cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; - cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; - cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {}; cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {}; cgi = self.cgi_3001_2_0_0; From f27adbed3ce2e599e5d4cadcbb7bd2a297e32b02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:01:41 +0100 Subject: [PATCH 09/88] haskell-convertible: drop obsolete version 1.0.11.1 --- .../haskell/convertible/1.0.11.1.nix | 19 ------------------- .../convertible/{1.1.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/convertible/1.0.11.1.nix rename pkgs/development/libraries/haskell/convertible/{1.1.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix deleted file mode 100644 index 57423c1b71f0..000000000000 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text, time }: - -cabal.mkDerivation (self: { - pname = "convertible"; - version = "1.0.11.1"; - sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl text time ]; - meta = { - homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; - description = "Typeclasses and instances for converting between types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/convertible/1.1.0.0.nix rename to pkgs/development/libraries/haskell/convertible/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c08b4b681d85..1be451ce09b9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -499,9 +499,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; - convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {}; - convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {}; - convertible = self.convertible_1_1_0_0; + convertible = callPackage ../development/libraries/haskell/convertible {}; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; From 350a6a014b53c658a925bcafe5290da28a8809bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:02:30 +0100 Subject: [PATCH 10/88] haskell-deepseq: drop obsolete versions 1.1.0.0 and 1.1.0.2 --- .../libraries/haskell/deepseq/1.1.0.0.nix | 15 --------------- .../libraries/haskell/deepseq/1.1.0.2.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix deleted file mode 100644 index 4d7a0b9b818a..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.0"; - sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; - meta = { - description = "Fully evaluate data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix deleted file mode 100644 index 7748ff96a8af..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.2"; - sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; - meta = { - description = "Deep evaluation of data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1be451ce09b9..eeb7ca6b8a2a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -617,8 +617,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Decimal = callPackage ../development/libraries/haskell/Decimal {}; - deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; - deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; deepseq = null; # core package since ghc >= 7.4.x From 5e1bd2b5083bd2356cb8c68fc8e4ee8a46afb670 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:04:23 +0100 Subject: [PATCH 11/88] haskell-editline: drop obsolete version 0.2.1.0 --- .../libraries/haskell/editline/0.2.1.0.nix | 17 ----------------- .../editline/{0.2.1.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/editline/0.2.1.0.nix rename pkgs/development/libraries/haskell/editline/{0.2.1.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix deleted file mode 100644 index d36a2ee11f28..000000000000 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libedit }: - -cabal.mkDerivation (self: { - pname = "editline"; - version = "0.2.1.0"; - sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3"; - extraLibraries = [ libedit ]; - meta = { - homepage = "http://code.haskell.org/editline"; - description = "Bindings to the editline library (libedit)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/editline/0.2.1.1.nix rename to pkgs/development/libraries/haskell/editline/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eeb7ca6b8a2a..51bcc33a0fc4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -725,9 +725,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editDistance = callPackage ../development/libraries/haskell/edit-distance {}; - editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; - editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {}; - editline = self.editline_0_2_1_1; + editline = callPackage ../development/libraries/haskell/editline {}; ekg = callPackage ../development/libraries/haskell/ekg {}; ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; From 78ccd47130b802ff7ce1f6b3495399cf115c6603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:05:18 +0100 Subject: [PATCH 12/88] haskell-equivalence: drop obsolete version 0.2.3 --- .../libraries/haskell/equivalence/0.2.3.nix | 23 ------------------- .../equivalence/{0.2.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/equivalence/0.2.3.nix rename pkgs/development/libraries/haskell/equivalence/{0.2.5.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix deleted file mode 100644 index c21c0e161703..000000000000 --- a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, QuickCheck, STMonadTrans, testFramework -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "equivalence"; - version = "0.2.3"; - sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743"; - buildDepends = [ mtl STMonadTrans ]; - testDepends = [ - mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/paba/equivalence/"; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/equivalence/0.2.5.nix rename to pkgs/development/libraries/haskell/equivalence/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51bcc33a0fc4..b2f7ff933cf9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -766,9 +766,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; - equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; - equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; - equivalence = self.equivalence_0_2_5; + equivalence = callPackage ../development/libraries/haskell/equivalence {}; erf = callPackage ../development/libraries/haskell/erf {}; From 2b28fc73f9984dc8581b8162a2276f46d519f3d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:06:32 +0100 Subject: [PATCH 13/88] haskell-extensible-exceptions: drop obsolete versions 0.1.1.0 0.1.1.2, 0.1.1.3, and 0.1.1.4 --- .../haskell/extensible-exceptions/0.1.1.0.nix | 15 --------------- .../haskell/extensible-exceptions/0.1.1.2.nix | 15 --------------- .../haskell/extensible-exceptions/0.1.1.3.nix | 15 --------------- .../{0.1.1.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix rename pkgs/development/libraries/haskell/extensible-exceptions/{0.1.1.4.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix deleted file mode 100644 index e9c1f352a095..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.0"; - sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix deleted file mode 100644 index 8003b47f64e1..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.2"; - sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix deleted file mode 100644 index ee5abc006b67..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.3"; - sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix rename to pkgs/development/libraries/haskell/extensible-exceptions/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b2f7ff933cf9..2c522c4252a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -816,11 +816,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; - extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; - extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; - extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; - extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; + extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {}; extra = callPackage ../development/libraries/haskell/extra {}; From 66439fcb3dafcb44b874f1e0e000ab4aad946012 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:08:11 +0100 Subject: [PATCH 14/88] haskell-fgl: drop obsolete versions 5.4.2.2, 5.4.2.3, 5.4.2.4, 5.5.0.0, and 5.5.0.1 --- .../libraries/haskell/fgl/5.4.2.2.nix | 17 ----------------- .../libraries/haskell/fgl/5.4.2.3.nix | 17 ----------------- .../libraries/haskell/fgl/5.4.2.4.nix | 17 ----------------- .../libraries/haskell/fgl/5.5.0.0.nix | 17 ----------------- .../haskell/fgl/{5.5.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 6 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.4.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.5.0.0.nix rename pkgs/development/libraries/haskell/fgl/{5.5.0.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix deleted file mode 100644 index 61043f82f976..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.2"; - sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix deleted file mode 100644 index 1ecc9fb05e71..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.3"; - sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix deleted file mode 100644 index 65596c350dea..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.4"; - sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix deleted file mode 100644 index 4fd2a4d05971..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.5.0.0"; - sha256 = "1kdqxbpsaka97rx0c7czlc1nfi72mdxs46gnqa8p0wxn1vx437g3"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/fgl/5.5.0.1.nix rename to pkgs/development/libraries/haskell/fgl/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2c522c4252a3..748d7e2710b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -848,11 +848,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in final = callPackage ../development/libraries/haskell/final {}; - fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; - fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; - fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; - fgl_5_5_0_1 = callPackage ../development/libraries/haskell/fgl/5.5.0.1.nix {}; - fgl = self.fgl_5_5_0_1; + fgl = callPackage ../development/libraries/haskell/fgl {}; fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {}; From b6f913d41f00ccdd36d8985d4f2975d48ee204c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:12:33 +0100 Subject: [PATCH 15/88] haskell-OpenGL: drop obsolete versions 2.2.1.1 2.2.3.0, 2.2.3.1, 2.4.0.2, 2.6.0.1, and 2.8.0.0 --- .../libraries/haskell/OpenGL/2.2.1.1.nix | 17 -------------- .../libraries/haskell/OpenGL/2.2.3.0.nix | 17 -------------- .../libraries/haskell/OpenGL/2.2.3.1.nix | 17 -------------- .../libraries/haskell/OpenGL/2.4.0.2.nix | 20 ----------------- .../libraries/haskell/OpenGL/2.6.0.1.nix | 22 ------------------- .../libraries/haskell/OpenGL/2.8.0.0.nix | 18 --------------- .../OpenGL/{2.9.2.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 +------- 8 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix rename pkgs/development/libraries/haskell/OpenGL/{2.9.2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix deleted file mode 100644 index 747720eba85c..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.1.1"; - sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix deleted file mode 100644 index af01702b01b1..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.3.0"; - sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix deleted file mode 100644 index fa3ae576bfae..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libX11, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.2.3.1"; - sha256 = "1vl5i1l76mjc0p18awdrvdcpszaz1z891505cqmn1xlld7ijb14z"; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix deleted file mode 100644 index 81e754e269f8..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor -}: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.4.0.2"; - sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix deleted file mode 100644 index f8bcd405d0ea..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor -}: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.6.0.1"; - sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; - extraLibraries = [ libX11 mesa ]; - jailbreak = true; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix deleted file mode 100644 index ea1fdcc97115..000000000000 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, GLURaw, libX11, mesa, OpenGLRaw }: - -cabal.mkDerivation (self: { - pname = "OpenGL"; - version = "2.8.0.0"; - sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff"; - buildDepends = [ GLURaw OpenGLRaw ]; - extraLibraries = [ libX11 mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix rename to pkgs/development/libraries/haskell/OpenGL/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 748d7e2710b2..48c481fb3c96 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1860,14 +1860,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; - OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; - OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; - OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; - OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; - OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {}; - OpenGL = self.OpenGL_2_9_2_0; + OpenGL = callPackage ../development/libraries/haskell/OpenGL {}; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; From 103cf8e78ae07cb3e8b1af8f5aed76d170a27761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:14:14 +0100 Subject: [PATCH 16/88] haskell-GLUT: drop obsolete versions 2.1.1.2, 2.1.2.1, 2.1.2.2, 2.2.2.1, 2.3.1.0, and 2.4.0.0 --- .../libraries/haskell/GLUT/2.1.1.2.nix | 18 ----------------- .../libraries/haskell/GLUT/2.1.2.1.nix | 19 ------------------ .../libraries/haskell/GLUT/2.1.2.2.nix | 19 ------------------ .../libraries/haskell/GLUT/2.2.2.1.nix | 20 ------------------- .../libraries/haskell/GLUT/2.3.1.0.nix | 20 ------------------- .../libraries/haskell/GLUT/2.4.0.0.nix | 20 ------------------- .../haskell/GLUT/{2.5.1.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 19 +----------------- 8 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix rename pkgs/development/libraries/haskell/GLUT/{2.5.1.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix deleted file mode 100644 index 88a10caac094..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.1.2"; - sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix deleted file mode 100644 index a9988a533285..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.1"; - sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix deleted file mode 100644 index c92565ca4afa..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.2"; - sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix deleted file mode 100644 index 0bac3e0d5dba..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.2.2.1"; - sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; - buildDepends = [ OpenGL StateVar Tensor ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix deleted file mode 100644 index 9402d56f687e..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.3.1.0"; - sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci"; - buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix deleted file mode 100644 index c28194d7adbe..000000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.4.0.0"; - sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h"; - buildDepends = [ OpenGL OpenGLRaw ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix rename to pkgs/development/libraries/haskell/GLUT/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 48c481fb3c96..aacc35f11817 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -986,24 +986,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; GLURaw = self.GLURaw_1_4_0_1; - GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; - GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; - GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {}; - GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { - OpenGL = self.OpenGL_2_6_0_1; - }; - GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_6_0_1.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { - OpenGL = self.OpenGL_2_9_2_0; - }; - GLUT = self.GLUT_2_5_1_1; + GLUT = callPackage ../development/libraries/haskell/GLUT {}; GLUtil = callPackage ../development/libraries/haskell/GLUtil {}; From f7bb952d56377a34157de80b52491287ab0ec3ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:15:37 +0100 Subject: [PATCH 17/88] haskell-GLURaw: drop obsolete version 1.3.0.0 --- .../libraries/haskell/GLURaw/1.3.0.0.nix | 18 ------------------ .../GLURaw/{1.4.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix rename pkgs/development/libraries/haskell/GLURaw/{1.4.0.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix deleted file mode 100644 index bf23628a7101..000000000000 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, mesa, OpenGLRaw }: - -cabal.mkDerivation (self: { - pname = "GLURaw"; - version = "1.3.0.0"; - sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0"; - buildDepends = [ OpenGLRaw ]; - extraLibraries = [ freeglut mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix rename to pkgs/development/libraries/haskell/GLURaw/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aacc35f11817..147bac240743 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -982,9 +982,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; - GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; - GLURaw = self.GLURaw_1_4_0_1; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT = callPackage ../development/libraries/haskell/GLUT {}; From c2e47bbb6dc675f0c10a1e0193689c8e98a5fdde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:16:31 +0100 Subject: [PATCH 18/88] haskell-hashable: drop obsolete version 1.1.2.5 --- .../libraries/haskell/hashable/1.1.2.5.nix | 22 ------------------- .../hashable/{1.2.2.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hashable/1.1.2.5.nix rename pkgs/development/libraries/haskell/hashable/{1.2.2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix deleted file mode 100644 index 3c8330e82ae9..000000000000 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck, random, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "hashable"; - version = "1.1.2.5"; - sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; - buildDepends = [ text ]; - testDepends = [ - QuickCheck random testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hashable/1.2.2.0.nix rename to pkgs/development/libraries/haskell/hashable/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 147bac240743..0e4578806de8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1054,9 +1054,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; - hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; - hashable = self.hashable_1_2_2_0; + hashable = callPackage ../development/libraries/haskell/hashable {}; hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {}; From 760e9812666692bb0274b625cc6f801cfce355dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:17:45 +0100 Subject: [PATCH 19/88] haskell-src: drop obsolete versions 1.0.1.3, 1.0.1.4, and 1.0.1.5.nix --- .../libraries/haskell/haskell-src/1.0.1.3.nix | 16 ---------------- .../libraries/haskell/haskell-src/1.0.1.4.nix | 17 ----------------- .../libraries/haskell/haskell-src/1.0.1.5.nix | 18 ------------------ .../haskell-src/{1.0.1.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix rename pkgs/development/libraries/haskell/haskell-src/{1.0.1.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix deleted file mode 100644 index e2e5ffa304d5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.3"; - sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; - buildTools = [ happy ]; - meta = { - description = "Manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix deleted file mode 100644 index 54decb79f2b5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.4"; - sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix deleted file mode 100644 index 02032c21120b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.5"; - sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - preConfigure = "runhaskell Setup.hs clean"; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix rename to pkgs/development/libraries/haskell/haskell-src/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0e4578806de8..93adaf1dde15 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1083,11 +1083,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {}; - haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; - haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; - haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; - haskellSrc_1_0_1_6 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.6.nix {}; - haskellSrc = self.haskellSrc_1_0_1_6; + haskellSrc = callPackage ../development/libraries/haskell/haskell-src {}; haskellSrcExts_1_15_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.15.0.1.nix {}; haskellSrcExts_1_16_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.16.0.1.nix {}; From 57bdeaa3758d822536e76edf8e79fc635c6a5c22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:21:07 +0100 Subject: [PATCH 20/88] alex: drop obsolete versions 2.3.1, 2.3.2, 2.3.3, 3.0.1, 3.0.2, and 3.0.5 --- pkgs/development/tools/parsing/alex/2.3.1.nix | 20 ------------------ pkgs/development/tools/parsing/alex/2.3.2.nix | 20 ------------------ pkgs/development/tools/parsing/alex/2.3.3.nix | 20 ------------------ pkgs/development/tools/parsing/alex/3.0.1.nix | 21 ------------------- pkgs/development/tools/parsing/alex/3.0.2.nix | 21 ------------------- pkgs/development/tools/parsing/alex/3.0.5.nix | 20 ------------------ pkgs/top-level/haskell-packages.nix | 6 ------ 7 files changed, 128 deletions(-) delete mode 100644 pkgs/development/tools/parsing/alex/2.3.1.nix delete mode 100644 pkgs/development/tools/parsing/alex/2.3.2.nix delete mode 100644 pkgs/development/tools/parsing/alex/2.3.3.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.1.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.2.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.5.nix diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix deleted file mode 100644 index 83138e2e0ffd..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.1"; - sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix deleted file mode 100644 index 0bc13d160170..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.2"; - sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix deleted file mode 100644 index ccef30058c50..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.3"; - sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix deleted file mode 100644 index 7dc18c63c915..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.1"; - sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix deleted file mode 100644 index c18c5d89d1be..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.2"; - sha256 = "0r1i10i9svnd0ayd229d8hgndgc6q8ghabw6zzghwviw5hs36zlr"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.5.nix b/pkgs/development/tools/parsing/alex/3.0.5.nix deleted file mode 100644 index af32598ee473..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, fetchpatch, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.5"; - sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - patches = [ (fetchpatch { url="http://github.com/simonmar/alex/pull/21.patch"; sha256="050psfwmjlxhyxiy65jsn3v6b9rnfzy8x5q9mmhzwbirqwi0zkfm"; }) ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 93adaf1dde15..9dd9e2912cd8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2997,13 +2997,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Development tools. - alex_2_3_1 = callPackage ../development/tools/parsing/alex/2.3.1.nix {}; - alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; - alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; - alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; - alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; - alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {}; alex = self.alex_3_1_3; From e1af9e865d434c6f267300ea4d7d281e1242f95d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:23:48 +0100 Subject: [PATCH 21/88] haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 --- .../tools/documentation/haddock/2.10.0.nix | 26 ------------------ .../tools/documentation/haddock/2.11.0.nix | 26 ------------------ .../tools/documentation/haddock/2.12.0.nix | 22 --------------- .../tools/documentation/haddock/2.13.2.1.nix | 26 ------------------ .../tools/documentation/haddock/2.13.2.nix | 26 ------------------ .../tools/documentation/haddock/2.14.2.nix | 27 ------------------- .../tools/documentation/haddock/2.14.3.nix | 23 ---------------- .../tools/documentation/haddock/2.4.2.nix | 21 --------------- .../tools/documentation/haddock/2.7.2.nix | 24 ----------------- .../tools/documentation/haddock/2.9.2.nix | 26 ------------------ .../tools/documentation/haddock/2.9.4.nix | 23 ---------------- .../haddock/{2.15.0.nix => default.nix} | 0 pkgs/top-level/haskell-defaults.nix | 6 ----- pkgs/top-level/haskell-packages.nix | 13 +-------- 14 files changed, 1 insertion(+), 288 deletions(-) delete mode 100644 pkgs/development/tools/documentation/haddock/2.10.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.11.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.12.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.13.2.1.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.13.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.14.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.14.3.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.4.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.7.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.9.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.9.4.nix rename pkgs/development/tools/documentation/haddock/{2.15.0.nix => default.nix} (100%) diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix deleted file mode 100644 index af9a72058b29..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.10.0"; - sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix deleted file mode 100644 index d43e529585ba..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.11.0"; - sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix deleted file mode 100644 index b1249eee3278..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.12.0"; - sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix deleted file mode 100644 index 749fee28571c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2.1"; - sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix deleted file mode 100644 index aa5be90fbae2..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2"; - sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix deleted file mode 100644 index c8ef4299f560..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml, makeWrapper -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.2"; - sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix deleted file mode 100644 index 7ce4782bb60c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.3"; - sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - preCheck = "unset GHC_PACKAGE_PATH"; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix deleted file mode 100644 index 6493302218f9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.4.2"; - sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix deleted file mode 100644 index 53178aca0a18..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{cabal, ghcPaths, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 - name = self.fname; - sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix deleted file mode 100644 index 2ed94ff072ab..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{cabal, ghcPaths, xhtml, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.9.2"; # Haskell Platform 2011.2.0.0 - name = self.fname; - sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths xhtml]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix deleted file mode 100644 index 80d7c623c1e9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.9.4"; - sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath regexCompat ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/default.nix similarity index 100% rename from pkgs/development/tools/documentation/haddock/2.15.0.nix rename to pkgs/development/tools/documentation/haddock/default.nix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 6ee3e4d9e0ab..e6773ea1fda4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -49,7 +49,6 @@ }; entropy = super.entropy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; gloss = null; # requires base >= 4.7 - haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_2; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_2; }; @@ -70,7 +69,6 @@ }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; - haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x @@ -81,14 +79,12 @@ caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 - haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x @@ -103,7 +99,6 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile - haddock = self.haddock_2_7_2; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -129,7 +124,6 @@ cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2; caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; - haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9dd9e2912cd8..065ca17fff4a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3009,18 +3009,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in DrIFT = callPackage ../development/tools/haskell/DrIFT {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; }; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; }; - haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; - haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; - haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; - haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; - haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; - haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; - haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; - haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {}; - haddock = self.haddock_2_15_0; + haddock = callPackage ../development/tools/documentation/haddock {}; haddockApi = callPackage ../development/libraries/haskell/haddock-api {}; From cdaccfbad4bfcaa768059fd2fe5ebafa45596b50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:26:43 +0100 Subject: [PATCH 22/88] haskell-HTTP: drop obsolete versions 4000.0.6, 4000.0.9, 4000.1.1, 4000.1.2, 4000.2.1, 4000.2.2, 4000.2.3, 4000.2.5, and 4000.2.8 --- .../libraries/haskell/HTTP/4000.0.6.nix | 18 ------------- .../libraries/haskell/HTTP/4000.0.9.nix | 18 ------------- .../libraries/haskell/HTTP/4000.1.1.nix | 18 ------------- .../libraries/haskell/HTTP/4000.1.2.nix | 18 ------------- .../libraries/haskell/HTTP/4000.2.1.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.2.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.3.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.5.nix | 25 ------------------ .../libraries/haskell/HTTP/4000.2.8.nix | 26 ------------------- .../HTTP/{4000.2.18.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 12 +-------- 11 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.0.6.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.0.9.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.5.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.8.nix rename pkgs/development/libraries/haskell/HTTP/{4000.2.18.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix deleted file mode 100644 index a41dd3c25dc4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.6"; - sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix deleted file mode 100644 index e530452b08c3..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.9"; - sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix deleted file mode 100644 index 76356134589e..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.1"; - sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix deleted file mode 100644 index 344a86a0da88..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.2"; - sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix deleted file mode 100644 index c677bbf40db4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.1"; - sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix deleted file mode 100644 index c18fd35c8a08..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.2"; - sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix deleted file mode 100644 index 86c4dc8fcc01..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.3"; - sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix deleted file mode 100644 index 54c8733c5840..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.5"; - sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix deleted file mode 100644 index d308d547c78d..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.8"; - sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix b/pkgs/development/libraries/haskell/HTTP/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/HTTP/4000.2.18.nix rename to pkgs/development/libraries/haskell/HTTP/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 065ca17fff4a..ac77f35e0875 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1129,17 +1129,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTF = callPackage ../development/libraries/haskell/HTF {}; - HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; - HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; - HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; - HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; - HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; - HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; - HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_18 = callPackage ../development/libraries/haskell/HTTP/4000.2.18.nix {}; - HTTP = self.HTTP_4000_2_18; + HTTP = callPackage ../development/libraries/haskell/HTTP {}; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From a3c4b817a562a51b99793ce993c0e17ead273806 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:28:48 +0100 Subject: [PATCH 23/88] haskell-html: rename the expression file from 1.0.1.2.nix to default.nix --- .../libraries/haskell/html/{1.0.1.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/development/libraries/haskell/html/{1.0.1.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/html/1.0.1.2.nix rename to pkgs/development/libraries/haskell/html/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ac77f35e0875..3c9dc32391cc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1319,8 +1319,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; - html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; - html = self.html_1_0_1_2; + html = callPackage ../development/libraries/haskell/html {}; htmlConduit = callPackage ../development/libraries/haskell/html-conduit {}; From 3f7ccb4114056187ada67c7abc76a8abf488286b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:30:33 +0100 Subject: [PATCH 24/88] haskell-HUnit: drop obsolete versions 1.2.0.3, 1.2.2.1, 1.2.2.3, 1.2.4.2, 1.2.4.3, and 1.2.5.1 --- .../libraries/haskell/HUnit/1.2.0.3.nix | 16 ---------------- .../libraries/haskell/HUnit/1.2.2.1.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.2.3.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.4.2.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.4.3.nix | 19 ------------------- .../libraries/haskell/HUnit/1.2.5.1.nix | 17 ----------------- .../HUnit/{1.2.5.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 +-------- 8 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix rename pkgs/development/libraries/haskell/HUnit/{1.2.5.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix deleted file mode 100644 index 7bd199555d79..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.0.3"; - sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12"; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix deleted file mode 100644 index e995adab83c8..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.1"; - sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix deleted file mode 100644 index 02757e9074c2..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.3"; - sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix deleted file mode 100644 index 13483375823f..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.2"; - sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix deleted file mode 100644 index 6f866137945c..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.3"; - sha256 = "0sk2s0g28wly64nisgrj4wr914zx940pvj5zvkv9n467vssywzbr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix deleted file mode 100644 index ae33779597bf..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.5.1"; - sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w"; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix rename to pkgs/development/libraries/haskell/HUnit/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3c9dc32391cc..50b92f2f12e0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1335,14 +1335,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in holyProject = callPackage ../development/libraries/haskell/holy-project {}; - HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; - HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; - HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; - HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; - HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {}; - HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; - HUnit = self.HUnit_1_2_5_2; + HUnit = callPackage ../development/libraries/haskell/HUnit {}; HUnitApprox = callPackage ../development/libraries/haskell/HUnit-approx {}; From 82aab38251753a4cc38b516707f8a16a1686cc2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:38:08 +0100 Subject: [PATCH 25/88] haskell-language-java: drop obsolete version 0.2.6 --- .../libraries/haskell/language-java/0.2.6.nix | 25 ------------------- .../language-java/{0.2.7.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +-- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/language-java/0.2.6.nix rename pkgs/development/libraries/haskell/language-java/{0.2.7.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix deleted file mode 100644 index 316a95481a5b..000000000000 --- a/pkgs/development/libraries/haskell/language-java/0.2.6.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "language-java"; - version = "0.2.6"; - sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27"; - buildDepends = [ cpphs parsec syb ]; - testDepends = [ - filepath HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - buildTools = [ alex ]; - doCheck = false; - meta = { - homepage = "http://github.com/vincenthz/language-java"; - description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.7.nix b/pkgs/development/libraries/haskell/language-java/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-java/0.2.7.nix rename to pkgs/development/libraries/haskell/language-java/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 50b92f2f12e0..d1366024cec6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1468,9 +1468,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; - languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {}; - languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {}; - languageJava = self.languageJava_0_2_7; + languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; From e278868975e9073c30d9f010258cfdb2dde14512 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:40:32 +0100 Subject: [PATCH 26/88] haskell-libsystemd-journal: re-generate expression with cabal2nix --- .../libraries/haskell/libsystemd-journal/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index 8cf84a5a14e3..e4dc138eae05 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { hashable hsyslog pipes pipesSafe text transformers uniplate unixBytestring unorderedContainers uuid vector ]; - extraLibraries = [ systemd-journal ]; + extraLibraries = [ systemd ]; jailbreak = true; meta = { homepage = "http://github.com/ocharles/libsystemd-journal"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d1366024cec6..406c1220a114 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1521,9 +1521,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; - libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { - systemd-journal = pkgs.systemd; - }; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; From b1aa6efc1a00499004c80b8c63afcd8476cd438d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:43:05 +0100 Subject: [PATCH 27/88] haskell-MonadRandom: drop obsolete version 0.1.13 --- .../libraries/haskell/MonadRandom/0.1.13.nix | 16 ---------------- pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix deleted file mode 100644 index 0cbd926b1f18..000000000000 --- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, random, transformers }: - -cabal.mkDerivation (self: { - pname = "MonadRandom"; - version = "0.1.13"; - sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk"; - buildDepends = [ mtl random transformers ]; - meta = { - description = "Random-number generation monad"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e6773ea1fda4..e53e21fc68db 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -23,7 +23,7 @@ ghc783Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; - MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x + MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 406c1220a114..633742f463ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1667,7 +1667,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; - MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; MonadRandom = self.MonadRandom_0_3; From 49d273d54863dc441a02552f41025a54ef550c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:45:51 +0100 Subject: [PATCH 28/88] haskell-mtl: drop obsolete versions 1.1.0.2, 2.0.1.0, 2.1.1, and 2.1.2 --- .../libraries/haskell/mtl/1.1.0.2.nix | 15 --------------- .../libraries/haskell/mtl/2.0.1.0.nix | 16 ---------------- .../development/libraries/haskell/mtl/2.1.1.nix | 16 ---------------- .../development/libraries/haskell/mtl/2.1.2.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 68 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/mtl/1.1.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.0.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.1.2.nix diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix deleted file mode 100644 index 3cc240114dfe..000000000000 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "1.1.0.2"; - sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; - meta = { - description = "Monad transformer library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix deleted file mode 100644 index e528736d95a7..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.0.1.0"; - sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix deleted file mode 100644 index 8cfb60ddfefd..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.1.1"; - sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix deleted file mode 100644 index d72f8bc79d62..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.1.2"; - sha256 = "1vwb98ci3jnjpndym012amia41h3cjdwpy9330ws881l6dj5fxwc"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/mtl"; - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 633742f463ea..407023683f27 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1695,10 +1695,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in msgpack = callPackage ../development/libraries/haskell/msgpack {}; - mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; - mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; - mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; - mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package From 1bcecaed5d59bbf0fd012df294b1dcbb50e14050 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:48:37 +0100 Subject: [PATCH 29/88] haskell-network: drop obsolete versions 2.2.1.4, 2.3.0.2, 2.3.0.5, 2.3.1.0, and 2.4.1.2 --- .../libraries/haskell/network/2.2.1.4.nix | 16 -------------- .../libraries/haskell/network/2.3.0.2.nix | 17 -------------- .../libraries/haskell/network/2.3.0.5.nix | 17 -------------- .../libraries/haskell/network/2.3.1.0.nix | 18 --------------- .../libraries/haskell/network/2.4.1.2.nix | 22 ------------------- pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 95 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/network/2.2.1.4.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.4.1.2.nix diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix deleted file mode 100644 index 481ad16a2a34..000000000000 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.2.1.4"; - sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25"; - buildDepends = [ parsec ]; - meta = { - description = "Networking-related facilities"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix deleted file mode 100644 index 3cf17949380e..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.2"; - sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix deleted file mode 100644 index f10d8c0dbcc7..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.5"; - sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix deleted file mode 100644 index 02185e860414..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.1.0"; - sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; - buildDepends = [ parsec ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix deleted file mode 100644 index 2ec39f7d4578..000000000000 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.4.1.2"; - sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh"; - buildDepends = [ parsec ]; - testDepends = [ - HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 407023683f27..7955a06c523c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1746,13 +1746,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in netwire = callPackage ../development/libraries/haskell/netwire {}; - network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; - network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; - network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {}; network = self.network_2_6_0_2; From 0ce19e1fd2602e7a99d3a5930acec328b8d7b1fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:50:07 +0100 Subject: [PATCH 30/88] haskell-OpenGLRaw: drop obsolete versions 1.3.0.0 and 1.4.0.0 --- .../libraries/haskell/OpenGLRaw/1.3.0.0.nix | 17 ----------------- .../libraries/haskell/OpenGLRaw/1.4.0.0.nix | 17 ----------------- .../OpenGLRaw/{1.5.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +---- 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix rename pkgs/development/libraries/haskell/OpenGLRaw/{1.5.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix deleted file mode 100644 index c3d8ce498819..000000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.3.0.0"; - sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32"; - extraLibraries = [ mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix deleted file mode 100644 index a2ffc9b4ad13..000000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.4.0.0"; - sha256 = "112xaz01950pyjaw3cv9yvw4w3gqbf79idyyh05ain7x29m7bxkh"; - extraLibraries = [ mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix rename to pkgs/development/libraries/haskell/OpenGLRaw/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7955a06c523c..2e74ce184fd1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1805,10 +1805,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGL = callPackage ../development/libraries/haskell/OpenGL {}; - OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; - OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_5_0_0; + OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {}; From d3b2c3f46c5bce8466e0813351afcaf2fe8fa92d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:55:07 +0100 Subject: [PATCH 31/88] haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5 --- .../libraries/haskell/pandoc-citeproc/0.4.nix | 29 ------------------- .../libraries/haskell/pandoc-citeproc/0.5.nix | 29 ------------------- .../pandoc-citeproc/{0.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 ++---- 4 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix rename pkgs/development/libraries/haskell/pandoc-citeproc/{0.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix deleted file mode 100644 index c4706634eccd..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.4.0.1"; - sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix deleted file mode 100644 index c6dc859ed8df..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.5"; - sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix rename to pkgs/development/libraries/haskell/pandoc-citeproc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e74ce184fd1..3029fd4cd9dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,9 +1040,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll { - pandocCiteproc = self.pandocCiteproc_0_4; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1825,10 +1823,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; - pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; - pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; - pandocCiteproc = self.pandocCiteproc_0_6; + pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; From f19bddedcb50c7d768e6acbacb5e7797f066d91b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:57:16 +0100 Subject: [PATCH 32/88] haskell-parallel: drop obsolete versions 1.1.0.1, 2.2.0.1, 3.1.0.1, and 3.2.0.2 --- .../libraries/haskell/parallel/1.1.0.1.nix | 15 --------------- .../libraries/haskell/parallel/2.2.0.1.nix | 16 ---------------- .../libraries/haskell/parallel/3.1.0.1.nix | 16 ---------------- .../libraries/haskell/parallel/3.2.0.2.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 67 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parallel/1.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/2.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/3.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix deleted file mode 100644 index 99575921cc68..000000000000 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "1.1.0.1"; - sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f"; - meta = { - description = "parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix deleted file mode 100644 index 52a5d3c3c339..000000000000 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "2.2.0.1"; - sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix deleted file mode 100644 index 095603717b7b..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.1.0.1"; - sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix deleted file mode 100644 index f881e2f83c78..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.2.0.2"; - sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3029fd4cd9dd..d43a2c2af8c0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1839,10 +1839,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; pango = self.pango_0_13_0_3; - parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; - parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; - parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; - parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; parallel = self.parallel_3_2_0_4; From d04ebcf64ed2aa135b6de19ba25233bcaf62b7c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:58:52 +0100 Subject: [PATCH 33/88] haskell-parsec: drop obsolete versions 2.1.0.1, 3.1.1, 3.1.2, and 3.1.3 --- .../libraries/haskell/parsec/2.1.0.1.nix | 16 ---------------- .../libraries/haskell/parsec/3.1.1.nix | 17 ----------------- .../libraries/haskell/parsec/3.1.2.nix | 18 ------------------ .../libraries/haskell/parsec/3.1.3.nix | 18 ------------------ .../haskell/parsec/{3.1.7.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 7 +------ 6 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsec/2.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.3.nix rename pkgs/development/libraries/haskell/parsec/{3.1.7.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix deleted file mode 100644 index 458a2bd29773..000000000000 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "2.1.0.1"; - sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix deleted file mode 100644 index e997acd4b49e..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.1"; - sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix deleted file mode 100644 index dd55106fa0df..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.2"; - sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix deleted file mode 100644 index 3e81947cfed7..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.3"; - sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.7.nix b/pkgs/development/libraries/haskell/parsec/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsec/3.1.7.nix rename to pkgs/development/libraries/haskell/parsec/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d43a2c2af8c0..680642c037bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1847,12 +1847,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parseargs = callPackage ../development/libraries/haskell/parseargs {}; - parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; - parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; - parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; - parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; - parsec_3_1_7 = callPackage ../development/libraries/haskell/parsec/3.1.7.nix {}; - parsec = self.parsec_3_1_7; + parsec = callPackage ../development/libraries/haskell/parsec {}; parsers = callPackage ../development/libraries/haskell/parsers {}; From dc6e0d95acf48879265e88f11843d54e8ddea5b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:00:17 +0100 Subject: [PATCH 34/88] haskell-primitive: drop obsolete version 0.5.2.1 --- .../libraries/haskell/primitive/0.5.2.1.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.2.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix deleted file mode 100644 index d9bbd51c1998..000000000000 --- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.5.2.1"; - sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f"; - meta = { - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 680642c037bd..1c5a64a4d7f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1978,7 +1978,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pureCdb = callPackage ../development/libraries/haskell/pure-cdb {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; primitive_0_5_4_0 = callPackage ../development/libraries/haskell/primitive/0.5.4.0.nix {}; primitive = self.primitive_0_5_4_0; From c6b48a1486e2b0eed0836c97113d3930894c2464 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:01:28 +0100 Subject: [PATCH 35/88] haskell-test-framework-quickcheck: drop obsolete package --- .../test-framework-quickcheck/default.nix | 20 ------------------- pkgs/top-level/haskell-packages.nix | 4 ---- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix deleted file mode 100644 index 5b822c2418c8..000000000000 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, extensibleExceptions, QuickCheck, random -, testFramework -}: - -cabal.mkDerivation (self: { - pname = "test-framework-quickcheck"; - version = "0.3.0"; - sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv"; - buildDepends = [ - deepseq extensibleExceptions QuickCheck random testFramework - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "QuickCheck support for the test-framework package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1c5a64a4d7f6..33cbd92424ce 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2515,10 +2515,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; - testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck { - QuickCheck = self.QuickCheck_1_2_0_1; # doesn't support version 2.x - }; - testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {}; From 0271e44d2501a588ecc0e4dc8af818dbda4c7981 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:03:52 +0100 Subject: [PATCH 36/88] haskell-QuickCheck: drop obsolete versions 1.2.0.0 1.2.0.1, 2.1.1.1, 2.4.0.1, 2.4.1.1, 2.4.2, 2.5.1.1, 2.6, and 2.7.5 --- .../libraries/haskell/QuickCheck/1.2.0.0.nix | 17 ----------------- .../libraries/haskell/QuickCheck/1.2.0.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.1.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.0.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.2.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.5.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.6.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.7.5.nix | 19 ------------------- .../QuickCheck/{2.7.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 14 ++------------ 11 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.6.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix rename pkgs/development/libraries/haskell/QuickCheck/{2.7.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix deleted file mode 100644 index 465fb510b50e..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.0"; - sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix deleted file mode 100644 index ba16967249db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.1"; - sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix deleted file mode 100644 index 373742a9755a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.1.1.1"; - sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://www.cse.chalmers.se/~koen"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix deleted file mode 100644 index 3bee4ac97026..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.0.1"; - sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix deleted file mode 100644 index d936d4b37841..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.1.1"; - sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix deleted file mode 100644 index 58a04593c494..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.2"; - sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix deleted file mode 100644 index 438c4cfff8db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.5.1.1"; - sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix deleted file mode 100644 index 0ed568384358..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.6"; - sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix deleted file mode 100644 index 26115cb8814a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random, testFramework, tfRandom, transformers }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.7.5"; - sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb"; - buildDepends = [ random tfRandom transformers ]; - testDepends = [ testFramework ]; - noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; - meta = { - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix rename to pkgs/development/libraries/haskell/QuickCheck/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 33cbd92424ce..d63dcb7c285b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -401,7 +401,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {}; ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {}; - ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms { QuickCheck = self.QuickCheck_2_6; }; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; cheapskate = callPackage ../development/libraries/haskell/cheapskate {}; @@ -2012,17 +2012,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; - QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; - QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; - QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; - QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; - QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; - QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; - QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; - QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; - QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; - QuickCheck = self.QuickCheck_2_7_6; + QuickCheck = callPackage ../development/libraries/haskell/QuickCheck {}; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; From e612537df9c1b449c84a77d95df7af3af041a3a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:17:21 +0100 Subject: [PATCH 37/88] haskell-regex-base: drop obsolete versions 0.72.0.2 and 0.93.1 --- .../libraries/haskell/regex-base/0.72.0.2.nix | 16 ---------------- .../libraries/haskell/regex-base/0.93.1.nix | 17 ----------------- .../regex-base/{0.93.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +---- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.93.1.nix rename pkgs/development/libraries/haskell/regex-base/{0.93.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix deleted file mode 100644 index b5b7068da01d..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.72.0.2"; - sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix deleted file mode 100644 index 5aa971ac3478..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.93.1"; - sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-base/0.93.2.nix rename to pkgs/development/libraries/haskell/regex-base/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d63dcb7c285b..dd4d32e28db8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2073,10 +2073,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; - regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; - regexBase = self.regexBase_0_93_2; + regexBase = callPackage ../development/libraries/haskell/regex-base {}; regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; From cbc39a26f7fa610ed65869bc2374524ff3dabfc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:18:37 +0100 Subject: [PATCH 38/88] haskell-regex-compat: drop obsolete versions 0.71.0.1, 0.92, 0.93.1 --- .../libraries/haskell/regex-compat/0.71.0.1.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.92.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.93.1.nix | 17 ----------------- .../regex-compat/{0.95.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.92.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.93.1.nix rename pkgs/development/libraries/haskell/regex-compat/{0.95.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix deleted file mode 100644 index 306d603a9cb5..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.71.0.1"; - sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix deleted file mode 100644 index 91dda463e6d0..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.92"; - sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix deleted file mode 100644 index 7fddc11a672a..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.93.1"; - sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-compat/0.95.1.nix rename to pkgs/development/libraries/haskell/regex-compat/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd4d32e28db8..ee2aa19e7733 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2075,11 +2075,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexBase = callPackage ../development/libraries/haskell/regex-base {}; - regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; - regexCompat = self.regexCompat_0_95_1; + regexCompat = callPackage ../development/libraries/haskell/regex-compat {}; regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {}; From eef8352a92d1d8489398ab46abc57caddd8a3d80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:19:34 +0100 Subject: [PATCH 39/88] haskell-regex-posix: drop obsolete versions 0.72.0.3, 0.94.1, 0.94.2, 0.94.4, and 0.95.1 --- .../libraries/haskell/regex-posix/0.72.0.3.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.1.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.2.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.4.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.95.1.nix | 17 ----------------- .../regex-posix/{0.95.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.1.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.2.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.4.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.95.1.nix rename pkgs/development/libraries/haskell/regex-posix/{0.95.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix deleted file mode 100644 index 893e36677011..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.72.0.3"; - sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix deleted file mode 100644 index ec4bdaab4319..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.1"; - sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix deleted file mode 100644 index 20f2dd714140..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.2"; - sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix deleted file mode 100644 index 49923bf2d6c1..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.4"; - sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix deleted file mode 100644 index 0bcc6d260525..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.95.1"; - sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-posix/0.95.2.nix rename to pkgs/development/libraries/haskell/regex-posix/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee2aa19e7733..4c3a986821be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2081,13 +2081,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {}; - regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; - regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; - regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; - regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; - regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; - regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {}; - regexPosix = self.regexPosix_0_95_2; + regexPosix = callPackage ../development/libraries/haskell/regex-posix {}; regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; From 8e1b3f3635898db837ef1bf69da1e04daac9efc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:21:08 +0100 Subject: [PATCH 40/88] haskell-shelly: drop obsolete version 0.15.4.1 --- .../libraries/haskell/shelly/0.15.4.1.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/shelly/0.15.4.1.nix diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix deleted file mode 100644 index 2840ba736f5b..000000000000 --- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text -, time, unixCompat -}: - -cabal.mkDerivation (self: { - pname = "shelly"; - version = "0.15.4.1"; - sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; - buildDepends = [ - mtl systemFileio systemFilepath text time unixCompat - ]; - testDepends = [ - hspec HUnit mtl systemFileio systemFilepath text time unixCompat - ]; - meta = { - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c3a986821be..2cc48820fe3c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2200,9 +2200,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shellmate = callPackage ../development/libraries/haskell/shellmate {}; - shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; - shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = self.shelly_1_5_3_1; + shelly = callPackage ../development/libraries/haskell/shelly {}; shell-conduit = callPackage ../development/libraries/haskell/shell-conduit {}; From 837b903cb49b99d20a8eb11eb34b4b759b46ee71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:21:56 +0100 Subject: [PATCH 41/88] haskell-syb: drop obsolete 0.3.x versions --- pkgs/development/libraries/haskell/syb/0.3.3.nix | 16 ---------------- .../libraries/haskell/syb/0.3.6.1.nix | 16 ---------------- pkgs/development/libraries/haskell/syb/0.3.7.nix | 16 ---------------- pkgs/development/libraries/haskell/syb/0.3.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 68 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.3.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.6.1.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.7.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.nix diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix deleted file mode 100644 index 967bc75e5221..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.3"; - sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix deleted file mode 100644 index de9da0478892..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.6.1"; - sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix deleted file mode 100644 index 72f883e52432..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.7"; - sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix deleted file mode 100644 index 355fd3671e41..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3"; - sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2cc48820fe3c..6db10831ecc6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2306,10 +2306,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; - syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; - syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; - syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; - syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {}; syb = self.syb_0_4_2; From 7503e32356eca695838faf5d061a6df126494d0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:22:40 +0100 Subject: [PATCH 42/88] haskell-split: drop obsolete version 0.2.1.1 --- .../libraries/haskell/split/0.2.1.1.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/split/0.2.1.1.nix diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix deleted file mode 100644 index 5dfcdf6de0cc..000000000000 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.2.1.1"; - sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; - testDepends = [ QuickCheck ]; - meta = { - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6db10831ecc6..fc503cdc2133 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2361,7 +2361,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; - split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; From fad637f23ff3e8cb284784539b2c31ec00ee4559 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:25:53 +0100 Subject: [PATCH 43/88] haskell-stm: drop obsolete versions 2.1.1.2 2.1.2.1, 2.2.0.1, 2.3, and 2.4 --- .../development/libraries/haskell/stm/2.1.1.2.nix | 15 --------------- .../development/libraries/haskell/stm/2.1.2.1.nix | 15 --------------- .../development/libraries/haskell/stm/2.2.0.1.nix | 15 --------------- pkgs/development/libraries/haskell/stm/2.3.nix | 15 --------------- pkgs/development/libraries/haskell/stm/2.4.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 80 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/stm/2.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.1.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.3.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.4.nix diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix deleted file mode 100644 index d69827bbb69d..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.1.2"; - sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix deleted file mode 100644 index ab99000b7e74..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.2.1"; - sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix deleted file mode 100644 index cfe7ff65871b..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.2.0.1"; - sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix deleted file mode 100644 index c5f62c9c8275..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.3"; - sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix deleted file mode 100644 index 6007e845e9b8..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.4"; - sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc503cdc2133..6a0473e501cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2368,11 +2368,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stbImage = callPackage ../development/libraries/haskell/stb-image {}; - stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {}; - stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; - stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; - stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; - stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {}; stm = self.stm_2_4_3; From b3a3e099d82096388766d49e65509907b0f3f486 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:28:07 +0100 Subject: [PATCH 44/88] haskell-terminfo: drop obsolete version 0.3.2.6 --- .../libraries/haskell/terminfo/0.3.2.6.nix | 17 ----------------- .../terminfo/{0.4.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix rename pkgs/development/libraries/haskell/terminfo/{0.4.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix deleted file mode 100644 index 6a065cb6e845..000000000000 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ncurses }: - -cabal.mkDerivation (self: { - pname = "terminfo"; - version = "0.3.2.6"; - sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f"; - extraLibraries = [ ncurses ]; - meta = { - homepage = "http://code.haskell.org/terminfo"; - description = "Haskell bindings to the terminfo library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix rename to pkgs/development/libraries/haskell/terminfo/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a0473e501cf..79b610b68e1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2472,9 +2472,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in terminalSize = callPackage ../development/libraries/haskell/terminal-size {}; - terminfo_0_3_2_6 = callPackage ../development/libraries/haskell/terminfo/0.3.2.6.nix { inherit (pkgs) ncurses; }; - terminfo_0_4_0_0 = callPackage ../development/libraries/haskell/terminfo/0.4.0.0.nix { inherit (pkgs) ncurses; }; - terminfo = self.terminfo_0_4_0_0; + terminfo = callPackage ../development/libraries/haskell/terminfo { inherit (pkgs) ncurses; }; testFramework = callPackage ../development/libraries/haskell/test-framework {}; From 49f0ff941d0ff224fcfde9b22c20fb5ba4aeaf2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:30:28 +0100 Subject: [PATCH 45/88] haskell-text: drop obsolete versions 0.11.0.5, 0.11.0.6, 0.11.1.5, 0.11.2.0, and 0.11.3.1 --- .../libraries/haskell/text/0.11.0.5.nix | 18 -------------- .../libraries/haskell/text/0.11.0.6.nix | 18 -------------- .../libraries/haskell/text/0.11.1.5.nix | 18 -------------- .../libraries/haskell/text/0.11.2.0.nix | 24 ------------------- .../libraries/haskell/text/0.11.3.1.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 5 ---- 6 files changed, 107 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/text/0.11.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.0.6.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.1.5.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.2.0.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.3.1.nix diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix deleted file mode 100644 index 5f63f68cfe76..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.5"; - sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix deleted file mode 100644 index c922db7e9597..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.6"; - sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix deleted file mode 100644 index afaa25305a32..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.1.5"; - sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix deleted file mode 100644 index f465f4c2afc5..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.2.0"; - sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix deleted file mode 100644 index 6cbed7c1268d..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.3.1"; - sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79b610b68e1c..3e80575acb1e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2492,12 +2492,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in texmath = callPackage ../development/libraries/haskell/texmath {}; - text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; - text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; - text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; text = self.text_1_2_0_0; From 1676f7a43ba75ace7aa9c3970cfdadae424021e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:33:05 +0100 Subject: [PATCH 46/88] haskell-transformers: drop obsolete version 0.2.2.0 --- .../libraries/haskell/transformers/0.2.2.0.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/transformers/0.2.2.0.nix diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix deleted file mode 100644 index cb3dd611ef36..000000000000 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "transformers"; - version = "0.2.2.0"; - sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; - meta = { - description = "Concrete functor and monad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e80575acb1e..4435080a960d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2555,7 +2555,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tostring = callPackage ../development/libraries/haskell/tostring {}; - transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; transformers = null; # core package since ghc >= 7.8.x From 6c6f8a5cc82905063b908d7f20598b3ed6100153 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:34:23 +0100 Subject: [PATCH 47/88] haskell-unordered-containers: drop obsolete versions 0.2.3.0 and 0.2.4.0 --- .../haskell/unordered-containers/0.2.3.0.nix | 24 ------------------- .../haskell/unordered-containers/0.2.4.0.nix | 24 ------------------- .../{0.2.5.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +--- 4 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix rename pkgs/development/libraries/haskell/unordered-containers/{0.2.5.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix deleted file mode 100644 index d7040ac611a3..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.3.0"; - sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix deleted file mode 100644 index 9cb06b029e66..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.4.0"; - sha256 = "1x6djgmawzq8i8spib729pdlpnxyi4gz4p08lyn6jhfqjq6fpsil"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix rename to pkgs/development/libraries/haskell/unordered-containers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4435080a960d..398b1ea812ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2625,10 +2625,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unlambda = callPackage ../development/libraries/haskell/unlambda {}; - unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; - unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; - unorderedContainers_0_2_5_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.1.nix {}; - unorderedContainers = self.unorderedContainers_0_2_5_1; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; uri = callPackage ../development/libraries/haskell/uri {}; From e4e0708397ae599e017833b9cb350d165c569023 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:35:48 +0100 Subject: [PATCH 48/88] haskell-vector: drop obsolete versions 0.10.0.1 and 0.10.11.0 --- .../libraries/haskell/vector/0.10.0.1.nix | 18 ------------------ .../libraries/haskell/vector/0.10.11.0.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.11.0.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix deleted file mode 100644 index 634116b3d9b7..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.0.1"; - sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; - buildDepends = [ deepseq primitive ]; - configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix deleted file mode 100644 index 6929594c62ba..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.11.0"; - sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j"; - buildDepends = [ deepseq primitive ]; - configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; - meta = { - homepage = "https://github.com/haskell/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 398b1ea812ff..44db3790cbdb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2673,9 +2673,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_11_0 = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {}; vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; vector = self.vector_0_10_12_1; From b2ac4769abe787adc348037d7a1a88625747cdf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:37:04 +0100 Subject: [PATCH 49/88] haskell-xhtml: drop obsolete versions 3000.2.0.1, 3000.2.0.4, and 3000.2.0.5 --- .../libraries/haskell/xhtml/3000.2.0.1.nix | 15 --------------- .../libraries/haskell/xhtml/3000.2.0.4.nix | 16 ---------------- .../libraries/haskell/xhtml/3000.2.0.5.nix | 16 ---------------- .../haskell/xhtml/{3000.2.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix rename pkgs/development/libraries/haskell/xhtml/{3000.2.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix deleted file mode 100644 index 3cb0238b82f3..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.1"; - sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; - meta = { - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix deleted file mode 100644 index 74b9fc5620c0..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.4"; - sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix deleted file mode 100644 index 065252d31b76..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.5"; - sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/xhtml/3000.2.1.nix rename to pkgs/development/libraries/haskell/xhtml/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44db3790cbdb..f57129c3f5b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2787,11 +2787,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xdot = callPackage ../development/libraries/haskell/xdot {}; - xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; - xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; - xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {}; - xhtml_3000_2_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.1.nix {}; - xhtml = self.xhtml_3000_2_1; + xhtml = callPackage ../development/libraries/haskell/xhtml {}; xml = callPackage ../development/libraries/haskell/xml {}; From 64ff17d4e648153c2fd7b9ed94d28cec7f89e5f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:38:32 +0100 Subject: [PATCH 50/88] haskell-zlib: drop obsolete versions 0.5.0.0, 0.5.2.0, 0.5.3.1, 0.5.3.3, and 0.5.4.0 --- .../libraries/haskell/zlib/0.5.0.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.2.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.1.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.3.nix | 17 ----------------- .../libraries/haskell/zlib/0.5.4.0.nix | 16 ---------------- .../haskell/zlib/{0.5.4.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.2.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.4.0.nix rename pkgs/development/libraries/haskell/zlib/{0.5.4.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix deleted file mode 100644 index b67604821293..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.0.0"; - sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix deleted file mode 100644 index f3669c97c0a8..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.2.0"; - sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix deleted file mode 100644 index 1bed95bc2e82..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.1"; - sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix deleted file mode 100644 index 5260b55a0277..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.3"; - sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; - extraLibraries = [ zlib ]; - jailbreak = true; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix deleted file mode 100644 index 8b13da93ce34..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.4.0"; - sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib/0.5.4.1.nix rename to pkgs/development/libraries/haskell/zlib/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f57129c3f5b5..42d6a9575638 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2867,13 +2867,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zippers = callPackage ../development/libraries/haskell/zippers {}; - zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;}; - zlib = self.zlib_0_5_4_1; + zlib = callPackage ../development/libraries/haskell/zlib { inherit (pkgs) zlib;}; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; From b8d631a6040fea5ca044a3910b1a755d477ce2f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:41:14 +0100 Subject: [PATCH 51/88] happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 --- .../tools/parsing/happy/1.18.10.nix | 20 ------------------- .../tools/parsing/happy/1.18.4.nix | 19 ------------------ .../tools/parsing/happy/1.18.5.nix | 19 ------------------ .../tools/parsing/happy/1.18.6.nix | 19 ------------------ .../tools/parsing/happy/1.18.9.nix | 20 ------------------- .../parsing/happy/{1.19.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 pkgs/development/tools/parsing/happy/1.18.10.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.4.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.5.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.6.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.9.nix rename pkgs/development/tools/parsing/happy/{1.19.4.nix => default.nix} (100%) diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix deleted file mode 100644 index 187fd3628e83..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.10"; - sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix deleted file mode 100644 index c7e3f919568b..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.4"; - sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix deleted file mode 100644 index f66f20893516..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.5"; - sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix deleted file mode 100644 index 7919908681e1..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.6"; - sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix deleted file mode 100644 index 4ad9bf546b5f..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.9"; - sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.19.4.nix b/pkgs/development/tools/parsing/happy/default.nix similarity index 100% rename from pkgs/development/tools/parsing/happy/1.19.4.nix rename to pkgs/development/tools/parsing/happy/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 42d6a9575638..cc3d25d7bb16 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2905,13 +2905,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; - happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; - happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; - happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; - happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {}; - happy = self.happy_1_19_4; + happy = callPackage ../development/tools/parsing/happy {}; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 0b36cbf8e7f6885951ccf4f6679b21fcec03102a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:45:38 +0100 Subject: [PATCH 52/88] cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 --- .../cabal-install/0.10.2.nix | 20 -------------- .../cabal-install/0.14.0.nix | 26 ------------------- .../cabal-install/0.6.2.nix | 20 -------------- .../cabal-install/0.8.0.nix | 20 -------------- .../cabal-install/0.8.2.nix | 20 -------------- pkgs/top-level/haskell-defaults.nix | 4 --- pkgs/top-level/haskell-packages.nix | 5 ---- 7 files changed, 115 deletions(-) delete mode 100644 pkgs/tools/package-management/cabal-install/0.10.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.14.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.6.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.2.nix diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix deleted file mode 100644 index 3d7b2d72d719..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.10.2"; - sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix deleted file mode 100644 index c5a67e61999c..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.14.0"; - sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Cabal filepath HTTP mtl network random time zlib - ]; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix deleted file mode 100644 index 3c79857f6e78..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.6.2"; - sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix deleted file mode 100644 index d27fbbca7d47..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.0"; - sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix deleted file mode 100644 index 6f8881b504bd..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.2"; - sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e53e21fc68db..72a00c1f5cf2 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -63,10 +63,6 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; - cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { - HTTP = self.HTTP.override { network = self.network_2_3_0_13; }; - network = self.network_2_3_0_13; - }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cc3d25d7bb16..df16bb125bad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3065,11 +3065,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalg = callPackage ../development/libraries/haskell/cabalg {}; - cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; - cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; - cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; - cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; - cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { From 094771012b7f8a9081c975ef8ea4d3715b8047d2 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Mon, 10 Nov 2014 10:32:41 +0200 Subject: [PATCH 53/88] Use "fetchpatch" instead of a patch file. --- .../libraries/haskell/wreq/default.nix | 7 +++++-- .../libraries/haskell/wreq/lens-4.5.patch | 15 --------------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/wreq/lens-4.5.patch diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index a5112b8fa3d9..96353311db07 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -3,7 +3,7 @@ { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson , mimeTypes, temporary, testFramework, testFrameworkHunit, text -, time +, time, fetchpatch }: cabal.mkDerivation (self: { @@ -21,7 +21,10 @@ cabal.mkDerivation (self: { temporary testFramework testFrameworkHunit text ]; doCheck = false; - patches = [ ./lens-4.5.patch ]; + patches = [ (fetchpatch { + url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; + sha256 = "143a4f661pigfqqkvhjzfmg24r4j595p1fcsiqiqc763pynccgq9"; + })]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; diff --git a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch b/pkgs/development/libraries/haskell/wreq/lens-4.5.patch deleted file mode 100644 index b47e5647bf1d..000000000000 --- a/pkgs/development/libraries/haskell/wreq/lens-4.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Network/Wreq/Lens/Machinery.hs b/Network/Wreq/Lens/Machinery.hs -index 782d965..0c97d27 100644 ---- a/Network/Wreq/Lens/Machinery.hs -+++ b/Network/Wreq/Lens/Machinery.hs -@@ -13,8 +13,8 @@ import Language.Haskell.TH.Syntax (Dec, Name, Q, mkName, nameBase) - defaultRules :: LensRules - defaultRules = lensRules - --fieldName :: (String -> String) -> [Name] -> Name -> [DefName] --fieldName f _ name = [TopName . mkName . f . nameBase $ name] -+fieldName :: (String -> String) -> Name -> [Name] -> Name -> [DefName] -+fieldName f _ _ name = [TopName . mkName . f . nameBase $ name] - - makeLenses :: Name -> Q [Dec] - makeLenses = makeLensesWith (defaultRules & lensField .~ fieldName id) From b2e9f0906754451817bdf80062cd4690f617c239 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Mon, 10 Nov 2014 10:47:49 +0200 Subject: [PATCH 54/88] fix sha256 for patch --- pkgs/development/libraries/haskell/wreq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 96353311db07..c16df5863a01 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { doCheck = false; patches = [ (fetchpatch { url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; - sha256 = "143a4f661pigfqqkvhjzfmg24r4j595p1fcsiqiqc763pynccgq9"; + sha256 = "09px4hbqkc9b0ykx7alzq2llzp0nxb2c5zsbaa05rcq9cb3nrq4m"; })]; meta = { homepage = "http://www.serpentine.com/wreq"; From 98878bc5a0a8da3b3f1351b5bf105c62546e2819 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 10 Nov 2014 12:31:15 +0300 Subject: [PATCH 55/88] Link Golly against libperl and libpython so it finds them in runtime --- .../science/misc/golly/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a29d37cc41a1..63a0be47c474 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -13,15 +13,27 @@ let wxGTK perl python zlib ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; - preConfigure = '' - cd gui-wx/configure + + sourceRoot="${name}-src/gui-wx/configure"; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python}/lib/libpython*.so)")" ''; + meta = { inherit (s) version; description = "Cellular automata simulation program"; From 7244de4a4a0e9ef9ca2013e1148fa87613a15cb1 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 10 Nov 2014 02:24:19 -0800 Subject: [PATCH 56/88] add myself to libretro maintainers --- pkgs/misc/emulators/retroarch/cores.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 346e1cbf7715..5da82ab3452d 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -33,7 +33,7 @@ let inherit description; homepage = "http://www.libretro.com/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.edwtjo ]; + maintainers = [ maintainers.edwtjo maintainers.MP2E ]; platforms = platforms.linux; }; } // a); From accb8d2c55527851c1ab5ee47328e886a82174ed Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 10 Nov 2014 12:46:36 +0100 Subject: [PATCH 57/88] xlockmore: update from 5.43 to 5.44, fix appdefaultdir and meta information --- pkgs/misc/screensavers/xlockmore/default.nix | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 7e750d9c9b37..f06eab3a29a4 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,23 +2,20 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.43"; + name = "xlockmore-5.44"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; + sha256 = "07bxl2k84jzz2zn364jakd1sg8rlhynkb7pchb19wy785ssgwvfi"; }; # Optionally, it can use GTK+. buildInputs = [ pam x11 ]; - # The `xlock' program needs to be linked against Glibc's - # `libgcrypt', which contains `crypt(3)'. - patches = [ ./makefile-libcrypt.patch ]; - # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + " --with-crypt" + + " --enable-appdefaultdir=$out/share/X11/app-defaults" + " --disable-setuid" + " --without-editres" + " --without-xpm" @@ -38,9 +35,15 @@ stdenv.mkDerivation rec { + " --without-gtk" + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); - meta = { + preConfigure = '' + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; + + meta = with stdenv.lib; { description = "Screen locker for the X Window System"; - homepage = "http://www.tux.org/~bagleyd/xlockmore.html"; - license = "GPL"; + homepage = http://www.tux.org/~bagleyd/xlockmore.html; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } From 015368fbfe8facc82419e6fb6ba952886e98dab8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 10 Nov 2014 12:52:22 +0100 Subject: [PATCH 58/88] xlockmore: remove unused patch --- .../screensavers/xlockmore/makefile-libcrypt.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch diff --git a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch b/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch deleted file mode 100644 index df31a00a13b8..000000000000 --- a/pkgs/misc/screensavers/xlockmore/makefile-libcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xlockmore-5.24/modes/Makefile.in 2007-01-22 23:02:07.000000000 +0100 -+++ xlockmore-5.24/modes/Makefile.in 2008-02-11 17:24:34.000000000 +0100 -@@ -326,7 +326,7 @@ CFLAGS = @CFLAGS@ - CXXFLAGS = @CXXFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -+XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -lcrypt - XLIBS = @XLIBS@ - XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ - From 3bff1c8fd350fed7855891fa7e8a811d885070e7 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Mon, 10 Nov 2014 15:54:37 +0100 Subject: [PATCH 59/88] netcdf: update to 4.3.2 --- pkgs/development/libraries/netcdf/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 1e354a49cfd2..b67dcafb0f93 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, zlib, hdf5 }: -stdenv.mkDerivation { - name = "netcdf-4.1.1"; +stdenv.mkDerivation rec { + name = "netcdf-4.3.2"; src = fetchurl { - url = http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-4.1.1.tar.gz; - sha256 = "1c1g6ig24fn1fm5wwzv4w832li2jikblvbjv6wwg0mwc6yfxccvr"; + url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; + sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e"; }; -} \ No newline at end of file + buildInputs = [zlib hdf5]; +} From c108ab47be03eb8f3329d351307751c548b9b38e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 10 Nov 2014 18:32:38 +0000 Subject: [PATCH 60/88] grsecurity: Update stable and test patches stable: 3.0-3.14.23-201411062033 -> 3.0-3.14.23-201411091053 test: 3.0-3.17.2-201411062034 -> 3.0-3.17.2-201411091054 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 766999ee42c6..5cb7554cc18d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -61,16 +61,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.23"; - revision = "201411062033"; + revision = "201411091053"; branch = "stable"; - sha256 = "1y1z4fygchhhk64s1zwhk5y5vvrsaldp3xmqfbx2ddsmcbzb4xyl"; + sha256 = "0fs084zggxvqswjs296bnvlvplalg7r60zbccmgrr2j1xa7s4pfl"; }; grsecurity_unstable = grsecPatch { kversion = "3.17.2"; - revision = "201411062034"; + revision = "201411091054"; branch = "test"; - sha256 = "0snhry47awxs68l2rkk10a7cwcwsmn547ywdcgj874x90a7yj63q"; + sha256 = "1yy9ig7ih8k13wl40fzdbhm6avjxw66nm99falzyr4j42k0zx77i"; }; grsec_fix_path = From 28abe40149feedcd8528aa2843af6f33a06954e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Nov 2014 20:16:16 +0100 Subject: [PATCH 61/88] pciutils: update, extend meta, maintain --- pkgs/tools/system/pciutils/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 25201ba97abc..fb3b6c5b9c61 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,11 +8,11 @@ let }; in stdenv.mkDerivation rec { - name = "pciutils-3.2.1"; # with database from 2013-11-10 + name = "pciutils-3.3.0"; # with database from 2014-11-10 src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "1pnwwc4sq0q7zz3mw2rsrc9j5rxwpdvxirqjmxcd0brf0hcjpm8j"; + url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; + sha256 = "008kh33kbpkk1wr9srrapw93imqx7l4djglrdkfxwvy6ppa9acs1"; }; buildInputs = [ pkgconfig zlib kmod which ]; @@ -26,8 +26,12 @@ stdenv.mkDerivation rec { # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; - meta = { - homepage = http://mj.ucw.cz/pciutils.shtml; + meta = with stdenv.lib; { + homepage = http://mj.ucw.cz/pciutils.html; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it }; } + From e78a1603fc872fe3894d49f1686ba18d9bc9eaff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Nov 2014 20:21:28 +0100 Subject: [PATCH 62/88] linux: Enable BPF_JIT only on 64-bit It's not supported on i686. http://hydra.nixos.org/build/16834647 --- pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c882ae3d029d..1af44088daef 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -67,7 +67,7 @@ with stdenv.lib; # Networking options. IP_PNP n ${optionalString (versionOlder version "3.13") '' - IPV6_PRIVACY y + IPV6_PRIVACY y ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y @@ -77,7 +77,9 @@ with stdenv.lib; IP_DCCP_CCID3 n # experimental CLS_U32_PERF y CLS_U32_MARK y - BPF_JIT y + ${optionalString (stdenv.system == "x86_64-linux") '' + BPF_JIT y + ''} # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build From 83cecbdcbcf1fa2d933a4bd2925e086bb7972008 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 10 Nov 2014 11:31:56 -0800 Subject: [PATCH 63/88] boost: Fix runtime dependencies in fixup instead of using a hook to fix binaries --- pkgs/development/libraries/boost/generic.nix | 15 ++++++++++++--- .../libraries/boost/strip-header-path.sh | 12 ------------ 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/libraries/boost/strip-header-path.sh diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ea2710c8e564..c53bb39717e2 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, makeSetupHook +{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames , toolset ? null , enableRelease ? true , enableDebug ? false @@ -90,7 +90,7 @@ let # Create a derivation which encompasses everything, making buildInputs nicer mkdir -p $out/nix-support - echo "${stripHeaderPathHook} $dev $lib" > $out/nix-support/propagated-native-build-inputs + echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs ''; commonConfigureFlags = [ @@ -98,7 +98,13 @@ let "--libdir=$(lib)/lib" ]; - stripHeaderPathHook = makeSetupHook { } ./strip-header-path.sh; + fixup = '' + # Make boost header paths relative so that they are not runtime dependencies + ( + cd "$dev" + find include \( -name '*.hpp' -or -name '*.h' \) -exec sed '1i#line 1 "{}"' -i '{}' \; + ) + ''; in @@ -144,6 +150,8 @@ stdenv.mkDerivation { installPhase = installer nativeB2Args; + postFixup = fixup; + outputs = [ "out" "dev" "lib" ]; crossAttrs = rec { @@ -162,5 +170,6 @@ stdenv.mkDerivation { ''; buildPhase = builder crossB2Args; installPhase = installer crossB2Args; + postFixup = fixup; }; } diff --git a/pkgs/development/libraries/boost/strip-header-path.sh b/pkgs/development/libraries/boost/strip-header-path.sh deleted file mode 100644 index f8243fc27be4..000000000000 --- a/pkgs/development/libraries/boost/strip-header-path.sh +++ /dev/null @@ -1,12 +0,0 @@ -postPhases+=" boostHeaderStripPhase" - -boostHeaderStripPhase() { - runHook preBoostHeaderStrip - [ -z "$outputs" ] && outputs=out - for output in $outputs; do - eval "path=\$$outputs" - [ -d "$path/bin" ] || continue - find "$path/bin" -type f -exec sed -i "s,[^/]*\(-boost-[0-9.]*-dev\),xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\1,g" {} \; - done - runHook postBoostHeaderStrip -} From 31df4f70afbe0ca3e5fa1f52f4a9c4c28f23c61a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 10 Nov 2014 22:08:10 +0100 Subject: [PATCH 64/88] nixos: Add boot.initrd.extraUdevRulesCommands --- nixos/modules/system/boot/stage-1.nix | 13 ++++++++++++- nixos/modules/tasks/swraid.nix | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index e101bbfe72ce..2a0dd005e494 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -127,8 +127,8 @@ let cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/ cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/ - cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/ + ${config.boot.initrd.extraUdevRulesCommands} for i in $out/*.rules; do substituteInPlace $i \ @@ -302,6 +302,17 @@ in ''; }; + boot.initrd.extraUdevRulesCommands = mkOption { + internal = true; + default = ""; + type = types.lines; + description = '' + Shell commands to be executed in the builder of the + udev-rules derivation. This can be used to add + additional udev rules in the initial ramdisk. + ''; + }; + boot.initrd.compressor = mkOption { internal = true; default = "gzip -9"; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 3b4aa9875f26..8e9728919718 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -8,4 +8,8 @@ boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ]; + boot.initrd.extraUdevRulesCommands = '' + cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ + ''; + } From b77d166b175baebacb7998fe73f3ea4f0d5a7292 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 10 Nov 2014 22:09:34 +0100 Subject: [PATCH 65/88] nixos: move bcache udev rule in a new bcache.nix module --- nixos/modules/module-list.nix | 1 + nixos/modules/system/boot/stage-1.nix | 1 - nixos/modules/tasks/bcache.nix | 11 +++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/tasks/bcache.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a709ffa2e2e9..c6187125abbf 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -360,6 +360,7 @@ ./system/boot/tmp.nix ./system/etc/etc.nix ./system/upstart/upstart.nix + ./tasks/bcache.nix ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix ./tasks/filesystems.nix diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 2a0dd005e494..33c9a70eb1b2 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -127,7 +127,6 @@ let cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/ cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/ - cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/ ${config.boot.initrd.extraUdevRulesCommands} for i in $out/*.rules; do diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix new file mode 100644 index 000000000000..f988ec02af72 --- /dev/null +++ b/nixos/modules/tasks/bcache.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + + environment.systemPackages = [ pkgs.bcache-tools ]; + + boot.initrd.extraUdevRulesCommands = '' + cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/ + ''; + +} From b5a925a972290dbe0ce972a6aa0763a2a1038fc5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 11 Nov 2014 10:05:33 +0900 Subject: [PATCH 66/88] Update firefox-bin to 33.1 --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 73459205c7d7..c052a007beb4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_source.rb > source.nix { - version = "33.0.3"; + version = "33.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "1921293ebe2f6ed8b26fb543c2d9673f617551bd"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "cf19672cc4f69d049f072cc3739deff77385652b"; } - { locale = "af"; arch = "linux-i686"; sha1 = "65382d7fcf53b28447c99eea6a1b1d5bccfc390c"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "af0c9cf1517e51f92a5c83c2621722cf3fff2c0f"; } - { locale = "an"; arch = "linux-i686"; sha1 = "10426df065b812a600c817e0567b1adea6148aba"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "ef8411a2a00eeab85ac9d7c6793bbd61302e2589"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "cdb9040dbd00599bf8490cb51c1a22ea27d57559"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "6a65730cadd941c8352ab4b28b5d051f387f7d3f"; } - { locale = "as"; arch = "linux-i686"; sha1 = "1bbcf263c7e211a101957d936f801f47dffd3a43"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "b6abce1b67f168adcfa6f50312407c42ea987895"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "82e66bbd01efa26862826cb785c228fe710edc1a"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "e7b65e099dda3ed9928cf0769e87702e68c8457d"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c6313210c17be8eb34657cd929cae28d46d4ac95"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5395709e0336bb79d1cc711b52353bd8c7b00005"; } - { locale = "be"; arch = "linux-i686"; sha1 = "69c5d38974cd23a3b42d6cc2e647b3d51e68f902"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "a9db15df6bca0bca8079181b9dff9149ddcdb36f"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "7487ede4bed190cc0cd94973e8219ca8c1da76df"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "f85f2992b7a1820a2d328bed7dbec42d461ba478"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "2fca93f2f697249012e61bbb42b1ff135602787d"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "68498facf3cfb2f01f4c6c632b858555f2dca915"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f867da3ea71fbece79d48897af3c264756050dea"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "483faa6cae8fbddc1a1dc70344ee9b8f140da2b7"; } - { locale = "br"; arch = "linux-i686"; sha1 = "843a9831bf65d6ace18e77fa12798e30a69e1bd8"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "6571768ba5c6648fc74c857ef193d214b057c9ff"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "649ac72cd49b1f12f0c5e65c51251ea459bba46f"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "e98aa76e2b0d482316f1497ef02fdc55911e7358"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "bdc2dabc89e77f8e3ffc0e1e1eef54d86da4e915"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "683573c54c29b3952df02414eb8c08ed72a175c0"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "e109d9c8a18021d95c6dd9b024a9ef3098ad2002"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "70571f4b8de2f6ecd78a0d993a92ba50ebfe88f5"; } - { locale = "csb"; arch = "linux-i686"; sha1 = "e257c5462caa7a2cc911b2fd98c2b0c1b8295c3d"; } - { locale = "csb"; arch = "linux-x86_64"; sha1 = "72ec3481d6d8f222954e74097de8f81353229476"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "a37c821b0e5b011928256fd2f1ba5bef904ea115"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "09f149d1a0298b86956278c7785ac1e463fbe966"; } - { locale = "da"; arch = "linux-i686"; sha1 = "3e9ecdbb95a47bc268b670944d8aad093468d300"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "d9f1c143820bb55b87d47c09fb8bd8e8806cc6bd"; } - { locale = "de"; arch = "linux-i686"; sha1 = "a3a0bc4e13191c298ded627f72905234764a3ddc"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "119b106774414fa5befffd7a1b9d33e932e8968f"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "783b4721e6c39bd10ab8adca64a9688ed46561d4"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "22ad1c92851fae97ecb6c73207e98eafed2ffe68"; } - { locale = "el"; arch = "linux-i686"; sha1 = "241cf6cfefd7148d594c97847bd5a38b1cb3d503"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "0557b84b189eaf4e40a1e7c6f1b50e25565abec9"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "b5ff1db0a6b0d757b600096f3f42681044806aa0"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6aca6f3184ffd1548f696988d3c020ccbd42ae39"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "446f501eac8c8f89c04bf27e43a6c5345b5c9672"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "550b8c17dabc55442fa3b64875ce7eabbc54624e"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "1021a7038bdb337c27b46a601f545a949f148b0c"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0dccd437651d9c58b0c7a7b9d6f406ce4949aa2"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "f4b15872c28238b5715a6462f95dc3b41f67e2bd"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "770a8387e74fa9dc5e35524d4b9b761e590b4cdc"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "7d8c56fdfbe441b4fefa3cb9cf86d23031bfd8b4"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "855659d84f4a2f9568f2328cc325875f1d8d1278"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "8b6fd782fb2c402beadbac8455e06c3c39b44a41"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "26887448078121ba67f9aa1595b3ef177c7eaba8"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "315fc00607a0c926ff5c8ce5f702036159b8cf5c"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "86f0474583db54add265b13d28bc5d96656d6e9f"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "8b848b83291d70f870d5bbb5bf6e4c2324224c71"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0b29b6e966099c686195c1de7c2fde7b1150338d"; } - { locale = "et"; arch = "linux-i686"; sha1 = "c64f5ac533b9afc8851abc9cc27aecc62e1896b2"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "90762975828e0003f41c8b91918cfa26385016b2"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "131fba3c72658418c2d33b727b97db94a9edf043"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "1c4cc0c11eff48db085cdc90e29c8d0a82ee1580"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "eda6dbfbdcc12e2b1f41e05847494f4fb186f86b"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "1753b8f6999ec79595d8220149c2f366dd53d50f"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "e4b4269db2ed0e70883b68b09c9de4944d7322e6"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "e84f1ef0a5af55eb455e8aea277c7915eba6c7fc"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "56112c07a35aa309975c177c63835d7084573091"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "68619b9f4e2a0d4d1fcfb125c3afe69ab7e4b888"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "b7e576d28cf1d9321d20e13fe06a75a420c9d266"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "b7a88881f9cd88861f2c1475ff651021215dc10f"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a4d32f2eef796da72906f17e3b3fefdbbeefff2"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "73ce69c69382e8928ba75bfee039484a89a954b7"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c6cd2c29d52f6d41e57a6a6c6920a1b81d3d9ad2"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "704b3f20af6eb5ba8fff11df2b61d165da0c704f"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "b44f19060ad05f90e8a4610ee31742fcf0a1887d"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "4cfe19b446023b477603986f8ebce10760116556"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "0ef95ffc60b27db15175c35c4c67d03e7d4ab187"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "7a4aeda8ebd3f8e84c5eaa41fe654002fa972cf9"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "ad61a487a2fa61c0a59df2a49ad66ffbea6c3d58"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be8cb3124bed4de2c75f4121e8fba51fd924d9c9"; } - { locale = "he"; arch = "linux-i686"; sha1 = "a8f61990571b1e82c92e3aa5d04e0634ba845868"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "21e9e92ac2e1b5d401db087e42cfb8e7b70dbb76"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f9dad0de082bbe79ac3a4d65a7e230ef7573615d"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "4d63ae66cd5c4f5f2136074f25a12a8d7afdf414"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "9fb6741ad66d4518da42f8fd01808cb7225cb179"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "95ab75701daab063c349affd2f64bb78c08c4372"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "3fcf4edabb1214959cb317c87712d93e2b528322"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "378c162773d8fa98bfd4c65a3318da6fd62d9e09"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "f14bbb59e17aa7f2e618acd7bada59f572969da0"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "9d3ed9567343e309d07e33bdd6bf12e342558b83"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "42ee6763c5583cb2a81e165a3594f5225478d341"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6b68651f66f01b2ca6809688208f58d962185334"; } - { locale = "id"; arch = "linux-i686"; sha1 = "af9764798b22a45700d6a8af4fa6fc4fa42057b0"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "1599eb91d24958067fbda8610baba4032906a80e"; } - { locale = "is"; arch = "linux-i686"; sha1 = "ddf37bd5da00481956cb5da8e5c7a4746eac89a2"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "771b15c19b66b9f9dabe2a21cdebdd1a038b1944"; } - { locale = "it"; arch = "linux-i686"; sha1 = "64eb88bbdb9684c985a0b370eebc231f8b7f541c"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "462256d8390173a8b3a4494f71a33882cfff2b05"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "042510095ba9d7d3c07f0fe2d8961ac5a66b3485"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "f5d831366bf57b383f941600b70ab8322207eba4"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "24dd935b408f9d02743dac81ff472f71a54c5652"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "43482c8dde95698306ad6bd21e19471c067cf8c1"; } - { locale = "km"; arch = "linux-i686"; sha1 = "7ab99490f590b2b6e7113c0e9e710db7c64ed3d3"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e9c23eb7fc81c1afc3d242f6a74fcadeed1e8625"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "7d1b892e88e01ea4eaf403036814096530cc96ad"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "1b72a40aa32456bfe7066e3953a38dd476b936d7"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "315bfc8bf6b9de2f949bc414205ad2e732e6b86a"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "b0276581252154e92757e5497b1f72afcc70a88d"; } - { locale = "ku"; arch = "linux-i686"; sha1 = "e723b3c993a32147d96ccd30fc49c38781e7b2e7"; } - { locale = "ku"; arch = "linux-x86_64"; sha1 = "f32b109fa8cc29aeba8efe88ce860b0d8cd31272"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "772d796a7c23c0a19570371ed975d9ce2a28152d"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "06b981f4f3d4ce531abd62cb5266326820f03032"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "48de585882d3f43c7482788ea53861ecdfe47feb"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "b15f167b0c02b18c87657aed28914b5bb8c9ae8c"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "f99e7c29d74e8c71ab3a75030785a796cb2fb7cd"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "cd0c6a7a6cb760daa95fb3f8512ceb59d02d9561"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "e14ef6323bc419c8ea9cc3a5377f81783ceacfe6"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "72b85394e96ea8427c87e305249db32d777679a1"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "f074172c4823d6460084ad035fdf125c7604fcfd"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "a9cb300a95e6209e0960cd4c442927f99685c157"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "ce1e3a7648aa414a036e8e8fedcda1625531a896"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "0ccdea5606e7bd153220986028b08adf9d110489"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "dd2cfce96f63c596d92fc41bf7b0cbb4d3910c75"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "e3132b39198a4d1102e91d5b128aff59a90749fb"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "ef75a6e8ff561505e156143e79732db4e6e7463f"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "d5f9910e8b9c99b6b2a0b02a8d235679bf91e3f9"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "a8a25e635595a463b278d3cad6fe0f3270dde5d4"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "bbaccfa625940ee0cea4bc80b890de12261a2975"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "300906dc853308d56f9be18efbe013ad84b842ed"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "0b3a2dc384b23bf5080514111af1eaddd8b08fdd"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "7ab5b40e63eec97e6340cc47027f3e1dde4bfd33"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "521efadf61693655cd55eff03f5c1b7c74531ede"; } - { locale = "or"; arch = "linux-i686"; sha1 = "56f2c698815def24af986fa5843bd421915f6f55"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "f6062ab71bad05de678f12eb7795786955b2729a"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "2a7390e40308487854ab73af5941936d72907fef"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "1d7ce2a4c0b5c2e1e469a2fd80ac1dd5efa6d5af"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "8aa59c2cbb548fbd3e770d8d149807eaf55d97dc"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "504a1ec25f4c7ec9bfaf171eee8388710ee74952"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "13175cb113c74407ed7014b4d63617e5ad94806b"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "eb3f3ea67b365b1f7d02eddc1edd1631530ecaed"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "17932f6836ab2eb476e53bf0de0ec71cca43cf91"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "d9842d99f3bf39b19f704d1d1037a2653845690f"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "75b6738fad63af2374ab1e68f762887b125951df"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "5e5463aa6c65f883f0b5256fa39d5674ce25af55"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "d31da8f672922c92646a99448204447ff4299fa0"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "8f70168006e90f722b3ce0374728ff25a99e7499"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "a030523200e2fb2423e4961d227c3adfa913d5f4"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "5d696249b6732a8a4d8806ac8032bfd86c49ad36"; } - { locale = "si"; arch = "linux-i686"; sha1 = "ce48e3f09e5a5473d568ed2004e3fef69479f8e0"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "be68d12ab8c5a23f4daf0f6ab024a0a2e43aa8cb"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "e22dd3e46ee4029aadcc6bbb1b7cd0cd2393583c"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "e731b4cb099ef5768861e50320eea79095b40883"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "54066600ccc2ab644dd37467deb4b316b9cc1054"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "79ea8f6eb4319e883b25ca3eb34d2e9baab210ac"; } - { locale = "son"; arch = "linux-i686"; sha1 = "bbf18f281de6083acabc9b94175a959edbedbf0d"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "0e73ef32446ef1b1bf78a748aa33e352dead9415"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "a9f07225212e4e76ea085fc959dd1e5b9ae4cf9e"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "6bfb8ac480c1959e5413ff2c0705bb3f33bc30e4"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "aabbce39a67c3124de70d44b7a0f9d6ee236317b"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "f1ee3384548fd5f42e0cf9562cb640082d370ea4"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "9657f9cd1b898b08d1318fc671ce049254ef179a"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "380ff2e58890a604235a32cdfd1ade91742cd1d0"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "2a888f529c1fd427de4d2c9192c6c34d382beb66"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "931d046374efe0cc02dae0481e71dd62a7ffbcda"; } - { locale = "te"; arch = "linux-i686"; sha1 = "a3ae25c1cad81e5c46917b537467de3a3f4df494"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "846b559dd6f1c09b7f362cc18948df73ef85b417"; } - { locale = "th"; arch = "linux-i686"; sha1 = "e4d9098a89300fcb91a8c9c832a932143b999cc6"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "152c26901be43baefba0acc268667a234b19c102"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "e860e4e718c9185683417cbe624797b0839740ba"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "30fb6171a38dee24f67ac0eb9d27f73d240927db"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "f35e3874fc5be4fe09af9562ba1ba10cb2d1adf8"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "961b37b14ffcb9d627c82b39b7c62d75986e6476"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "06cc7e7827a7426ce5dfb067475ff3bf7ba7abd2"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "e17faa31f58ece35cc00b28b3c94e4b2ce302a51"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "b67854a2dbe447cca7b367916c11acccb17e56d3"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "398bcfbec858de749c6f8e4a7361ed97962653e9"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "542d2872ef5ca6d9e61dd632f1f4c00d9e1b63c8"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ffe67b7988f74e557ce83f62eaa692a86b5e8dc2"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "7cae4e75d12f484799569bbfba2a534e5d0b2ab1"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "53c9cb92486c5b166e6e93fa688b82e0c4e39af1"; } - { locale = "zu"; arch = "linux-i686"; sha1 = "1c5dfd0b0ed74bbbc70f005e82f3715463ac36ac"; } - { locale = "zu"; arch = "linux-x86_64"; sha1 = "44cdce366e31abb691676f9effc8f6bfb6b3b9f4"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "f6ecc5e1d1470a4d79d0f680f3a194857674c5a1"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "d28450930e53f168c11e7e0c4e7df46c20d50882"; } + { locale = "af"; arch = "linux-i686"; sha1 = "2865493140bd8838e7981749f9fe7a734fa59745"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "8f94c2be8ba8e496ff917f78206ab9a9294e4de1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "3f6ecaab216f91759a39e255571edaf9b48d4733"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "ae0fce83ae2aa416dc3acda327dec98f2c7c0b98"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "aeaed8574b13046d1afb129ad9d3cc0ee22b2bff"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "997495abb13611591ce9ab5ea81cc65dd7ee579a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "84193f01192c8341905a0f8d2e7b3d198c39e113"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "f7e9278e9d4b0d3b45f453a16b5840bb84598ccc"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "e52fb5a1e813e1d91ec7562bd7e94632f661c5a4"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "89f13d927c9d8596899ed09f8c9f7d97c26d78f5"; } + { locale = "az"; arch = "linux-i686"; sha1 = "bc0972e18db99f9d6fdbe100dd09d62bb2c3afbd"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "4552aa92a799086b7f79178eb8d846a84e77e094"; } + { locale = "be"; arch = "linux-i686"; sha1 = "4c2577170f9df45a313c6728076cc35504f7ad80"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "dea774633ab5c1ab5c74380984253b0597d53d2c"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "5f770c719895ddec1a8c27bda298361341b2e924"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5581f70176eb35cf01d5ebb368741130420b505e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "f0853164e4d1497be6dcffd6dd365eaf56b6582b"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0ccb11141eb9c339cfe652aee6e902ed0cd700e4"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "36448e2198e3650f0e5a107af3ae10dbdc8273ce"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "804668a7692b378f6686ea56dae3b9e047bce4a1"; } + { locale = "br"; arch = "linux-i686"; sha1 = "396a845931ee25c79baaa2147c94b7eea6c8505f"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "87d9567073d22f09abe6c45a044fd3b4ee4d925b"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "e3263e2215862dad2268686242a2374e460d1868"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "714597790f46b03289a4a91e20f797c82672f849"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "0dfc5d9abcac90e5ab254bb72ae20d987ff206f3"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "2eac6e7cb6eae8ca0714dd219eb08b3f7d846191"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "505764e55d673a282d38c3bca7db4ac29325ead1"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "bd32e999d5c61b20bb3a5983032227ff2a7d6d84"; } + { locale = "csb"; arch = "linux-i686"; sha1 = "ae5065363647da475901fb7cc156a4ecdecc528b"; } + { locale = "csb"; arch = "linux-x86_64"; sha1 = "df0de3d7e5b2aa84e37097b5f65168d732bfd3de"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "3e1e7991983277f4c07486d1f2896e2a192d5f85"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "20232e85c69830eb08b4387f69e3d26637b3d06c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "1a3a3913876fe8eea20b4b6d33b939b9e531fd34"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f89864c28eb750655fb212d77569fcfdfbd38ee9"; } + { locale = "de"; arch = "linux-i686"; sha1 = "da97ff54467b5d0cad8142158e01514a1e75f457"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "988c4cd52388368d21cfb1e6002c28f3e8fb57b1"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "0997a81282c73a8faf8a784a296bbe9102c823bd"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6573147c354d29f0ba928888916882aafb92268"; } + { locale = "el"; arch = "linux-i686"; sha1 = "df53cedb977f9f1cff6b43351fa19801c51e53d9"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "e124b8586af6fb23371c006be0fbe3525dafc8a9"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "738a7335b42e4d324bb3c8411666c3d64e481f85"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "788abe682ac80e08739edf0fabfd4f160eee44da"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "9aeaab7265640c4dfdde57b0ef7eebac26c1d1ec"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e4bdb638b0a4c90ecb664a9b64351a31ad237ee5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "381749003d0755cec8dbf29cd1d4ebfa806576f8"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "518c307bb0b23592ff711943594ea76ffdf0d0c3"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "f570024c9c665b36bd8646f44b2b27ff7021f590"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "fb777076f2a2a7d911a381a0561c02701dd54878"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "20cac134a4312d5cee8ad1f144b2c44108e96b8e"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d4757bfb61d84d6d3e4b484377f1037b1ff2728c"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "0416114a667fbc9144186d9a74ce2cf3e09944cc"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "73eeff57047143e8d4217bb22a3831555f87341f"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "66d8288cb4af4d4e8584dcebefc14d9aaf46f4bc"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d0830ffc8634ab47033b932dcac51e7d042c4f19"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "592df3f8ee6e6a6fc56991a7b1e9f55a1ea1b8e8"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cf0d2afac587dbb4f640ea672ea01190f2425905"; } + { locale = "et"; arch = "linux-i686"; sha1 = "441a5dbb69fe61e28e06ec3ed29f34d067ec2ade"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "633b25f83507b61829a934385766628c8764544e"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "f8f6ddf346afb5bb0420ab092463d61e5e6abfe7"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "cc7cfc43d8e6db5ac08f846e81a416e5a75b37b6"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "796ee1d052e97372a870f113390ef25f26047203"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "3810bd3727a7de7474070e329ddeabfb98f4aeee"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "436b6732f58bb6a128c6e3027358089bca0d753e"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "ed7e3e1a90d31e40cd47645474246adba30eaa1d"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "1d7909cbfe55f6234b6789addae5c9a2dbcf1e49"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "d7734ee040a5ff56aa6d7149d6d5a78541f533fb"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a8614ef406ed6d4ce7f64f14335b5c4a13fd1ee2"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "98d5e3476784ee4d759b7995e2ff936910a1b213"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "3c7a1c5e1fb9e0f2320a33771bde1cbd774eb6bf"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "10178c5fc56dd8f510f80748767e7e5961bac6ff"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "235c5016eb77c9369ee10e51514961a6986f3c78"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "023c3aafa794faa30cc25576e411f2482cc83131"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "e86c734f2afb872f407f78e867735ecda7ceb622"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "29b695a5c8291f23b22871dcec4d6e66f918e21c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "c13ac4e21e70e5d3bcf0b2149bfc3e6090c383ce"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "70116ba4463b6937382dc9c7c8da465f5aa78c07"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "7b687b19b72543d411c9eeb4055015c4e4ebaa4b"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "d2cc38aafa2311808d92f1c927b6b6fd86c35d59"; } + { locale = "he"; arch = "linux-i686"; sha1 = "24027663a19be1d27379167585936591ffe01650"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "0ab9ec52df1e0debad953b2c658c16396a7c336d"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d72b91be0e392a853d3b894f2809bb16d4ed77f5"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "560a3562b66a46f7b5c235e5f0c9a37518dc60f4"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "319c19a36f1d9f087f59470cb14ad0b9429cb751"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "2c98ac830fb0eff611cb82690d068dc61fa6fb21"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "f8b2f8a85b7e5d8d4c551f0e64340cfe491695c4"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "5b6533ac4222a3e18c3d4ba74e0aa459bfa413d1"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "93308746df2c99182d2919fece807b47db688b3d"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "9fd5cd46a04bed5b8fb079aeb59050664c5d93e0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d889d18ccef0c7c25dc2e1fc71b9eaa6aaeb4229"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2ef01a1c2f01825d80d6a0846d59ff6ad77e90e1"; } + { locale = "id"; arch = "linux-i686"; sha1 = "1c5cb9d1d4b20b2060a8fd07d2851067a4b71d6a"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "82c871d7554fe8411d8f6fccf5e3c7f0d7798885"; } + { locale = "is"; arch = "linux-i686"; sha1 = "1e697fa5802915b826e29ea73805b7101a32312c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "44b0d19bc285462f305abf8137aefd9477715e8f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "16e00713bd355373c676e05a032933d9c210ba87"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "c32e8d9e9dde6c61092e4b72a3192f50e70bcfa9"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "d2d4d0a2c32769ae9fb6d27dfb71e52f146824c3"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "271d50bcf97440e61bf7b952a48fe3992c40faf0"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "bc1e2c28b01b7bffde01d88e6aa6aec1a8868f3d"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "94a66d608cec6de58fb8d72b116395c77198494d"; } + { locale = "km"; arch = "linux-i686"; sha1 = "99fdf2ae88c34db6fe9234d236caffeb50cbb843"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "78645872859dc627c5d12e6aa86aef6e3528b3d9"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "ef5dcee189c685ee5b71a76cb19138e65f22a0be"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "87b064a5ce23ffd1397b8a480e6a158b1de4cd67"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "95e6290a38025af724c34272f8e2a4d531e4f06a"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "e989184dfda401f19a895275519f729597a27e97"; } + { locale = "ku"; arch = "linux-i686"; sha1 = "c1004b96937b848d9e1e53f9fe4a8507d218572d"; } + { locale = "ku"; arch = "linux-x86_64"; sha1 = "a4e61d630ab6ce54a06ff1a90c7df3b76b235181"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "be5da1e0d17c7b51da616c082932d8190a33a74e"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "35e29b7825124dd5c68d02e7c1a15e9cdefaec22"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "c09c5cf5f25eac88f90f4aeb48495f688d78d80d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "7f4f6511d9cf4b70e34b37c823c12bd13409a7e8"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "7fc81c00badbbd877a67d5e1998f16560dd41f3e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "5edb8fac36c755db3e3270a0cf4320970696ff4c"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "4d49ecb2e195c9c65382155128ff02d857937703"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "96d0dac8116f20972469e527757d17cf7c22792b"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "b72b07ab4d69430d62fb9c497c047f2987636ea1"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "441918ac58ff166851921bf1566e7dda24ce2377"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "b7947f50a0618ba9b8fb5fa9f1adff13dbfc0147"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "3c98db55a6b9c707957786cc40a03d69e9b4e619"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "f1e5109a2fe72d1c7d8a32f83918064d607efa1a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "820f056eb3413fc0e1979f192e9542db0c9e0e79"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "6a9f01f286fbe0b63f6c171f0171f2883fa5b474"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "f8cccf1c87845947693c631fd60300d1a5ec7436"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "2dbe61442b310777b427d27159ee767d82a4b254"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b7a437552fc540966478832bf89a85dc81b16766"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "36f65d56954e59bd758b4a1c09abec85872eb140"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "0c1ed8b52afdd3d15f163fc8899e14caeb0a4497"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "729144a52c95cbcb2665da00e953cbdb269c0665"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "5298026198b8d6c7eb0b816ca29bbd26f0f65907"; } + { locale = "or"; arch = "linux-i686"; sha1 = "33aaf77833a3c3a504559c399a270061a582ffbb"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a2dca791375b174d0f888ce56555fe21e5b2eaf4"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "3670a8492dde8b19e1f5fba10d54eabd003183e1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "376576536d6a7d373ec5c453e107f63261819cf1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "53af2036a170d77f828e80d455edf6cddf826cfb"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "01e04cf2530c1b51bd9e8ee5114ac9ba5317e0e4"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0fec2a4ea90ecb6d7e09041d45a4b0647c37ebe0"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f7f1dd1f7d78b3647cb77f282b87a3d7224ec567"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "cf46849b5fbd06b51c468f2dc6dab3eb9e8ffde1"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e6bae39233b0c3735fb122b9e56ac4e82d435749"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "41ed6d9c3816647069b0416d1b7edda97fe1abff"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "36a83ca4594ba79a3b01ee21a5cfde45b13b323e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "d70284aea6297688eb25835a482d9ca349eac313"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "78079d94b0ad83e6cd687433c335b7e0012c8cb8"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "354fb775dbddfe9f87e78982e7456f20d01476bb"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "30a29bb1cbf967fb24e5bbc6abefcdf074b316cc"; } + { locale = "si"; arch = "linux-i686"; sha1 = "b20089f3f2ef670426a29e409426a9cd3569090a"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "bee5b374f0ca41a858e9b61fe0b43a56bf303180"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "6c9d83b2cef140bdf513c7226854fc991d087785"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "57595905385b6b7e77eee34f54a40562d041169d"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "63b3edf9aec8a6beabdf1a4b4a9fb0fb835345fc"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "3afafa985ee73cfe378e39881665d2242a6943c9"; } + { locale = "son"; arch = "linux-i686"; sha1 = "e6b6b56ebee586bb10511d197b11d93aefae6316"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f95cb4b571fa389df4e182632b12216699cc9f0a"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "18dfa5b40bd31a0d23884f6e9af357b0be01c4b2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f9d026e9d5a85eaad008d65b736ae8c63cb5064d"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "a5ed16491244d9ab6237546e241335005572c1c0"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "2ed29dec3a28949b93f82d0652a38a5539fb2304"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "594eae45b36645a47b12d9579826789e3255b275"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "0cec1133910c8ae87878ca56fd63b610651f99ca"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "86da5bfa06e670359b831226822db6a40a7ec7c3"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "86b3749d396a7be3628face4bf7ed7278b98c5ab"; } + { locale = "te"; arch = "linux-i686"; sha1 = "7020a27e9173b52a54c8e442e8e2ffc60a888e2c"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "417ea3e749a9f7309b11d50f99bd5c1b916a0c77"; } + { locale = "th"; arch = "linux-i686"; sha1 = "539293f4f6183ec2941fa83705f7c91bf5e65776"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "362d3c39936725437d63576f2c8ee6deaf9429ea"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "eb0d205cf6eac45a8405d072b89856293d4cb63e"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "84c19d6ec3446ecbe03f0751822501d3628699a8"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "5ef72696a4180c91483f406627ea040bede2f30c"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9de7bcc3ff254234e1844860c3bc907317c02ae6"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "3338130b87e4dd9ee7b8e7120dd158065a772290"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "53ebf9890f9b4ccdc786fa65dcae739fae7b8f7c"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "83ae4b1f84c64733d196b9bec58ab1468b126577"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "da5b9dca0277dd2be1027251c96f7524e0204f2f"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "bc3e12000156a886e00a64bf536c5b2c35bb727d"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1ac45fd506eb1d5bb92a86ee3a9686e8c93b5c9e"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "5377236c138066df6f67083ae8ed348c6d611a81"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "8733a47e10d1bd025507c09a443acf80dd614643"; } + { locale = "zu"; arch = "linux-i686"; sha1 = "a653e724fe28431b2b5ca5f2553654da4ffa526f"; } + { locale = "zu"; arch = "linux-x86_64"; sha1 = "81c967fc251d77a38de24519dba0f4465326fcd8"; } ]; } From b9388e9711f1c9736ccfb120f4bd972d9a78cf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Nov 2014 07:06:09 +0100 Subject: [PATCH 67/88] fix kernel builds on 32bit linux --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1af44088daef..16362de9ae01 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -318,7 +318,9 @@ with stdenv.lib; ${optionalString (!stdenv.is64bit) '' HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. ''} - INTEL_IOMMU_DEFAULT_ON y + ${optionalString stdenv.is64bit '' + INTEL_IOMMU_DEFAULT_ON y + ''} ${optionalString (versionAtLeast version "3.9") '' VFIO_PCI_VGA y ''} From eba10b008f0ac9ab00a02e6fb16e7477bff971cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Nov 2014 07:21:43 +0100 Subject: [PATCH 68/88] fix tarball eval --- pkgs/development/compilers/mozart/binary.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index f8f19e599539..3d9e4311c313 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, bash, makeWrapper, coreutils, emacs, tcl, tk, boost, gmp, cacert }: +assert stdenv.isLinux; + let version = "2.0.0"; in @@ -23,6 +25,6 @@ stdenv.mkDerivation { description = "The Mozart Programming System combines ongoing research in programming language design and implementation, constraint logic programming, distributed computing, and human-computer interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality."; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 189e73de989b2db606c780742d3224797934d45e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 10 Nov 2014 22:30:36 -0800 Subject: [PATCH 69/88] kernel-testing: 3.18-rc3 -> 3.18-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 737c52d6eb22..1fef29e5aec4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18-rc3"; - modDirVersion = "3.18.0-rc3"; + version = "3.18-rc4"; + modDirVersion = "3.18.0-rc4"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1w58szpljzm2ys53fiagqypiw9ylbqf843rwqyv9bwxg5lm1jaq1"; + sha256 = "1ifdz4ss2ghaw8h89f5738fhgy8m7g92y763q8wrd9r4nipqdpnr"; }; features.iwlwifi = true; From adb831e8bcb66684592b21f5ff1559c056faac60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Nov 2014 07:40:52 +0100 Subject: [PATCH 70/88] strongswan: -lgcc_s, fixes #4925 CC maint. @shlevy. --- pkgs/tools/networking/strongswan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 391fd8833642..fe698b6e3be2 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; + NIX_LDFLAGS = "-lgcc_s" ; + meta = { maintainers = [ stdenv.lib.maintainers.shlevy ]; description = "OpenSource IPsec-based VPN Solution"; From fb3e83d091532fc63e55a063515e66bfaa014e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Nov 2014 07:46:26 +0100 Subject: [PATCH 71/88] firefox: update to 33.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 0baa3f32bed1..bb96d417a4d8 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "33.0.3"; in +let version = "33.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "88b8380f0c0929a8beb892e6169e8e5d4bf5f62f"; + sha1 = "bc87055d3b68e8458f07d0c04503b6aaed3771df"; }; buildInputs = From 7ff9cd2c41558c050164c3fe494d8b0a13e612f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Nov 2014 09:21:53 +0100 Subject: [PATCH 72/88] more kernel fixes --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 16362de9ae01..0aaefc2a723e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -321,7 +321,7 @@ with stdenv.lib; ${optionalString stdenv.is64bit '' INTEL_IOMMU_DEFAULT_ON y ''} - ${optionalString (versionAtLeast version "3.9") '' + ${optionalString (versionAtLeast version "3.9" && stdenv.is64bit) '' VFIO_PCI_VGA y ''} VIRT_DRIVERS y From 43be15a89cb70530a4843a1dda8a1fb5a90dc5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Nov 2014 09:34:40 +0100 Subject: [PATCH 73/88] fix quake3game build --- pkgs/games/quake3/game/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index d73c8c6a4c47..bea117c04197 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal }: +{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./exit.patch ]; - buildInputs = [x11 SDL mesa openal]; + buildInputs = [x11 SDL mesa openal gcc]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b96e9b26cc..244c236bb17c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11457,7 +11457,7 @@ let quake3demodata = callPackage ../games/quake3/demo { }; - quake3game = callPackage ../games/quake3/game { }; + quake3game = callPackage ../games/quake3/game { gcc = gcc46; }; quantumminigolf = callPackage ../games/quantumminigolf {}; From aa17cbf0a8b39e040d3e04198d3c4266100ceadc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2014 10:38:48 +0100 Subject: [PATCH 74/88] Remove unnecessary override --- pkgs/games/quake3/game/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index bea117c04197..cbcc8c290f81 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc }: +{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./exit.patch ]; - buildInputs = [x11 SDL mesa openal gcc]; + buildInputs = [ x11 SDL mesa openal gcc46 ]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 244c236bb17c..97b96e9b26cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11457,7 +11457,7 @@ let quake3demodata = callPackage ../games/quake3/demo { }; - quake3game = callPackage ../games/quake3/game { gcc = gcc46; }; + quake3game = callPackage ../games/quake3/game { }; quantumminigolf = callPackage ../games/quantumminigolf {}; From db4053fb590d72f68da681b3460e1cecb103c294 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2014 10:30:58 +0100 Subject: [PATCH 75/88] httpd-2.2: Enable building of mod_cache and friends --- pkgs/servers/http/apache-httpd/2.2.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index eb9c6846089c..2af7b761c24a 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} + --enable-cache + --enable-disk-cache + --enable-file-cache + --enable-mem-cache ''; enableParallelBuilding = true; From 23d0af8f347c5054bc59d45fb96794ef400ee817 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Tue, 11 Nov 2014 17:14:30 +0800 Subject: [PATCH 76/88] new package: ndn-cxx --- .../development/libraries/ndn-cxx/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ndn-cxx/default.nix diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix new file mode 100644 index 000000000000..d95443da359d --- /dev/null +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }: +let + version = "4c32e7"; +in +stdenv.mkDerivation { + name = "ndn-cxx-0.1-${version}"; + src = fetchgit { + url = "https://github.com/named-data/ndn-cxx.git"; + rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; + sha256 = "18s18inf14wmkfh1z6w087w7l3bqszd0nkhr09j73hqpz90b06hz"; + }; + buildInputs = [ openssl doxygen boost sqlite cryptopp pkgconfig python pythonPackages.sphinx]; + preConfigure = '' + patchShebangs waf + ./waf configure \ + --with-cryptopp=${cryptopp} \ + --boost-includes=${boost.dev}/include \ + --boost-libs=${boost.lib}/lib \ + --with-examples \ + --prefix=$out + ''; + buildPhase = '' + ./waf + ''; + installPhase = '' + ./waf install + ''; + meta = with stdenv.lib; { + homepage = "http://named-data.net/"; + description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + longDescription = '' + ndn-cxx is a C++ library, implementing Named Data Networking (NDN) + primitives that can be used to implement various NDN applications. + NDN operates by addressing and delivering Content Objects directly + by Name instead of merely addressing network end-points. In addition, + the NDN security model explicitly secures individual Content Objects + rather than securing the connection or “pipe”. Named and secured + content resides in distributed caches automatically populated on + demand or selectively pre-populated. When requested by name, NDN + delivers named content to the user from the nearest cache, thereby + traversing fewer network hops, eliminating redundant requests, + and consuming less resources overall. + ''; + license = licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.sjmackenzie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b96e9b26cc..763ede96255b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4903,6 +4903,8 @@ let ccnx = callPackage ../development/libraries/ccnx { }; + ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + cimg = callPackage ../development/libraries/cimg { }; scmccid = callPackage ../development/libraries/scmccid { }; @@ -10211,7 +10213,7 @@ let musescore = callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; - mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { + mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { withSidebar = true; automake = automake113x; }; From 6c39bbde6d030a1ba7a4881a28f07fa4b7644969 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 11 Nov 2014 13:57:00 +0300 Subject: [PATCH 77/88] Set correct current platform support for Mozart binary --- pkgs/development/compilers/mozart/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 3d9e4311c313..57e339204bd0 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "The Mozart Programming System combines ongoing research in programming language design and implementation, constraint logic programming, distributed computing, and human-computer interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality."; license = licenses.mit; - platforms = platforms.linux; + platforms = ["x86_64-linux"]; }; } From 8df0e0b151475350265304dfa58e9193eea0058b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 11 Nov 2014 14:20:43 +0100 Subject: [PATCH 78/88] Fixed many descriptions --- pkgs/applications/audio/cantata/default.nix | 4 +- .../audio/milkytracker/default.nix | 2 +- .../audio/mopidy-spotify/default.nix | 2 +- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/audio/vimpc/default.nix | 2 +- .../editors/emacs-modes/darcsum/default.nix | 4 +- .../graphics/solvespace/default.nix | 2 +- pkgs/applications/misc/bitcoin/altcoins.nix | 4 +- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- pkgs/applications/misc/spacefm/default.nix | 2 +- .../fonts/kochi-substitute-naga10/default.nix | 2 +- pkgs/data/fonts/kochi-substitute/default.nix | 2 +- pkgs/data/fonts/poly/default.nix | 2 +- .../gnome-3/3.12/core/yelp/default.nix | 2 +- pkgs/development/compilers/agda/stdlib.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 2 +- .../compilers/opendylan/default.nix | 2 +- pkgs/development/libraries/dlib/default.nix | 2 +- pkgs/development/libraries/gdcm/default.nix | 2 +- pkgs/development/libraries/gtest/default.nix | 2 +- .../libraries/gupnp-av/default.nix | 2 +- .../java/commons/compress/default.nix | 4 +- .../java/commons/fileupload/default.nix | 4 +- .../libraries/libsearpc/default.nix | 2 +- pkgs/development/libraries/libzdb/default.nix | 4 +- .../development/libraries/skalibs/default.nix | 2 +- .../lisp-modules/lisp-packages.nix | 4 +- pkgs/development/tools/golint/default.nix | 2 +- .../tools/misc/dfu-programmer/default.nix | 2 +- .../tools/selenium/server/default.nix | 2 +- pkgs/development/web/remarkjs/default.nix | 2 +- pkgs/games/astromenace/default.nix | 2 +- pkgs/games/mnemosyne/default.nix | 4 +- pkgs/games/sdlmame/default.nix | 2 +- pkgs/games/tcl2048/default.nix | 2 +- pkgs/games/thePenguinMachine/default.nix | 4 +- pkgs/games/typespeed/default.nix | 2 +- pkgs/misc/apulse/default.nix | 2 +- pkgs/misc/drivers/xboxdrv/default.nix | 5 +- pkgs/misc/emulators/ppsspp/default.nix | 2 +- pkgs/os-specific/linux/cpupower/default.nix | 2 +- pkgs/os-specific/linux/ktap/default.nix | 2 +- .../linux/s6-linux-utils/default.nix | 2 +- pkgs/os-specific/linux/usermount/default.nix | 2 +- pkgs/servers/beanstalkd/default.nix | 2 +- pkgs/servers/brickd/default.nix | 2 +- pkgs/servers/corosync/default.nix | 2 +- pkgs/servers/http/winstone/default.nix | 4 +- pkgs/servers/mail/opensmtpd/default.nix | 4 +- pkgs/servers/monitoring/riemann/default.nix | 6 +- pkgs/servers/nosql/cassandra/default.nix | 4 +- pkgs/servers/s6/default.nix | 2 +- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/audio/mpdcron/default.nix | 2 +- pkgs/tools/audio/volumeicon/default.nix | 4 +- pkgs/tools/filesystems/jmtpfs/default.nix | 2 +- pkgs/tools/misc/execline/default.nix | 2 +- pkgs/tools/misc/s6-portable-utils/default.nix | 2 +- pkgs/tools/misc/screenfetch/default.nix | 2 +- pkgs/tools/misc/sutils/default.nix | 2 +- pkgs/tools/networking/bully/default.nix | 4 +- pkgs/tools/networking/ccnet/default.nix | 4 +- pkgs/tools/networking/ndjbdns/default.nix | 5 +- .../networking/netcat-openbsd/default.nix | 2 +- pkgs/tools/networking/s6-dns/default.nix | 2 +- .../networking/s6-networking/default.nix | 2 +- pkgs/tools/security/nmap/default.nix | 4 +- .../security/tpm-quote-tools/default.nix | 9 +- pkgs/tools/system/safe-rm/default.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 18 +-- pkgs/top-level/python-packages.nix | 112 +++++++++--------- 72 files changed, 160 insertions(+), 159 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index aade5636c168..10baf254dc73 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://code.google.com/p/cantata/"; - description = "A graphical client for MPD."; + homepage = http://code.google.com/p/cantata/; + description = "A graphical client for MPD"; license = licenses.gpl3; # Technically Cantata can run on Windows so if someone wants to diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index eadbaabcf560..d5d7ea7be76a 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ]; meta = { - description = "Music tracker application, similar to Fasttracker II."; + description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 6223ffb0d81f..b16e63dc421b 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://www.mopidy.com/; - description = "Mopidy extension for playing music from Spotify."; + description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; maintainers = [ maintainers.rickynils ]; hydraPlatforms = []; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index a0a3af0e9585..b261508438f0 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonPackage rec { homepage = http://www.mopidy.com/; description = '' An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more. + SoundCloud, Google Play Music, and more ''; license = licenses.asl20; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 717262dbcb57..71a07f18e084 100755 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; + description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = https://github.com/boysetsfrog/vimpc; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix index 349146dbdd89..0a1c2c77b2a2 100644 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { ''; meta = { - description = "A pcl-cvs like interface for managing darcs patches."; - homepage = "http://hub.darcs.net/simon/darcsum"; + description = "A pcl-cvs like interface for managing darcs patches"; + homepage = http://hub.darcs.net/simon/darcsum; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.falsifian ]; }; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 95230291fe95..cba69c476b54 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A parametric 3d CAD program."; + description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix index 2643094e2f16..931dfcaa8611 100644 --- a/pkgs/applications/misc/bitcoin/altcoins.nix +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -45,7 +45,7 @@ in rec { }; meta = { - description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm."; + description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' Litecoin is a peer-to-peer Internet currency that enables instant payments to anyone in the world. It is based on the Bitcoin protocol but differs @@ -75,7 +75,7 @@ in rec { extraBuildInputs = [ glib ]; meta = { - description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology."; + description = "A decentralized key/value registration and transfer system based on Bitcoin technology"; homepage = http://namecoin.info; }; }; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 34bef86f4380..2ae5a7ac8efa 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "K2pdfopt optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones."; + description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = http://www.willus.com/k2pdfopt; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6f1ced9097e9..b88e4c567cc1 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; + description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration"; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index 98ab8a3bcac5..ea2c15752d7f 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Japanese font, non-free replacement for MS Gothic and MS Mincho."; + description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; longDescription = '' Kochi Gothic and Kochi Mincho were developed as free replacements for the MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index dec20fd51000..574bc7f29218 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; + description = "Japanese font, a free replacement for MS Gothic and MS Mincho"; longDescription = '' Kochi Gothic and Kochi Mincho were developed as free replacements for the MS Gothic and MS Mincho fonts from Microsoft. These are the Debian diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 63006fdd4f8a..1bd0d8980677 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Medium contrast serif font."; + description = "Medium contrast serif font"; longDescription = '' With short ascenders and a very high x-height, Poly is efficient in small sizes. Thanks to its careful balance between the x-height and glyph widths, diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix index d8897e262d59..d7f9fe1ff532 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp is the help viewer in Gnome."; + description = "The help viewer in Gnome"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index 638b45951c89..a583ff33cb68 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -18,7 +18,7 @@ agda.mkDerivation (self: rec { meta = with stdenv.lib; { homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; - description = "A standard library for use with the Agda compiler."; + description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ jwiegley fuuzetsu ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 19f8eab482cb..4f0a1bd05129 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; - description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index e4bdcf7889bb..66e62f8965e6 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; - description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 94f74e516f1b..0d262fb061e2 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ x11 ]; meta = with stdenv.lib; { - description = "Dlib is a general purpose cross-platform C++ machine learning library."; + description = "A general purpose cross-platform C++ machine learning library"; homepage = http://www.dlib.net; license = stdenv.lib.licenses.boost; maintainers = with maintainers; [ christopherpoole ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index e100b82ae9ed..4663f7aac224 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ]; meta = { - description = "The grassroots cross-platform DICOM implementation."; + description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 787cd4066c0a..d71c29cbca5d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Google test: Google's framework for writing C++ tests."; + description = "Google's framework for writing C++ tests"; homepage = https://code.google.com/p/googletest/; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 3cbb13972d35..2dcd5b11c386 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gupnp.org/; - description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP."; + description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 2c20d9a9b362..4e04ba47c858 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://commons.apache.org/proper/commons-compress"; - description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files."; + homepage = http://commons.apache.org/proper/commons-compress; + description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index ebb8a7d7f9db..2018e3f11f2d 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://commons.apache.org/proper/commons-fileupload"; - description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications."; + homepage = http://commons.apache.org/proper/commons-fileupload; + description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 32cb7b860c4e..d33ca9a15edd 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec meta = { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; + description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 90692569f089..a5799f79b56b 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec meta = { - homepage = "http://www.tildeslash.com/libzdb/"; - description = "A small, easy to use Open Source Database Connection Pool Library."; + homepage = http://www.tildeslash.com/libzdb/; + description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 842d74848df6..ba8dcc812e83 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/skalibs/; - description = "A set of general-purpose C programming libraries."; + description = "A set of general-purpose C programming libraries"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 0d9383a465fd..2b4cda88ef81 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -48,7 +48,7 @@ let lispPackages = rec { alexandria = buildLispPackage rec { baseName = "alexandria"; version = "git-20131029"; - description = "Alexandria is a collection of portable public domain utilities."; + description = "A collection of portable public domain utilities"; deps = []; src = pkgs.fetchgit { url = "git://common-lisp.net/projects/alexandria/alexandria.git"; @@ -88,7 +88,7 @@ let lispPackages = rec { esrap = buildLispPackage rec { baseName = "esrap"; version = "git-20131029"; - description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; + description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp"; deps = [alexandria]; src = pkgs.fetchgit { url = "https://github.com/scymtym/esrap.git"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 9e82580018fc..b9292f6fa117 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Linter for Go source code."; + description = "Linter for Go source code"; homepage = https://github.com/golang/lint; license = licenses.mit; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 2df687b8bc6b..577bd6f01f56 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2; - description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = http://dfu-programmer.sourceforge.net/; maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index ebbcd2c8fd87..0c3331653078 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/selenium; - description = "Selenium Server for remote WebDriver."; + description = "Selenium Server for remote WebDriver"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index bebf2d80caad..153b165da1e5 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://remarkjs.com; - description = "A simple, in-browser, markdown-driven slideshow tool."; + description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index a2897a795e84..76aed3f2cc6a 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Hardcore 3D space shooter with spaceship upgrade possibilities."; + description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; homepage = http://www.viewizard.com/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 1d23640ce8b1..4d4eb7659e19 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -26,8 +26,8 @@ in buildPythonPackage rec { ''; installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = "http://mnemosyne-proj.org/"; - description = "Spaced-repetition software."; + homepage = http://mnemosyne-proj.org/; + description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index acc724490181..8488d357fc5a 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sdlmame.lngn.net; - description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support."; + description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support"; license = "MAME"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 01ffd27d5bb4..fac28ce2fd94 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/dbohdan/2048-tcl; - description = "The game of 2048 implemented in Tcl."; + description = "The game of 2048 implemented in Tcl"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 04438cf70add..e1a87f225385 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation { ''; meta = { - description = " - The Penguin Machine - an Incredible Machine clone. -"; + description = "An Incredible Machine clone"; }; } diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 169c74621d73..4e99eff00651 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = "--datadir=\${out}/share/"; meta = { - description = "A curses based typing game."; + description = "A curses based typing game"; homepage = http://typespeed.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 9ca2cee47960..9e73afa5922b 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { [ alsaLib cmake pkgconfig glib ]; meta = with stdenv.lib; { - description = "PulseAudio emulation for ALSA."; + description = "PulseAudio emulation for ALSA"; homepage = "https://github.com/i-rinat/apulse"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 7164f7d6f15f..a40dd0bd31dc 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -18,9 +18,8 @@ in stdenv.mkDerivation { buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { - homepage = "http://pingus.seul.org/~grumbel/xboxdrv/"; - description = - "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace."; + homepage = http://pingus.seul.org/~grumbel/xboxdrv/; + description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ maintainers.fuuzetsu ]; }; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4c49e1e3af2d..732500be0fcf 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.ppsspp.org/"; - description = "A PSP emulator, the Qt4 version."; + description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; maintainers = [ maintainers.fuuzetsu ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index bf6e8c36f3df..269729917dd1 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Tool to examine and tune power saving features."; + description = "Tool to examine and tune power saving features"; homepage = https://www.kernel.org.org/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index a82804cb8379..b91fc871350a 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A lightweight script-based dynamic tracing tool for Linux."; + description = "A lightweight script-based dynamic tracing tool for Linux"; homepage = "http://www.ktap.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 0f0967079dfb..a50400e492a8 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6-linux-utils/; - description = "A set of minimalistic Linux-specific system utilities."; + description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 9bf8692d1ce9..6f96445ef5ea 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; - description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; + description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 264e6ff749a5..cea7ca0b337f 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://kr.github.io/beanstalkd/; - description = "Beanstalk is a simple, fast work queue."; + description = "A simple, fast work queue"; license = licenses.mit; maintainers = [ maintainers.zimbatm ]; platforms = platforms.all; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index e88f62a1337d..a99c8c5a6f95 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tinkerforge.com/; - description = "The Brick Daemon is a daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages."; + description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; maintainers = [ stdenv.lib.maintainers.qknight ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index cd87e0530554..f4ceca5f386d 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://corosync.org/; - description = "a Group Communication System with features for implementing high availability within applications."; + description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix index 8991a220a76d..6a92c0a228af 100644 --- a/pkgs/servers/http/winstone/default.nix +++ b/pkgs/servers/http/winstone/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://winstone.sourceforge.net/"; - description = "A simple Java Servlet container."; + homepage = http://winstone.sourceforge.net/; + description = "A simple Java Servlet container"; license = stdenv.lib.licenses.cddl; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.rickynils ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 522d0b60f00c..7c442bf8c7ec 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.postfix.org/"; + homepage = http://www.postfix.org/; description = '' A free implementation of the server-side SMTP protocol as defined by - RFC 5321, with some additional standard extensions. + RFC 5321, with some additional standard extensions ''; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 5278e5438133..95b433abbf5c 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://riemann.io/"; - description = '' - A network monitoring system. - ''; + homepage = http://riemann.io/; + description = "A network monitoring system"; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix index 1413888f3f1b..fd263cad5d5a 100644 --- a/pkgs/servers/nosql/cassandra/default.nix +++ b/pkgs/servers/nosql/cassandra/default.nix @@ -35,8 +35,8 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://cassandra.apache.org/"; - description = "Apache Cassandra™ is a massively scalable open source NoSQL database."; + homepage = http://cassandra.apache.org/; + description = "A massively scalable open source NoSQL database"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 045e31207ba0..039128e9df4c 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6/; - description = "skarnet.org's small & secure supervision software suite."; + description = "skarnet.org's small & secure supervision software suite"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 3e97d11fffb0..6bcddfa72f1b 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A simple and lightweight volume icon that sits in your system tray."; + description = "A simple and lightweight volume icon that sits in your system tray"; homepage = https://github.com/Unia/gvolicon; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 6a59fc49a954..c8f485ed5daf 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A cron like daemon for mpd."; + description = "A cron like daemon for mpd"; homepage = http://alip.github.io/mpdcron/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 0de3af28c19e..92091c18df35 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 pkgconfig intltool alsaLib ]; meta = with stdenv.lib; { - description = "A lightweight volume control that sits in your systray."; - homepage = "http://softwarebakery.com/maato/volumeicon.html"; + description = "A lightweight volume control that sits in your systray"; + homepage = http://softwarebakery.com/maato/volumeicon.html; platforms = pkgs.lib.platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = pkgs.lib.licenses.gpl3; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 5ee793977071..86dad1cc0fa4 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ]; meta = { - description = "A FUSE filesystem for MTP devices like Android phones."; + description = "A FUSE filesystem for MTP devices like Android phones"; homepage = https://github.com/JasonFerrara/jmtpfs; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.coconnor ]; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index ba0784138b31..8462ca0e9c69 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/execline/; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts."; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index f8e7dfaddc9e..8da10b7eb582 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; - description = "A set of tiny general Unix utilities optimized for simplicity and small size."; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 826f4e4d869f..442922b78054 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Fetches system/theme information in terminal for Linux desktop screenshots."; + description = "Fetches system/theme information in terminal for Linux desktop screenshots"; longDescription = '' screenFetch is a "Bash Screenshot Information Tool". This handy Bash script can be used to generate one of those nifty terminal theme diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 53945113e7f2..d0576cc069a7 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; meta = { - description = "Small command-line utilities."; + description = "Small command-line utilities"; homepage = https://github.com/baskerville/sutils; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index f667d772ac44..6c090a7ec1f6 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point."; - homepage = "https://github.com/bdpurcell/bully"; + description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; + homepage = https://github.com/bdpurcell/bully; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 8896156bd1c5..a967e8b27351 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec meta = { - homepage = "https://github.com/haiwen/ccnet"; - description = "A framework for writing networked applications in C."; + homepage = https://github.com/haiwen/ccnet; + description = "A framework for writing networked applications in C"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index e2dc1fd1eafd..2a7e996f8db2 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig systemd ]; meta = with stdenv.lib; { - description = "N-DJBDNS is a brand new release of the Djbdns. Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein."; + description = "A brand new release of the Djbdns"; + longDescription = '' + Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. + ''; homepage = http://pjp.dgplug.org/ndjbdns/; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 8619eb798479..e71abcd8a2c8 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://packages.debian.org/netcat-openbsd"; - description = "TCP/IP swiss army knife. OpenBSD variant."; + description = "TCP/IP swiss army knife, OpenBSD variant"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 3165434de3da..881bb7dd32f4 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6-dns/; - description = "A suite of DNS client programs and libraries for Unix systems."; + description = "A suite of DNS client programs and libraries for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 3d5e3e048110..5faa2af8ba11 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.skarnet.org/software/s6-networking/; - description = "A suite of small networking utilities for Unix systems."; + description = "A suite of small networking utilities for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; }; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 56964c1f6923..61e4989f6cbd 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A free and open source utility for network discovery and security auditing."; - homepage = "http://www.nmap.org"; + description = "A free and open source utility for network discovery and security auditing"; + homepage = http://www.nmap.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ mornfall thoughtpolice ]; diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index c178d401154f..b294c1c9feb8 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation { buildInputs = [ trousers openssl ]; meta = with stdenv.lib; { - description = ''The TPM Quote Tools is a collection of programs that provide support - for TPM based attestation using the TPM quote mechanism. The manual - page for tpm_quote_tools provides a usage overview.''; + description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; + longDescription = '' + The TPM Quote Tools is a collection of programs that provide support + for TPM based attestation using the TPM quote mechanism. The manual + page for tpm_quote_tools provides a usage overview. + ''; homepage = http://tpmquotetools.sourceforge.net/; license = licenses.bsd3; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 418817332e92..1cd7743e152a 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Tool intended to prevent the accidental deletion of important files."; + description = "Tool intended to prevent the accidental deletion of important files"; homepage = https://launchpad.net/safe-rm; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 9cef82e5e530..db7eeb789afb 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = '' A little program that can be used to compare putatively similar files line by line and field by field, ignoring small numeric differences - or/and different numeric formats. + or/and different numeric formats ''; homepage = http://www.nongnu.org/numdiff/; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b0ee4cfa5b5..122cc1a596b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -872,7 +872,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDeep TestException ]; propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { - description = "Flexible caching support for Catalyst."; + description = "Flexible caching support for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; @@ -1503,7 +1503,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CaptureTiny ]; meta = { - description = "A module to implement some of AutoConf macros in pure perl."; + description = "A module to implement some of AutoConf macros in pure perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2347,7 +2347,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { - description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; + description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2506,7 +2506,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ]; meta = { - description = "Simplify the common case stuff for DBIx::Class."; + description = "Simplify the common case stuff for DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2733,7 +2733,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ LWP ]; meta = { - description = "Perl extension for getting MD5 sums for files and urls."; + description = "Perl extension for getting MD5 sums for files and urls"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3459,7 +3459,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0j4rhx3w6nbvmxqjg6q09gm10nnpkcmqmh29cgxsfc9k14d8bb6w"; }; meta = { - description = "A tool to build C libraries."; + description = "A tool to build C libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7094,7 +7094,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; }; meta = { - description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."; + description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa"; license = "unknown"; }; }; @@ -8052,7 +8052,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { - description = "A module for when strings are too long to be displayed in.."; + description = "A module for when strings are too long to be displayed in"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9460,7 +9460,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestTester ]; propagatedBuildInputs = [ DataDump ]; meta = { - description = "Trap exit codes, exceptions, output, etc."; + description = "Trap exit codes, exceptions, output, etc"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d2b198cabfb..08cf2770f31e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -247,7 +247,7 @@ let meta = { homepage = https://github.com/teythoon/afew; - description = "afew is an initial tagging script for notmuch mail."; + description = "An initial tagging script for notmuch mail"; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -266,7 +266,7 @@ let meta = { homepage = http://bitbucket.org/zzzeek/alembic; - description = "A database migration tool for SQLAlchemy."; + description = "A database migration tool for SQLAlchemy"; license = stdenv.lib.licenses.mit; }; }; @@ -1271,7 +1271,7 @@ let meta = with stdenv.lib; { homepage = http://certifi.io/; - description = "Python package for providing Mozilla's CA Bundle."; + description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; maintainers = [ maintainers.koral ]; }; @@ -1358,7 +1358,7 @@ let }; meta = { homepage = "http://click.pocoo.org/"; - description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary."; + description = "A Python package for creating beautiful command line interfaces in a composable way with as little code as necessary"; license = stdenv.lib.licenses.bsd3; }; }; @@ -1505,7 +1505,7 @@ let doCheck = false; meta = { - description = "Autogenerate Colander schemas based on SQLAlchemy models."; + description = "Autogenerate Colander schemas based on SQLAlchemy models"; homepage = https://github.com/stefanofontanelli/ColanderAlchemy; license = licenses.mit; }; @@ -1526,7 +1526,7 @@ let propagatedBuildInputs = with self; [ six ]; meta = { - description = "Config file reading, writing and validation."; + description = "Config file reading, writing and validation"; homepage = http://pypi.python.org/pypi/configobj; license = licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garbas ]; @@ -2082,7 +2082,7 @@ let doCheck = false; meta = { - description = "A caching front-end based on the Dogpile lock."; + description = "A caching front-end based on the Dogpile lock"; homepage = http://bitbucket.org/zzzeek/dogpile.cache; license = licenses.bsd3; }; @@ -2296,7 +2296,7 @@ let }; meta = with pkgs.stdenv.lib; { - description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK."; + description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = https://github.com/pythonforfacebook/facebook-sdk; license = licenses.asl20 ; }; @@ -2311,7 +2311,7 @@ let }; buildInputs = with self; [ nose ]; meta = with stdenv.lib; { - description = "A Python library for generating fake user data."; + description = "A Python library for generating fake user data"; homepage = http://pypi.python.org/pypi/Faker; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; @@ -2326,7 +2326,7 @@ let sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn"; }; meta = with stdenv.lib; { - description = "A Python package that generates fake data for you."; + description = "A Python package that generates fake data for you"; homepage = https://pypi.python.org/pypi/fake-factory; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; @@ -2481,8 +2481,8 @@ let }; meta = with stdenv.lib; { - description = "Brings Google services to the command line."; - homepage = "https://code.google.com/p/googlecl/"; + description = "Brings Google services to the command line"; + homepage = https://code.google.com/p/googlecl/; license = licenses.asl20; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; @@ -3531,7 +3531,7 @@ let meta = { homepage = http://docutils.sourceforge.net/; - description = "Docutils is an open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX."; + description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX"; }; }; @@ -3622,7 +3622,7 @@ let meta = { homepage = http://pypi.python.org/pypi/enum/; - description = "Robust enumerated type support in Python."; + description = "Robust enumerated type support in Python"; }; }; @@ -3745,7 +3745,7 @@ let #doCheck = false; meta = { - description = "code checking using pep8 and pyflakes."; + description = "Code checking using pep8 and pyflakes"; homepage = http://pypi.python.org/pypi/flake8; license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; @@ -3811,7 +3811,7 @@ let meta = { homepage = http://flexget.com/; - description = "Multipurpose automation tool for content like torrents, ..."; + description = "Multipurpose automation tool for content like torrents"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; @@ -3963,7 +3963,7 @@ let buildInputs = with self; [ pkgs.pkgconfig pkgs.fuse ]; meta = { - description = "Python bindings for FUSE."; + description = "Python bindings for FUSE"; license = stdenv.lib.licenses.lgpl21; }; }); @@ -4188,8 +4188,8 @@ let ''; meta = with stdenv.lib; { - description = "Search your google contacts from the command-line or mutt."; - homepage = "https://pypi.python.org/pypi/goobook"; + description = "Search your google contacts from the command-line or mutt"; + homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; @@ -4525,7 +4525,7 @@ let buildInputs = with self; [ nose ]; meta = { - description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting."; + description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; homepage = http://pypi.python.org/pypi/iptools; }; }; @@ -4608,8 +4608,8 @@ let }; meta = { - homepage = "https://github.com/davidhalter/jedi"; - description = "An autocompletion tool for Python that can be used for text editors."; + homepage = https://github.com/davidhalter/jedi; + description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.garbas ]; }; @@ -4936,7 +4936,7 @@ let propagatedBuildInputs = with self; [ markupsafe ]; meta = { - description = "Super-fast templating language."; + description = "Super-fast templating language"; homepage = http://www.makotemplates.org; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -5268,7 +5268,7 @@ let meta = { homepage = http://code.google.com/p/pymox/; - description = "A mock object framework for Python."; + description = "A mock object framework for Python"; }; }; @@ -5305,7 +5305,7 @@ let }; meta = with pkgs.stdenv.lib; { - description = "An MPD (Music Player Daemon) client library written in pure Python."; + description = "An MPD (Music Player Daemon) client library written in pure Python"; homepage = http://jatreuman.indefero.net/p/python-mpd/; license = licenses.gpl3; }; @@ -5709,7 +5709,7 @@ let }; meta = { - description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler."; + description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; }; buildInputs = with self; [ nose ]; @@ -6266,8 +6266,8 @@ let doCheck = false; meta = { - homepage = "http://www.noah.org/wiki/Pexpect"; - description = "Automate interactive console applications such as ssh, ftp, etc."; + homepage = http://www.noah.org/wiki/Pexpect; + description = "Automate interactive console applications such as ssh, ftp, etc"; license = stdenv.lib.licenses.mit; longDescription = '' @@ -6475,7 +6475,7 @@ let meta = with stdenv.lib; { homepage = https://github.com/Lokaltog/powerline; - description = "The ultimate statusline/prompt utility."; + description = "The ultimate statusline/prompt utility"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; @@ -6511,7 +6511,7 @@ let meta = { - description = "Protocol Buffers are Google's data interchange format."; + description = "Protocol Buffers are Google's data interchange format"; homepage = http://code.google.com/p/protobuf/; }; }; @@ -6650,7 +6650,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; - description = "Pygit2 is a set of Python bindings to the libgit2 shared library."; + description = "A set of Python bindings to the libgit2 shared library"; license = with stdenv.lib.licenses; gpl2; platforms = with stdenv.lib.platforms; all; }; @@ -6669,7 +6669,7 @@ let meta = { homepage = http://babel.edgewall.org; - description = "A collection of tools for internationalizing Python applications."; + description = "A collection of tools for internationalizing Python applications"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; @@ -6890,7 +6890,7 @@ let propagatedBuildInputs = with self; [pyparsing pkgs.graphviz]; meta = { homepage = http://code.google.com/p/pydot/; - description = "pydot allows to easily create both directed and non directed graphs from Python."; + description = "Allows to easily create both directed and non directed graphs from Python"; }; }; @@ -6943,8 +6943,8 @@ let doCheck = !isPyPy; meta = { - homepage = "https://launchpad.net/pyflakes"; - description = "A simple program which checks Python source files for errors."; + homepage = https://launchpad.net/pyflakes; + description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; }; @@ -7397,7 +7397,7 @@ let buildInputs = with self; [ pkgs.acl ]; meta = { - description = "A Python extension module for POSIX ACLs. It can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them."; + description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; license = stdenv.lib.licenses.lgpl21Plus; }; }); @@ -7508,7 +7508,7 @@ let meta = { homepage = http://pypi.python.org/pypi/pyreport; license = "BSD"; - description = "Pyreport makes notes out of a python script."; + description = "Pyreport makes notes out of a python script"; }; }); @@ -7729,7 +7729,7 @@ let buildInputs = with self; [ pkgs.attr ]; meta = { - description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems."; + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; license = stdenv.lib.licenses.lgpl21Plus; }; }); @@ -7785,7 +7785,7 @@ let doCheck = false; meta = { - description = "The ReportLab Toolkit. An Open Source Python library for generating PDFs and graphics."; + description = "An Open Source Python library for generating PDFs and graphics"; homepage = http://www.reportlab.com/; }; }; @@ -7800,7 +7800,7 @@ let }; meta = { - description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; }; }; @@ -7815,7 +7815,7 @@ let }; meta = { - description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; }; }; @@ -7980,7 +7980,7 @@ let propagatedBuildInputs = with self; [ isodate ]; meta = { - description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; + description = "A Python library for working with RDF, a simple yet powerful language for representing information"; homepage = http://www.rdflib.net/; }; }); @@ -8943,8 +8943,8 @@ let ''; meta = { - homepage = "https://pypi.python.org/pypi/subprocess32"; - description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x."; + homepage = https://pypi.python.org/pypi/subprocess32; + description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -9360,7 +9360,7 @@ let doCheck = false; meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = https://code.google.com/p/mimeparse/; license = licenses.mit; }; @@ -9380,7 +9380,7 @@ let doCheck = false; meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = https://code.google.com/p/mimeparse/; license = licenses.mit; }; @@ -9396,7 +9396,7 @@ let }; meta = { - description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information."; + description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; homepage = http://pypi.python.org/pypi/tmdb3; license = stdenv.lib.licenses.bsd3; }; @@ -9486,7 +9486,7 @@ let propagatedBuildInputs = with self; [ six ]; meta = { - description = "Python implementation of the Transmission bittorent client RPC protocol."; + description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = http://pypi.python.org/pypi/transmissionrpc/; license = stdenv.lib.licenses.mit; }; @@ -9528,8 +9528,8 @@ let doCheck = false; meta = { - homepage = "https://github.com/alejandrogomez/turses"; - description = "A Twitter client for the console."; + homepage = https://github.com/alejandrogomez/turses; + description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; @@ -9621,7 +9621,7 @@ let doCheck = false; meta = with pkgs.stdenv.lib; { - description = "Tzinfo object for the local timezone."; + description = "Tzinfo object for the local timezone"; homepage = https://github.com/regebro/tzlocal; license = licenses.cddl; }; @@ -10794,7 +10794,7 @@ let meta = { homepage = http://liw.fi/cliapp/; - description = "Python framework for Unix command line programs."; + description = "Python framework for Unix command line programs"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10825,7 +10825,7 @@ let }; meta = { - description = "The TornadoKick Web Toolkit for Tornado Web Framework."; + description = "A Toolkit for the Tornado Web Framework"; homepage = http://github.com/multoncore/tornadokick; license = stdenv.lib.licenses.asl20; }; @@ -10943,7 +10943,7 @@ let meta = { homepage = http://liw.fi/tracing/; - description = "Python debug logging helper."; + description = "Python debug logging helper"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -10983,7 +10983,7 @@ let meta = { homepage = http://liw.fi/ttystatus/; - description = "Progress and status updates on terminals for Python."; + description = "Progress and status updates on terminals for Python"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; @@ -11005,7 +11005,7 @@ let meta = { homepage = http://liw.fi/larch/; - description = "Python B-tree library."; + description = "Python B-tree library"; maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; From 19e5c3c306171bbf0989ba5d05ad3ddd896de794 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2014 15:36:44 +0100 Subject: [PATCH 79/88] firefox-13.0: Remove It's outdated, insecure and not used anywhere in Nixpkgs. --- .../networking/browsers/firefox/13.0.nix | 188 ------------------ pkgs/top-level/all-packages.nix | 6 - 2 files changed, 194 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/13.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix deleted file mode 100644 index 1717a476e9ca..000000000000 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "13.0.1"; - - xulVersion = "13.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # disabled for the moment because our Cairo is too old - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{xpcshell,plugin-container}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8243f9d1dc4e..1c0d43a58f15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9563,12 +9563,6 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { - inherit (gnome) libIDL; - }; - - firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; - firefox = callPackage ../applications/networking/browsers/firefox { stdenv = if stdenv.isLinux then useGoldLinker stdenv else stdenv; inherit (gnome) libIDL; From 064f10ba3c3d17f4d3c28862c42fe4ed935cd7ad Mon Sep 17 00:00:00 2001 From: Alexander Flatter Date: Tue, 11 Nov 2014 15:44:45 +0100 Subject: [PATCH 80/88] Allow leiningen to build on darwin --- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 7a7755ab2b04..5f3a032051b1 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://leiningen.org/; description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } From e9b6ad43a661614ce1d325dcf07328950a14594e Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 11 Nov 2014 10:18:20 -0700 Subject: [PATCH 81/88] Add Lightum package: MacBook light sensor daemon Also a NixOS service could make sense but the daemon puts configuration under the Xdg user path. --- pkgs/os-specific/linux/lightum/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/lightum/default.nix diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix new file mode 100644 index 000000000000..fea188f89491 --- /dev/null +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: + +stdenv.mkDerivation { + name = "lightum"; + src = fetchgit { + url = https://github.com/poliva/lightum; + rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; + sha256 = "1r8c9mb82qgs8i7dczqx8fc7xrbn413b59xkqgjh4z1pfy75sl79"; + }; + + buildInputs = [ + dbus + glib + libX11 + libXScrnSaver + libXext + pkgconfig + systemd + ]; + + installPhase = '' + make install prefix=$out bindir=$out/bin docdir=$out/share/doc \ + mandir=$out/share/man INSTALL="install -c" INSTALLDATA="install -c -m 644" + ''; + + meta = { + description = "MacBook automatic light sensor daemon"; + homepage = https://github.com/poliva/lightum; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0d43a58f15..baaa2fea1807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7998,6 +7998,8 @@ let light = callPackage ../os-specific/linux/light { }; + lightum = callPackage ../os-specific/linux/lightum { }; + e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; ebtables = callPackage ../os-specific/linux/ebtables { }; From 9d7c65f8407c969c1cb9078ab8be33e75ed4f0e1 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Tue, 11 Nov 2014 18:20:45 +0100 Subject: [PATCH 82/88] purescript-0.6.0.2 --- .../libraries/haskell/purescript/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index ea5014ea76f6..59283d071e3f 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,22 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec -, patternArrows, time, transformers, unorderedContainers -, utf8String +{ cabal, cmdtheline, fileEmbed, filepath, haskeline, monadUnify +, mtl, parsec, patternArrows, time, transformers +, unorderedContainers, utf8String, nodejs }: cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.7.1"; - sha256 = "1xjihv7lq5b2cw44jhxwzr21749gayqfiqjkryz6z9p820hg1zzv"; + version = "0.6.0.2"; + sha256 = "1fkbdpfbx7sywcaybw8y5s3x44xlpkrp24gvl0286kajmciix2f8"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline filepath haskeline monadUnify mtl parsec patternArrows - time transformers unorderedContainers utf8String + cmdtheline fileEmbed filepath haskeline monadUnify mtl parsec + patternArrows time transformers unorderedContainers utf8String ]; - testDepends = [ filepath mtl parsec transformers utf8String ]; - doCheck = false; + testDepends = [ filepath mtl parsec transformers utf8String nodejs ]; meta = { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; From dddea7f0d1ab765fcddab7177838b1b0ecd91acb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 11 Nov 2014 12:49:33 -0600 Subject: [PATCH 83/88] Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5" This reverts commit d3b2c3f46c5bce8466e0813351afcaf2fe8fa92d. @peti I'm reverting this commit until a resolution is found that allows Hakyll to build. I've confirmed that reverting it here fixes the build error. --- .../libraries/haskell/pandoc-citeproc/0.4.nix | 29 +++++++++++++++++++ .../libraries/haskell/pandoc-citeproc/0.5.nix | 29 +++++++++++++++++++ .../pandoc-citeproc/{default.nix => 0.6.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 ++++-- 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix rename pkgs/development/libraries/haskell/pandoc-citeproc/{default.nix => 0.6.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix new file mode 100644 index 000000000000..c4706634eccd --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.4.0.1"; + sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix new file mode 100644 index 000000000000..c6dc859ed8df --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.5"; + sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc-citeproc/default.nix rename to pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index df16bb125bad..b27c1788998d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,7 +1040,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll {}; + hakyll = callPackage ../development/libraries/haskell/hakyll { + pandocCiteproc = self.pandocCiteproc_0_4; + }; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1823,7 +1825,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; + pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; + pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; + pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; + pandocCiteproc = self.pandocCiteproc_0_6; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; From 68f3d5688036cfeb774d64e9191efc587a8239b6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 11 Nov 2014 12:50:22 -0600 Subject: [PATCH 84/88] Drop reference to old shelly from haskell-defaults.nix --- pkgs/top-level/haskell-defaults.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 72a00c1f5cf2..50f1177e07ae 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -68,7 +68,6 @@ haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x - shelly = self.shelly_0_15_4_1; }; ghc722Prefs = self : super : ghc742Prefs self super // { From f207fee7258255d9101f27581dede97c5f3601a9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 11 Nov 2014 14:27:21 -0500 Subject: [PATCH 85/88] bird: bump --- pkgs/servers/bird/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9b9655053693..9b17551a8cbb 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, flex, bison, readline }: stdenv.mkDerivation rec { - name = "bird-1.4.4"; + name = "bird-1.4.5"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "0dh14zi3v1j0iwxxcyfymfdyaxxmilfbf3bc4mwj682jb3x6ll7g"; + sha256 = "1z4z7zmx3054zxi4q6a7095s267mw8ky628gir2n5xy5ch65yj7z"; }; buildInputs = [ flex bison readline ]; meta = { - description = ""; + description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; + platforms = stdenv.lib.platforms.linux; }; } From 9bfa20862132cd04b85b8f2e9ac3f0a2b81eb0b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Nov 2014 20:06:40 +0000 Subject: [PATCH 86/88] ocaml-sqlite3: update from 2.0.4 to 2.0.7 --- .../ocaml-modules/sqlite3/default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index d92207cd20b1..4111e2646583 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,32 +1,24 @@ {stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}: stdenv.mkDerivation { - name = "ocaml-sqlite3-2.0.4"; + name = "ocaml-sqlite3-2.0.7"; src = fetchurl { - url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-2.0.4.tar.gz; - sha256 = "51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1"; + url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz; + sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq"; }; - buildInputs = [ocaml findlib pkgconfig ]; - - #configureFlags = "--with-sqlite3=${sqlite}"; - - preConfigure = '' - export PKG_CONFIG_PATH=${sqlite}/lib/pkgconfig/ - export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR - mkdir -p $out/bin - ''; + buildInputs = [ocaml findlib pkgconfig sqlite]; createFindlibDestdir = true; - meta = { - homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; + meta = with stdenv.lib; { + homepage = http://mmottl.github.io/sqlite3-ocaml/; description = "OCaml bindings to the SQLite 3 database access library"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z + maintainers = with maintainers; [ + z77z vbgl ]; }; } From 56d325550b8940039034ea52f735270b444aa6bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Nov 2014 21:15:16 +0100 Subject: [PATCH 87/88] Revert "Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"". This reverts commit dddea7f0d1ab765f. @jwiegley, Hakyll builds just fine with pandoc-citeproc 0.6. See http://hydra.cryp.to/build/239248, for example. If you have trouble compiling that package, then please share a build log that shows the error message instead of reverting my commits, please. --- .../libraries/haskell/pandoc-citeproc/0.4.nix | 29 ------------------- .../libraries/haskell/pandoc-citeproc/0.5.nix | 29 ------------------- .../pandoc-citeproc/{0.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 ++---- 4 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix rename pkgs/development/libraries/haskell/pandoc-citeproc/{0.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix deleted file mode 100644 index c4706634eccd..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.4.0.1"; - sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix deleted file mode 100644 index c6dc859ed8df..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.5"; - sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix rename to pkgs/development/libraries/haskell/pandoc-citeproc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b27c1788998d..df16bb125bad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,9 +1040,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll { - pandocCiteproc = self.pandocCiteproc_0_4; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1825,10 +1823,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; - pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; - pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; - pandocCiteproc = self.pandocCiteproc_0_6; + pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; From ea49ac04966380be9bc77c62c0d01862b515e6a6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 11 Nov 2014 21:53:16 +0100 Subject: [PATCH 88/88] flashrom: fix 4936 --- pkgs/tools/misc/flashrom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 2d22bdcd3026..b514f1c920f2 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libftdi pciutils ]; - makeFlags = ["PREFIX=$out"]; + preConfigure = "export PREFIX=$out"; meta = { homepage = "http://www.flashrom.org";