diff options
Diffstat (limited to 'pkgs/development')
377 files changed, 3318 insertions, 1239 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f1be290b190e..94336cc9e2b4 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }: +{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.6"; name = "arduino-core"; - src = fetchurl { - url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz"; - sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x"; + src = fetchFromGitHub { + owner = "arduino"; + repo = "Arduino"; + rev = "${version}"; + sha256 = "0nr5b719qi03rcmx6swbhccv6kihxz3b8b6y46bc2j348rja5332"; }; buildInputs = [ jdk ant ]; - phases = "unpackPhase patchPhase buildPhase installPhase"; - - patchPhase = '' - # - ''; - buildPhase = '' cd ./core && ant cd ../build && ant @@ -34,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Arduino libraries"; + description = "Libraries for the open-source electronics prototyping platform"; homepage = http://arduino.cc/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ]; }; } diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index 3a44baa489a7..c930fa1b193a 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -30,5 +30,6 @@ cabal.mkDerivation (self: { description = "A dependently typed functional programming language and proof assistant"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index 7305fbb5397b..638b45951c89 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -21,6 +21,6 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler."; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 622f182e8c56..38e1d7de2c6d 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,27 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup -, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript -, languageGlsl, mtl, pandoc, parsec, QuickCheck, scientific -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, transformers, unionFind, unorderedContainers, yaml +, cheapskate, cmdargs, filemanip, filepath, highlightingKate, HUnit +, indents, languageEcmascript, languageGlsl, mtl, parsec +, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, transformers, unionFind +, unorderedContainers }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.12.3"; - sha256 = "1v6h9qbbz27ikh19xwjbyfw0zi5ag9x1gp0khh9v4af1g0j86320"; + version = "0.13"; + sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath - indents languageEcmascript languageGlsl mtl pandoc parsec - scientific text transformers unionFind unorderedContainers yaml + aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs + filepath highlightingKate indents languageEcmascript languageGlsl + mtl parsec text transformers unionFind unorderedContainers ]; testDepends = [ - aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip - filepath HUnit indents languageEcmascript languageGlsl mtl pandoc - parsec QuickCheck scientific testFramework testFrameworkHunit - testFrameworkQuickcheck2 text transformers unionFind - unorderedContainers yaml + aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs + filemanip filepath highlightingKate HUnit indents + languageEcmascript languageGlsl mtl parsec QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + unionFind unorderedContainers ]; doCheck = false; preConfigure = '' diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 6ea377387ec6..ae4d73d6e209 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.9.3"; - sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237"; + version = "0.9.3.2"; + sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl ]; @@ -16,7 +16,5 @@ cabal.mkDerivation (self: { description = "Compiler for a simple functional language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 99e893c79d1c..179c70a5f47d 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.25"; + version = "3.1.1.26"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d"; + sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index ca117baca787..3c465c3471f0 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -8,8 +8,8 @@ let loaderArm = "${glibc}/lib/ld-linux.so.3"; srcs = { golang = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz; - sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y"; + url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz; + sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a"; }; tools = fetchhg { url = https://code.google.com/p/go.tools/; @@ -20,7 +20,7 @@ let in stdenv.mkDerivation { - name = "go-1.3.2"; + name = "go-1.3.3"; src = srcs.golang; diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index c9697bac36c7..48b5dbb35a3b 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "0bbwa944kaam0r8ldlqrrj9z9zj54v6zdc3q663ck59shw5z828w"; + sha256 = "1581j1bmg4pavh10dd13q5zchr54j2hf11i2wcd4yml4z9b67w83"; }; buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ]; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 2af8ec1b022a..ea4651378230 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -31,5 +31,6 @@ cabal.mkDerivation (self: { description = "Functional Programming Language with Dependent Types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; -}) +}) \ No newline at end of file diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 63af45643749..c97d74ec9af3 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "11"; + patchVersion = "20"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"; - sha256_x86_64 = "f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"; + sha256_i686 = "fa013b3fcbb1308040bf0e75bbd6ef7e8396b547cbc8dd79e3cb8153604bfd06"; + sha256_x86_64 = "3e717622ae48af5ca7298e7797cb71d4d545238f362741a83e69c097ca055de4"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch index 21e6576e4e35..8701cd3c9829 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -1,5 +1,5 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 6332485..9500a23 100644 +index 1cc60fc..2e94b99 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri @@ -35,4 +35,3 @@ index 060dda5..fecf76b 100644 + None => "@arPath@" }; let mut cmd = Command::new(ar); - diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index f81539fad9a3..afefc6dcd810 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-127-ga0ea210";}); let snapshot = if stdenv.system == "i686-linux" - then "555aca74f9a268f80cab2df1147dc6406403e9e4" + then "0644637db852db8a6c603ded0531ccaa60291bd3" else if stdenv.system == "x86_64-linux" - then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431" + then "656b8c23fbb97794e85973aca725a4b9cd07b29e" else if stdenv.system == "i686-darwin" - then "331bd7ef519cbb424188c546273e8c7d738f0894" + then "e4d9709fcfe485fcca00f0aa1fe456e2f164ed96" else if stdenv.system == "x86_64-darwin" - then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9" + then "6b1aa5a441965da87961be81950e8663eadba377" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-10-04"; - snapshotRev = "749ff5e"; + snapshotDate = "2014-10-10"; + snapshotRev = "78a7676"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305"; - sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4"; + rev = "a0ea210b394aa1b61d341593a3f9098fe5bf7806"; + sha256 = "0flwzj6dywaq9s77ayinshqbz8na2a1jabkr9s7zj74s2ya5096i"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index ec1fda10d8c3..f752ad35a6d4 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.2.0"; + name = "yasm-1.3.0"; src = fetchurl { url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; - sha256 = "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn"; + sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; meta = { diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix new file mode 100644 index 000000000000..7aadead54281 --- /dev/null +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, coq}: + +stdenv.mkDerivation rec { + + name = "coq-bedrock-${coq.coq-version}-${version}"; + version = "20140722"; + + src = fetchurl { + url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; + sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + buildFlags = "cito"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Bedrock + cp -pR src $COQLIB/user-contrib/Bedrock + ''; + + meta = with stdenv.lib; { + homepage = http://plv.csail.mit.edu/bedrock/; + description = "Bedrock is a library that turns Coq into a tool much like classical verification systems"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix index 8c20d64d8c7d..5c5681f60107 100644 --- a/pkgs/development/coq-modules/containers/default.nix +++ b/pkgs/development/coq-modules/containers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz; - sha256 = "1y9x2lwrskv2231z9ac3kv4bmg6h1415xpp4gl7v5w90ba6p6w8w"; + sha256 = "0z7yk0g7zkniwc73ka7wwb5jjg5a2wr1krrn3akr7kn5z3gvy2mc"; }; buildInputs = [ coq.ocaml coq.camlp5 ]; @@ -17,9 +17,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4; description = "A typeclass-based Coq library of finite sets/maps"; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; - broken = true; /* the source hash is wrong */ }; } diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix new file mode 100644 index 000000000000..b9939a2e7f4a --- /dev/null +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ext-lib-${coq.coq-version}-${version}"; + version = "c2c71a2a"; + + src = fetchgit { + url = git://github.com/coq-ext-lib/coq-ext-lib.git; + rev = "c2c71a2a90ac87f2ceb311a6da53a6796b916816"; + sha256 = "01sihw3nmvvpc8viwyr01qnqifdcmlg016034xmrfmv863yp8c4g"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://github.com/coq-ext-lib/coq-ext-lib; + description = "A collection of theories and plugins that may be useful in other Coq developments"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context new file mode 100644 index 000000000000..5dac711c0c0a --- /dev/null +++ b/pkgs/development/coq-modules/domains/darcs_context @@ -0,0 +1,809 @@ + +Context: + +[additional facts about limits on cuts +robdockins@fastmail.fm**20140818025955 + Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 +] + +[work on limits +robdockins@fastmail.fm**20140817221707 + Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 +] + +[finish proving that Q field ops commute with injq +robdockins@fastmail.fm**20140817060600 + Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 +] + +[split up realdom.v and perform associated code motion +robdockins@fastmail.fm**20140817030034 + Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 +] + +[recip is canonical and converges +robdockins@fastmail.fm**20140725211947 + Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 +] + +[improve the proof that 1 is a unit for multiplication +robdockins@fastmail.fm**20140724150124 + Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e +] + +[complete proof the interval multiplication converges; other minor stuff +robdockins@fastmail.fm**20140724015132 + Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 +] + +[further progress in realdom.v +robdockins@fastmail.fm**20140723004023 + Ignore-this: f33e18d22ae69c9b6209e28151d18017 +] + +[unmessify rational_intervals patch +robdockins@fastmail.fm**20140721123718 + Ignore-this: 4a125b192a9964a508a1063845e9f160 +] + +[messy updates to rational_intervals.v +robdockins@fastmail.fm**20140721015810 + Ignore-this: 858dac9c55426167c6f397a71ef3fda5 +] + +[implicit arguments for "fixes" +robdockins@fastmail.fm**20140721015739 + Ignore-this: 229ecdd48265fc855319141e399bc522 +] + +[metadata +robdockins@fastmail.fm**20140714201441 + Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 +] + +[further beautification +robdockins@fastmail.fm**20140714200516 + Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 +] + +[start working on the recripricol function +robdockins@fastmail.fm**20140714180055 + Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf +] + +[tweaks to the lambda models +robdockins@fastmail.fm**20140714180031 + Ignore-this: 219788fe70f42f0f6e60176cab464f19 +] + +[beauty edits in st_lam* +robdockins@fastmail.fm**20140714180006 + Ignore-this: a40aa7ae00ed27595ee04073918bd028 +] + +[move stuff to rational_intervals.v / define real_mult and prove some properties +robdockins@fastmail.fm**20140712053232 + Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 +] + +[finish correctness proof for interval multiplication +robdockins@fastmail.fm**20140711191547 + Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 +] + +[break out facts about rational intervals +robdockins@fastmail.fm**20140711012320 + Ignore-this: b7fe6e9377629a89b5debe3019ae1aa +] + +[updates to ideal completion +robdockins@fastmail.fm**20140707053800 + Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c +] + +[a pile of additional properties in realdom.v +robdockins@fastmail.fm**20140707053519 + Ignore-this: 7edba1e72a1856f297ef11e698ed989f +] + +[some properties of converging prereals +robdockins@fastmail.fm**20140706041401 + Ignore-this: 273bfbb245302becd7ff402831827ffb +] + +[make realdom compile +robdockins@fastmail.fm**20140630015439 + Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa +] + +[renaming +robdockins@fastmail.fm**20140630011639 + Ignore-this: a287e083af095790cbf2b48df7a58739 +] + +[reorganize some code +robdockins@fastmail.fm**20140630011446 + Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd +] + +[build the retract for realdom +robdockins@fastmail.fm**20140630001245 + Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 +] + +[fill out lemmas about cPLT +robdockins@fastmail.fm**20140630001140 + Ignore-this: add9e45c14621e3d6328684098bf8461 +] + +[more facts about cPLT +robdockins@fastmail.fm**20140628073731 + Ignore-this: 101a131ed114902924a1707eff7ebc70 +] + +[continuous domains as retracts of bifinite domains +robdockins@fastmail.fm**20140628035522 + Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 +] + +[start implementing arithmetic operations in RealDom +robdockins@fastmail.fm**20140620003249 + Ignore-this: c28479b8a933cba263765bdddb112264 +] + +[define the domain of rational intervals +robdockins@fastmail.fm**20140619040809 + Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b + this domain is useful for describing the semantics of exact real arithmetic. +] + +[show that every effective CUSL is Plotkin +robdockins@fastmail.fm**20140619034433 + Ignore-this: d529a4b1d6d698f79572caa805072394 +] + +[fix notation for octothorpe +robdockins@fastmail.fm**20140614222130 + Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 +] + +[fix for coq 8.4pl4 +robdockins@fastmail.fm**20140614222049 + Ignore-this: 9745904845aaf54e5569df982fc93d65 +] + +[move swelling lemma into finsets +robdockins@fastmail.fm**20140504080535 + Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e +] + +[documentation improvements and code motion +robdockins@fastmail.fm**20140504070008 + Ignore-this: da7847f82403990342732a8ce226315c +] + +[replace the old finprod +robdockins@fastmail.fm**20140504005534 + Ignore-this: 606cf44422f68d66c8d2d90049e67b93 +] + +[remove the old finprod +robdockins@fastmail.fm**20140504005137 + Ignore-this: 38bd54e16c87d27bbede08496c37bfba +] + +[update st_lam_fix to use the new finprod +robdockins@fastmail.fm**20140504003627 + Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 +] + +[update st_lam to use the new termmodel +robdockins@fastmail.fm**20140503230854 + Ignore-this: c3d6b2155674b414c5c2e14b85b13760 +] + +[new version of finprod with a better term model +robdockins@fastmail.fm**20140503222035 + Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b +] + +[a few more (hopefully final) lemmas about union +robdockins@fastmail.fm**20140422223924 + Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 +] + +[finish proofs about union +robdockins@fastmail.fm**20140422065034 + Ignore-this: 2929c3cdb013c028a48022b0293b2f18 +] + +[powerdomain progress +robdockins@fastmail.fm**20140421064325 + Ignore-this: 592f9c6046f05a27897b460edb2efe10 + Show that powerdomains are endofunctors on PLT. Further, they are monads with + the 'singleton' and 'join' operations. Also make some progress on the additive + portion of the theory, dealing with emptyset and union. +] + +[tweak makefile +robdockins@fastmail.fm**20140420031337 + Ignore-this: d5954b26f731bfed3d79cefacab322fb +] + +[show that semvalue is the weakest condition allowing beta-reduction of strict functions +robdockins@fastmail.fm**20140420020447 + Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf +] + +[some additional operations relating to the PLT adjunction +robdockins@fastmail.fm**20140420020351 + Ignore-this: db8eec6e3f74cce3acb67d2b660b104e +] + +[finish building power domain fmap +robdockins@fastmail.fm**20140420020217 + Ignore-this: 556e1cb87576de36cb26f8add3a1b163 +] + +[fix up st_lam.v +robdockins@fastmail.fm**20140329015058 + Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 +] + +[push some proofs into finprod +robdockins@fastmail.fm**20140329000401 + Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 +] + +[documentation and aesthetic changeds +robdockins@fastmail.fm**20140327043141 + Ignore-this: be27b24b78ea6af722a307117e59f5b3 +] + +[finish the st_lam_fix example +robdockins@fastmail.fm**20140322011153 + Ignore-this: e702f564b6eab2f8c11ab16bcb62504b +] + +[clarafications re: countable choice; remove unfinished example from build order +robdockins@fastmail.fm**20140321212852 + Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c +] + +[break the "fixes" operator into a separate file and prove some facts about it +robdockins@fastmail.fm**20140318013247 + Ignore-this: 80c506cef0719a974a049a1f5870f676 +] + +[minor fix to skiy.v +robdockins@fastmail.fm**20140317054057 + Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c +] + +[add the fixpoint operator; admit proofs +robdockins@fastmail.fm**20140317044648 + Ignore-this: 97ca18e980cdf46a9b40c8252badef14 +] + +[remove the evaluation case for variables +robdockins@fastmail.fm**20140317032932 + Ignore-this: e46d634e735e5b21a18518a48777168d +] + +[start on STLC with fixpoints -- but without fixpoints for now +robdockins@fastmail.fm**20140317031953 + Ignore-this: 3458bc18c73d967bef58418bc73e06cb +] + +[add the eliminator for booleans to st_lam; other additional utility lemmas +robdockins@fastmail.fm**20140317031753 + Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec +] + +[some minor code motion +robdockins@fastmail.fm**20140228064927 + Ignore-this: 804828472ddb0c5fafc72460fce8387b +] + +[plug final holes in st_lam and add to build order +robdockins@fastmail.fm**20140228044729 + Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 +] + +[reduce st_lam.v to facts I believe about fresh variables +robdockins@fastmail.fm**20140228010832 + Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 +] + +[fix breakages +robdockins@fastmail.fm**20140226073930 + Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 +] + +[more work on lambdas +robdockins@fastmail.fm**20140226043753 + Ignore-this: 7f7452670221e2643067a3c7cc180998 +] + +[use new finprod implementation +robdockins@fastmail.fm**20140226043700 + Ignore-this: c9e05df5fcfd31254ed7318fe693490c +] + +[remove old finprod +robdockins@fastmail.fm**20140226043642 + Ignore-this: 2705703a2c782da21a152fbb27c8a972 +] + +[rearrange the interfact to finprod +robdockins@fastmail.fm**20140226043541 + Ignore-this: c44d7c478948f42b188eb8d06469abbf +] + +[fill remaining holes in finprod2 +robdockins@fastmail.fm**20140225205242 + Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 +] + +[rework some stuff dealing with semidecidable predicates +robdockins@fastmail.fm**20140225092149 + Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 +] + +[lots of work on alpha-congrunce in lambdas +robdockins@fastmail.fm**20140225035601 + Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 +] + +[terminate is universal in PLT +robdockins@fastmail.fm**20140225035538 + Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 +] + +[new attack on nominal finite products +robdockins@fastmail.fm**20140225035516 + Ignore-this: 3875e713acc6aa5193696612f3ede76d +] + +[push forward a little on lambdas +robdockins@fastmail.fm**20140221095249 + Ignore-this: c690a1b03075702e3fd84aac7e268211 +] + +[update finprod for various changes +robdockins@fastmail.fm**20140221095230 + Ignore-this: a6d787930ed356ae2b0a003af1f4d44 +] + +[better discrete cases lemma +robdockins@fastmail.fm**20140219051301 + Ignore-this: f0ec88e8207257e7657ced933cf687e7 +] + +[start working on simply-typed lambdas +robdockins@fastmail.fm**20140219051238 + Ignore-this: 69bea345376ea39cd1addc0849a43077 +] + +[more messing about with advanced category theory stuff +robdockins@fastmail.fm**20140211095003 + Ignore-this: 9cd3c9d961349e8797f109f716c5f678 +] + +[minor rearrangements and code motion +robdockins@fastmail.fm**20140211041724 + Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 +] + +[some basic bicategory theory +robdockins@fastmail.fm**20140210083634 + Ignore-this: f47a898fa045a397d3ee70e1512b8baa +] + +[even more notation futzing +robdockins@fastmail.fm**20140209072416 + Ignore-this: d2061652cb3e80f6994f567a9e677b32 +] + +[additional notational futzing +robdockins@fastmail.fm**20140209043308 + Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 +] + +[futz around with notations, various other cleanup activities +robdockins@fastmail.fm**20140209005551 + Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 +] + +[complete adequacy for SKI+Y +robdockins@fastmail.fm**20140206050414 + Ignore-this: f730587ac7a42f3e35740976a1439f2e +] + +[minor changes in cpo +robdockins@fastmail.fm**20140206014745 + Ignore-this: 95244704faf1e6c336d62dc7912f9022 +] + +[push through most of SKI+Y adequacy +robdockins@fastmail.fm**20140205214805 + Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 +] + +[major simplification of the adequacy proof for SKI +robdockins@fastmail.fm**20140205185605 + Ignore-this: f1f0dc46274db05f3393038dfe2775e2 +] + +[push forward on SKI+Y +robdockins@fastmail.fm**20140205044216 + Ignore-this: daf255aa940b42c1c68ba947a356370d +] + +[continue futzing with the LR statement +robdockins@fastmail.fm**20140203055601 + Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab +] + +[start pushing on adequacy for SKI+Y +robdockins@fastmail.fm**20140202085948 + Ignore-this: 956844809340fad0c13c19e9fa729b5c +] + +[mostly finish soundness for SKI+Y +robdockins@fastmail.fm**20140202060633 + Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd +] + +[start working on a CCL example +robdockins@fastmail.fm**20140202020748 + Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 +] + +[make id(A) a parsing-only notation +robdockins@fastmail.fm**20140202020724 + Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 +] + +[the PLT adjunction is strong monodial +robdockins@fastmail.fm**20140202020637 + Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd +] + +[fix my broken version of lfp and fixup proofs +robdockins@fastmail.fm**20140202020615 + Ignore-this: 3ac283481318622cbf38378e815a4f09 +] + +[more work on SKI + Y +robdockins@fastmail.fm**20140202020516 + Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 +] + +[start work on SKI + Y +robdockins@fastmail.fm**20140201085039 + Ignore-this: fb7a405830cf90526cddd8ce37f4da40 +] + +[doc corrections +robdockins@fastmail.fm**20140130015908 + Ignore-this: bca4c04267bfdac8cb202651a0960d92 +] + +[lots of additional inline documentation +robdockins@fastmail.fm**20140129234834 + Ignore-this: ab2c59add5514f44a898de1f0eece98b +] + +[powerdomains form continuous functors in EMBED +robdockins@fastmail.fm**20140126234115 + Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 +] + +[complete the powerdomain constructions; build some operations +robdockins@fastmail.fm**20140125225202 + Ignore-this: 9c8f2632df05e84fc3794a338ff8720d +] + +[construct the basic powerdomains--still some holes left +robdockins@fastmail.fm**20140125064541 + Ignore-this: c3206d2e1e925096b3e9ff49afacef2f +] + +[generalize the lfp construction to a generic chain_sup operation +robdockins@fastmail.fm**20140124183103 + Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 +] + +[update makefile +robdockins@fastmail.fm**20140124073734 + Ignore-this: a0b7db8383262caa314c21b99e146222 +] + +[new file for recursive lambda domains +robdockins@fastmail.fm**20140124070023 + Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d +] + +[more lemmas about antistrict homs +robdockins@fastmail.fm**20140124065953 + Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c +] + +[fix breakage related to implicit arguments +robdockins@fastmail.fm**20140124065805 + Ignore-this: 561693d3280851299c6a49a2a34546b3 +] + +[notation tweaks in cpo.v +robdockins@fastmail.fm**20140124053800 + Ignore-this: 83e92d8c14568448074a940ceafbe2c9 +] + +[add if/then/else to the SKI system +robdockins@fastmail.fm**20140124023630 + Ignore-this: 37a9737932a05393a6338380226ca346 +] + +[case analysis for finite types +robdockins@fastmail.fm**20140124012505 + Ignore-this: 6ec1076b2a74f5832501a105a28a6dba +] + +[finish adequacy proof for SKI +robdockins@fastmail.fm**20140123211322 + Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 +] + +[additional lemmas about domains +robdockins@fastmail.fm**20140123090037 + Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 +] + +[most of a proof of adequacy for SKI +robdockins@fastmail.fm**20140123085839 + Ignore-this: d1595c02a6387297018e7f316a3e751 +] + +[more work on finite products +robdockins@fastmail.fm**20140121061158 + Ignore-this: c2f8212e041478104dd4c81c225b42d5 +] + +[begin work on a more flexible "finprod" domain +robdockins@fastmail.fm**20140119021653 + Ignore-this: 249718a2c31964733171b21c84d2effb +] + +[mess with implicit arguments in categories.v +robdockins@fastmail.fm**20140113041450 + Ignore-this: 314cad9207f706e949bd686aaa5c5e1b +] + +[products for CPO, uniformity of lfp +robdockins@fastmail.fm**20140113041421 + Ignore-this: e533abe995e634c732a35e71d66ddb6a +] + +[define the LFP in pointed CPOs, prove the Scott induction principle +robdockins@fastmail.fm**20140112231843 + Ignore-this: 2014174b1c6914bef376d614f34d073f +] + +[build the forgetful functor from EMBED to PLT +robdockins@fastmail.fm**20140110014909 + Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec +] + +[notation changes, prove sum_cases and curry preserve order and equality +robdockins@fastmail.fm**20140110014820 + Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f +] + +[prove addl facts about pairs, tweak implicit arguments +robdockins@fastmail.fm**20140110010319 + Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 +] + +[make 'ob' a coercion +robdockins@fastmail.fm**20140110010204 + Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 +] + +[copyright notices +robdockins@fastmail.fm**20140106232333 + Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 +] + +[add ord_dec coercion +robdockins@fastmail.fm**20140104052750 + Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c +] + +[define the model for CBV lambda calculus +robdockins@fastmail.fm**20140104050626 + Ignore-this: 88ca796d4697bfebb044d3fae27d6129 +] + +[proof a fixpoint lemma for unpointed domains +robdockins@fastmail.fm**20140103231818 + Ignore-this: 4939eb02d09b6a4eecf145c887c64393 +] + +[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED +robdockins@fastmail.fm**20140103000915 + Ignore-this: 54da0101f581731ebe512ed514e0603e +] + +[notation changes for PLT +robdockins@fastmail.fm**20140102234446 + Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 +] + +[move embeddings into their own file; pull TPLT and PPLT into profinite.v +robdockins@fastmail.fm**20140102234424 + Ignore-this: 3704996af47ae32415ba3e539d67cf5c +] + +[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated +robdockins@fastmail.fm**20140102213805 + Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 +] + +[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout +robdockins@fastmail.fm**20140102213646 + Ignore-this: b6a5ad59296f938b377d71852120d48b +] + +[move proofs that empty and unit preorders are effective plotkin +robdockins@fastmail.fm**20140102205530 + Ignore-this: 7324843510fd938d356aa82003c9ec68 +] + +[make epi/mono/iso morphisms into categories +robdockins@fastmail.fm**20131228082442 + Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 +] + +[define the cocartesian and distributive categories +robdockins@fastmail.fm**20131226001612 + Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 +] + +[remove uses of maximally implict arguments +robdockins@fastmail.fm**20131226001536 + Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 +] + +[fixpoints and binary sums for NOMINAL +robdockins@fastmail.fm**20131121092931 + Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 +] + +[modify bilimit.v to use the general construction from cont_functors.v +robdockins@fastmail.fm**20131120075848 + Ignore-this: 17ea36107ade1646eab5c99aec3561a9 +] + +[generic fixpoint construction for categories with initial objects and directed colimits +robdockins@fastmail.fm**20131119092522 + Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d +] + +[remove some irritating unit parameters, fix doc typos +robdockins@fastmail.fm**20131118093204 + Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 +] + +[improvements to categories; complete some constructions in nominal +robdockins@fastmail.fm**20131118085737 + Ignore-this: e58cb49a01d0210dabdb021250910adb +] + +[build fixes +robdockins@fastmail.fm**20131113004305 + Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 +] + +[Documentation additions +robdockins@fastmail.fm**20131113004254 + Ignore-this: 79a913d3a8652866f3fdc64891f6304d +] + +[lots of inline documentation additions +robdockins@fastmail.fm**20131112192736 + Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 +] + +[update makefiles +robdockins@fastmail.fm**20131112192706 + Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f +] + +[continuous functors for binary sum and products +robdockins@fastmail.fm**20131112192605 + Ignore-this: 61520e6e315df909465a02f854816366 +] + +[add the category of nominal types +robdockins@fastmail.fm**20131112192520 + Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 +] + +[split the proof that expF is a continuous functor into a separate file; rearrange some defintions +robdockins@fastmail.fm**20130924013328 + Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 +] + +[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D +robdockins@fastmail.fm**20130924002837 + Ignore-this: a66f9e8833601e244048b70e8bfaab96 +] + +[show that the function space is a continuous functor; other junk +robdockins@fastmail.fm**20130923060521 + Ignore-this: d8f406450688c633ebc1fe1eb0343c91 +] + +[some name changes, other cosmetic fixes +robdockins@fastmail.fm**20130909043234 + Ignore-this: cdd24d1c96a34fb3573c1806153df9fb +] + +[additional cosmetic changes and rearrangements +robdockins@fastmail.fm**20130909020137 + Ignore-this: 77d28bc9452f6c93915194033118dab7 +] + +[reorganize profinite code +robdockins@fastmail.fm**20130909011437 + Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 +] + +[cosmetic changes +robdockins@fastmail.fm**20130908183909 + Ignore-this: e19039701e58fd26ca4eab79d7b49d14 +] + +[complete the bilimit construction, show how to take fixpoints of continuous functors +robdockins@fastmail.fm**20130908175228 + Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 +] + +[find a MUCH easier path to a bilimit construction +robdockins@fastmail.fm**20130907012151 + Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 +] + +[lots of progress, mostly on defining bilimits +robdockins@fastmail.fm**20130905204959 + Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 +] + +[start working on the theory of finite preorders, which form a basis for plokin orders +robdockins@fastmail.fm**20130812054451 + Ignore-this: 5be36257a8fdf486bcc31f587d93c457 +] + +[parameterize plotkin orders, build category PPLT +robdockins@fastmail.fm**20130811063623 + Ignore-this: 3f273841bc72098acee0fd618627dbd5 +] + +[complete the details showing PLT is cartesian closed +robdockins@fastmail.fm**20130809230336 + Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 +] + +[add files missed in the first import +robdockins@fastmail.fm**20130809080742 + Ignore-this: 6b59cce866a486d70559f7c80fe99053 +] + +[initial import of development +robdockins@fastmail.fm**20130809080409 + Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf + First major steps toward a fully effective and usable formalized + domain theory. We formalize the plotkin preorders and show that + they form a cartesian closed category. +] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix new file mode 100644 index 000000000000..975260c839bd --- /dev/null +++ b/pkgs/development/coq-modules/domains/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchdarcs, coq}: + +stdenv.mkDerivation rec { + + name = "coq-domains-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchdarcs { + url = http://hub.darcs.net/rdockins/domains; + context = ./darcs_context; + sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = http://rwd.rdockins.name/domains/; + description = "A Coq library for domain theory"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix new file mode 100644 index 000000000000..5f31fe6dc341 --- /dev/null +++ b/pkgs/development/coq-modules/heq/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-heq-${coq.coq-version}-${version}"; + version = "0.92"; + + src = fetchurl { + url = "https://www.mpi-sws.org/~gil/Heq/download/Heq-${version}.zip"; + sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + + meta = with stdenv.lib; { + homepage = https://www.mpi-sws.org/~gil/Heq/; + description = "Heq : a Coq library for Heterogeneous Equality"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index ca8bd6481efc..02d06edd538b 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ coq ssreflect ]; + enableParallelBuilding = true; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.jwiegley ]; platforms = coq.meta.platforms; hydraPlatforms = []; }; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix new file mode 100644 index 000000000000..c885d14aa3f2 --- /dev/null +++ b/pkgs/development/coq-modules/paco/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-paco-${coq.coq-version}-${version}"; + version = "1.2.7"; + + src = fetchurl { + url = "http://plv.mpi-sws.org/paco/paco-${version}.zip"; + sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Paco + cp -pR *.vo $COQLIB/user-contrib/Paco + ''; + + meta = with stdenv.lib; { + homepage = http://plv.mpi-sws.org/paco/; + description = "Paco is a Coq library implementing parameterized coinduction"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 912ff7071f8f..75112ec96639 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -14,12 +14,26 @@ stdenv.mkDerivation { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; + enableParallelBuilding = true; + + patchPhase = '' + # Permit building of the ssrcoq statically-bound executable + sed -i 's/^#-custom/-custom/' Make + sed -i 's/^#SSRCOQ/SSRCOQ/' Make + ''; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + postInstall = '' + mkdir -p $out/bin + cp -p bin/ssrcoq $out/bin + cp -p bin/ssrcoq.byte $out/bin + ''; + meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix new file mode 100644 index 000000000000..e47ffbdd4562 --- /dev/null +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchsvn, coq}: + +stdenv.mkDerivation { + + name = "coq-tlc-${coq.coq-version}"; + + src = fetchsvn { + url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; + rev = 240; + sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Tlc + cp -p *.vo $COQLIB/user-contrib/Tlc + ''; + + meta = with stdenv.lib; { + homepage = http://www.chargueraud.org/softs/tlc/; + description = "TLC is a general purpose Coq library that provides an alternative to Coq's standard library"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix new file mode 100644 index 000000000000..555945068b1a --- /dev/null +++ b/pkgs/development/coq-modules/ynot/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ynot-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchgit { + url = git://github.com/Ptival/ynot.git; + rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; + sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Ynot + cp -pR coq/*.vo $COQLIB/user-contrib/Ynot + ''; + + meta = with stdenv.lib; { + homepage = http://ynot.cs.harvard.edu/; + description = "Ynot is a library for writing and verifying imperative programs"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 521933b0ed1f..66f53831374f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { homepage = http://clisp.cons.org; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + branch = "2.44"; }; } diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 45eb8993b6f2..66a9ca597a40 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -23,11 +23,11 @@ with { }; stdenv.mkDerivation rec { - name = "perl-5.20.0"; + name = "perl-5.20.1"; src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; + sha256 = "1dfl4v5fngnkd1c4278gcdjgcapsw7laxq0b34nxrx76z4805wgy"; }; patches = diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index c1d02064fe1c..4de87f20d8ed 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -10,7 +10,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.28"; + version = "5.3.29"; name = "php-${version}"; @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; + sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4f378ddff4f7..4d70ba0e3587 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.32"; + version = "5.4.33"; name = "php-${version}"; @@ -249,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "09n8lxnc5p2xfwk0ql2lh183h78hha1axhrdsa6g3650d5v73l16"; + sha256 = "1d8bwiw24k5p34fzkdqv8j8ndq50k2ahv66kdj4bhx2yhg8b4x8s"; }; meta = { diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 84ae789150da..c2cd71b999e1 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,52 +1,33 @@ -x@{builderDefsPackage - , llvm, gmp, mpfr, readline, bison, flex, makeWrapper - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ lib, stdenv, fetchurl, makeWrapper, + llvm, gmp, mpfr, readline, bison, flex }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="pure"; - project="pure-lang"; - version="0.58"; - name="${baseName}-${version}"; - extension="tar.gz"; +stdenv.mkDerivation rec { + baseName="pure"; + project="pure-lang"; + version="0.62"; + name="${baseName}-${version}"; + extension="tar.gz"; + + src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - hash="180ygv8nmfy8v4696km8jdahn5cnr454sc8i1av7s6z4ss7mrxmi"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256="77df64e8154ef6f8fac66f8bcc471dc8f994862d1ee77b7c98003607757a013b"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "doWrap"]; + buildInputs = [ bison flex makeWrapper ]; + propagatedBuildInputs = [ llvm gmp mpfr readline ]; - doWrap = a.makeManyWrappers ''$out/bin/pure'' ''--prefix LD_LIBRARY_PATH : "${llvm}/lib"''; + postInstall = '' + wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib + ''; meta = { - description = "A purely functional programming language based on term rewriting"; - maintainers = with a.lib.maintainers; + description = "A modern-style functional programming language based on term rewriting"; + maintainers = with lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with lib.platforms; linux; - license = a.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; - passthru = { - updateInfo = { - downloadPage = "https://bitbucket.org/purelang/pure-lang/downloads"; - }; - }; -}) x - +} \ No newline at end of file diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 8f9647c21342..b8065ad047ef 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -71,7 +71,8 @@ let # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python + # disable test_zipfile64 because it randomly timeouts + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 64e21b755691..cbdb55f4cc35 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm -}: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm}: assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.6"; version = "${majorVersion}.9"; @@ -27,37 +25,42 @@ let # the Nix store to 1. So treat that as a special case. ./nix-store-mtime.patch ]; + + preConfigure = '' + # Purity. + for i in /usr /sw /opt /pkg; do + substituteInPlace ./setup.py --replace $i /no-such-path + done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h + ''; buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { - name = "python-${version}"; + name = "python${if includeModules then "" else "-minimal"}-${version}"; - inherit majorVersion version src patches buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = - '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ - done - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; setupHook = ./setup-hook.sh; @@ -69,6 +72,10 @@ let ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} mv $out/share/man/man1/{python.1,python2.6.1} ln -s $out/share/man/man1/{python2.6.1,python.1} + + paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { @@ -96,7 +103,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -108,18 +115,16 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "true"; - buildPhase = '' # Fake the build environment that setup.py expects. @@ -178,8 +183,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 05fb8134f854..72c61e1f2358 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: assert zlibSupport -> zlib != null; @@ -6,7 +6,6 @@ assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.7"; version = "${majorVersion}.8"; @@ -28,33 +27,39 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - ]; - - postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - substituteInPlace ./Lib/plat-generic/regen \ - --replace /usr/include/netinet/in.h \ - ${stdenv.gcc.libc}/include/netinet/in.h - ''; - - buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] - ++ optional zlibSupport zlib; - ensurePurity = - '' + # http://bugs.python.org/issue21963 + ./remove-avoid-daemon-thread-shutdown.patch + ]; + + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h ''; + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + ++ optional zlibSupport zlib; + # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { name = "python-${version}"; - inherit majorVersion version src patches postPatch buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); @@ -62,15 +67,6 @@ let configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = "${ensurePurity}" + optionalString stdenv.isCygwin - '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; @@ -84,6 +80,8 @@ let ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { @@ -111,7 +109,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -123,25 +121,17 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches postPatch; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "${ensurePurity}"; - - buildPhase = - '' - # Fake the build environment that setup.py expects. - ln -s ${python}/include/python*/pyconfig.h . - ln -s ${python}/lib/python*/config/Setup Modules/ - ln -s ${python}/lib/python*/config/Setup.local Modules/ - + buildPhase = '' substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' @@ -193,8 +183,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; diff --git a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch new file mode 100644 index 000000000000..650f276f08a3 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch @@ -0,0 +1,170 @@ +changeset: 93046:61ad2208a5ce +branch: 2.7 +tag: tip +user: William A. Kennington III <william@wkennington.com> +date: Mon Oct 13 13:57:12 2014 -0700 +summary: Revert: 91229:7741d0dd66ca to fix i21963 + +diff -r ed4098380799 -r 61ad2208a5ce Include/pythonrun.h +--- a/Include/pythonrun.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Include/pythonrun.h Mon Oct 13 13:57:12 2014 -0700 +@@ -147,8 +147,6 @@ + PyAPI_FUNC(void) PyByteArray_Fini(void); + PyAPI_FUNC(void) _PyRandom_Fini(void); + +-PyAPI_DATA(PyThreadState *) _Py_Finalizing; +- + /* Stuff with no proper home (yet) */ + PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); + PyAPI_DATA(int) (*PyOS_InputHook)(void); +diff -r ed4098380799 -r 61ad2208a5ce Lib/test/test_threading.py +--- a/Lib/test/test_threading.py Mon Oct 13 12:58:03 2014 -0700 ++++ b/Lib/test/test_threading.py Mon Oct 13 13:57:12 2014 -0700 +@@ -700,49 +700,6 @@ + output = "end of worker thread\nend of main thread\n" + self.assertScriptHasOutput(script, output) + +- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") +- def test_6_daemon_threads(self): +- # Check that a daemon thread cannot crash the interpreter on shutdown +- # by manipulating internal structures that are being disposed of in +- # the main thread. +- script = """if True: +- import os +- import random +- import sys +- import time +- import threading +- +- thread_has_run = set() +- +- def random_io(): +- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' +- while True: +- in_f = open(os.__file__, 'rb') +- stuff = in_f.read(200) +- null_f = open(os.devnull, 'wb') +- null_f.write(stuff) +- time.sleep(random.random() / 1995) +- null_f.close() +- in_f.close() +- thread_has_run.add(threading.current_thread()) +- +- def main(): +- count = 0 +- for _ in range(40): +- new_thread = threading.Thread(target=random_io) +- new_thread.daemon = True +- new_thread.start() +- count += 1 +- while len(thread_has_run) < count: +- time.sleep(0.001) +- # Trigger process shutdown +- sys.exit(0) +- +- main() +- """ +- rc, out, err = assert_python_ok('-c', script) +- self.assertFalse(err) +- + @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") + @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") + def test_reinit_tls_after_fork(self): +diff -r ed4098380799 -r 61ad2208a5ce Misc/NEWS +--- a/Misc/NEWS Mon Oct 13 12:58:03 2014 -0700 ++++ b/Misc/NEWS Mon Oct 13 13:57:12 2014 -0700 +@@ -96,10 +96,6 @@ + - Issue #21831: Avoid integer overflow when large sizes and offsets are given to + the buffer type. + +-- Issue #1856: Avoid crashes and lockups when daemon threads run while the +- interpreter is shutting down; instead, these threads are now killed when they +- try to take the GIL. +- + - Issue #19656: Running Python with the -3 option now also warns about + non-ascii bytes literals. + +diff -r ed4098380799 -r 61ad2208a5ce Python/ceval.c +--- a/Python/ceval.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/ceval.c Mon Oct 13 13:57:12 2014 -0700 +@@ -355,12 +355,6 @@ + if (interpreter_lock) { + int err = errno; + PyThread_acquire_lock(interpreter_lock, 1); +- /* _Py_Finalizing is protected by the GIL */ +- if (_Py_Finalizing && tstate != _Py_Finalizing) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- assert(0); /* unreachable */ +- } + errno = err; + } + #endif +@@ -1024,13 +1018,6 @@ + /* Other threads may run now */ + + PyThread_acquire_lock(interpreter_lock, 1); +- +- /* Check if we should make a quick exit. */ +- if (_Py_Finalizing && _Py_Finalizing != tstate) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- } +- + if (PyThreadState_Swap(tstate) != NULL) + Py_FatalError("ceval: orphan tstate"); + +diff -r ed4098380799 -r 61ad2208a5ce Python/pythonrun.c +--- a/Python/pythonrun.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/pythonrun.c Mon Oct 13 13:57:12 2014 -0700 +@@ -91,8 +91,6 @@ + int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ + int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ + +-PyThreadState *_Py_Finalizing = NULL; +- + + /* Hack to force loading of object files */ + int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ +@@ -165,7 +163,6 @@ + if (initialized) + return; + initialized = 1; +- _Py_Finalizing = NULL; + + if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') + Py_DebugFlag = add_flag(Py_DebugFlag, p); +@@ -425,16 +422,12 @@ + * the threads created via Threading. + */ + call_sys_exitfunc(); ++ initialized = 0; + + /* Get current thread state and interpreter pointer */ + tstate = PyThreadState_GET(); + interp = tstate->interp; + +- /* Remaining threads (e.g. daemon threads) will automatically exit +- after taking the GIL (in PyEval_RestoreThread()). */ +- _Py_Finalizing = tstate; +- initialized = 0; +- + /* Disable signal handling */ + PyOS_FiniInterrupts(); + +diff -r ed4098380799 -r 61ad2208a5ce Python/thread_pthread.h +--- a/Python/thread_pthread.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/thread_pthread.h Mon Oct 13 13:57:12 2014 -0700 +@@ -242,9 +242,9 @@ + PyThread_exit_thread(void) + { + dprintf(("PyThread_exit_thread called\n")); +- if (!initialized) ++ if (!initialized) { + exit(0); +- pthread_exit(0); ++ } + } + + #ifdef USE_SEMAPHORES + diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 312bf247de7c..4ce659389ec6 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let majorVersion = "3.4"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -31,13 +31,11 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5"; + sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [ ./issue21121-3.patch ]; - preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch deleted file mode 100644 index 506d9ea9b3d9..000000000000 --- a/pkgs/development/interpreters/python/3.4/issue21121-3.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -71,12 +71,17 @@ - BASECFLAGS= @BASECFLAGS@ - BASECPPFLAGS= @BASECPPFLAGS@ - CONFIGURE_CFLAGS= @CFLAGS@ -+# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. -+# Use it when a compiler flag should _not_ be part of the distutils CFLAGS -+# once Python is installed (Issue #21121). -+CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ - CONFIGURE_CPPFLAGS= @CPPFLAGS@ - CONFIGURE_LDFLAGS= @LDFLAGS@ - # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the - # command line to append to these values without stomping the pre-set - # values. - PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) - # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to - # be able to build extension modules using the directories specified in the - # environment variables -@@ -91,7 +96,7 @@ - # Extra C flags added for building the interpreter object files. - CFLAGSFORSHARED=@CFLAGSFORSHARED@ - # C flags used for building the interpreter object files --PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE -+PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE - - - # Machine-dependent subdirectories -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -662,6 +662,7 @@ - LIBTOOL_CRUFT - OTHER_LIBTOOL_OPT - UNIVERSAL_ARCH_FLAGS -+CFLAGS_NODIST - BASECFLAGS - OPT - ABIFLAGS -@@ -6504,7 +6505,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1147,6 +1147,7 @@ - fi - - AC_SUBST(BASECFLAGS) -+AC_SUBST(CFLAGS_NODIST) - - # The -arch flags for universal builds on OSX - UNIVERSAL_ARCH_FLAGS= -@@ -1231,7 +1232,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -19,6 +19,12 @@ - - cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ - -+# Add special CFLAGS reserved for building the interpreter and the stdlib -+# modules (Issue #21121). -+cflags = sysconfig.get_config_var('CFLAGS') -+py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') -+sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist -+ - def get_platform(): - # cross build - if "_PYTHON_HOST_PLATFORM" in os.environ: diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ccfbcfcdd42f..37180b1472b1 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,11 @@ { stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" -, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false -}: +, ignoreCollisions ? false }: # Create a python executable that knows about additional packages. (buildEnv { - name = "python-${python.version}-wrapper"; - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; + name = "python-${python.version}-env"; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; inherit ignoreCollisions; diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 6fc4bcb9dea8..a036388f15ee 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -20,7 +20,22 @@ stdenv.mkDerivation rec { export LIBXUL_DIST=$out ''; - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + # Explained below in configureFlags for ARM + patches = stdenv.lib.optionals stdenv.isArm [ + ./findvanilla.patch + ]; + + patchFlags = "-p3"; + + # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in + # "make check". Disabling tracejit makes it work, but then it needs the + # patch findvanilla.patch do disable a checker about allocator safety. In case + # of polkit, which is what matters most, it does not override the allocator + # so the failure of that test does not matter much. + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ + stdenv.lib.optionals stdenv.isArm [ + "--with-cpu-arch=armv5t" + "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/findvanilla.patch new file mode 100644 index 000000000000..f6dab5497a0a --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/findvanilla.patch @@ -0,0 +1,19 @@ +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index a85e055..92ef441 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -580,14 +580,6 @@ check-valgrind:: + $(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build + endif + +-# The "find any vanilla new/new[] calls" script is tailored to Linux, so +-# only run it there. That should be enough to catch any such calls that +-# creep in. +-ifeq ($(OS_ARCH),Linux) +-check:: +- $(srcdir)/config/find_vanilla_new_calls $(LIBRARY) +-endif +- + ifdef ENABLE_TRACEJIT + ifndef WINCE + JITFLAGS = ,m,j,mj,mjp,am,amj,amjp,amd diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index b5ed6f30e34b..699030b8fe53 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.2"; + name = "asio-1.10.4"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41"; + sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index c15e27695ac9..0d1f3bb14ee9 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -72,6 +72,7 @@ rec { platforms = with a.lib.platforms; linux; license = "bsd"; + branch = "2.0.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 3e75cb45a733..ade48cb22888 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.6"; + name = "ccrtp-2.0.9"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz; - sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir"; + url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz; + sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0"; }; buildInputs = [ openssl pkgconfig libgcrypt ]; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 0f42e7cd0407..f489e95f5d4f 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.5.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 5c5dae866bb8..35cfae9ebb16 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.7"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 4095c1ae2f4b..200bf034dc64 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; - md5 = "ff4104b0e58bca1b61d528edbd902769"; + sha256 = "1lhbbf5rrqxb44y5clga7iifcfrh8sfjwpj4phnr3qabk92wdn3i"; }; builder = ./builder.sh; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 0e584c0d4993..276f1219444a 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "1fjdvbj6wazblg6qy0gdqs3kach2y2p6xrcvssmcvxr0nfyaadg2"; + sha256 = "0m3gzv5l7hw3zwhndjjvwmkhh66lvgnk0mspa2s12r1hlzc91zi3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index a00fbff50b9e..fb290cbcbeba 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2; - md5 = "d35833414534bcac8ce2c8a62ce903a4"; + sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; buildInputs = [libxml2 openssl bzip2]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix new file mode 100644 index 000000000000..94f74e516f1b --- /dev/null +++ b/pkgs/development/libraries/dlib/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cmake, x11 }: + +stdenv.mkDerivation rec { + version = "18.10"; + name = "dlib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; + sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + }; + + # The supplied CMakeLists.txt does not have any install targets. + sources_var = "\$\{sources\}"; + headers_var = "\$\{hearders\}"; + preConfigure = '' + cat << EOF > CMakeLists.txt + cmake_minimum_required(VERSION 2.6 FATAL_ERROR) + project(dlib) + + include_directories(./) + + file(GLOB sources ./dlib/all/*.cpp) + file(GLOB headers ./dlib/*.h) + + SET(LIBRARY_OUTPUT_PATH ".") + add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) + + install(TARGETS dlib DESTINATION lib) + install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") + EOF + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake x11 ]; + propagatedBuildInputs = [ x11 ]; + + meta = with stdenv.lib; { + description = "Dlib is a general purpose cross-platform C++ machine learning library."; + homepage = http://www.dlib.net; + license = stdenv.lib.licenses.boost; + maintainers = with maintainers; [ christopherpoole ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6317dfe5887d..4ea9f068d39e 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + branch = "2"; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 6d7d7a838790..dfd2c75184ee 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - md5 = "b5897e9c664967f5042e57070037ff18"; + sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix new file mode 100644 index 000000000000..e100b82ae9ed --- /dev/null +++ b/pkgs/development/libraries/gdcm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "2.4.4"; + name = "gdcm-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + sha256 = "07svgp7c928sw712gq6rx4h0c6wp2kr1n8fmxjlzb031l51jzkf5"; + }; + + dontUseCmakeBuildDir = true; + preConfigure = '' + cmakeDir=$PWD + mkdir ../build + cd ../build + ''; + + cmakeFlags = '' + -DGDCM_BUILD_APPLICATIONS=ON + -DGDCM_BUILD_SHARED_LIBS=ON + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake ]; + propagatedBuildInputs = [ ]; + + meta = { + 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. + ''; + homepage = http://gdcm.sourceforge.net/; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 2b4c291f7f59..99a566cf1955 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "1.6.0"; in +let version = "1.6.2"; in stdenv.mkDerivation { name = "geoip-${version}"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.raskin ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; + homepage = "http://geolite.maxmind.com/"; + downloadPage = "http://geolite.maxmind.com/download/"; }; } diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 010a2aee88e2..a5b62c6b04ef 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.5.3"; + name = "glm-0.9.5.4"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl"; + sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix new file mode 100644 index 000000000000..5a2ff5daa11b --- /dev/null +++ b/pkgs/development/libraries/granite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0"; + name = "granite-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; + sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { + description = "An extension to GTK+ used by elementary OS"; + longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + homepage = https://launchpad.net/granite; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index d7a8474bd5b2..137171b77500 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.2.2"; - sha256 = "1awi9ff2gb9gddalzn2hgp8klvcsizicqpd7xb5fds5j3278qrdz"; + version = "0.2.3"; + sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn"; meta = { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index 715793c7e9a7..829af010da78 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; + jailbreak = true; meta = { description = "For testing partial and infinite values"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 44a5d50edc5a..18f095cd8b16 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "CouchDB interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index be383fd4143e..b361ae045fbf 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -2,20 +2,21 @@ { cabal, caseInsensitive, dataDefault, either, errors, exceptions , httpClient, httpClientTls, httpTypes, lens, mtl, network -, optparseApplicative, transformers, transformersBase, utf8String -, xmlConduit, xmlHamlet +, networkUri, optparseApplicative, transformers, transformersBase +, utf8String, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "1.0.2"; - sha256 = "0xbiq3q8w1cjnh71sfnincir8igvwig734r8schbsps993p2d24b"; + version = "1.0.3"; + sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd"; isLibrary = true; isExecutable = true; buildDepends = [ caseInsensitive dataDefault either errors exceptions httpClient - httpClientTls httpTypes lens mtl network optparseApplicative - transformers transformersBase utf8String xmlConduit xmlHamlet + httpClientTls httpTypes lens mtl network networkUri + optparseApplicative transformers transformersBase utf8String + xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra/default.nix index 0db01edcc61c..aada08828b1a 100644 --- a/pkgs/development/libraries/haskell/Extra/default.nix +++ b/pkgs/development/libraries/haskell/Extra/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { description = "A grab bag of modules"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index ee99ccc4fee6..0b7910a7e0f4 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.8.1"; - sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w"; + version = "0.8.2"; + sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3"; buildDepends = [ cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index bcc297812104..9bcd1f5a21ba 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -1,22 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat -, regexPosix, fetchpatch +, regexPosix }: cabal.mkDerivation (self: { pname = "HSH"; - version = "2.1.0"; - sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; + version = "2.1.1"; + sha256 = "14aijsafd8mkh46dy071haix16p31ppdn2s3r9kxdbjjas6qh13g"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hslogger MissingH mtl regexBase regexCompat regexPosix ]; - patches = [ (fetchpatch { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0ddb3vf8ipf37zg4hkqh0frff1a7sv9ils3lw6qd3irpbwna1hdz"; }) ]; meta = { homepage = "http://software.complete.org/hsh"; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix index 3712dda87eb8..370c371eb8ce 100644 --- a/pkgs/development/libraries/haskell/HaTeX/default.nix +++ b/pkgs/development/libraries/haskell/HaTeX/default.nix @@ -6,12 +6,12 @@ cabal.mkDerivation (self: { pname = "HaTeX"; - version = "3.13.1.0"; - sha256 = "1ciifdb7yd79lvwdcxj8dq98dfmm9pg25rx9rc2wjn2jnp8j85r7"; + version = "3.14.0.0"; + sha256 = "0vbwhj031ny2vkp5hjxihlmpxaqy1far2nmxfzl1bv6rx0sqfjbg"; buildDepends = [ matrix parsec QuickCheck text transformers wlPprintExtras ]; - testDepends = [ QuickCheck tasty tastyQuickcheck ]; + testDepends = [ QuickCheck tasty tastyQuickcheck text ]; meta = { homepage = "http://daniel-diaz.github.io/projects/hatex"; description = "The Haskell LaTeX library"; diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index cbf5e87bcccb..c5f1d1ee97aa 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -16,5 +16,6 @@ cabal.mkDerivation (self: { description = "Work with HTML more easily in HXT"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix index d5cc70855382..f3d3e3a09b9e 100644 --- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "HaskellNet-SSL"; - version = "0.2.4"; - sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb"; + version = "0.2.5.1"; + sha256 = "0qkc0bw0p201wi3v8ck348j8m32x9dn8lkf6r787sd1bxhrsd2z7"; buildDepends = [ connection dataDefault HaskellNet network tls ]; meta = { homepage = "https://github.com/dpwright/HaskellNet-SSL"; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix index 940bdbd678d3..284bdce97376 100644 --- a/pkgs/development/libraries/haskell/HaskellNet/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64String, Crypto, mimeMail, mtl, network, text }: +{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }: cabal.mkDerivation (self: { pname = "HaskellNet"; - version = "0.3.1"; - sha256 = "168w6y5rizszq1428amxbkhww65sy3b7czxpjyrzzq3dhjn517nr"; - buildDepends = [ base64String Crypto mimeMail mtl network text ]; + version = "0.4"; + sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp"; + buildDepends = [ + base64String cryptohash mimeMail mtl network text + ]; meta = { homepage = "https://github.com/jtdaugherty/HaskellNet"; description = "Client support for POP3, SMTP, and IMAP"; diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix index cc430e22090f..41796adb963e 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index e5b918a5ad55..38fbbfdbfbf8 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.3"; - sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh"; + version = "1.4"; + sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb"; meta = { homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix index 6e37fe2ca494..bbd5f45f9caa 100644 --- a/pkgs/development/libraries/haskell/Thrift/default.nix +++ b/pkgs/development/libraries/haskell/Thrift/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix new file mode 100644 index 000000000000..6082f5e76cf5 --- /dev/null +++ b/pkgs/development/libraries/haskell/WAVE/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parseargs }: + +cabal.mkDerivation (self: { + pname = "WAVE"; + version = "0.1.3"; + sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ parseargs ]; + meta = { + homepage = "http://github.com/BartMassey/WAVE"; + description = "WAVE audio file IO library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index c7067dd66020..ab2e682fdc89 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.12.2"; - sha256 = "0hwi2254bj84djxmah23vy3xw8binh75fsn8ac6y89rwc8i35w1f"; + version = "0.12.3"; + sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix index de9708f25461..32cc221d5b4a 100644 --- a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.8.0.0"; - sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; + version = "0.8.0.1"; + sha256 = "0363pzla3kjk2ckmm7j07hav3bgq31jkrya5jhl9dn0nv4l4slxk"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index 758d1a90d3b9..50beb4d3e64a 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index edfcbe4e342b..9d2ccdfb11ba 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "auto-update"; - version = "0.1.1.3"; - sha256 = "06izsfd3xiragzac682vg3bmr6947y8s4yr2r7rip7qjvsja2yhy"; + version = "0.1.1.5"; + sha256 = "1gwx9k953nhw6n4d8a4jw3sfp51761s5qjsql73pr8i6gri0849h"; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix index 1799fa6a6bae..fdbd2b855102 100644 --- a/pkgs/development/libraries/haskell/base-prelude/default.nix +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "base-prelude"; - version = "0.1.4"; - sha256 = "10xvzkzlmyrq0mi6056rl6hq4bga1k1c6671b1bxjhgzgqrzpjpz"; + version = "0.1.6"; + sha256 = "1lc8j3wfaqh42pqshlizkpr67ghkr1m90m1g9xiw8h36p8n72fcm"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix index b8803868cd13..60eaf0e00311 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.2.1"; - sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz"; + version = "0.7.2.2"; + sha256 = "10z1b9axgfg9kb44b8sfxd5mak5qaqyjfwn4i21y37zgf7wadblr"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 3747b2cc877c..82d45baf88ae 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.4.4"; - sha256 = "0ik2wxcvz2y3bn3r2p9kzjiy78vjhxyz4fn3nkaz5wl3jmh4gydf"; + version = "1.4.5"; + sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index c8a4143e2178..da84b55cc0f9 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bytestring-trie"; - version = "0.2.3"; - sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga"; + version = "0.2.4"; + sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck"; buildDepends = [ binary ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b77e31663543..45981490749f 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.13.0.0"; - sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92"; + version = "0.13.0.3"; + sha256 = "0jlxgxsby8qscyfq517xlaib8xkp310gbjbmk9yyi7sd5bnmblh9"; buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index af77f37abdb7..906222c3bbb3 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.4.0.1"; - sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv"; + version = "0.4.1.0"; + sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index bb95e920ef97..5f7cce6b0600 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A Citation Style Language implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index b2a85e356996..d96166817c2f 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.5"; - sha256 = "1m26d463h5hxiyc4dm6fwbyjwzmd0bwl2blwpgp4wqnyvspz195m"; + version = "0.10.0"; + sha256 = "0ziggymy37iz68c2rjdjdzjsamnvn81r836a6xx2nhqjivmfmlav"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index b3f94ea7bdfe..ccd784175153 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions -, hashable, hspec, liftedBase, monoTraversable, mtl, primitive -, QuickCheck, semigroups, stm, systemFilepath, text, time -, transformers, unorderedContainers, vector, vectorInstances +{ cabal, basicPrelude, bifunctors, chunkedData, enclosedExceptions +, exceptions, hashable, hspec, liftedBase, monoTraversable, mtl +, primitive, QuickCheck, semigroups, stm, systemFilepath, text +, time, transformers, unorderedContainers, vector, vectorInstances }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.5"; - sha256 = "1gd5z4gd62v3k59psmrj41ca6mly4fjqgf4l80smv89kc2s2w809"; + version = "0.10.0"; + sha256 = "007a1gs9wgfw7gkm4jyh0fndcnxwkffzdm5rgxw08f1g8s0yqwf3"; buildDepends = [ - basicPrelude chunkedData enclosedExceptions exceptions hashable - liftedBase monoTraversable mtl primitive semigroups stm + basicPrelude bifunctors chunkedData enclosedExceptions exceptions + hashable liftedBase monoTraversable mtl primitive semigroups stm systemFilepath text time transformers unorderedContainers vector vectorInstances ]; diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix new file mode 100644 index 000000000000..9ec71da8eeca --- /dev/null +++ b/pkgs/development/libraries/haskell/clean-unions/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "clean-unions"; + version = "0.1.1"; + sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21"; + meta = { + homepage = "https://github.com/fumieval/clean-unions"; + description = "Open unions without need for Typeable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index cee91c51be0c..bd06ff10a86f 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,17 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi -, cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged -, transformers +, cryptoRandom, entropy, hspec, HUnit, QuickCheck, setenv, skein +, tagged, transformers }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.0.5"; - sha256 = "0l11wpxr3cgd8q708ay7957mdzq7nhm7c6z3p9iwl0lp3pkcl810"; + version = "0.9.1"; + sha256 = "1hq4f5iq4xb9jilr6qprww9lql314vpfw5khwmizljry9cwd2gq7"; + isLibrary = true; + isExecutable = true; buildDepends = [ base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom - entropy skein tagged + entropy setenv skein tagged ]; testDepends = [ cereal hspec HUnit QuickCheck transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 60bea4fed839..e97195cb5fc3 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clock"; - version = "0.4.1.1"; - sha256 = "0xbhx16sa0rwidaljp8lklb5ifhdc8cccbyznrpxqqwh8icm5pjp"; + version = "0.4.1.3"; + sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; meta = { homepage = "http://corsis.github.com/clock/"; description = "High-resolution clock functions: monotonic, realtime, cputime"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index a3c7cd1773fe..0f5cdf427eb9 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.10"; - sha256 = "17glliishfxc01ippgzb8v12i40id2b6l18rqp6wfygbb7f93rvv"; + version = "0.10.11"; + sha256 = "0wfw6gpqbd89wzq6gh11bc35m2wbaf2jnkf6gxhpml70jn6ca8nz"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index 8943eacdd217..aa83ae1a0ec6 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit -, transformers +, transformers, fetchpatch }: cabal.mkDerivation (self: { pname = "cmdtheline"; version = "0.2.3"; sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04"; + doCheck = false; + patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ]; buildDepends = [ filepath parsec transformers ]; testDepends = [ filepath HUnit parsec testFramework testFrameworkHunit transformers @@ -18,6 +20,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 8443a4909fc1..1bcdd8f25e7e 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { async attoparsec blazeBuilder conduit exceptions hspec resourcet stm text transformers transformersBase ]; + doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 5b82a2f26a08..f58293ec5e66 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.2.0.2"; - sha256 = "0gr4vqyvy3jdc1l7sinwr5dgmwzv7dq2z1npwvmbxz85bq89rmd9"; + version = "1.2.1"; + sha256 = "0pcnaqvavy289cmsp6mfapc350p9sq2fq8aq9lv5a256nxq2qffa"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 108fb48f939b..abbafafa5297 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,18 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, time +, tasty, tastyHunit, tastyQuickcheck, text, time }: cabal.mkDerivation (self: { pname = "cookie"; - version = "0.4.1.3"; - sha256 = "184ymp1pbi49fm4jl9s04dfyrgdbc9vlmqahqha4yncppr5s1sdw"; + version = "0.4.1.4"; + sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d"; buildDepends = [ blazeBuilder dataDefault deepseq text time ]; testDepends = [ - blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time + blazeBuilder HUnit QuickCheck tasty tastyHunit tastyQuickcheck text + time ]; doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 5a5ce89f732d..01ea05575652 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "1.0.1.0"; - sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll"; + version = "1.0.2.0"; + sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index dbad9c538a92..5b8c5297316a 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.16"; - sha256 = "0vahwnb2hzdm990b2m139kbg9jkk4whcxjdfjvlpimqk72s27viy"; + version = "2.5.18"; + sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index cd42f175b969..33268b295926 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2.0.2"; - sha256 = "0qm1s56kg7l96p5cvmdxc0g8r8ibh7vpyavp64178mdy62b6xavh"; + version = "1.2.0.3"; + sha256 = "00x759n6jn8cpf49ma3mfs4v77g535cpjr5vcc81am37a3vq3ypk"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index ea5b1aad27fa..523911c2ea4b 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -2,18 +2,18 @@ { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree , filepath, fingertree, hashable, intervals, JuicyPixels, lens -, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups -, tagged, vectorSpace, vectorSpacePoints +, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged +, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.3"; - sha256 = "1rgyv7yywmqk3s2cmv5s923421ybj6mnii7jgxri56jzw0agfyq7"; + version = "1.2.0.4"; + sha256 = "01gcbgxsnrcsysvpjhprym5ix10350x7l57f28nm0hbrfrsgidhz"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie - monoidExtras optparseApplicative safe semigroups tagged vectorSpace + monoidExtras optparseApplicative semigroups tagged vectorSpace vectorSpacePoints ]; meta = { diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index 6d20bcd23766..764279056172 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.2"; - sha256 = "16pwpa34hxf8qd7mf3zn4k7sr6p2pkvag3c77iwcs5qwqf5vhyf9"; + version = "0.1.0.3"; + sha256 = "0bscz7jkx1pwamfx5w90k19349qypzrlbd0in6kjpsw4nb58sy58"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 07eca858972a..c3be0f888ac2 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "direct-sqlite"; - version = "2.3.13"; - sha256 = "0d16jmls41cwyzg91fpd32dv8vvx1v3ilypv1wd7ya8j08fwfvdn"; + version = "2.3.14"; + sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w"; buildDepends = [ text ]; testDepends = [ base16Bytestring HUnit text ]; meta = { - homepage = "http://ireneknapp.com/software/"; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 21cebedefe46..24375cb277a9 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers ]; + jailbreak = true; meta = { homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix index 9b038d047f9f..f0d64562d7c1 100644 --- a/pkgs/development/libraries/haskell/dsp/default.nix +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ random ]; + patchPhase = '' + sed -i -e 's|random.*<1.1,|random,|' dsp.cabal + ''; meta = { homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; diff --git a/pkgs/development/libraries/haskell/dynamic-state/default.nix b/pkgs/development/libraries/haskell/dynamic-state/default.nix new file mode 100644 index 000000000000..21eb0fdab281 --- /dev/null +++ b/pkgs/development/libraries/haskell/dynamic-state/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, concreteTyperep, hashable, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "dynamic-state"; + version = "0.1.1.0"; + sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n"; + buildDepends = [ + binary concreteTyperep hashable unorderedContainers + ]; + meta = { + description = "Optionally serializable dynamic state keyed by type"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix index 06daad669676..2339009a138b 100644 --- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-carbon"; - version = "1.0.1"; - sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d"; + version = "1.0.2"; + sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i"; buildDepends = [ ekgCore network networkCarbon text time unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 2bdf088aea3d..6e2189dbadb6 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ekg-core"; - version = "0.1.0.1"; - sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja"; + version = "0.1.0.2"; + sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg"; buildDepends = [ text unorderedContainers ]; meta = { homepage = "https://github.com/tibbe/ekg-core"; diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 07c522b98188..4bf39315dad9 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.2"; - sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9"; + version = "0.4.0.3"; + sha256 = "0fynng6r0aj25k4j8ba3fvq4a6kgijil4m9ygd99xq8c1cvj2zyy"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 3470aab9b2b3..a28c9fc4683c 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "enclosed-exceptions"; - version = "1.0.0.2"; - sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h"; + version = "1.0.1"; + sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; buildDepends = [ async deepseq liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index c3b4850f5b25..e8d1059b699d 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.0.2"; - sha256 = "1r8w3h36fhj77llcfgiq6ww634jymz8fpm86fm17arj7m7ll6rq3"; + version = "2.1.0"; + sha256 = "1qkxp12444wgf2hvhj3yw928sbd8y8rxpw90xpi2nx5jw5ws86qc"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index d3d21aaf27a5..49fb11535a12 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "exception-mtl"; - version = "0.3.0.4"; - sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc"; + version = "0.3.0.5"; + sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj"; buildDepends = [ exceptionTransformers mtl transformers ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Exception monad transformer instances for mtl2 classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index e6c778e981d3..2e2f828cb307 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,15 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, stm, transformers }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit +, transformers +}: cabal.mkDerivation (self: { pname = "exception-transformers"; - version = "0.3.0.3"; - sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; + version = "0.3.0.4"; + sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra"; buildDepends = [ stm transformers ]; - testDepends = [ HUnit transformers ]; + testDepends = [ + HUnit testFramework testFrameworkHunit transformers + ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 78f6b104c942..e978d5ec9394 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.2"; - sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4"; + version = "0.19.2.1"; + sha256 = "19vzrdbd1c8wws4mccycpq70594qy2ka3mr5x5fsdya56ff4xgld"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index 68bbe884e874..7f80072335ad 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-text"; - version = "0.3.0.2"; - sha256 = "12hgamqbrflmnr3ri0ajvzf6al5nn4adcdmv6ag6h5mrsik2sklf"; + version = "0.3.1"; + sha256 = "0blr39vah0zd3i6clzzgmsfhxncwj8q6j4widk27iz3l27nlyin8"; buildDepends = [ fay fayBase text ]; meta = { homepage = "https://github.com/faylang/fay-text"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index 90e3c5dadfce..fd1df306be7c 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.2.0"; - sha256 = "1xblfsd1rj38nlw0dl56zvvnad3l0bpsncv1k5vjs4h8cmwl1ik2"; + version = "0.21.0.1"; + sha256 = "0lrnn73xqgkgh5zd4ngvl0lyzqbx5kp52j14dj2xbkbxnnivwgl4"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index b35f994caaaf..0eb53c9165ac 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.5"; - sha256 = "1y4i6w659v4zm6kxz8fnzrwm0gjv7siqlh1wdsm03rcadkicyxmr"; + version = "1.0.6"; + sha256 = "16dwvh2xn14gpni0qpabqfifywrkdz1p0mmq6yyf3k19ix3xg9im"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index ee47e6bb3f5b..acd217f73f61 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.1.78"; - sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; + version = "1.1.79"; + sha256 = "0dlkkcbi7442cbl3ibzy234alaixh34hkc20wr7p75z47w1r5fbx"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 7cea462a1cb1..47b2a7d26ad8 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.2.0.0"; - sha256 = "0w7bwmbjsskynyfisnhp4piikdw2jkr4zg24c9ipsp28szy8qsb9"; + version = "0.2.0.1"; + sha256 = "0k5zkfmwffdv4q0c9zgysq4654gjwnz1nbl37y8aq7g3rsfzfbf5"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 704c820797ef..a7032f5a2509 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, transformers }: +{ cabal, binary, deepseq, transformers }: cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.5.1"; - sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; + version = "0.5.3"; + sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0"; buildDepends = [ binary transformers ]; + testDepends = [ deepseq ]; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" @@ -16,8 +17,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; - }; }) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index af4b76f7b780..6235dc711506 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, Cabal, convertible, deepseq, djinnGhc, doctest -, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint -, hspec, ioChoice, makeWrapper, monadControl, monadJournal, mtl -, split, syb, text, time, transformers, transformersBase +{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc +, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts +, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal +, mtl, split, syb, text, time, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.1.0.2"; - sha256 = "0jdni0n5qzz0ncaa3ja4b6vcfykbl7swiafak4wyvm9izssjh8ra"; + version = "5.1.1.0"; + sha256 = "0msx2x976ap4jx506mzp48sdigc29vq4ypjbxiyn30mjw52rg53w"; isLibrary = true; isExecutable = true; buildDepends = [ - async Cabal convertible deepseq djinnGhc filepath ghcPaths - ghcSybUtils haskellSrcExts hlint ioChoice monadControl monadJournal - mtl split syb text time transformers transformersBase + async Cabal convertible dataDefault deepseq djinnGhc filepath + ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl + monadJournal mtl split syb text time transformers transformersBase ]; testDepends = [ Cabal convertible deepseq djinnGhc doctest filepath ghcPaths diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 741523011eca..fadc69bae29d 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.3"; - sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2"; + version = "0.7.2.5"; + sha256 = "15dp34dvcqs3b0np1xpi3s6543svhgmxy1kzggw0rmflmq2whsd8"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 63468acf27f4..443a15ff7a9e 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.13.0.0"; - sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj"; + version = "0.13.0.1"; + sha256 = "03194npzv48flg6pba3m8c5gfmmy34z0545y84wa979z21fbv22m"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4a17862c966a..57a0b05dcd77 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.13.0.1"; - sha256 = "0xbv7y1lmy35k6h2cgav7mxvpywvwfw47jq7qkcjj8mmr2sizp8i"; + version = "0.13.0.4"; + sha256 = "1ckl6liw6x4hqirki1vcxrvdca0cf17kpxnngrfnxvndlwghly68"; buildDepends = [ text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index bb6676916771..03c814d359f1 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.0"; - sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m"; + version = "0.13.0.2"; + sha256 = "0m5gvs2zsm8y742yvfcd8h6qqihgjjyhhz8f4dxg589bhckv3amj"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 1fe97ad01aa0..2081f7467d79 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.13.0.1"; - sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa"; + version = "0.13.0.2"; + sha256 = "14yx2v2y3k0cvjsgknff9qbv0pfnbar4j1b1hpz9ygjhb8kd5kjl"; isLibrary = false; isExecutable = true; buildDepends = [ filepath hashtables random ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 99d76c03c526..c6365eb8000c 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.0.0"; - sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f"; + version = "0.13.0.2"; + sha256 = "0j5df9xah5ya91x3d7cyy5zw7mkw3j2y7n0vv5s78w0adchaxzzl"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 393c1f076825..cee7f9737fd0 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.13.0.0"; - sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn"; + version = "0.13.1.0"; + sha256 = "1znmr694jxam9n5lgikrhf8wb4jwdml82a3mgnpfr482a8knndbn"; buildDepends = [ glib gtk mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 65ba25d1d9a8..5cbad954c31a 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random -, regexCompat, utf8String +{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, networkUri +, random, regexCompat, utf8String }: cabal.mkDerivation (self: { pname = "hS3"; - version = "0.5.8"; - sha256 = "1wmrrmlz4qlhr75lixn385pjpvpq21aafgf0fw8jyfqgdyjkg7bm"; + version = "0.5.9"; + sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y"; isLibrary = true; isExecutable = true; buildDepends = [ - Crypto dataenc HTTP hxt MissingH network random regexCompat - utf8String + Crypto dataenc HTTP hxt MissingH network networkUri random + regexCompat utf8String ]; meta = { homepage = "http://gregheartsfield.com/hS3/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index 610220cc09ec..fa904e0434a4 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.4"; - sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811"; + version = "7.3.5"; + sha256 = "1gkzkmg1ad5k9hb4gix2afq1k4j996qpp8mm1jzqk03a5njdpb4b"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 1bc0b36f1204..24b740736bf7 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.8"; - sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2"; + version = "7.3.9"; + sha256 = "10js2kmxw5lyy1h5xyz7qx852d29cl48qxyvadc4bdad6w06gdlz"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network networkUri parsec sendfile syb diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index fb1a1b6e263a..f8ec4d67a0b5 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.4"; - sha256 = "02cbs3bwakm9bwh4yy242msh5hibxfr9dsc6a0nbpihj1fhbv6b4"; + version = "0.4.1"; + sha256 = "1zkfq54s7n17g77sqzfhhc4bmqwdwbynz0gzwyaf3m4nmz6lkfl8"; buildDepends = [ aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass typeEq uniplate diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 0044d6aa0527..a23c6691a664 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4.2"; - sha256 = "03qg6b6vy9c8j9k91jajkjhswcks64vcdd28606aac0bw68lkjkg"; + version = "0.2.4.3"; + sha256 = "0s1z5zzl53nmjnrlf1czri634h8fksbgkqvvz8hpwa60wsaf4dxn"; buildDepends = [ aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl optparseApplicative tagged transformers transformersCompat diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix index b8c0a78001b0..93e07dede858 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix @@ -14,11 +14,11 @@ cabal.mkDerivation (self: { tastySmallcheck ]; buildTools = [ happy ]; - doCheck = false; meta = { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell 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/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.nix index 1f9d3bf4d19e..4e52ceb6c0d4 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.nix @@ -1,19 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cpphs, happy }: +{ cabal, cpphs, filepath, happy, mtl, smallcheck, syb, tasty +, tastyGolden, tastySmallcheck +}: cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.13.5"; - sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; + version = "1.16.0"; + sha256 = "15nhmwd2vfv14d4mc35alcjxg165a8jh0pgzinmx8aa8zbzvz5ha"; buildDepends = [ cpphs ]; + testDepends = [ + filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck + ]; buildTools = [ happy ]; doCheck = false; meta = { - homepage = "http://code.haskell.org/haskell-src-exts"; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell 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/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index cc6cc60bb180..e43c0430be7f 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.6.0.7"; - sha256 = "0cxqh35cd2j6ljsmgjisgm9pn26rj01x43mkn9jk6qs1fbqspb4d"; + version = "0.6.0.8"; + sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix index ecb92c184934..d732a4655809 100644 --- a/pkgs/development/libraries/haskell/haskelldb/default.nix +++ b/pkgs/development/libraries/haskell/haskelldb/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskelldb"; - version = "2.2.2"; - sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm"; + version = "2.2.4"; + sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y"; buildDepends = [ mtl time ]; meta = { homepage = "https://github.com/m4dc4p/haskelldb"; @@ -13,7 +13,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix index d5a9a5ff3a28..c659d3966f0c 100644 --- a/pkgs/development/libraries/haskell/haskintex/default.nix +++ b/pkgs/development/libraries/haskell/haskintex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskintex"; - version = "0.5.0.1"; - sha256 = "14x1n7x0dqcj14qkv0lmf2jcrswyjjjygqj5vdj6w29a8v9zr296"; + version = "0.5.0.2"; + sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix index dfedd812a20a..a6d9c6f83715 100644 --- a/pkgs/development/libraries/haskell/haste-compiler/default.nix +++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix @@ -22,5 +22,6 @@ cabal.mkDerivation (self: { description = "Haskell To ECMAScript compiler"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix index aec315995c82..8b55299eab52 100644 --- a/pkgs/development/libraries/haskell/haste-perch/default.nix +++ b/pkgs/development/libraries/haskell/haste-perch/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index b1422f616c9a..9927e65cfc32 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree -, dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl -, random, text, time, transformers, unorderedContainers, vector -, xmlhtml +, dlist, errors, filepath, hashable, mapSyntax +, MonadCatchIOTransformers, mtl, random, text, time, transformers +, unorderedContainers, vector, xmlhtml }: cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.1.2"; - sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5"; + version = "0.14.0.1"; + sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors - filepath hashable MonadCatchIOTransformers mtl random text time - transformers unorderedContainers vector xmlhtml + filepath hashable mapSyntax MonadCatchIOTransformers mtl random + text time transformers unorderedContainers vector xmlhtml ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix index 2179ad0d85f0..a7a1527cd1d1 100644 --- a/pkgs/development/libraries/haskell/here/default.nix +++ b/pkgs/development/libraries/haskell/here/default.nix @@ -1,20 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -# The file was later edited to add the state patch. -# https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc -{ cabal, haskellSrcMeta, mtl, parsec, fetchpatch }: +{ cabal, haskellSrcMeta, mtl, parsec }: cabal.mkDerivation (self: { pname = "here"; - version = "1.2.5"; - sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb"; + version = "1.2.6"; + sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; buildDepends = [ haskellSrcMeta mtl parsec ]; - patches = [ (fetchpatch { url = "https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc.patch"; sha256 = "1qibwbcpnl1cg35zvvdd2k8nr6bgd36qbla3naim3g08qaapm82h"; }) ]; - meta = with self.stdenv.lib; { + meta = { homepage = "https://github.com/tmhedberg/here"; description = "Here docs & interpolated strings via quasiquotation"; - license = licenses.bsd3; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with self.stdenv.lib.maintainers; [ edwtjo ]; }; }) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 9e2e6d93f839..63e92de9424d 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.6"; - sha256 = "02ms6lchj6k0krqjk47bibfb0cbpbc16ip9f22c4rgp04qkzp60b"; + version = "0.20.7"; + sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index ca76bda7c346..dcaef42fd53f 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -1,17 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, dataDefault, haskellSrcExts, monadLoops, mtl, text }: +{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text +}: cabal.mkDerivation (self: { pname = "hindent"; - version = "3.4"; - sha256 = "060l4dkqz4fma005yai6mdv2bdr2lp59z289j7rv1ygr6p8pqhci"; + version = "3.8"; + sha256 = "015madajwljh2an3djla0qdds8bg7kgcdn3xb30cdf6gb77mf1xv"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; + testDepends = [ + dataDefault haskellSrcExts hspec monadLoops mtl text + ]; meta = { description = "Extensible Haskell pretty printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index bf92945d1648..08ff35ca8aaa 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -2,19 +2,19 @@ { cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl , parsec, patience, QuickCheck, random, systemFileio -, systemFilepath, testFramework, testFrameworkQuickcheck2, vector -, zlib, zlibBindings +, systemFilepath, testFramework, testFrameworkQuickcheck2 +, unixCompat, vector, zlib, zlibBindings }: cabal.mkDerivation (self: { pname = "hit"; - version = "0.6.1"; - sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9"; + version = "0.6.2"; + sha256 = "07lfjbn48v8ykkyj15diy4a9kpgzc93gv0l1rdfcacl3f26a97hs"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec cryptohash hourglass mtl parsec patience random - systemFileio systemFilepath vector zlib zlibBindings + systemFileio systemFilepath unixCompat vector zlib zlibBindings ]; testDepends = [ bytedump hourglass HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 7a335fefb340..cbb4a44655db 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.16.0.5"; - sha256 = "12019yd4hxqryxsrppijff6w0wmqj2l5cssldh1lyv4dbjaaxb5y"; + version = "0.16.0.6"; + sha256 = "13xbz0dx153m6nc7lv522gihvav5n6a4kiavwsqwh27ql4zyind7"; buildDepends = [ binary deepseq random split storableComplex vector ]; diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index e9b0d4bf2601..6de6e25b4b64 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.4.1"; - sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx"; + version = "0.4.2"; + sha256 = "08vdrgzn1j02gn2j5apjhnv2lgp7i8xhvibqjcjf4l80spmja2h0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index bda89829d68c..5b12f8d28c49 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -2,14 +2,15 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes -, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text -, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup +, temporary, text, time, transformers, uniplate, vector +, vectorAlgorithms, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.34"; - sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg"; + version = "4.2.36"; + sha256 = "1h65pl0jfki2pcrywak9mh3hfi3wziffhb2q0xp6r4v01536zifv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +19,7 @@ cabal.mkDerivation (self: { resourcet safe shake tagsoup text time transformers uniplate vector vectorAlgorithms wai warp ]; - testDepends = [ filepath ]; + testDepends = [ filepath temporary ]; testTarget = "--test-option=--no-net"; meta = { homepage = "http://www.haskell.org/hoogle/"; diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 5b11121a9efc..16b8adfa31db 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.2"; - sha256 = "015ipy9adi67nfddjsw9c0ihn0banghgawjli0lgrmiyjz01610c"; + version = "0.2.5"; + sha256 = "08nw9zqa0y09lw0c6qlh9pn8vr6h03mw1i7n7w0y3fv94az9vg9v"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix index ed116058e92a..c4e9ddbe2aa6 100644 --- a/pkgs/development/libraries/haskell/hplayground/default.nix +++ b/pkgs/development/libraries/haskell/hplayground/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hplayground"; - version = "0.1.0.5"; - sha256 = "0hd4xmw4lfaaar7yxwhq4msg2qbn42q57rvaphl95pbr4x5a0h70"; + version = "0.1.1.0"; + sha256 = "03ya82lxhv7acakhl01835p3wvwr3z14jiww7wvj4bzlib8qsi8b"; buildDepends = [ dataDefault hasteCompiler hastePerch monadsTf transformers ]; @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index c9809d3eff04..068aed9ff896 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.6"; - sha256 = "07nhymn4kww1c5f9sjbmdg8ng08wbgmpvf5hws4qpwmfw1yfgdpn"; + version = "0.6.2"; + sha256 = "02v32gh5has3y8qk55cpdr0336n2hi33d5aw0ifpg84p89k8kr33"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 9cf37d4622c0..cad0951b7c02 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,20 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, caseInsensitive, hspec2, httpTypes -, markdownUnlit, scotty, text, transformers, wai, waiExtra +{ cabal, caseInsensitive, hspec2, httpTypes, text, transformers +, wai, waiExtra }: cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.4.1"; - sha256 = "1005qhzi561zc5kbdc55d3wjngdcal47him19fn5gk4389jdbln7"; + version = "0.5.1"; + sha256 = "0l2fgcxq9ca593kvi5a3g68m49wkdjrziczbk06hlb40x8vg0qw9"; buildDepends = [ - aeson aesonQq caseInsensitive hspec2 httpTypes text transformers - wai waiExtra + caseInsensitive hspec2 httpTypes text transformers wai waiExtra ]; testDepends = [ - aeson caseInsensitive hspec2 httpTypes markdownUnlit scotty text - transformers wai waiExtra + caseInsensitive hspec2 httpTypes text transformers wai waiExtra ]; meta = { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 11efa4968af7..5f95b1fd1f95 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -3,14 +3,14 @@ { cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra , connection, cookie, dataDefaultClass, hspec, httpClient , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl -, network, networkConduit, resourcet, streamingCommons, text, time -, transformers, utf8String, wai, waiConduit, warp, warpTls +, network, resourcet, streamingCommons, text, time, transformers +, utf8String, wai, waiConduit, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.4.3"; - sha256 = "0318k4k4w1zpifalfa7vb33sd8ksa8jdyaxs4843idmwsz3ahwgq"; + version = "2.1.4.5"; + sha256 = "0damsk83j52ndciybxiss0whd486i10ibawxj70z1c0h78f9wwrs"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { testDepends = [ blazeBuilder caseInsensitive conduit conduitExtra connection cookie dataDefaultClass hspec httpClient httpTypes HUnit liftedBase - network networkConduit streamingCommons text time transformers - utf8String wai waiConduit warp warpTls + network streamingCommons text time transformers utf8String wai + waiConduit warp warpTls ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index c2316799a030..61f4d91d5cc6 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -2,15 +2,14 @@ { cabal, async, blazeBuilder, caseInsensitive, conduit , conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit -, httpTypes, liftedBase, monadControl, network, networkConduit -, resourcet, streamingCommons, text, transformers, wai, waiLogger -, warp, word8 +, httpTypes, liftedBase, monadControl, network, resourcet +, streamingCommons, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.4.0.1"; - sha256 = "0gygmykxsy6rs3xmwb24s5c3brmabdgxb1w0ak82vyvfvsnqxz1h"; + version = "0.4.1.2"; + sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy"; buildDepends = [ async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl @@ -19,8 +18,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ blazeBuilder conduit conduitExtra hspec httpConduit httpTypes - liftedBase network networkConduit resourcet streamingCommons - transformers wai warp + liftedBase network resourcet streamingCommons transformers wai warp ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix index c4d3686ceb9b..ec993a8b2a51 100644 --- a/pkgs/development/libraries/haskell/http-streams/default.nix +++ b/pkgs/development/libraries/haskell/http-streams/default.nix @@ -3,26 +3,26 @@ { cabal, aeson, aesonPretty, attoparsec, base64Bytestring , blazeBuilder, caseInsensitive, HsOpenSSL, hspec , hspecExpectations, httpCommon, HUnit, ioStreams -, MonadCatchIOTransformers, mtl, network, opensslStreams, snapCore -, snapServer, systemFileio, systemFilepath, text, transformers -, unorderedContainers +, MonadCatchIOTransformers, mtl, network, networkUri +, opensslStreams, snapCore, snapServer, systemFileio +, systemFilepath, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "http-streams"; - version = "0.7.2.2"; - sha256 = "093ldljnabkmi67vj1qnvdlpjk1mpgqwrzdl9cq93v64sqbfwkjw"; + version = "0.7.2.4"; + sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive - HsOpenSSL httpCommon ioStreams mtl network opensslStreams text - transformers unorderedContainers + HsOpenSSL httpCommon ioStreams mtl network networkUri + opensslStreams text transformers unorderedContainers ]; testDepends = [ aeson aesonPretty attoparsec base64Bytestring blazeBuilder caseInsensitive HsOpenSSL hspec hspecExpectations httpCommon HUnit - ioStreams MonadCatchIOTransformers mtl network opensslStreams - snapCore snapServer systemFileio systemFilepath text transformers - unorderedContainers + ioStreams MonadCatchIOTransformers mtl network networkUri + opensslStreams snapCore snapServer systemFileio systemFilepath text + transformers unorderedContainers ]; jailbreak = true; doCheck = false; diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index bf5ad9217d3c..4ae04b2c7264 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 1ca367a96c92..28eaff157f11 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, deepseq, filepath, HUnit, hxtCharproperties -, hxtRegexXmlschema, hxtUnicode, mtl, network, parsec +, hxtRegexXmlschema, hxtUnicode, mtl, networkUri, parsec }: cabal.mkDerivation (self: { @@ -10,9 +10,9 @@ cabal.mkDerivation (self: { sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema - hxtUnicode mtl network parsec + hxtUnicode mtl networkUri parsec ]; - jailbreak = true; + configureFlags = "-fnetwork-uri"; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "A collection of tools for processing XML with Haskell"; diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix index 33a5ba4bea6e..867474fdfb93 100644 --- a/pkgs/development/libraries/haskell/iCalendar/default.nix +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 1dd734af6100..de0ce49c83eb 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ieee754"; - version = "0.7.3"; - sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0"; + version = "0.7.4"; + sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h"; meta = { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix index 5529f27eb5e9..20ab917dbfd7 100644 --- a/pkgs/development/libraries/haskell/imm/default.nix +++ b/pkgs/development/libraries/haskell/imm/default.nix @@ -23,5 +23,6 @@ cabal.mkDerivation (self: { description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir"; license = "unknown"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix index a2fd8cd438e4..81331833cc48 100644 --- a/pkgs/development/libraries/haskell/implicit/default.nix +++ b/pkgs/development/libraries/haskell/implicit/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 875759a17eb8..cc62218a928d 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck -, quickcheckInstances, text +{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances +, text }: cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.4"; - sha256 = "0yr0pahb07r7p6d7hb4bqafa64a4jkd37bchr6vkan2zbffwcrcm"; + version = "0.1.0"; + sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id"; buildDepends = [ haskellSrcMeta ]; testDepends = [ - doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + haskellSrcMeta hspec QuickCheck quickcheckInstances text ]; meta = { description = "String interpolation done right"; diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 962f30de8a09..8c552654bac0 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "intervals"; - version = "0.7"; - sha256 = "00kwq57x72xi5kca7symb98nzs1j82r6bkgvr83aqpvq0ql9ka9d"; + version = "0.7.0.1"; + sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9"; buildDepends = [ distributive ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix index d9037a8229b3..c0f012f5747f 100644 --- a/pkgs/development/libraries/haskell/ipprint/default.nix +++ b/pkgs/development/libraries/haskell/ipprint/default.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Tiny helper for pretty-printing values in ghci console"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 0c06cb107d59..39374b436ad6 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-schema"; - version = "0.7.0.1"; - sha256 = "1r8f0i3w2g5i5amqpvmi6ys3ax4rzpbvwnvwk9wy95bch3nlvsw0"; + version = "0.7.0.2"; + sha256 = "1yh5zq10d0lyn67p5n3q445rcm18rdagj6pi2ic7fpyh9bks2r12"; buildDepends = [ aeson genericAeson genericDeriving mtl scientific tagged text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index d9e4ce8f0dd9..27eb104f4dff 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, base64Bytestring, cryptohash, dataDefault -, httpTypes, HUnit, network, QuickCheck, scientific, tasty -, tastyHunit, tastyQuickcheck, tastyTh, text, time +, httpTypes, HUnit, network, networkUri, QuickCheck, scientific +, tasty, tastyHunit, tastyQuickcheck, tastyTh, text, time , unorderedContainers }: cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.0"; - sha256 = "0kfdrl795h7nyai1gk056kjbw2c5n3bc30aq9466pky5jv6ywlbz"; + version = "0.4.2"; + sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network - scientific text time unorderedContainers + networkUri scientific text time unorderedContainers ]; testDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes HUnit - network QuickCheck scientific tasty tastyHunit tastyQuickcheck - tastyTh text time unorderedContainers + network networkUri QuickCheck scientific tasty tastyHunit + tastyQuickcheck tastyTh text time unorderedContainers ]; meta = { homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index c7261c4eed81..34cf827c0275 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index b869c59d1310..88cd164ae4e9 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -31,6 +31,6 @@ cabal.mkDerivation (self: { license = "GPL"; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index d08a5c7fab9b..03b1d62546b1 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.8.0"; - sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; + version = "0.10.1.3"; + sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index 0b721be21519..2e3ba0032335 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -1,17 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, dataDefault, filepath, leveldb, resourcet, snappy +{ cabal, async, dataDefault, exceptions, filepath, leveldb, mtl +, QuickCheck, resourcet, snappy, tasty, tastyQuickcheck, temporary , transformers }: cabal.mkDerivation (self: { pname = "leveldb-haskell"; - version = "0.3.1"; - sha256 = "09pyji49sdl60xicd32ra7v72qf0jkjhnvpsfr9k698is7lcq06d"; + version = "0.6"; + sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5"; isLibrary = true; isExecutable = true; buildDepends = [ - async dataDefault filepath resourcet transformers + async dataDefault exceptions filepath resourcet transformers + ]; + testDepends = [ + dataDefault exceptions mtl QuickCheck tasty tastyQuickcheck + temporary transformers ]; extraLibraries = [ leveldb snappy ]; meta = { diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index 0411cb93063f..26a9bfdad2d9 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,22 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, conduit, doctest, filepath, free, hspec +{ cabal, async, conduit, doctest, exceptions, filepath, free, hspec , hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens -, monadControl, network, resourcet, text, transformers, xmlConduit +, monadControl, network, networkUri, resourcet, text, transformers +, xmlConduit }: cabal.mkDerivation (self: { pname = "libjenkins"; - version = "0.4.3.0"; - sha256 = "18z1yaf1a1ncvflxzv96b35d44933yrmsmxv5dr87iyfry28qbnv"; + version = "0.5.0"; + sha256 = "010gid9r3kcajijg7x56c77l93vlbh7fy7akjrg7b73i4zy6jnl7"; buildDepends = [ - async conduit free httpClient httpConduit httpTypes lens - monadControl network resourcet text transformers xmlConduit + async conduit exceptions free httpClient httpConduit httpTypes lens + monadControl network networkUri resourcet text transformers + xmlConduit ]; testDepends = [ - async conduit doctest filepath free hspec hspecExpectationsLens - httpClient httpConduit httpTypes lens monadControl network - resourcet text transformers xmlConduit + async conduit doctest exceptions filepath free hspec + hspecExpectationsLens httpClient httpConduit httpTypes lens + monadControl network networkUri resourcet text transformers + xmlConduit ]; jailbreak = true; doCheck = false; diff --git a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix deleted file mode 100644 index f7f83cd973e3..000000000000 --- a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl -, network, QuickCheck, text, time, utf8String -}: - -cabal.mkDerivation (self: { - pname = "libmpd"; - version = "0.8.0.5"; - sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; - buildDepends = [ - attoparsec dataDefault filepath mtl network text time utf8String - ]; - testDepends = [ - dataDefault hspec HUnit mtl network QuickCheck text time utf8String - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "http://github.com/joachifm/libmpd-haskell#readme"; - description = "An MPD client library"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 6dc0aede0699..6dc0aede0699 100644 --- a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix new file mode 100644 index 000000000000..2c5dc577f0ff --- /dev/null +++ b/pkgs/development/libraries/haskell/linux-inotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hashable }: + +cabal.mkDerivation (self: { + pname = "linux-inotify"; + version = "0.2.0.1"; + sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r"; + buildDepends = [ hashable ]; + meta = { + description = "Thinner binding to the Linux Kernel's inotify interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix index f7f8997480aa..c3e90c84c566 100644 --- a/pkgs/development/libraries/haskell/lushtags/default.nix +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -9,11 +9,11 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ haskellSrcExts text vector ]; - jailbreak = true; meta = { homepage = "https://github.com/bitc/lushtags"; description = "Create ctags compatible tags files for Haskell programs"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/machines-directory/default.nix b/pkgs/development/libraries/haskell/machines-directory/default.nix new file mode 100644 index 000000000000..dadae68668ad --- /dev/null +++ b/pkgs/development/libraries/haskell/machines-directory/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, machines, machinesIo, transformers }: + +cabal.mkDerivation (self: { + pname = "machines-directory"; + version = "0.0.0.1"; + sha256 = "1npgh7f5czx6r3s05y48rs6xkrgpv3if38apwnbvi4ignmsfsvyx"; + buildDepends = [ filepath machines machinesIo transformers ]; + jailbreak = true; + meta = { + homepage = "http://github.com/aloiscochard/machines-io"; + description = "Directory (system) utilities for the machines library"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/machines-io/default.nix b/pkgs/development/libraries/haskell/machines-io/default.nix new file mode 100644 index 000000000000..f66bfae6730a --- /dev/null +++ b/pkgs/development/libraries/haskell/machines-io/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, chunkedData, machines, transformers }: + +cabal.mkDerivation (self: { + pname = "machines-io"; + version = "0.1.0.0"; + sha256 = "07ky1j9ihn493a8q2g1pc0ynam1mkzdi4hjs74kpfnlvl9x6ic7g"; + buildDepends = [ chunkedData machines transformers ]; + jailbreak = true; + meta = { + homepage = "http://github.com/aloiscochard/machines-io"; + description = "IO utilities for the machines library"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 1b391739c202..98a6248899b7 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.2.5"; - sha256 = "0745lhmfwq27nna517q7b82q59pda587wgh6840nw65syaj2qfhp"; + version = "0.4"; + sha256 = "00qs1hv1sc4278hlwjfv9ykbhxg4hxb0kqyrglagb42sn8j35kyz"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; diff --git a/pkgs/development/libraries/haskell/map-syntax/default.nix b/pkgs/development/libraries/haskell/map-syntax/default.nix new file mode 100644 index 000000000000..52c42efd3209 --- /dev/null +++ b/pkgs/development/libraries/haskell/map-syntax/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "map-syntax"; + version = "0.2"; + sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r"; + buildDepends = [ mtl ]; + testDepends = [ + deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 transformers + ]; + meta = { + description = "Syntax sugar for defining maps"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix index d65eecc6a303..73af49f41685 100644 --- a/pkgs/development/libraries/haskell/monad-journal/default.nix +++ b/pkgs/development/libraries/haskell/monad-journal/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-journal"; - version = "0.4.0.2"; - sha256 = "0biz564lgddzd6hygb7jd3rh8xa7qmzby4q3fyfa9fizmdcwf9j8"; + version = "0.5"; + sha256 = "1dr5l9pz1wij3ysp95pchlgw1zs12akgrm7rrr3bnv162c13vb9h"; buildDepends = [ either monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix index dc6c90bcd977..e8c598d3a302 100644 --- a/pkgs/development/libraries/haskell/monad-supply/default.nix +++ b/pkgs/development/libraries/haskell/monad-supply/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-supply"; - version = "0.4"; - sha256 = "0qvv9j55hw1lrfqnz1aric4mvg62c2vqaf5wirn69gvh74slqyj8"; + version = "0.6"; + sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; buildDepends = [ mtl ]; meta = { description = "Stateful supply monad"; diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix index 13a8dfa3677b..37855b131866 100644 --- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -16,5 +16,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 4c6ffcdaff61..f9912a6d0134 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.26.0.0"; - sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m"; + version = "0.28.0.0"; + sha256 = "1qy2xlxqhxlj9f5g7wf90vwch3qs1yz733f87irdmak0v4vxdkd5"; buildDepends = [ bifunctors utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index f964af3c8b72..3a5cd89b9267 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ncurses"; - version = "0.2.10"; - sha256 = "0qdw5dwi1w42nygvzyq8la7i917f0fz9qjw6ivgl2h1rjxc5j9cb"; + version = "0.2.11"; + sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk"; buildDepends = [ text transformers ]; buildTools = [ c2hs ]; extraLibraries = [ ncurses ]; @@ -15,7 +15,5 @@ cabal.mkDerivation (self: { description = "Modernised bindings to GNU ncurses"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix index c12737a2edf0..447e0590bc05 100644 --- a/pkgs/development/libraries/haskell/network-carbon/default.nix +++ b/pkgs/development/libraries/haskell/network-carbon/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "1.0.1"; sha256 = "1q3b7vw80yw6fkmpwgazy8ikhbwjmmqmm4fry8c9f8ckkpzahj2b"; buildDepends = [ network text time vector ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 45d912da07a5..256b6a6102a5 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.1.0"; - sha256 = "1q9wx7bvr4a65rkyfn2vd3h9bfpsvm9zcqqjhjsrgb91l6x5bdqi"; + version = "1.1.0.1"; + sha256 = "13axzdzcljv240nkrfpycj184ap94hn6zsk9mszp5k48rb3ddc8a"; buildDepends = [ conduit conduitExtra connection cprngAes dataDefault monadControl network streamingCommons systemFileio systemFilepath tls diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 35840ba1716c..003629d7852a 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { deepseq nonNegative parsec QuickCheck random storableRecord utilityHt ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix new file mode 100644 index 000000000000..9ed48a45e923 --- /dev/null +++ b/pkgs/development/libraries/haskell/objective/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cleanUnions, free, transformers }: + +cabal.mkDerivation (self: { + pname = "objective"; + version = "0.4"; + sha256 = "0zcls4b6i5b9yazy6d6fq2vpc6gbq16cqbycyc909bm7kkqzmb86"; + buildDepends = [ cleanUnions free transformers ]; + meta = { + homepage = "https://github.com/fumieval/objective"; + description = "Extensible objects"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index b58df3be3148..b1b9bd5820f3 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -1,20 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }: +{ cabal, HTTP, HUnit, network, networkUri, testFramework +, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.5"; - sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6"; - buildDepends = [ HTTP network ]; + version = "0.3.6"; + sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0"; + buildDepends = [ HTTP network networkUri ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; - patchPhase = '' - sed -i -e 's|network *==.*|network|' oeis.cabal - ''; meta = { description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/oo-prototypes/default.nix b/pkgs/development/libraries/haskell/oo-prototypes/default.nix new file mode 100644 index 000000000000..b9f011d3aa13 --- /dev/null +++ b/pkgs/development/libraries/haskell/oo-prototypes/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "oo-prototypes"; + version = "0.1.0.0"; + sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly"; + meta = { + homepage = "https://github.com/yi-editor/oo-prototypes"; + description = "Support for OO-like prototypes"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix index ff546c76eae5..ea2dc95e364b 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { description = "Utilities and combinators for parsing command line options"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix new file mode 100644 index 000000000000..bef76ab73ee6 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiWlPprint, transformers, transformersCompat }: + +cabal.mkDerivation (self: { + pname = "optparse-applicative"; + version = "0.11.0.1"; + sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9"; + buildDepends = [ ansiWlPprint transformers transformersCompat ]; + jailbreak = true; + meta = { + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 907a9a2e0325..11323122676d 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.13.0.0"; - sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw"; + version = "0.13.0.2"; + sha256 = "1f546k53j5ymb1321n31na0fpm69idx5l0nh9s75yallbij3gyfg"; buildDepends = [ cairo glib mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index b9f6eda669e8..2bf50add8620 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions random ]; + jailbreak = true; meta = { homepage = "http://batterseapower.github.com/parallel-io"; description = "Combinators for executing IO actions in parallel on a thread pool"; diff --git a/pkgs/development/libraries/haskell/parsec/3.1.6.nix b/pkgs/development/libraries/haskell/parsec/3.1.7.nix index 5a8d83622f54..f2258da99682 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.6.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.7.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsec"; - version = "3.1.6"; - sha256 = "12k2gzy7fi83929mr2s4vj3ipfyg7l74v1cb2vbi4613qmq5wrw4"; + version = "3.1.7"; + sha256 = "12h7n367gaw9ifd19yd3ppi4j6kghf7rryacl0ips0fwlxw1x8wa"; buildDepends = [ mtl text ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix index f9f631827d89..5ca5ab956228 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix @@ -6,12 +6,13 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-content"; - version = "0.0.3.0"; - sha256 = "0glcm6mrgg8ixzhp09kfkk3ra3qblvrp1wcsa2nhqlypg3ca8r3h"; + version = "0.0.3.1"; + sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; buildDepends = [ attoparsec base16Bytestring ioStreams pdfToolboxCore text ]; meta = { + homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix index bfccb645fbb2..bc7b179a0da2 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -1,14 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, errors, ioStreams, transformers, zlibBindings +{ cabal, attoparsec, errors, ioStreams, scientific, transformers +, zlibBindings }: cabal.mkDerivation (self: { pname = "pdf-toolbox-core"; - version = "0.0.2.1"; - sha256 = "14jj6xprzh2k1njal0mgapkm3xivy8370p9kdjxha9gnwmc581df"; + version = "0.0.3.0"; + sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; buildDepends = [ - attoparsec errors ioStreams transformers zlibBindings + attoparsec errors ioStreams scientific transformers zlibBindings ]; meta = { homepage = "https://github.com/Yuras/pdf-toolbox"; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix index b62d3e92e5ef..77615ed86650 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-document"; - version = "0.0.3.0"; - sha256 = "0y1kb2hf420jx6r81c431avgar32wzx2xr747akcs4rypf6w53fn"; + version = "0.0.4.0"; + sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; buildDepends = [ cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore text transformers diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index dd895b937ce7..55da0403a957 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-mysql"; - version = "2.0.5"; - sha256 = "1zhva0wikp3d57fsz5phqwi0b3vbgnapf6bw46xmmrp8r21zsnk5"; + version = "2.1"; + sha256 = "0r4xxv1250ny7x3298mqcv2x5l8vp0ncn9k9js7yi2lj9gcijj6f"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger mysql mysqlSimple persistent resourcet text transformers diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 8a8b0989e728..1161017bbbfe 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "2.0.5"; - sha256 = "1awdxh354y2hxsiijwvc2x7ficrcwmg27ai2mi79a0b2ylrxc9pk"; + version = "2.1"; + sha256 = "0458z9n61wn8g55cp8a9061qgc99i5yp3wmwmf3x4p4vfkl5kw9c"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger persistent postgresqlLibpq postgresqlSimple resourcet text time transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index db5965d378f6..fb8fd059aa7b 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "2.0.5"; - sha256 = "1x65pni93xgsbfwaknd9fgqccz0gbn1ky6k55l2ss5ab92apqy8i"; + version = "2.1.0.1"; + sha256 = "1l5iwyd8qi75ijjiznkp9i6b3rzs64bb1lph0syr0xi2arx18bxs"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 7060eddc17e3..1c8f502ba7b9 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "2.0.5"; - sha256 = "0mf18n07r2bvvf5448xq4pzylpprkbc1wb86339gaxnax321ipap"; + version = "2.1"; + sha256 = "0rj3yqm38kg7lvj9hi4c5yaypvxj6pwb47b0kg8h2hsa0rshhrdy"; buildDepends = [ aeson monadControl monadLogger pathPieces persistent tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 588f6163b650..a8aca43f65d7 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "2.0.5.1"; - sha256 = "14xzqr9f0ggqkakpq6badbrnwr6nhzq61ga7d2m0d0lni039vdax"; + version = "2.1"; + sha256 = "0ybjjya8q4kwnq6lksahpm0g8wzxwzfqxqmkrw18vw4fb7kry58k"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit exceptions fastLogger liftedBase monadControl monadLogger mtl diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix index 58894ce6dd6d..bbb555681e04 100644 --- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-zlib"; - version = "0.4.1"; - sha256 = "0wjx51d3inhsjzqf16l46mhh0mdsa8fk7x1vvp2apg9s6zfw624k"; + version = "0.4.3"; + sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc"; buildDepends = [ pipes transformers zlib zlibBindings ]; meta = { homepage = "https://github.com/k0001/pipes-zlib"; diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 50039d4466b9..4dd93bc8e8b3 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes"; - version = "4.1.2"; - sha256 = "0prxk4qjdcmxjdvpi1bwql0s3l1kwlaz9sydr9swa8bc8ams3a11"; + version = "4.1.3"; + sha256 = "188gwfw0v8v9rac9m00j453a4hr0n4dmjfn92r8zymxc8806mqaw"; buildDepends = [ mmorph mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index f4d77d70560c..0edfbaf702e6 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.4.1"; - sha256 = "0lqvy8nc2izwlv7z0n12cknsrb2dkmla84bvjis5z9f63ngs2580"; + version = "0.4.6.0"; + sha256 = "16pipp806askv7a97d2nncws8kr29d09rvas17b3mhbly5nah2kr"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix index 46d7fbbdcfb3..4f6d728122c7 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { 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/development/libraries/haskell/primitive/0.5.4.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix new file mode 100644 index 000000000000..08b081d227c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.4.0"; + sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; + meta = { + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 20739bc45159..09cfe0c78aba 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.6.2"; - sha256 = "1zb5jvgwldzvvw1ga125p5048rwkrb636kn7pcf070m615k9w055"; + version = "0.5.6.3"; + sha256 = "0f9jzv886dg9aphwaqgx17xk2j6j4v2n12y3yhkbs46icmlr8zxp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { description = "PureScript Programming Language Compiler"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index a59a9b2d2da3..cca1e04bd4e6 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.4.3"; - sha256 = "02dj297s04fxb4ys9nfdw6aap5zrwlryq515gky0c3af6ss2yiz7"; + version = "2.4.4"; + sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj"; buildDepends = [ base64Bytestring binary byteable cryptohash random ]; diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix index 26763deb10a6..3939c4392486 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.3.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "random number 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/random/1.1.nix b/pkgs/development/libraries/haskell/random/1.1.nix new file mode 100644 index 000000000000..5ff11eeefda0 --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.1.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "random"; + version = "1.1"; + sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p"; + buildDepends = [ time ]; + meta = { + description = "random number library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index 229c3f5c7bfd..708122b92f35 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16"; - sha256 = "05qpj4zhihmb2cdgw3vx7ir0mqga1w6qidc4vwdjq6dy8d81sdmc"; + version = "0.16.0.2"; + sha256 = "0sh3sgv02x49pr02yb9jsd694g27xifnclrcc6npkkbkcvy9m7y7"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index affe39729f32..f0260034aded 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -1,24 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, dataDefault, mtl, network -, protocolBuffers, protocolBuffersDescriptor, text, time -, unorderedContainers, utf8String, vector +{ cabal, aeson, base64Bytestring, binary, dataDefault, doctest, mtl +, network, scientific, text, time, unorderedContainers, utf8String +, vector }: cabal.mkDerivation (self: { pname = "rethinkdb"; - version = "1.8.0.5"; - sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq"; + version = "1.15.0.0"; + sha256 = "0zswbz73c8h7h31ppw5251l6spn6y5ha3hm9hb90j04hjg8g235i"; buildDepends = [ - aeson attoparsec dataDefault mtl network protocolBuffers - protocolBuffersDescriptor text time unorderedContainers utf8String - vector + aeson base64Bytestring binary dataDefault mtl network scientific + text time unorderedContainers utf8String vector ]; + testDepends = [ doctest ]; meta = { homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "RethinkDB driver for Haskell"; + description = "A driver for the RethinkDB database server"; license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix index d60a69ae9281..dc8ef033c028 100644 --- a/pkgs/development/libraries/haskell/sdl2/default.nix +++ b/pkgs/development/libraries/haskell/sdl2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sdl2"; - version = "1.1.1"; - sha256 = "0kqs211ksp25pgkzy9rz8zcfi3pqrbl1zmbjh1vx8r2lkf79z1y5"; + version = "1.1.2"; + sha256 = "1viy6f8iqbw264hmsvfqjf8b27h8klyybywd5976yin6ianbqm2a"; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; meta = { diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 23ce15222545..bbac214625e2 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, conduit, conduitExtra, controlMonadLoop, filepath +{ cabal, async, conduit, conduitExtra, controlMonadLoop, filepath , monadControl, monadsTf, resourcet, semigroups, split, text, these , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "3.0"; - sha256 = "07x920j52zjqh3lpfam5f1nhsgqbcgz458dbrwxsmsn3cnqf2qd6"; + version = "4.2"; + sha256 = "1ac1imsz1ffm0ldi29ylprgs4zh0qhn52ka17zn8f9301hfx9vhc"; buildDepends = [ - conduit conduitExtra controlMonadLoop filepath monadControl + async conduit conduitExtra controlMonadLoop filepath monadControl monadsTf resourcet semigroups split text these transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 6deaa209dc87..10659c72266f 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.5"; - sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1"; + version = "1.5.6"; + sha256 = "1vnn0s3i3n76286b7rc70qjzgkmfwllpg7w4zin627v6466pfpzl"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index fc41353d3575..d291aba96308 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -4,9 +4,9 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.17"; - sha256 = "1xxzw916v5zwn8i5i61z6p1wa2rm95sa6ry9z3yg2b2ybpyagw5g"; - buildDepends = [ network resourcet ]; + version = "0.2.18"; + sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49"; + buildDepends = [ network ]; testDepends = [ conduit conduitExtra hspec HUnit network resourcet ]; diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index be9147d6c765..a81c6ec24ab3 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { description = "Add CORS headers to Snap applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix index 71b8c3c49da3..a8252a4f3f02 100644 --- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix +++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.5.0.0"; sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv"; buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ]; + jailbreak = true; meta = { homepage = "https://github.com/lukerandall/snap-web-routes"; description = "Type safe URLs for Snap"; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index d2278f329f42..f42d838a52ca 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { ]; configureFlags = "-fopenssl"; patchPhase = '' - sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal + sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' -e 's|network.*2.6,|network,|' snap-server.cabal ''; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index aab1a7bf89be..c28ee69fb2c0 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.9"; - sha256 = "1iv29mbbm1xjfrq3ys7zpskjpcwx6k08zrnrs1yj62yg5aa6bnim"; + version = "0.13.3.1"; + sha256 = "016azx90gxjkhmncpnqvqrwsk9kbkz315z088wm7y67s97lpnr9c"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index d6bfcd260ca3..6bb589984efc 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, configurator, hedis, lens, mtl, network, snap +{ cabal, configurator, hedis, lens, mtl, network, snap, text , transformers }: cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.3"; - sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l"; + version = "0.1.4"; + sha256 = "1xyff7hsafxjyiifm7fb2d43sscrzqrn3gxfdjzgrhf8b3ayi01y"; buildDepends = [ - configurator hedis lens mtl network snap transformers + configurator hedis lens mtl network snap text transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index 1024b2ac4ee3..ecc2507a8ca0 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Stripe snaplet for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix index f27c5d0e51c0..0dbd0647a864 100644 --- a/pkgs/development/libraries/haskell/sodium/default.nix +++ b/pkgs/development/libraries/haskell/sodium/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sodium"; - version = "0.10.0.2"; - sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy"; + version = "0.11.0.2"; + sha256 = "0m3ig6nqkw0m6xh6ijgr2w06i4ydyfwx7rsbkrrxflichadm9r2g"; buildDepends = [ mtl ]; meta = { description = "Sodium Reactive Programming (FRP) System"; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index 087871bbc53e..8d30afc77add 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.4.0"; - sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k"; + version = "0.4.1"; + sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/state-plus/default.nix b/pkgs/development/libraries/haskell/state-plus/default.nix new file mode 100644 index 000000000000..d35da29273e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/state-plus/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, checkers, mtl, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "state-plus"; + version = "0.1.1"; + sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1"; + buildDepends = [ mtl ]; + testDepends = [ checkers mtl QuickCheck ]; + meta = { + description = "MonadPlus for StateT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix index 5176cad03cd3..9225bacbfe30 100644 --- a/pkgs/development/libraries/haskell/string-conversions/default.nix +++ b/pkgs/development/libraries/haskell/string-conversions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "string-conversions"; - version = "0.3.0.2"; - sha256 = "0jcm0vv0ll74zfc7s2l8qpqpbfnkv7ir9d1kg68m6b0f9sq0dgng"; + version = "0.3.0.3"; + sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p"; buildDepends = [ text utf8String ]; meta = { description = "Simplifies dealing with different types for strings"; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 9cc43e142a7e..d739d11c17ab 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.10.2"; - sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q"; + version = "0.5.11.0"; + sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 4451b2c3bdb4..46a2979d775d 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, deepseq, syb }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "symbol"; - version = "0.2.1"; - sha256 = "1g9rpz40v6wnmp671wvbbinzvvxkibdnny4i6ai28pn3sxa6fgkj"; - buildDepends = [ deepseq syb ]; + version = "0.2.4"; + sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h"; + buildDepends = [ deepseq ]; jailbreak = true; meta = { homepage = "http://www.cs.drexel.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 35d004445fc2..40ddd46ba547 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.13.2"; - sha256 = "0q9r4vsdlib6dm0b387zg089b1410f0nspzigx2awqi2xqfsi0xz"; + version = "0.13.3"; + sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 1fa30cf368d7..499234cac143 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, genericDeriving, mtl, reducers, stm, tagged, tasty -, transformers, xml +{ cabal, genericDeriving, mtl, stm, tagged, tasty, transformers +, xml }: cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.10"; - sha256 = "1qjpgbsj8fh5w3l9zap3wsrf1cp8bmsl1adcxy5z2j8yi3rsljii"; + version = "1.0.0.11"; + sha256 = "0cia8n31pyyax7v02xgpznanzd5wd32kps0dzx5ky1bmgbi9w4am"; buildDepends = [ - genericDeriving mtl reducers stm tagged tasty transformers xml + genericDeriving mtl stm tagged tasty transformers xml ]; meta = { homepage = "http://github.com/ocharles/tasty-ant-xml"; diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 067e60818183..edbdf8b9cd65 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.9"; - sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc"; + version = "0.9.0.1"; + sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb"; buildDepends = [ tasty ]; meta = { homepage = "http://documentup.com/feuerbach/tasty"; diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index f4af3a190972..28a94fe0edad 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -4,10 +4,11 @@ cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8.1"; - sha256 = "1diqc5dmddrfc6i0zqkmlnnhsv8paqy2fdmbx8484qa4ylk5r6bs"; + version = "0.8.2"; + sha256 = "16fdzdlvivrkhpg9nbfz9gamvlpb25fgcxnshzg7i7hkrgzhbrji"; buildDepends = [ QuickCheck tagged tasty ]; meta = { + homepage = "http://documentup.com/feuerbach/tasty"; description = "QuickCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index ea1a37d5e9b5..9bdf0c52895e 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "tasty-smallcheck"; - version = "0.8"; - sha256 = "0c4ccmhql118j4dlvy5cmrnma454b0rdv1wq2ds6xhpdhx20h1br"; + version = "0.8.0.1"; + sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm"; buildDepends = [ async smallcheck tagged tasty ]; meta = { - homepage = "https://github.com/feuerbach/tasty"; + homepage = "http://documentup.com/feuerbach/tasty"; description = "SmallCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index b06233771140..cd63c7dd4789 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.10"; - sha256 = "1va9rj6k0v8mdkqbgjvn5rcaf2zp785ihfr4b5j87xzaiw32m1l6"; + version = "0.10.0.2"; + sha256 = "0d2lmdrhdcmpay1yj613ckmjhwnrmaazcy3xhbc3fjlmd0rma44q"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm tagged time unboundedDelays diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index f53c68e5e7fb..a7881a7ebfce 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework-th-prime"; - version = "0.0.6"; - sha256 = "11fk7sk644ky8f22imrfqk8yx07050vy9szha0pnkkjk9i3bqfcq"; + version = "0.0.7"; + sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p"; buildDepends = [ cpphs haskellSrcExts testFramework ]; meta = { description = "Template Haskell for test framework"; diff --git a/pkgs/development/libraries/haskell/test-simple/default.nix b/pkgs/development/libraries/haskell/test-simple/default.nix new file mode 100644 index 000000000000..181c92147e3d --- /dev/null +++ b/pkgs/development/libraries/haskell/test-simple/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, executablePath, mtl, QuickCheck, statePlus }: + +cabal.mkDerivation (self: { + pname = "test-simple"; + version = "0.1.7"; + sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka"; + buildDepends = [ mtl QuickCheck statePlus ]; + testDepends = [ executablePath mtl QuickCheck ]; + meta = { + description = "Simple Perl inspired testing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index fad37db7c9c3..5586c28079b9 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsecEnumerator, dataDefault, deepseq -, filepath, hashable, MonadCatchIOTransformers, network, safe +, filepath, hashable, MonadCatchIOTransformers, networkUri, safe , snapCore, snapServer, stm, text, time, transformers , unorderedContainers, utf8String, vault, websockets , websocketsSnap @@ -9,15 +9,15 @@ cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.2.0"; - sha256 = "1746l90h9xkwnwxvfqsr93nax7ihv8lwc4kz203v13rrwckr7m8h"; + version = "0.5.0.0"; + sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsecEnumerator dataDefault deepseq filepath hashable - MonadCatchIOTransformers network safe snapCore snapServer stm text - time transformers unorderedContainers utf8String vault websockets - websocketsSnap + MonadCatchIOTransformers networkUri safe snapCore snapServer stm + text time transformers unorderedContainers utf8String vault + websockets websocketsSnap ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 187637011264..110f9f396c1d 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.2"; - sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; + version = "0.3.5.3"; + sha256 = "1gfqj9rsjmc8gdg2qrzdnjnjdwdls55k061qh82ihwa6l7nfkjv1"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix index 825361354d2a..8b6623d46396 100644 --- a/pkgs/development/libraries/haskell/tostring/default.nix +++ b/pkgs/development/libraries/haskell/tostring/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, text, utf8String }: +{ cabal, caseInsensitive, text, utf8String }: cabal.mkDerivation (self: { pname = "tostring"; - version = "0.2.0.2"; - sha256 = "0gjc1576cb4cil55l2jki3y4zp8z6b1m04rf68f2fbc619wji5k6"; - buildDepends = [ text utf8String ]; + version = "0.2.1"; + sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw"; + buildDepends = [ caseInsensitive text utf8String ]; meta = { description = "The ToString class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix new file mode 100644 index 000000000000..b32653032b54 --- /dev/null +++ b/pkgs/development/libraries/haskell/trivia/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, distributive }: + +cabal.mkDerivation (self: { + pname = "trivia"; + version = "0.0"; + sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78"; + buildDepends = [ comonad distributive ]; + meta = { + homepage = "https://github.com/fumieval/trivia"; + description = "The trivial monad and comonad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 8720fb3f2beb..6c43c5891c48 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.6"; - sha256 = "1vm4wa3cdmyz2m45rnwkrjcx8wajc89395c28rz1q12hf856970j"; + version = "0.0.7"; + sha256 = "1xwfyhjkbdl19b7cpw12lgnjzqhpiqvfhag2l8zhks21yv0l3kg0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 60f0f21b292a..74bfb2927753 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.3.3"; - sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x"; + version = "0.3.4"; + sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5"; buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix index 70f00b68d422..07f1b8beb974 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.5.0"; - sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj"; + version = "0.2.5.1"; + sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix index 11276f2bc4ae..633818d9518d 100644 --- a/pkgs/development/libraries/haskell/uri/default.nix +++ b/pkgs/development/libraries/haskell/uri/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uri"; - version = "0.1.6.2"; - sha256 = "0f2ms8awm4x7pw8ms6in0mxspqmnhv8bxas0947rkrzc5m9k0h3s"; + version = "0.1.6.3"; + sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j"; buildDepends = [ parsec safe utf8String ]; meta = { homepage = "http://gitorious.org/uri"; diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index 74ae443f8a6c..e60af0e3152d 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "Generate or process x-www-urlencoded data"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix index fc95d494e368..87f0ed126fa4 100644 --- a/pkgs/development/libraries/haskell/vado/default.nix +++ b/pkgs/development/libraries/haskell/vado/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vado"; - version = "0.0.2"; - sha256 = "15kdqgpdy501g4hpldq44s7qgh4xchl6acnr95i5fj8ky4vgwfi0"; + version = "0.0.3"; + sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec filepath text ]; diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix new file mode 100644 index 000000000000..2ae7e9c66e52 --- /dev/null +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, doctest, filepath, lens, QuickCheck +, semigroupoids, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "validation"; + version = "0.4.1"; + sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + buildDepends = [ + bifunctors lens semigroupoids semigroups transformers + ]; + testDepends = [ doctest filepath QuickCheck ]; + meta = { + homepage = "https://github.com/tonymorris/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 0f48fbecf063..634116b3d9b7 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { 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"; diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix index e93160ff6d0e..6929594c62ba 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -7,10 +7,12 @@ cabal.mkDerivation (self: { 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/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix new file mode 100644 index 000000000000..e83a53b57a1d --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, primitive, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.12.1"; + sha256 = "0m4m650yxv92dz8xgcjfkbhsl46hgnf02viwgdja5xmvg3aa8fcp"; + buildDepends = [ deepseq primitive ]; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + transformers + ]; + 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; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index d07f27bee310..42796bea5481 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.9.3"; sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ deepseq primitive ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 1c63b4ce5964..2effc4fc83bf 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.1.1"; - sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0"; + version = "3.0.2"; + sha256 = "0k67yzr05d6vjwqamnzzggk1mlj9wabqrm26dqbrrc40jj3kddgw"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 4eca4c8c1920..19ef6c4e7d95 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "3.0.0"; - sha256 = "14gm43a811v9h87ia2b9y9kynafrvq3yw89gswlj832469jx9sfw"; + version = "3.0.0.1"; + sha256 = "054xazykd2njwrjzxkz08nqf7fghgjzc7rg7qbl5pfpn9b2a4pls"; buildDepends = [ cprngAes dataDefaultClass network streamingCommons tls wai warp ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index bf53afbe8c8f..abca63eaf1bf 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.1.1"; - sha256 = "1sgmcyk9ngys990287wsga3kk6wf29sj414w6jmv8a4sal202mqc"; + version = "3.0.2.3"; + sha256 = "16fwqd3nnw0bpa2a8ki0ynxif8a90qa20fvw5fmyngyvysl8g7qn"; buildDepends = [ autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index bed9467a9d25..88f268782805 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "web-routes-boomerang"; - version = "0.28.2"; - sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05"; + version = "0.28.3"; + sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn"; buildDepends = [ boomerang mtl parsec text webRoutes ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 12f2212c8e35..b29d42dc9611 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.27.6"; - sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp"; + version = "0.27.7"; + sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb"; buildDepends = [ blazeBuilder httpTypes mtl parsec split text utf8String ]; diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix index 1f73dda79ede..b7c1828c3e5a 100644 --- a/pkgs/development/libraries/haskell/webdriver/default.nix +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -26,5 +26,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix index 0d47aeb79551..10cd225cee41 100644 --- a/pkgs/development/libraries/haskell/webkit/default.nix +++ b/pkgs/development/libraries/haskell/webkit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "webkit"; - version = "0.13.0.0"; - sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5"; + version = "0.13.0.2"; + sha256 = "1dagfc5v5ihg7hm8vkymg1jyhxqhlxb8f4bnbmjcv4sffbm9q14f"; buildDepends = [ cairo glib gtk mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ webkit ]; diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index f4d056f66560..2b80e524d4a8 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.9.0.1"; - sha256 = "0advbw1z0g53n8az34287fix16a457jv8z6s0g1l8lr4a8b74x0w"; + version = "0.9.1.0"; + sha256 = "18q2dax5d4qh7didr2jhsns07lsybab4v231wjxn6iiyf9f7f16i"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/word-trie/default.nix b/pkgs/development/libraries/haskell/word-trie/default.nix new file mode 100644 index 000000000000..f817254aa629 --- /dev/null +++ b/pkgs/development/libraries/haskell/word-trie/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, derive, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "word-trie"; + version = "0.2.0.4"; + sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f"; + buildDepends = [ binary derive ]; + testDepends = [ binary derive hspec QuickCheck ]; + meta = { + homepage = "https://github.com/yi-editor/word-trie"; + description = "Implementation of a finite trie over words"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix index b36b8c9cdfbb..c50e83449bba 100644 --- a/pkgs/development/libraries/haskell/x509-system/default.nix +++ b/pkgs/development/libraries/haskell/x509-system/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "x509-system"; - version = "1.4.5"; - sha256 = "0pwn624n6fagg9rw2p09x2k212rc8167jhqz6z5wf6m7y56ql28x"; + version = "1.4.6"; + sha256 = "0h462dgc0jf88yfd4nx9xpqx5kfzc3z6ps8akw13pfy92xdxj28c"; buildDepends = [ filepath mtl pem time x509 x509Store ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 71601c9306dd..c49a0e75fcf0 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.12"; - sha256 = "0bfsmmngpvghbfljxa2gymf6hvsw04snw6fr2r6hpaw40njxfxxj"; + version = "1.4.13"; + sha256 = "1cl2ygk38jh803aplsg68q6njzb0wcd1syb182amxqn8jlwh8a7c"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes filepath mtl pem time diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 445577c2309a..297bc8130306 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -4,8 +4,10 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.3"; - sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg"; + version = "0.2.4.4"; + sha256 = "1bv2n1pzn58kqf9k5qbyzlkddhx2v2c9gc50c7q7yd7wxxpml7gi"; + isLibrary = true; + isExecutable = true; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index ddd6129dd83c..a6e0cdfa3b06 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,19 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, conduit , conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl , resourcet, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.2"; - sha256 = "0rya11zzkqkq9jspd3q75b50l0p42aq3ka77by0wan373hw4ydan"; + version = "1.2.3"; + sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v"; buildDepends = [ - attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq - monadControl resourcet systemFilepath text transformers xmlTypes + attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra + dataDefault deepseq monadControl resourcet systemFilepath text + transformers xmlTypes ]; testDepends = [ blazeMarkup conduit hspec HUnit resourcet text transformers diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 9173baa97baa..22222e1177c7 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.9.1"; - sha256 = "129pf4gg3mf2ljag8vxknnqxbrbx53hshzpaggndxjir72303njy"; + version = "0.8.9.3"; + sha256 = "0hpxmb7flb9xl5s5pf1g76lvm73fbnfs9fr37vlhdxcdqgih0m68"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix index a47f3bed59da..3ccab6ece5ea 100644 --- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore -, yesodForm, yesodPersistent +{ cabal, cryptohash, persistent, pwstoreFast, text, yesodAuth +, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth-hashdb"; - version = "1.3.0.1"; - sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q"; + version = "1.4.0"; + sha256 = "0z6gfm1dk03ap2ra7b9wd2jcsnfazcpk6vxcsx94vmb3a9jqx22l"; buildDepends = [ - cryptohash pwstoreFast text yesodAuth yesodCore yesodForm - yesodPersistent + cryptohash persistent pwstoreFast text yesodAuth yesodCore + yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index f15d96df0057..1b6b3ab076c6 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,27 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsecConduit, authenticate, base16Bytestring -, base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup -, byteable, conduit, conduitExtra, cryptohash, dataDefault -, emailValidate, fileEmbed, hamlet, httpClient, httpConduit -, httpTypes, liftedBase, mimeMail, networkUri, persistent -, persistentTemplate, random, resourcet, safe, shakespeare -, shakespeareCss, shakespeareJs, text, time, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent +{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring +, binary, blazeBuilder, blazeHtml, blazeMarkup, byteable, conduit +, conduitExtra, cryptohash, dataDefault, emailValidate, fileEmbed +, httpClient, httpConduit, httpTypes, liftedBase, mimeMail +, networkUri, persistent, persistentTemplate, random, resourcet +, safe, shakespeare, text, time, transformers, unorderedContainers +, wai, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.4.6"; - sha256 = "17lp99pinq72if527ml4sfqvvjn7kmkcc5jq1l9vsbfgqckmqcff"; + version = "1.4.0.1"; + sha256 = "1d5rimp6jnxi8j518g3hg74a4g90rvgfhnxpz2kj6881v85avvh3"; buildDepends = [ - aeson attoparsecConduit authenticate base16Bytestring - base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable - conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed - hamlet httpClient httpConduit httpTypes liftedBase mimeMail - networkUri persistent persistentTemplate random resourcet safe - shakespeare shakespeareCss shakespeareJs text time transformers - unorderedContainers wai yesodCore yesodForm yesodPersistent + aeson authenticate base16Bytestring base64Bytestring binary + blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra + cryptohash dataDefault emailValidate fileEmbed httpClient + httpConduit httpTypes liftedBase mimeMail networkUri persistent + persistentTemplate random resourcet safe shakespeare text time + transformers unorderedContainers wai yesodCore yesodForm + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 8a5d21a30aa8..ffec55a1da42 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -3,25 +3,23 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit , conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase -, network, networkConduit, optparseApplicative, parsec -, projectTemplate, resourcet, shakespeare, shakespeareCss -, shakespeareJs, shakespeareText, split, streamingCommons -, systemFileio, systemFilepath, tar, text, time, transformers -, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib +, network, optparseApplicative, parsec, projectTemplate, resourcet +, shakespeare, split, streamingCommons, systemFileio +, systemFilepath, tar, text, time, transformers, unixCompat +, unorderedContainers, wai, waiExtra, warp, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.13"; - sha256 = "11378w4r48d41cdigcmrcqzrl70vxxqdwq3j1da6dbmdx7nksxfk"; + version = "1.4.0.1"; + sha256 = "062jr3g32rsljscq7bq9bgwwfx7vijx3cmhakwcxw17yh5405ks5"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit - httpReverseProxy httpTypes liftedBase network networkConduit - optparseApplicative parsec projectTemplate resourcet shakespeare - shakespeareCss shakespeareJs shakespeareText split streamingCommons + httpReverseProxy httpTypes liftedBase network optparseApplicative + parsec projectTemplate resourcet shakespeare split streamingCommons systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers wai waiExtra warp yaml zlib ]; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e27f751e6b15..8c55c35181b4 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,34 +1,31 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml -, blazeMarkup, caseInsensitive, cereal, clientsession, conduit -, conduitExtra, cookie, dataDefault, deepseq, exceptions -, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase -, monadControl, monadLogger, mtl, network, networkConduit, parsec -, pathPieces, QuickCheck, random, resourcet, safe, shakespeare -, shakespeareCss, shakespeareI18n, shakespeareJs, streamingCommons -, text, time, transformers, transformersBase, unixCompat, vector -, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes +{ cabal, aeson, async, blazeBuilder, blazeHtml, blazeMarkup +, caseInsensitive, cereal, clientsession, conduit, conduitExtra +, cookie, dataDefault, deepseq, exceptions, fastLogger, hspec +, httpTypes, HUnit, liftedBase, monadControl, monadLogger, mtl +, network, parsec, pathPieces, QuickCheck, random, resourcet, safe +, shakespeare, streamingCommons, text, time, transformers +, transformersBase, unixCompat, unorderedContainers, vector, wai +, waiExtra, waiLogger, warp }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.20.1"; - sha256 = "188mfw9ag6287azb633xznwrbsavy5k12ycg2aahrxd84g6xjnan"; + version = "1.4.2"; + sha256 = "0qi1shmbsi8vkxzvyzqzgmdapnbfkkjvhkshkmr7rrdhkdbnkbxl"; buildDepends = [ - aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup - caseInsensitive cereal clientsession conduit conduitExtra cookie - dataDefault deepseq exceptions fastLogger hamlet httpTypes - liftedBase monadControl monadLogger mtl parsec pathPieces random - resourcet safe shakespeare shakespeareCss shakespeareI18n - shakespeareJs text time transformers transformersBase unixCompat - vector wai waiExtra waiLogger warp yesodRoutes + aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal + clientsession conduit conduitExtra cookie dataDefault deepseq + exceptions fastLogger httpTypes liftedBase monadControl monadLogger + mtl parsec pathPieces random resourcet safe shakespeare text time + transformers transformersBase unixCompat unorderedContainers vector + wai waiExtra waiLogger warp ]; testDepends = [ - async blazeBuilder conduit conduitExtra hamlet hspec httpTypes - HUnit liftedBase network networkConduit QuickCheck random resourcet - shakespeare shakespeareCss shakespeareJs streamingCommons text - transformers wai waiExtra waiTest + async blazeBuilder conduit conduitExtra hspec httpTypes HUnit + liftedBase network pathPieces QuickCheck random resourcet + shakespeare streamingCommons text transformers wai waiExtra ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d2e7b45e57ea..45650de0df53 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, byteable, dataDefault, emailValidate, hamlet, hspec, networkUri -, persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs -, text, time, transformers, wai, xssSanitize, yesodCore -, yesodPersistent +, byteable, dataDefault, emailValidate, hspec, networkUri +, persistent, resourcet, shakespeare, text, time, transformers, wai +, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.16"; - sha256 = "0dqmp0df0ahayvg4f4fvn6kwpr3b5d5qfzvk3vwk8bnivk6jrwj5"; + version = "1.4.0.2"; + sha256 = "1y2585pdph2vl42ig6fvzpyy1p3n4v1i1xqnlkb2cfsyssswh5d4"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable - dataDefault emailValidate hamlet networkUri persistent resourcet - shakespeare shakespeareCss shakespeareJs text time transformers wai - xssSanitize yesodCore yesodPersistent + dataDefault emailValidate networkUri persistent resourcet + shakespeare text time transformers wai xssSanitize yesodCore + yesodPersistent ]; testDepends = [ hspec text time ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index fdfd55272470..845fc1c18ff0 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,20 +2,20 @@ { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers -, waiExtra, waiTest, yesodCore +, waiExtra, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.3.1"; - sha256 = "1mmy1l91ksjvwi2zr1wnb50vshs4pdri9rcaracwrnrmdpbmyy3s"; + version = "1.4.0.1"; + sha256 = "08648n6b4xhsqbvqh8vpsf3481hvzhrkyqbzs303s6fz683mn0zw"; buildDepends = [ blazeBuilder conduit persistent persistentTemplate resourcePool resourcet transformers yesodCore ]; testDepends = [ blazeBuilder conduit hspec persistent persistentSqlite text - waiExtra waiTest yesodCore + waiExtra yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 5ad4a27b66fe..02ffd51b47b1 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -3,29 +3,29 @@ { cabal, async, attoparsec, base64Bytestring, blazeBuilder , byteable, conduit, conduitExtra, cryptohash, cryptohashConduit , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin -, hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss -, systemFileio, systemFilepath, text, transformers, unixCompat -, unorderedContainers, wai, waiAppStatic, waiExtra, waiTest -, yesodCore, yesodTest +, hspec, httpTypes, HUnit, mimeTypes, resourcet, systemFileio +, systemFilepath, text, transformers, unixCompat +, unorderedContainers, wai, waiAppStatic, waiExtra, yesodCore +, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.4"; - sha256 = "0r5bz1jmgjd7cmvhkp3ahgl610bssvgxxsvb626dvqz2vqc0061z"; + version = "1.4.0.2"; + sha256 = "0s5jx1hj6rsrsm36xzg8l21v5z2dbd6k63wihrz31rc3gan3wxj2"; buildDepends = [ async attoparsec base64Bytestring blazeBuilder byteable conduit conduitExtra cryptohash cryptohashConduit cssText dataDefault fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet - shakespeareCss systemFileio systemFilepath text transformers - unixCompat unorderedContainers wai waiAppStatic yesodCore + systemFileio systemFilepath text transformers unixCompat + unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ async base64Bytestring byteable conduit conduitExtra cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec - httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio - systemFilepath text transformers unixCompat unorderedContainers wai - waiAppStatic waiExtra waiTest yesodCore yesodTest + httpTypes HUnit mimeTypes resourcet systemFileio systemFilepath + text transformers unixCompat unorderedContainers wai waiAppStatic + waiExtra yesodCore yesodTest ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index f344e5929620..75cde9382190 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -3,18 +3,18 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, text, time, transformers, wai -, waiExtra, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm +, waiExtra, xmlConduit, xmlTypes, yesodCore, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.6"; - sha256 = "0509kd0qwwd83fnw2zr156l01h4hi4hd9lfkjx7dp8ky6506515f"; + version = "1.4.0.3"; + sha256 = "00rg8q5qwyp7aa409d8ir09vgbvwa9qxkgcjpwqa4lp3ncbpiw9j"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent text time transformers wai waiExtra waiTest xmlConduit - xmlTypes yesodCore + persistent text time transformers wai waiExtra xmlConduit xmlTypes + yesodCore ]; testDepends = [ hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 07d4ac958e63..1cc7f282f2a3 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,8 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault -, fastLogger, hamlet, monadControl, monadLogger, networkConduit -, safe, shakespeare, shakespeareCss, shakespeareJs +, fastLogger, monadControl, monadLogger, safe, shakespeare , streamingCommons, text, transformers, unorderedContainers, wai , waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm , yesodPersistent @@ -10,14 +9,13 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.6.1"; - sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2"; + version = "1.4.0"; + sha256 = "1h4jrzbf85malv3k1r4xxqp2y537naj1l284wazsrs2xikndwwn9"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger - hamlet monadControl monadLogger networkConduit safe shakespeare - shakespeareCss shakespeareJs streamingCommons text transformers - unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore - yesodForm yesodPersistent + monadControl monadLogger safe shakespeare streamingCommons text + transformers unorderedContainers wai waiExtra warp yaml yesodAuth + yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yi-contrib/default.nix b/pkgs/development/libraries/haskell/yi-contrib/default.nix new file mode 100644 index 000000000000..40c6dddc8cfe --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-contrib/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, lens, mtl, ooPrototypes, split, text, time +, transformersBase, yi, yiLanguage, yiRope +}: + +cabal.mkDerivation (self: { + pname = "yi-contrib"; + version = "0.10.1"; + sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k"; + buildDepends = [ + filepath lens mtl ooPrototypes split text time transformersBase yi + yiLanguage yiRope + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Yi"; + description = "Add-ons to Yi, the Haskell-Scriptable Editor"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-language/default.nix b/pkgs/development/libraries/haskell/yi-language/default.nix new file mode 100644 index 000000000000..2c26e7345a1c --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-language/default.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, alex, binary, dataDefault, derive, filepath, hashable +, hspec, lens, ooPrototypes, pointedlist, QuickCheck, regexBase +, regexTdfa, transformersBase, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "yi-language"; + version = "0.1.0.7"; + sha256 = "1d6r5lvpngrhgyfam8hf675h9ylglhyzv11pabczbh8rz4jk40w1"; + buildDepends = [ + binary dataDefault derive hashable lens ooPrototypes pointedlist + regexBase regexTdfa transformersBase unorderedContainers + ]; + testDepends = [ + binary dataDefault derive filepath hashable hspec lens pointedlist + QuickCheck regexBase regexTdfa transformersBase unorderedContainers + ]; + buildTools = [ alex ]; + meta = { + homepage = "https://github.com/yi-editor/yi-language"; + description = "Collection of language-related Yi libraries"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix new file mode 100644 index 000000000000..00db09fec70a --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-rope/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, dataDefault, deepseq, fingertree, hspec +, QuickCheck, quickcheckInstances, text +}: + +cabal.mkDerivation (self: { + pname = "yi-rope"; + version = "0.4.1.0"; + sha256 = "11k0fl2m6m7idvanfrgvl3h068i6yj6rzxmwpjylz4vdqq618rcq"; + buildDepends = [ binary dataDefault deepseq fingertree text ]; + testDepends = [ hspec QuickCheck quickcheckInstances text ]; + meta = { + description = "A rope data structure used by Yi"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 2dadfcbfd686..ea3991eebe9d 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.4.1"; - sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq"; + version = "0.4.1.1"; + sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index e4519c473585..4b7c333c07cc 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "zeromq4-haskell"; - version = "0.6.1"; - sha256 = "14ai6sp39qv6kmj33basnvvfqhzbiqxskv3crjwfdaxbijh23mif"; + version = "0.6.2"; + sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb"; buildDepends = [ async exceptions semigroups transformers ]; testDepends = [ async QuickCheck tasty tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index bb1f6b630845..9d5b11501fc1 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.2.1"; + version = "2.3"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5"; + sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 4d94624ce78b..0ea1e96947ea 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; - md5 = "19f27ddd2dda4b2d26a559a4f0f402a7"; + sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 27aaad7598a0..d8193926fef5 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; - md5 = "2a5561457e7f8b2e04d88f73508fd13a"; + sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; configureFlags = " diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 987e1a25d35f..9477aca59733 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.51"; + name = "iso-codes-3.56"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj"; + sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 521118f31757..8bb015a6c5f4 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.5"; + name = "lcms2-2.6"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0ax71bmscjzlpmg1r8vj3dypxf2jr7j9qfx5vc8j22j78hmpf9v7"; + sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 8479551d28d0..21c95066b336 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, perl}: stdenv.mkDerivation rec { - name = "ldns-1.6.16"; + name = "ldns-1.6.17"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; - sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4"; + sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix new file mode 100644 index 000000000000..5f0b1ccd18ec --- /dev/null +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libantlr3c-3.4"; + src = fetchurl { + url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; + }; + + configureFlags = if stdenv.is64bit then "--enable-64bit" else ""; + + meta = with stdenv.lib; { + description = "C runtime libraries of ANTLR v3"; + homepage = http://www.antlr3.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 34352484738c..b1a937c1a012 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -13,12 +13,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.6.0"; + version = "0.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "0zsk16p7rxwbyizm87i7x2fcy3gwjfnlfd2gi2n17fv6gajvsyv2"; + sha256 = "1l2wr9mwz5pikqxlxkjfw3rwz0l1j0n7x9hl80sfiqm1lk41194c"; }; nativeBuildInputs = with stdenv.lib; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 758f86e5f9a5..bc88d8dc12cd 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let name = "libbsd-0.3.0"; +let name = "libbsd-0.7.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38"; + url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index ac7b428bfb00..02dd10841c16 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.92"; + name = "libcdio-0.93"; src = fetchurl { - url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"; + url = "mirror://gnu/libcdio/${name}.tar.bz2"; + sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index bc5f6a1d7a03..afde4e260e8f 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libraw1394, libusb1 }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.1"; + name = "libdc1394-2.2.3"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j"; + sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; buildInputs = [ libraw1394 libusb1 ]; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 40fa337bd66e..8632da12c735 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdvdcss-1.2.13"; + name = "libdvdcss-1.3.0"; src = fetchurl { - url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2; - sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4"; + url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2; + sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; }; meta = { diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index c3c73381acd1..f3ea67ce93e1 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz; - md5 = "7bbf4160876c12db6193c06e2badedb2"; + sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; buildInputs = [pkgconfig libestr]; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix new file mode 100644 index 000000000000..e628490f159a --- /dev/null +++ b/pkgs/development/libraries/libetpan/default.nix @@ -0,0 +1,24 @@ +{ autoconf, automake, fetchgit, libtool, stdenv, openssl }: + +let version = "1.5"; in + +stdenv.mkDerivation { + name = "libetpan-${version}"; + + meta = with stdenv.lib; { + description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; + homepage = http://www.etpan.org/libetpan.html; + license = licenses.bsd3; + platforms = platforms.linux; + }; + + src = fetchgit { + url = "git://github.com/dinhviethoa/libetpan"; + rev = "refs/tags/" + version; + sha256 = "bf9465121a0fb09418215ee3474a400ea5bc5ed05a6811a2978afe4905e140c9"; + }; + + buildInputs = [ autoconf automake libtool openssl ]; + + configureScript = "./autogen.sh"; +} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 2776a3c0614c..981dcd13a626 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.2"; + name = "libevdev-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0h54ym5rsmicl4gx7gcdaifpyndakbl38c5dcxgr27f0cy0635a1"; + sha256 = "0f0yvfg9bwl5xgpcz4kj37l5awcd4l9c78ghxiq3w32gwaz25ibw"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch index b1135f47f3ac..7b90d9863fd6 100644 --- a/pkgs/development/libraries/libgdiplus/giflib.patch +++ b/pkgs/development/libraries/libgdiplus/giflib.patch @@ -1,8 +1,7 @@ -diff --git a/src/gifcodec.c b/src/gifcodec.c -index 8dee0eb..564beed 100644 +diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c --- src/gifcodec.c +++ src/gifcodec.c -@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 +@@ -39,8 +39,10 @@ #include "gifcodec.h" @@ -13,7 +12,7 @@ index 8dee0eb..564beed 100644 /* Data structure used for callback */ typedef struct -@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) +@@ -105,7 +107,7 @@ */ static int @@ -22,7 +21,7 @@ index 8dee0eb..564beed 100644 { ExtensionBlock *ep; -@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) +@@ -129,7 +131,7 @@ if (ExtData) { memcpy(ep->Bytes, ExtData, Len); @@ -31,7 +30,7 @@ index 8dee0eb..564beed 100644 } return (GIF_OK); -@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) +@@ -232,20 +234,20 @@ } case EXTENSION_RECORD_TYPE: { @@ -55,7 +54,7 @@ index 8dee0eb..564beed 100644 } break; } -@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) +@@ -303,12 +305,19 @@ result = NULL; loop_counter = FALSE; @@ -76,7 +75,25 @@ index 8dee0eb..564beed 100644 if (gif == NULL) { goto error; } -@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -581,7 +590,7 @@ + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +606,7 @@ + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -660,11 +669,22 @@ return InvalidParameter; } @@ -99,7 +116,7 @@ index 8dee0eb..564beed 100644 if (!fp) { return FileNotFound; -@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -848,8 +868,15 @@ Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; @@ -115,3 +132,12 @@ index 8dee0eb..564beed 100644 } } +@@ -923,7 +950,7 @@ + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix new file mode 100644 index 000000000000..cef34fe6db8d --- /dev/null +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libibverbs-1.1.8"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/verbs/${name}.tar.gz"; + sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw"; + }; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 701b4df3cd81..ad578ac272b1 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: -let version = "1.0.8"; in +let version = "1.0.9"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "17jjhsgbwrzh09i0wcqsnmxzyrqy1png5ixpnx6rbqmhp54a3jn3"; + sha256 = "09qiaxsxw6g2m7mvkffpfsi5wis8nl1x4lgnk0sa30859z54iw53"; }; prefixKey = "--prefix "; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 10bc9e5eebfe..938c995e755b 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.6"; + name = "libmtp-1.1.8"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s"; + sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz"; }; meta = { diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 714870fab160..99c253cdb358 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; - md5 = "f4824d0a75bdeeef1e45cc88de7bb58a"; + sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; meta = { diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 2dce6db1bf26..c17045d5e4be 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.9"; + name = "libofx-0.9.10"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl"; + sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix new file mode 100644 index 000000000000..aaa1abacab80 --- /dev/null +++ b/pkgs/development/libraries/libowfat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libowfat-0.29"; + + src = fetchurl { + url = "http://dl.fefe.de/${name}.tar.bz2"; + sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab"; + }; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + homepage = http://www.fefe.de/libowfat/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 11eccb0a0e31..77b0d3975c0b 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -10,14 +10,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; - configureFlags = "--with-pcap=linux"; + # Apparently, 32 bit systems need this forced? Not verified if still needed. + configureFlags = stdenv.lib.optionals (stdenv.system == "i686-linux") "--with-pcap=linux"; preInstall = ''mkdir -p $out/bin''; crossAttrs = { # Stripping hurts in static libraries dontStrip = true; - configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ]; + configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ]; }; meta = { diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix new file mode 100644 index 000000000000..a3b549e83b4b --- /dev/null +++ b/pkgs/development/libraries/libqb/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig }: + +stdenv.mkDerivation rec{ + name = "libqb-0.16.0"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; + sha256 = "0j3zl5g5nnx98jb16p89q8w61har3gbvnlnmma8yj31xngps3kdq"; + }; + + buildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clusterlabs/libqb; + description = "a library providing high performance logging, tracing, ipc, and poll"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix new file mode 100644 index 000000000000..0f5500478b4d --- /dev/null +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libibverbs }: + +stdenv.mkDerivation rec { + name = "librdmacm-1.0.19.1"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; + sha256 = "0aq9x2aq62j9qn5yqifp4f2y7w2l35571ns260bwd2c60jf5fjlm"; + }; + + buildInputs = [ libibverbs ]; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + platforms = platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix new file mode 100644 index 000000000000..32fec68ad012 --- /dev/null +++ b/pkgs/development/libraries/libsieve/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "libsieve-${version}"; + + src = fetchurl { + url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; + sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; + }; + + meta = with stdenv.lib; { + description = "An interpreter for RFC 3028 Sieve and various extensions"; + homepage = "http://sodabrew.com/libsieve/"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix new file mode 100644 index 000000000000..36327327b4dd --- /dev/null +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libstatgrab-0.91"; + + src = fetchurl { + url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; + }; + + meta = with stdenv.lib; { + homepage = http://www.i-scream.org/libstatgrab/; + description = "a library that provides cross platforms access to statistics about the running system"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index f6bdbdb3c75f..da6c61b064e9 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -37,13 +37,14 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libtool automake libsodium ncurses - libconfig pkgconfig + check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + # Some tests fail in the Sheevaplug due to timeout doCheck = !stdenv.isArm; meta = { diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 64ef4ed66b6d..ac06b4893f1e 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz; - md5 = "caf182cbc7565dac0fd72155919672e6"; + sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"; }; } diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index afce119e3961..09d2e9dfc43c 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.1.8"; + name = "libvirt-glib-0.1.9"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0ld7g9vlpdzx8rm90i8y1gnpygkn20x5z12gvsgms7dy5nala3ns"; + sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a4c8c167b39a..deba645a39b9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -2,16 +2,19 @@ , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng , dnsmasq, libnl +, pythonPackages }: -let version = "1.2.7"; in +let version = "1.2.9"; in + +assert version == pythonPackages.libvirt.version; stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx"; + sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 25c2117b059d..106106c0915f 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "1.11"; + version = "1.12"; name = "libyubikey-${version}"; src = fetchurl { url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; - sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9"; + sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; }; meta = diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index ae9f3fc6c18d..5c67aaa4c197 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; - md5 = "55339ca42494690c3942ee1465a96937"; + sha256 = "1qr9z73i33y49pbpq6zy7q537g0iyc8sm56rjf0ylwcv01fkzacm"; }; patches = [ ./glib-2.32.patch ]; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 2d37a2506c4f..7fbd44b3fa4a 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; - md5 = "b716a6aaabd5622b65d6126438766260"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; inherit stdenv apacheAnt; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 630d18904096..7e34db242219 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.16.5"; + version = "3.17.2"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/${name}.tar.gz"; - sha256 = "e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_2_RTM/src/${name}.tar.gz"; + sha256 = "134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ''; patches = - [ ./nss-3.15-gentoo-fixups.patch + [ ./nss-3.17-gentoo-fixups.patch # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; diff --git a/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch index b3e35b1d2d19..26b488acb5d8 100644 --- a/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch +++ b/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch @@ -1,5 +1,5 @@ ---- a/nss/config/Makefile -+++ b/nss/config/Makefile +--- nss-3.17.1/nss/config/Makefile ++++ nss-3.17.1/nss/config/Makefile @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -41,8 +41,8 @@ + +dummy: all export libs + ---- a/nss/config/nss-config.in -+++ b/nss/config/nss-config.in +--- nss-3.17.1/nss/config/nss-config.in ++++ nss-3.17.1/nss/config/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -189,8 +189,8 @@ + echo $libdirs +fi + ---- a/nss/config/nss.pc.in -+++ b/nss/config/nss.pc.in +--- nss-3.17.1/nss/config/nss.pc.in ++++ nss-3.17.1/nss/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -204,8 +204,8 @@ +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + ---- a/nss/Makefile -+++ b/nss/Makefile +--- nss-3.17.1/nss/Makefile ++++ nss-3.17.1/nss/Makefile @@ -44,7 +44,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -215,7 +215,7 @@ nss_clean_all: clobber_nspr clobber -@@ -103,12 +103,6 @@ +@@ -109,12 +109,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' @@ -228,11 +228,14 @@ build_docs: $(MAKE) -C $(CORE_DEPTH)/doc ---- a/nss/manifest.mn -+++ b/nss/manifest.mn -@@ -10,4 +10,4 @@ +--- nss-3.17.1/nss/manifest.mn ++++ nss-3.17.1/nss/manifest.mn +@@ -10,7 +10,7 @@ RELEASE = nss -DIRS = coreconf lib cmd +DIRS = coreconf lib cmd config + + ifdef NSS_BUILD_GTESTS + DIRS += external_tests diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 396eaa88fbff..29656f7ef888 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1i"; + name = "openssl-1.0.1j"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -45,7 +45,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1izwv1wzqdw8aqnvb70jcqpqp0rvkcm22w5c1dm9l1kpr939y5rw"; + sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; }; patches = patchesCross false; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 419978a10117..844c2e580093 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.7.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 060f4c45a486..8a196463639c 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -2,7 +2,7 @@ let pname = "phonon-backend-vlc"; - v = "0.7.0"; + v = "0.7.2"; vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; + sha256 = "1acmbn8pmmq16gcz825dlzaf3haj6avp1bmcxzpkjd1fvxh86y0a"; }; nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index b29deae9260c..7fd99ab0244a 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.7.1"; + v = "4.7.2"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg"; + sha256 = "1ghidabmi6vnnmz8q272qi259nb8bbqlbayqk52ln98fs8s9g7l1"; }; buildInputs = [ qt4 pulseaudio ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b8af18f8dd6a..c29da1438f39 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.26.4"; # even major numbers are stable - sha256 = "0raw35nkd6mkp0pk1gdr385nvrhsxvflcf3glln1srfnb8m51pky"; + version = "0.26.5"; # even major numbers are stable + sha256 = "1vni6kqpcx4jy9q8mhhxphfjych76xxmgs3jyg8yacbl6gxfazfy"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.24 diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ec392e715315..c204dbf6e65d 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 15e89d9210a1..55ae69e6e643 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://samba.org/ftp/talloc/${name}.tar.gz"; - md5 = "c6e736540145ca58cb3dcb42f91cf57b"; + sha256 = "1d694zyi451a5zr03l5yv0n8yccyr3r8pmzga17xaaaz80khb0av"; }; configureFlags = "--enable-talloc-compat1 --enable-largefile"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f8c437f2b0f1..29b0c1a9b291 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./yylex.patch ]; # Workaround to make the python wrapper not drop this package: - # pythonFull.override { extraLibs = [ thrift ]; } + # pythonFullBuildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; buildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "Library for scalable cross-language services"; homepage = http://thrift.apache.org/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index faa17c08363f..9e9bf9c83dd3 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -8,14 +8,14 @@ assert withMesa -> mesa != null; with stdenv.lib; let - version = "3.0.1"; + version = "3.0.2"; in stdenv.mkDerivation { name = "wxwidgets-${version}"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "1xf5s8cnq6xr0r6l0y9cn1pjg961xbycl4afhjrqzbsnxiwinrxx"; + sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; }; buildInputs = diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 80f4e2fc8604..3fba451c7111 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }: let - version = "1.2.19"; + version = "1.2.20"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g"; + sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j"; }; buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ]; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 14c996fa05a8..d9359da0a6a9 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -44,8 +44,6 @@ let lispPackages = rec { }; }; - stumpwm = callPackage ./stumpwm {}; - alexandria = buildLispPackage rec { baseName = "alexandria"; version = "git-20131029"; diff --git a/pkgs/development/lisp-modules/stumpwm/default.nix b/pkgs/development/lisp-modules/stumpwm/default.nix deleted file mode 100644 index ae0dab1ec9d4..000000000000 --- a/pkgs/development/lisp-modules/stumpwm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{pkgs, nixLib, clwrapper, cl-ppcre, clx, buildLispPackage}: -buildLispPackage rec { - baseName = "stumpwm"; - version = "2013-09"; - src = pkgs.fetchgit { - url = "https://github.com/sabetts/stumpwm"; - sha256 = "0dd69myssfn2bsdx3xdp65mjrvs9x81dl3y3659pyf1avnjlir7h"; - rev = "565ef58f04f59e1667ec1da4087f1a43a32cd67f"; - }; - description = "Tiling window manager for X11"; - deps = [cl-ppcre clx]; - buildInputs = with pkgs; [texinfo4 autoconf which makeWrapper]; - meta = { - maintainers = [nixLib.maintainers.raskin]; - platforms = nixLib.platforms.linux; - }; - overrides = x: { - preConfigure = '' - ${x.deployConfigScript} - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/" - ./autogen.sh - configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) --with-contrib-dir=$out/lib/common-lisp/stumpwm/contrib/" - ''; - installPhase = with pkgs; x.installPhase + '' - make install - - if [ "$NIX_LISP" = "sbcl" ]; then - wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl" - fi; - - mv $out/lib/common-lisp/stumpwm/contrib/stumpish $out/bin/stumpish - wrapProgram "$out"/bin/stumpish --prefix PATH : "${xlibs.xprop}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin:${rlwrap}/bin:${ncurses}/bin" - ''; - postInstall = ''false''; - }; -} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 2b3bb3339481..114482655751 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; - md5 = "6c1d7d99f55f0c17ecbcf81ba0eb201f"; + sha256 = "0lrxx8rclmda72dynh0qjr6xpcnv5vs3gc96jcia37h8mmn2xv6m"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; - md5 = "c7c775ab3342965408d20fd18e71aa45"; + sha256 = "16miwrnf3c7x7rlpmssmjx9kybmapsjyamjyivhabb2wm21x3q8l"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index fa959035a9e9..e3e07b2edbe6 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ -{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}: +{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}: { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0" , enableWirelessDistribution ? false, installURL ? null }: @@ -49,6 +49,13 @@ stdenv.mkDerivation { '' titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* + # Add zipalign to PATH to make Ti 3.1 builds still work + for i in $(find -L ${androidsdkComposition}/libexec/android-sdk-*/build-tools -name zipalign) + do + export PATH=$(dirname $i):$PATH + break + done + ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else @@ -94,12 +101,15 @@ stdenv.mkDerivation { cat > $HOME/.titanium/auth_session.json <<EOF { "loggedIn": true } EOF - + + # Configure the path to Xcode + titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} + # Set the SDK to our copy titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --ios-version ${iosVersion} --output-dir $out # Remove our generated keychain @@ -115,7 +125,10 @@ stdenv.mkDerivation { cp -av * $out cd $out - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out + # Configure the path to Xcode + titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} + + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out ''} '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6c71116b5e81..34e14b67c006 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -25,12 +25,14 @@ rec { xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override { version = xcodeVersion; + inherit xcodeBaseDir; } else null; titaniumsdk = let titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix + else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -45,6 +47,6 @@ rec { inherit (pkgs.nodePackages) titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; - inherit titaniumsdk; + inherit titaniumsdk xcodeBaseDir; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index d595db408178..a2cc690267c7 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,7 +1,8 @@ { nixpkgs ? <nixpkgs> , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "5.0" -, tiVersion ? "3.2.3.GA" +, xcodeVersion ? "6.0.1" +, xcodeBaseDir ? "/Applications/Xcode.app" +, tiVersion ? "3.4.0.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false @@ -18,7 +19,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; }); @@ -29,7 +30,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; release = true; @@ -60,23 +61,16 @@ rec { rec { kitchensink_ios_development = import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "iphone"; }; - simulate_kitchensink_iphone = import ./simulate-kitchensink { + simulate_kitchensink = import ./simulate-kitchensink { inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; kitchensink = kitchensink_ios_development; - device = "iPhone"; - }; - - simulate_kitchensink_ipad = import ./simulate-kitchensink { - inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; - kitchensink = kitchensink_ios_development; - device = "iPad"; + bundleId = if rename then newBundleId else "com.appcelerator.kitchensink"; }; } else {}) // (if rename then let @@ -85,7 +79,7 @@ rec { { kitchensink_ipa = import ./kitchensink { inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; target = "iphone"; inherit tiVersion; release = true; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index a5ab8d59a743..15a86e338dea 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,9 +1,7 @@ -{stdenv, xcodeenv, kitchensink, device}: +{stdenv, xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { - name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; - appName = "KitchenSink"; - app = kitchensink; - inherit device; - baseDir = "build/iphone/build/Debug-iphonesimulator"; + name = "simulate-${kitchensink.name}"; + inherit bundleId; + app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator"; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix index fa01dadc7756..50346ac5115d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix @@ -53,8 +53,10 @@ stdenv.mkDerivation { '' else ""} - # Wrap builder script + # Fix zipalign compatibility issue with newer Android SDKs + sed -i -e 's|zipalign = self.sdk.get_zipalign()|zipalign = "zipalign"|' builder.py + # Wrap builder script mv builder.py .builder.py cat > builder.py <<EOF #!${python}/bin/python diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix new file mode 100644 index 000000000000..1baf57a94cfb --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.4.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-linux.zip; + sha1 = "c281a3a3f3af35adc95fc00dcd525b84516c2083"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-osx.zip; + sha1 = "2f10426462e5f8e487be83c8038f2934d5079f0d"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + cd 3.4.0.GA + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py <<EOF + #!${python}/bin/python + + import os, sys + + os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' + os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' + + os.execv('$(pwd)/.builder.py', sys.argv) + EOF + + chmod +x builder.py + + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py + + sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 0d221a8952bd..341b06d98228 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "5.0", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index c999497d8c09..645bcd69da0c 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,22 +1,47 @@ {stdenv, xcodewrapper}: -{ name, appName ? null, app -, device ? "iPhone", baseDir ? "" -, sdkVersion ? "7.0" -}: +{name, bundleId, app}: -let - _appName = if appName == null then name else appName; -in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - - cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk" + + if [ "$1" = "" ] + then + # Show the user the possibile UDIDs and let him pick one, if none is provided as a command-line parameter + xcrun simctl list + + echo "Please provide a UDID of a simulator:" + read udid + else + # If a parameter has been provided, consider that a device UDID an use that + udid="$1" + fi + + # Open the simulator instance + open -a "$(readlink "${xcodewrapper}/bin/iOS Simulator")" --args -CurrentDeviceUDID $udid + + # Copy the app and restore the write permissions + appTmpDir=$(mktemp -d -t appTmpDir) + cp -r "$(echo ${app}/*.app)" $appTmpDir + chmod -R 755 "$(echo $appTmpDir/*.app)" + + # Wait for the simulator to start + echo "Press enter when the simulator is started..." + read + + # Install the app + xcrun simctl install $udid "$(echo $appTmpDir/*.app)" + + # Remove the app tempdir + rm -Rf $appTmpDir + + # Launch the app in the simulator + xcrun simctl launch $udid "${bundleId}" EOF + chmod +x $out/bin/run-test-simulator ''; } diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 4545ea8dae15..4be204d5dc52 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { ln -s /usr/bin/codesign ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun" - ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + ln -s "${xcodeBaseDir}/Contents/Developer/Applications/iOS Simulator.app/Contents/MacOS/iOS Simulator" cd .. ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 6af7ce250772..48aaf9725037 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, ocaml, findlib}: stdenv.mkDerivation { - name = "ocaml-calendar-2.03.2"; + name = "ocaml-calendar-2.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz; + url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index ff344ef6f327..e3ab1d37b15a 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlimages"; version = "4.0.1"; in @@ -14,9 +13,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; - propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; @@ -32,12 +31,10 @@ stdenv.mkDerivation { omake install ''; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; - - meta = { - homepage = http://cristal.inria.fr/camlimages; - description = "Image manipulation library"; - license = stdenv.lib.licenses.gpl2; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + meta = with stdenv.lib; { + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 8b611c65a41d..59da5473ab10 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib}: +{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; }; - buildInputs = [ocaml_pcre ocamlnet ocaml findlib]; + buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4]; createFindlibDestdir = true; @@ -30,10 +30,10 @@ stdenv.mkDerivation { make all opt ''; - meta = { + meta = with stdenv.lib; { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ roconnor vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/META.patch b/pkgs/development/ocaml-modules/lablgl/META.patch new file mode 100644 index 000000000000..bf5b2184ac0a --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/META.patch @@ -0,0 +1,18 @@ +diff -r 562eb6ecb8ca META +--- a/META Wed Oct 01 20:09:24 2014 +0100 ++++ b/META Wed Oct 01 20:22:15 2014 +0100 +@@ -1,6 +1,5 @@ +-description "Bindings for OpenGL" ++description="Bindings for OpenGL" + version="1.05" +-directory="+lablGL" + archive(byte) = "lablgl.cma" + archive(native) = "lablgl.cmxa" + +@@ -16,4 +15,4 @@ + requires = "lablgl" + archive(byte) = "lablglut.cma" + archive(native) = "lablglut.cmxa" +-) +\ No newline at end of file ++) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7cefe26746f8..115f66ab9834 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,10 @@ stdenv.mkDerivation { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ocaml findlib lablgtk mesa freeglut ]; + buildInputs = [ocaml findlib lablgtk freeglut camlp4]; + propagatedBuildInputs = [ mesa ]; - patches = [ ./Makefile.config.patch ]; + patches = [ ./Makefile.config.patch ./META.patch ]; preConfigure = '' substituteInPlace Makefile.config \ @@ -35,10 +36,10 @@ stdenv.mkDerivation { cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl ''; - meta = { + meta = with stdenv.lib; { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pSub ]; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7499be9c5dd3..19b0bf63ee39 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,16 +3,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.16.0"; + version = "2.18.2"; in assert stdenv.lib.versionAtLeast ocaml_version "3.12"; -stdenv.mkDerivation (rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz"; - sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; + url = https://forge.ocamlcore.org/frs/download.php/1456/lablgtk-2.18.2.tar.gz; + sha256 = "0f9rs4av0v7p5k8hifcq4b49xx8jmmfch3sdk9pij8a8jfgwxvfy"; }; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; @@ -25,14 +25,13 @@ stdenv.mkDerivation (rec { export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH ''; - meta = { + meta = with stdenv.lib; { platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z - stdenv.lib.maintainers.roconnor + maintainers = with maintainers; [ + z77z roconnor vbgl ]; - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; - license = stdenv.lib.licenses.lgpl21Plus; + homepage = http://lablgtk.forge.ocamlcore.org/; + description = "An OCaml interface to gtk+"; + license = licenses.lgpl21Plus; }; -}) +} diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix new file mode 100644 index 000000000000..f2d13ad1f137 --- /dev/null +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}: + +stdenv.mkDerivation { + name = "ocaml-macaque-0.7.1"; + src = fetchurl { + url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz; + sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa"; + }; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ pgocaml ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Macros for Caml Queries"; + homepage = https://github.com/ocsigen/macaque; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 5f72afcf7666..bfffb67d4b0e 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}: +{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib ocaml_typeconv ounit]; + buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4]; createFindlibDestdir = true; @@ -16,13 +16,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { description = "Store data using OCaml notation"; homepage = https://forge.ocamlcore.org/projects/odn/; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix new file mode 100644 index 000000000000..f1166d1c3249 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}: + +stdenv.mkDerivation { + name = "ocaml-pgocaml-2.1"; + src = fetchurl { + url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz; + sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym"; + }; + + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [calendar csv ocaml_pcre]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "An interface to PostgreSQL databases for OCaml applications"; + homepage = http://pgocaml.forge.ocamlcore.org/; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix new file mode 100644 index 000000000000..eecae885302f --- /dev/null +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, ocaml, findlib, ocaml_react, opam}: + +let + ocamlVersion = stdenv.lib.getVersion ocaml; +in + +assert stdenv.lib.versionAtLeast ocamlVersion "3.11"; + +stdenv.mkDerivation { + name = "ocaml-reactiveData-0.1"; + src = fetchurl { + url = https://github.com/hhugo/reactiveData/archive/0.1.tar.gz; + sha256 = "056y9in6j6rpggdf8apailvs1m30wxizpyyrj08xyfxgv91mhxgw"; + }; + + buildInputs = [ocaml findlib opam]; + propagatedBuildInputs = [ocaml_react]; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out reactiveData.install > install.sh + sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh + sh install.sh + ''; + + meta = with stdenv.lib; { + description = "An OCaml module for functional reactive programming (FRP) based on React"; + homepage = https://github.com/hhugo/reactiveData; + license = licenses.lgpl21; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 9a495002f1de..ad75b4a3dac0 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,7 +2,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.4.4"; + version = "0.4.7"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; - sha256 = "1m45d0bd4ndxswaa1symp6c1npzjmm9pz0nf7w0q15gflqhba5ch"; + sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9"; }; buildInputs = [which openssl ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 10ac88bcb90b..2f679da977d7 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -3,13 +3,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in + +assert stdenv.lib.versionAtLeast ocaml_version "3.12.1"; + stdenv.mkDerivation rec { name = "zarith-${version}"; - version = "1.2.1"; + version = "1.3"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1199/${name}.tgz"; - sha256 = "0i21bsx41br0jgw8xmlpnky5zamzqkpbykrq0z53z7ar77602s4i"; + url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; + sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; buildInputs = [ ocaml findlib pkgconfig gmp perl ]; @@ -22,11 +25,11 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; - meta = { + meta = with stdenv.lib; { description = "fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; platforms = ocaml.meta.platforms; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 62c282949aab..8eb44095e084 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: stdenv.mkDerivation rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { unzip ${sources30Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.DamienCassou ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; -} \ No newline at end of file +} diff --git a/pkgs/development/pure-modules/pure-gsl/default.nix b/pkgs/development/pure-modules/pure-gsl/default.nix new file mode 100644 index 000000000000..bbad1e380d50 --- /dev/null +++ b/pkgs/development/pure-modules/pure-gsl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pure, pkgconfig, gsl }: + +stdenv.mkDerivation { + name = "pure-gsl-0.12"; + src = fetchurl { + url = https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-0.12.tar.gz; + sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ pure gsl ]; + + installPhase = '' + mkdir -p $out/lib/pure/gsl + install gsl.pure gsl$(pkg-config pure --variable DLL) $out/lib/pure + install gsl/*.pure $out/lib/pure/gsl + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "GNU Scientific Library interface for Pure"; + homepage = http://puredocs.bitbucket.org/pure-gsl.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ asppsa ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/pure-modules/pure-gsl/setup-hook.sh b/pkgs/development/pure-modules/pure-gsl/setup-hook.sh new file mode 100644 index 000000000000..efaa2211ae66 --- /dev/null +++ b/pkgs/development/pure-modules/pure-gsl/setup-hook.sh @@ -0,0 +1,2 @@ +addToSearchPath PURE_INCLUDE $1/lib/pure +addToSearchPath PURE_LIBRARY $1/lib/pure diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 2e5701375a47..b1692407e1da 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.1-83-g8008cac"; + name = "gnulib-0.1-228-gb155b06"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6"; - sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm"; + rev = "b155b0649814b20e635a2db305696710fa1037ce"; + sha256 = "06r0cpm97k82hx6qqm9nbwyp5mr8g9qqdiw2ak2pndymc66v233l"; }; buildPhase = ":"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix new file mode 100644 index 000000000000..9e82580018fc --- /dev/null +++ b/pkgs/development/tools/golint/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "golint"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o lint github.com/golang/lint/golint + ''; + + installPhase = '' + mkdir -p $out/bin + mv lint $out/bin/golint + ''; + + meta = with lib; { + description = "Linter for Go source code."; + homepage = https://github.com/golang/lint; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 000000000000..47b8ade22982 --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/golang/lint"; + src = fetchFromGitHub { + owner = "golang"; + repo = "lint"; + rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1"; + sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix new file mode 100644 index 000000000000..5fec8c181a89 --- /dev/null +++ b/pkgs/development/tools/gotags/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gotags"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gotags github.com/jstemmer/gotags + ''; + + installPhase = '' + mkdir -p $out/bin + mv gotags $out/bin + ''; + + meta = with lib; { + description = "Ctags-compatible tag generator for Go"; + homepage = https://github.com/nsf/gotags; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gotags/deps.nix b/pkgs/development/tools/gotags/deps.nix new file mode 100644 index 000000000000..97e77bdd977e --- /dev/null +++ b/pkgs/development/tools/gotags/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/jstemmer/gotags"; + src = fetchFromGitHub { + owner = "jstemmer"; + repo = "gotags"; + rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; + sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index 4acc8f38f175..4a2ed055cf8f 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, alex, deepseq, filepath, happy, hspec, HUnit, mtl +{ cabal, alex, deepseq, doctest, filepath, happy, hspec, HUnit, mtl , QuickCheck, temporary }: cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.7.0.1"; - sha256 = "18009jrpd5kcaz06j4ksay4c7c65m4zrc7jrp3rjx81bs6gkrwk1"; + version = "2.7.1"; + sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath mtl ]; testDepends = [ - deepseq filepath hspec HUnit mtl QuickCheck temporary + deepseq doctest filepath hspec HUnit mtl QuickCheck temporary ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix index ce1c8a27c54e..92d985ecc6e2 100644 --- a/pkgs/development/tools/haskell/PastePipe/default.nix +++ b/pkgs/development/tools/haskell/PastePipe/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdargs, HTTP, network }: +{ cabal, cmdargs, HTTP, network, networkUri }: cabal.mkDerivation (self: { pname = "PastePipe"; - version = "1.5"; - sha256 = "1jqfk6d22vi0vrwx0whjkh4pxwagr4hmi79bid6bffn72c7ygm8f"; + version = "1.6"; + sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4"; isLibrary = true; isExecutable = true; - buildDepends = [ cmdargs HTTP network ]; + buildDepends = [ cmdargs HTTP network networkUri ]; meta = { - homepage = "http://github.com/creswick/pastepipe"; + homepage = "http://github.com/Fuuzetsu/pastepipe"; description = "CLI for pasting to lpaste.net"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index abfd386c82aa..0ce5872d26a2 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix index 234c158cf90c..215be2d43632 100644 --- a/pkgs/development/tools/haskell/cabal-db/default.nix +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 07ba2a4a09ec..044ebfad4346 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { Cabal filepath hackageDb mtl regexPosix transformers ]; testDepends = [ doctest ]; - doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version; + doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index b3c1ba9fa667..902faca957f5 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -1,18 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH -, monadLoops, tar, text, transformers, yaml, zlib +{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, machines +, machinesDirectory, MissingH, monadLoops, monoTraversable, tar +, text, transformers, yaml, zlib }: cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.5"; - sha256 = "0hlx72dan9qvwrpp6rkyr6y9zk2lafa15va098w38r7658jymfy0"; + version = "0.2.0.2"; + sha256 = "0an043cmsxc296i90pv19d8xdl7fg2fvf026lx4rly7bwskzn99x"; isLibrary = true; isExecutable = true; buildDepends = [ - Cabal downloadCurl either filepath hackageDb MissingH monadLoops - tar text transformers yaml zlib + Cabal downloadCurl either filepath hackageDb machines + machinesDirectory MissingH monadLoops monoTraversable tar text + transformers yaml zlib ]; jailbreak = true; meta = { diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 92a33602a1f6..de09d232b6c7 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.4"; - sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m"; + version = "1.9.9"; + sha256 = "193ls1pfycdl8ifq09y2acbhy2hjb2p8f79gjn13ziaycgfz9ygr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/hsb2hs/default.nix b/pkgs/development/tools/haskell/hsb2hs/default.nix new file mode 100644 index 000000000000..9efebdf1db76 --- /dev/null +++ b/pkgs/development/tools/haskell/hsb2hs/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, preprocessorTools }: + +cabal.mkDerivation (self: { + pname = "hsb2hs"; + version = "0.2"; + sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath preprocessorTools ]; + meta = { + description = "Preprocesses a file, adding blobs from files as string literals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/hscope/default.nix b/pkgs/development/tools/haskell/hscope/default.nix index 981e61204440..529ad2ef47ec 100644 --- a/pkgs/development/tools/haskell/hscope/default.nix +++ b/pkgs/development/tools/haskell/hscope/default.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "cscope like browser for Haskell code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix index f65053841283..a9b1347517fb 100644 --- a/pkgs/development/tools/haskell/ihaskell/default.nix +++ b/pkgs/development/tools/haskell/ihaskell/default.nix @@ -39,6 +39,7 @@ cabal.mkDerivation (self: { postInstall = '' patchShebangs . ''; + jailbreak = true; meta = with self.stdenv.lib; { homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; diff --git a/pkgs/development/tools/haskell/pointfree/default.nix b/pkgs/development/tools/haskell/pointfree/default.nix index 166105f22b6a..4eb911ebd621 100644 --- a/pkgs/development/tools/haskell/pointfree/default.nix +++ b/pkgs/development/tools/haskell/pointfree/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pointfree"; - version = "1.0.4.7"; - sha256 = "0jwql0ka01cr53ayjc4dpaci11i7r1y3b9gcbh3rlamb1mnfcqvl"; + version = "1.0.4.8"; + sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy"; isLibrary = false; isExecutable = true; buildDepends = [ haskellSrcExts transformers ]; diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index a07383778ed1..bcc7b7c35d69 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.25"; - sha256 = "14zyzr53gpp0i7wx49zzdrndqdhsw3q4z3w5hdl8c4m541pr25fw"; + version = "1.0.27"; + sha256 = "072bxa0pfxyia4xvj0w0h8v3yfk05bbq5j905sj6jf9apjr9h558"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "A tool for visualizing time series from log files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8194ffc22a81..76e74d7623e9 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = ''A lightweight and flexible command-line JSON processor''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 91150255bdaa..a57840827c1f 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -7,12 +7,14 @@ stdenv.mkDerivation rec { sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [lesstif ncurses libX11 libXt]; - configureFlags = "--with-x"; + configureFlags = "--with-x"; patches = [ ./gcc44.patch ]; - meta = { - homepage = http://www.gnu.org/software/ddd; - description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - }; + + meta = { + homepage = http://www.gnu.org/software/ddd; + description = "Graphical front-end for command-line debuggers"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 23b781902e7b..9d84011e3657 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,17 +1,21 @@ {stdenv, fetchurl, rpm}: -stdenv.mkDerivation { - name = "epm-4.1"; +stdenv.mkDerivation rec { + name = "epm-${version}"; + version = "4.2"; src = fetchurl { - url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/epm/4.1/epm-4.1-source.tar.bz2; - sha256 = "18xq1h9hx410x28bfccabydrqb1c0dqnq62qa17wc3846rwf234n"; + url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; + sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; }; - buildInputs = [rpm]; + buildInputs = [ rpm ]; - meta = { + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = http://www.easysw.com/epm/index.php; + homepage = http://www.msweet.org/projects.php?Z2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index caf9dc489b5b..e93d844db23c 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.46.3"; + name = "help2man-1.46.4"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0hi94a6ai96yw0v8xgjzpp5c6jr33ifmbn2mkp7wz7rgmwxxqsd6"; + sha256 = "0csn7jx7nhlrflalw1992p3l5afawlpdyjdff2q5bk5hadgz3rqs"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix deleted file mode 100644 index 0940bcca191a..000000000000 --- a/pkgs/development/tools/misc/hydra/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool -, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite -, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma -, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit -}: - -let - - perldeps = with perlPackages; - [ CatalystDevel - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginAuthorizationRoles - CatalystAuthenticationStoreDBIxClass - CatalystViewTT - CatalystEngineHTTPPrefork - CatalystViewDownload - XMLSimple - IPCRun - IOCompress - Readonly - DBDPg - EmailSender - TextTable - NetTwitterLite - PadWalker - DataDump - JSONXS - DateTime - DigestSHA1 - CryptRandPasswd - nixPerl - ]; - - version = "0.1pre27592"; - -in - -stdenv.mkDerivation { - name = "hydra-${version}"; - - src = fetchurl { - url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz; - sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz"; - }; - - configureFlags = "--with-nix=${nix}"; - - buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; - - hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ - libxslt sqlite subversion openssh nix coreutils findutils - gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz - rpm dpkg cdrkit])); - - postInstall = '' - for i in "$out/bin/"*; do - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name} - done - ''; - - meta = { - description = "Hydra, the Nix-based continuous integration system"; - homepage = http://nixos.org/hydra/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 14bfe74821de..a27b2318b95f 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.7"; + name = "intel-gpu-tools-1.8"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + sha256 = "0n9pzwjzx4xiffcy3nkc7q7689sid2ry8m9xx4vgxxspr8ds3qpz"; }; configureFlags = [ "--disable-tests" ]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 42e5c2209f1c..dab04861d9fa 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,29 +1,28 @@ -{ stdenv, fetchurl, unzip, conf ? null }: +{ stdenv, fetchurl, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://download.elasticsearch.org/kibana/kibana/${name}.zip"; - sha256 = "05i97zi08rxwx951hgs92fbhk6cchpvdlikrfz07v1dpn787xz8j"; + url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz"; + sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b"; }; - buildInputs = [ unzip ]; - phases = ["unpackPhase" "installPhase"]; + installPhase = '' - mkdir -p $out && cp -R * $out - ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} + mkdir -p $out + mv * $out/ + ${optionalString (conf != null) "cp ${conf} $out/config.js"} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; license = licenses.asl20; - - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ offline rickynils ]; }; } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 5758500d86f9..800947e788ab 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-2.4.1"; + name = "lttng-tools-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; + sha256 = "19qw3v8z5kz9ls988sc1d8yczl9i1d5c6vmzna8wz790szwvin6s"; }; - buildInputs = [ popt libuuid liburcu lttng-ust ]; + buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 0cba211f28b9..3c47966ac5ca 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-2.4.1"; + name = "lttng-ust-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1"; + sha256 = "1an3ymk6hy86gp4z4py93mdyb9q8f74hq2hixbnyccr8l60vpl6w"; }; buildInputs = [ liburcu ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index cfbabad72cc1..a9673be26ee3 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.4.1"; + name = "ocaml-findlib-1.5.3"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz; - sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf"; + url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz; + sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 4729885bcefe..f152feaaecfb 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,11 @@ ---- findlib-1.3.3/src/findlib/Makefile -+++ findlib-1.3.3/src/findlib/Makefile -@@ -82,7 +82,7 @@ clean: +--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200 ++++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200 +@@ -89,7 +89,7 @@ install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ - diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index a5260b499c45..3f172e6aaf2b 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, +{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { - name = "ocaml-oasis-0.4.1"; + name = "ocaml-oasis-0.4.4"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz; + url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.4.tar.bz2; sha256 = "1lsnw9f1jh6106kphxg40qp0sia6cbkbb9ahs5y6ifnfkmllkjhj"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit + ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 1b99c4d4d43b..10025ff8a96b 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.14"; + version = "1.15"; name = "utop-${version}"; src = fetchurl { - url = https://github.com/diml/utop/archive/1.14.tar.gz; - sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk"; + url = https://github.com/diml/utop/archive/1.15.tar.gz; + sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr"; }; buildInputs = [ ocaml findlib makeWrapper]; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 5ff4f8ec9db7..4176182ab621 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.13.7.4"; + version = "0.13.7.5"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0j42s2gpz0rgiadwyb7ksqgc7i02l0q2qnmiyaj5f1w5rfa2c7yy"; + sha256 = "0qdly4493d4p6jif0anf79c8h6ylc34aw622zk4n8icyax8gv2nm"; }; meta = { |