From 4b3e14f5d0ea4dc0182a1fd4b7cd6fa73481de01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Feb 2012 11:31:19 +0000 Subject: [PATCH] Deleted deprecated packages: haskell-containers-deepseq haskell-control-monad-attempt haskell-data-object haskell-data-object-yaml haskell-frown haskell-jsonEnumerator haskell-neither haskell-pool haskell-web-routes haskell-web-routes-quasi haskell-xml-enumerator svn path=/nixpkgs/trunk/; revision=32538 --- .../haskell/containers-deepseq/default.nix | 17 ----------- .../haskell/control-monad-attempt/default.nix | 18 ----------- .../haskell/data-object-yaml/default.nix | 24 --------------- .../libraries/haskell/data-object/default.nix | 18 ----------- .../haskell/jsonEnumerator/default.nix | 23 -------------- .../libraries/haskell/neither/default.nix | 18 ----------- .../libraries/haskell/pool/default.nix | 18 ----------- .../haskell/web-routes-quasi/default.nix | 20 ------------- .../libraries/haskell/web-routes/default.nix | 21 ------------- .../haskell/xml-enumerator/default.nix | 24 --------------- .../tools/parsing/frown/builder.sh | 7 ----- .../tools/parsing/frown/default.nix | 11 ------- pkgs/top-level/haskell-packages.nix | 30 ------------------- 13 files changed, 249 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/containers-deepseq/default.nix delete mode 100644 pkgs/development/libraries/haskell/control-monad-attempt/default.nix delete mode 100644 pkgs/development/libraries/haskell/data-object-yaml/default.nix delete mode 100644 pkgs/development/libraries/haskell/data-object/default.nix delete mode 100644 pkgs/development/libraries/haskell/jsonEnumerator/default.nix delete mode 100644 pkgs/development/libraries/haskell/neither/default.nix delete mode 100644 pkgs/development/libraries/haskell/pool/default.nix delete mode 100644 pkgs/development/libraries/haskell/web-routes-quasi/default.nix delete mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix delete mode 100644 pkgs/development/libraries/haskell/xml-enumerator/default.nix delete mode 100644 pkgs/development/tools/parsing/frown/builder.sh delete mode 100644 pkgs/development/tools/parsing/frown/default.nix diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix deleted file mode 100644 index 1e7630a93e8c..000000000000 --- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "containers-deepseq"; - version = "0.1.0.1"; - sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; - buildDepends = [ deepseq ]; - meta = { - description = "Provide orphan NFData instances for containers as needed. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix deleted file mode 100644 index 0450373e8c65..000000000000 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, attempt, transformers }: - -cabal.mkDerivation (self: { - pname = "control-monad-attempt"; - version = "0.3.0.1"; - sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; - buildDepends = [ attempt transformers ]; - meta = { - homepage = "http://github.com/snoyberg/control-monad-attempt"; - description = "Monad transformer for attempt. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix deleted file mode 100644 index 54c2a05f8f14..000000000000 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, conduit, convertibleText, dataObject, failure, text -, transformers, yaml -}: - -cabal.mkDerivation (self: { - pname = "data-object-yaml"; - version = "0.3.4.2"; - sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - conduit convertibleText dataObject failure text transformers yaml - ]; - meta = { - homepage = "http://github.com/snoyberg/data-object-yaml"; - description = "Serialize data to and from Yaml files (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix deleted file mode 100644 index c1b12ab038fb..000000000000 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, failure, text, time }: - -cabal.mkDerivation (self: { - pname = "data-object"; - version = "0.3.1.9"; - sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; - buildDepends = [ failure text time ]; - meta = { - homepage = "http://github.com/snoyberg/data-object/tree/master"; - description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix deleted file mode 100644 index 1e4629166fad..000000000000 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator -, jsonTypes, text, transformers -}: - -cabal.mkDerivation (self: { - pname = "json-enumerator"; - version = "0.0.1.2"; - sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; - buildDepends = [ - blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text - transformers - ]; - meta = { - homepage = "http://github.com/snoyberg/json-enumerator"; - description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix deleted file mode 100644 index e5b3e6a8c487..000000000000 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, failure, transformers }: - -cabal.mkDerivation (self: { - pname = "neither"; - version = "0.3.1"; - sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; - buildDepends = [ failure transformers ]; - meta = { - homepage = "http://github.com/snoyberg/neither"; - description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix deleted file mode 100644 index fb417a3faf2e..000000000000 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, monadControl, transformers }: - -cabal.mkDerivation (self: { - pname = "pool"; - version = "0.1.2.1"; - sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; - buildDepends = [ monadControl transformers ]; - meta = { - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Thread-safe resource pools. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix deleted file mode 100644 index 7ecc85742e1e..000000000000 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, pathPieces, text }: - -cabal.mkDerivation (self: { - pname = "web-routes-quasi"; - version = "0.7.1.1"; - sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; - isLibrary = true; - isExecutable = true; - buildDepends = [ pathPieces text ]; - meta = { - homepage = "http://docs.yesodweb.com/web-routes-quasi/"; - description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix deleted file mode 100644 index 270328441e1a..000000000000 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text -, utf8String -}: - -cabal.mkDerivation (self: { - pname = "web-routes"; - version = "0.27.1"; - sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz"; - buildDepends = [ - blazeBuilder httpTypes mtl network parsec text utf8String - ]; - meta = { - description = "Library for maintaining correctness and composability of URLs within an application"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix deleted file mode 100644 index c891096c2057..000000000000 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, dataDefault, enumerator, failure, text -, transformers, xmlTypes -}: - -cabal.mkDerivation (self: { - pname = "xml-enumerator"; - version = "0.4.4.1"; - sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; - buildDepends = [ - attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - dataDefault enumerator failure text transformers xmlTypes - ]; - meta = { - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh deleted file mode 100644 index 82689b42d72d..000000000000 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -makeFlags="-e PREFIX=\"$out\"" - -ensureDir $out/bin - -genericBuild diff --git a/pkgs/development/tools/parsing/frown/default.nix b/pkgs/development/tools/parsing/frown/default.nix deleted file mode 100644 index f94a12e11d14..000000000000 --- a/pkgs/development/tools/parsing/frown/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, ghc}: - -stdenv.mkDerivation { - name = "frown-0.6.1"; - src = fetchurl { - url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz; - md5 = "b6fe9a8bf029c2a7c31b574be05816cf"; - }; - builder = ./builder.sh; - buildInputs = [ghc]; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be48385e5d54..5fcc1ca607e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -547,10 +547,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; - containersDeepseq = callPackage ../development/libraries/haskell/containers-deepseq {}; - - controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {}; - convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; @@ -600,12 +596,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; - dataObject = callPackage ../development/libraries/haskell/data-object { - failure = self.failure_0_1_2; - }; - - dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {}; - dataReify = callPackage ../development/libraries/haskell/data-reify {}; datetime = callPackage ../development/libraries/haskell/datetime {}; @@ -940,8 +930,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); json = callPackage ../development/libraries/haskell/json {}; - jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; - jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript { @@ -1033,8 +1021,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; - neither = callPackage ../development/libraries/haskell/neither {}; - 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 {}; @@ -1109,8 +1095,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {}; - pool = callPackage ../development/libraries/haskell/pool {}; - poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; ppm = callPackage ../development/libraries/haskell/ppm {}; @@ -1450,12 +1434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; WebBitsHtml = self.WebBitsHtml_1_0_2; - webRoutes = callPackage ../development/libraries/haskell/web-routes {}; - - webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi { - pathPieces = self.pathPieces_0_0_0; - }; - CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; @@ -1481,10 +1459,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; - xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator { - failure = self.failure_0_1_2; - }; - xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; @@ -1578,10 +1552,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; - # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly - # unmaintained, and we should delete it unless anyone complains. - # frown = callPackage ../development/tools/parsing/frown {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};