diff options
Diffstat (limited to 'pkgs/development')
20 files changed, 204 insertions, 97 deletions
diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix index a85ed9290fe2..5bb03b592b94 100644 --- a/pkgs/development/compilers/rustc/1.0.0.nix +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -1,5 +1,5 @@ { stdenv, callPackage }: -callPackage ./makeRustcDerivation.nix { +callPackage ./generic.nix { shortVersion = "1.0.0"; isRelease = true; srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak"; diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/generic.nix index 6208190f8dfd..d1091643f779 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -63,7 +63,7 @@ let version = if isRelease then homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; @@ -136,6 +136,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + outputs = [ "out" "doc" ]; + preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; doCheck = true; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index c73a12c6f6e8..5e5b41e8b250 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,5 @@ { stdenv, callPackage }: -callPackage ./makeRustcDerivation.nix { +callPackage ./generic.nix { shortVersion = "1.0.0-dev"; isRelease = false; # src rev for master on 2015-05-13 diff --git a/pkgs/development/coq-modules/mathcomp/1.5.nix b/pkgs/development/coq-modules/mathcomp/1.5.nix deleted file mode 100644 index c984bab49171..000000000000 --- a/pkgs/development/coq-modules/mathcomp/1.5.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, coq, ssreflect}: - -stdenv.mkDerivation { - - name = "coq-mathcomp-1.5-8.5b2"; - - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz; - sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy"; - }; - - 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.jwiegley ]; - platforms = coq.meta.platforms; - hydraPlatforms = []; - }; - -} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 02d06edd538b..7c34e186717c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,26 +1,24 @@ -{stdenv, fetchurl, coq, ssreflect}: +{ callPackage, coq, fetchurl }: -stdenv.mkDerivation { +let src = + if coq.coq-version == "8.4" then - name = "coq-mathcomp-1.5"; + fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz; + sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam"; + } - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz; - sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam"; - }; + else if coq.coq-version == "8.5" then - propagatedBuildInputs = [ coq ssreflect ]; + fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz; + sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy"; + } - enableParallelBuilding = true; + else throw "No mathcomp package for Coq version ${coq.coq-version}"; - 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.jwiegley ]; - platforms = coq.meta.platforms; - hydraPlatforms = []; - }; +in +callPackage ./generic.nix { + inherit src; } diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix new file mode 100644 index 000000000000..56838734b6d3 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, coq, ssreflect +, graphviz, ocamlPackages, withDoc ? true +, src +}: + +stdenv.mkDerivation { + + name = "coq-mathcomp-1.5-${coq.coq-version}"; + + inherit src; + + nativeBuildInputs = stdenv.lib.optionals withDoc + ([ graphviz ] ++ (with ocamlPackages; [ ocaml camlp5_transitional ])); + propagatedBuildInputs = [ ssreflect ]; + + enableParallelBuilding = true; + + buildFlags = stdenv.lib.optionalString withDoc "doc"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + postInstall = stdenv.lib.optionalString withDoc '' + make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ + ''; + + meta = with stdenv.lib; { + homepage = http://ssr.msr-inria.inria.fr/; + license = licenses.cecill-b; + maintainers = [ maintainers.vbgl 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 75112ec96639..a0b0d951c0df 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,40 +1,27 @@ -{stdenv, fetchurl, coq}: +{ callPackage, fetchurl, coq }: -assert coq.coq-version == "8.4"; +if coq.coq-version == "8.4" then -stdenv.mkDerivation { - - name = "coq-ssreflect-1.5"; +callPackage ./generic.nix { src = fetchurl { url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.tar.gz; sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds"; }; - 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}/"; +else if coq.coq-version == "8.5" then - postInstall = '' - mkdir -p $out/bin - cp -p bin/ssrcoq $out/bin - cp -p bin/ssrcoq.byte $out/bin - ''; +callPackage ./generic.nix { - meta = with stdenv.lib; { - homepage = http://ssr.msr-inria.inria.fr/; - license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl jwiegley ]; - platforms = coq.meta.platforms; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz; + sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf"; }; + patches = [ ./threads.patch ]; + } + +else throw "No ssreflect package for Coq version ${coq.coq-version}" diff --git a/pkgs/development/coq-modules/ssreflect/1.5.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index 7c16b43ba8cb..e208f1cc25a8 100644 --- a/pkgs/development/coq-modules/ssreflect/1.5.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -1,22 +1,21 @@ -{stdenv, fetchurl, coq}: - -assert coq.coq-version == "8.5"; +{ stdenv, fetchurl, coq +, graphviz, withDoc ? true +, src, patches ? [] +}: stdenv.mkDerivation { - name = "coq-ssreflect-1.5-8.5b2"; + name = "coq-ssreflect-1.5-${coq.coq-version}"; - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz; - sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf"; - }; + inherit src; + nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; - patches = [ ./threads.patch ]; + inherit patches; postPatch = '' # Permit building of the ssrcoq statically-bound executable @@ -24,12 +23,17 @@ stdenv.mkDerivation { sed -i 's/^#SSRCOQ/SSRCOQ/' Make ''; + buildFlags = stdenv.lib.optionalString withDoc "doc"; + 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 + '' + stdenv.lib.optionalString withDoc '' + mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/ + cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index b919aef5658c..2f4a122d61e8 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libasr-${version}"; - version= "1.0.1"; + version= "1.0.2"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916"; + sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix new file mode 100644 index 000000000000..cafd6a66aa00 --- /dev/null +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + version = "1.0.5"; + name = "liblaxjson-${version}"; + + src = fetchFromGitHub { + owner = "andrewrk"; + repo = "liblaxjson"; + rev = "${version}"; + sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Library for parsing JSON config files"; + homepage = https://github.com/andrewrk/liblaxjson; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 15e711b096bb..36cc4d55933d 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -107,5 +107,8 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wkennington ]; }; - passthru.ldflags = "-lncurses"; + passthru = { + ldflags = "-lncurses"; + inherit unicode abiVersion; + }; } diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index a1645189161a..944a531ae9c3 100644 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.2a"; + name = "openssl-1.0.2c"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -23,7 +23,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm"; + sha256 = "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00"; }; patches = (patchesCross false) ++ extraPatches; diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix new file mode 100644 index 000000000000..c3396dcdad22 --- /dev/null +++ b/pkgs/development/libraries/tk/8.5.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchurl, tcl, ... } @ args: + +callPackage ./generic.nix (args // rec { + + src = fetchurl { + url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; + sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03"; + }; + +}) + diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix new file mode 100644 index 000000000000..110151227bdd --- /dev/null +++ b/pkgs/development/libraries/tk/8.6.nix @@ -0,0 +1,13 @@ +{ callPackage, fetchurl, tcl, ... } @ args: + +callPackage ./generic.nix (args // rec { + + src = fetchurl { + url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; + sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; + }; + + patches = [ ./different-prefix-with-tcl.patch ]; + +}) + diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/generic.nix index a847f848a02a..c3bab0b2f868 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,14 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }: +{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }: stdenv.mkDerivation { name = "tk-${tcl.version}"; - src = fetchurl { - url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; - }; - - patches = [ ./different-prefix-with-tcl.patch ]; + inherit src patches; postInstall = '' ln -s $out/bin/wish* $out/bin/wish diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index fd955602844e..716e31b2bfe2 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -4,7 +4,7 @@ buildOcaml rec { version = "109.35.02"; name = "herelib"; - minimumSupportedOcamlVersion = "4.02"; + minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix new file mode 100644 index 000000000000..d70f409f3430 --- /dev/null +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, ncurses, gettext +, withLibrary ? false, libtool +, unicodeSupport ? true +}: + +let optional = stdenv.lib.optional; + optStr = stdenv.lib.optionalString; + buildShared = !stdenv.isDarwin; +in + +assert withLibrary -> libtool != null; +assert unicodeSupport -> ncurses.unicode && ncurses != null; + +stdenv.mkDerivation rec { + name = "dialog-${version}"; + version = "1.2-20150225"; + + src = fetchurl { + url = "ftp://invisible-island.net/dialog/${name}.tgz"; + sha256 = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"; + }; + + buildInputs = [ ncurses ]; + + configureFlags = '' + --disable-rpath-hacks + ${optStr withLibrary "--with-libtool"} + --with-libtool-opts=${optStr buildShared "-shared"} + --with-ncurses${optStr unicodeSupport "w"} + ''; + + installTargets = "install${optStr withLibrary "-full"}"; + + meta = { + homepage = http://invisible-island.net/dialog/dialog.html; + description = "Display dialog boxes from shell"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [ stdenv.lib.maintainers.spacefrogg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 43959c8a43c8..07e67b558d2f 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; + maintainers = with maintainers; [ mornfall jgeerds ]; }; } diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix new file mode 100644 index 000000000000..09008c9d63d8 --- /dev/null +++ b/pkgs/development/tools/rucksack/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: + +stdenv.mkDerivation rec { + version = "3.1.0"; + name = "rucksack-${version}"; + + src = fetchFromGitHub { + owner = "andrewrk"; + repo = "rucksack"; + rev = "${version}"; + sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; + }; + + buildInputs = [ cmake liblaxjson freeimage ]; + + meta = with stdenv.lib; { + description = "Texture packer and resource bundler"; + platforms = platforms.unix; + homepage = https://github.com/andrewrk/rucksack; + license = licenses.mit; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 84bfcce541ac..16b6981fdb8c 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin ]; + maintainers = with maintainers; [ lovek323 globin jgeerds ]; platforms = platforms.linux; }; |