diff options
Diffstat (limited to 'pkgs/development')
20 files changed, 156 insertions, 72 deletions
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index d25001697443..9c6bbba24d5d 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go # Disable the unix socket test sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable network timeout test + sed -i '/TestDialTimeout/areturn' src/net/dial_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/os/os_test.go # ParseInLocation fails the test @@ -84,7 +86,6 @@ stdenv.mkDerivation rec { ''; patches = [ - ./cacert-1.4.patch ./remove-tools-1.4.patch ]; diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 54c8cf219d5f..b5bfac850280 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { ''; patches = [ - ./cacert-1.5.patch ./remove-tools-1.5.patch ] # -ldflags=-s is required to compile on Darwin, see diff --git a/pkgs/development/compilers/go/cacert-1.4.patch b/pkgs/development/compilers/go/cacert-1.4.patch deleted file mode 100644 index 5346d3f39505..000000000000 --- a/pkgs/development/compilers/go/cacert-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -Go comes with hardcoded cacert. We add the usual in NixOS, -for easier NixOS life. - -diff -r 14854533dcc7 src/crypto/x509/root_unix.go ---- a/src/crypto/x509/root_unix.go Thu Dec 11 11:27:56 2014 +1100 -+++ b/src/crypto/x509/root_unix.go Tue Jan 06 00:41:31 2015 -0600 -@@ -17,6 +17,7 @@ - "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly - "/etc/pki/tls/cacert.pem", // OpenELEC - "/etc/certs/ca-certificates.crt", // Solaris 11.2+ -+ "/etc/ssl/certs/ca-bundle.crt", // NixOS - } - - // Possible directories with certificate files; stop after successfully diff --git a/pkgs/development/compilers/go/cacert-1.5.patch b/pkgs/development/compilers/go/cacert-1.5.patch deleted file mode 100644 index 32c322a104e6..000000000000 --- a/pkgs/development/compilers/go/cacert-1.5.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/src/crypto/x509/root_linux.go 2015-08-19 23:06:11.115133174 +0200 -+++ b/src/crypto/x509/root_linux.go 2015-08-19 23:07:04.238507161 +0200 -@@ -10,4 +10,5 @@ - "/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL - "/etc/ssl/ca-bundle.pem", // OpenSUSE - "/etc/pki/tls/cacert.pem", // OpenELEC -+ "/etc/ssl/certs/ca-bundle.crt", // NixOS - } diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 4d2039669598..66730cf855a3 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,11 +2,11 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2016-02-01"; + shortVersion = "2016-02-22"; isRelease = false; forceBundledLLVM = true; - srcRev = "094c5b0d6"; - srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz"; + srcRev = "d1f422ec280b881b8236c5d173103bc799e1590e"; + srcSha = "b0753045ae438c0869d37f429fe84451dcacc4b2ab9413d34bf29fde94fde462"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 93aa7811449a..df79b0ba70ee 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -1,23 +1,17 @@ # Note: The Haskell package set used for building UHC is # determined in the file top-level/haskell-packages.nix. -# We are using Stackage LTS to avoid constant breakage. -# Bump the Stackage LTS release to the last release if possible -# when a new UHC version is released. -{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }: +{ stdenv, coreutils, m4, libtool, clang, ghcWithPackages, fetchFromGitHub }: let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] ); in stdenv.mkDerivation rec { - # Important: - # The commits "Fixate/tag v..." are the released versions. - # Ignore the "bumped version to ...." commits, they do not - # correspond to releases. - version = "1.1.9.2"; + version = "1.1.9.3"; name = "uhc-${version}"; - src = fetchgit { - url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "292d259113b98c32154a5be336875751caa5edbc"; - sha256 = "1f462xq9ilkp9mnxm8hxhh1cdwps5d0hxysyibxryk32l7hh53cz"; + src = fetchFromGitHub { + owner = "UU-ComputerScience"; + repo = "uhc"; + rev = "v${version}"; + sha256 = "1r3mja77dqj2ncgp1d9nnc7dhp3gzrb1b1qvml3rq2321mn3m2ad"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -55,10 +49,5 @@ in stdenv.mkDerivation rec { # On Darwin, the GNU libtool is used, which does not # support the -static flag and thus breaks the build. platforms = ["x86_64-linux"]; - # Hydra currently doesn't build the Stackage LTS package set, - # and we don't want to build all our haskell dependencies - # from scratch just to build UHC. - hydraPlatforms = stdenv.lib.platforms.none; - }; } diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix new file mode 100644 index 000000000000..10ba217175c3 --- /dev/null +++ b/pkgs/development/libraries/ace/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libtool, perl +}: + +stdenv.mkDerivation rec { + name = "ace-${version}"; + version = "6.3.3"; + src = fetchurl { + url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2; + sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig libtool perl ]; + + patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ + --replace /usr/bin/perl "${perl}/bin/perl"''; + + preConfigure = '' + export INSTALL_PREFIX=$out + export ACE_ROOT=$(pwd) + export LD_LIBRARY_PATH="$ACE_ROOT/ace:$ACE_ROOT/lib" + echo '#include "ace/config-linux.h"' > ace/config.h + echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU'\ + > include/makeinclude/platform_macros.GNU + ''; + +meta = { + description = "ADAPTIVE Communication Environment"; + homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; + license = stdenv.lib.licenses.doc; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} + diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 74ca0a30892b..120b707af1e3 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "1vshy00bz9l5nzphkxpd35plcfcrz2wha5qiic7mx5yywafdxbd4"; + sha256 = "1l7rih17nzy75zf5h8mx5x38jbl9kxyxpr0ib6nn2615fw92xxgj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 013ebd9b9627..4db3913bdd2f 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libevdev, mtdev, udev +, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support , testsSupport ? false, check ? null, valgrind ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libevdev mtdev udev ] + buildInputs = [ libevdev mtdev udev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index c53c4792a6f6..d1da2bbf3aac 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-02-16"; + listVersion = "2016-02-25"; listSources = fetchFromGitHub { - sha256 = "0f27nynm4skn1mnv7kgyyl7cy599n6al7x3alvqn0nw9s25cfmkc"; - rev = "5bece2d9de4bb67274fd8e5928d6b449e7ff7674"; + sha256 = "0i9aa0bl3x50z0ba4n06pajpfncw8n780hhql13b1vppgfc6s4i7"; + rev = "84fd7e2a090f53ba4378f2a0e08cdaaa882ce3e5"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 110151227bdd..c10771c9109d 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, tcl, ... } @ args: +{ callPackage, fetchurl, tcl, stdenv, ... } @ args: callPackage ./generic.nix (args // rec { @@ -7,7 +7,7 @@ callPackage ./generic.nix (args // rec { sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; }; - patches = [ ./different-prefix-with-tcl.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; }) diff --git a/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch new file mode 100644 index 000000000000..528a75e1c91f --- /dev/null +++ b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch @@ -0,0 +1,29 @@ +From f90278dac42135acd55200b7d2153f44d72fec53 Mon Sep 17 00:00:00 2001 +From: Josef Knedl <josef.kemetmueller@aon.at> +Date: Wed, 24 Feb 2016 00:37:40 +0100 +Subject: [PATCH] Fix bad install_name for libtk8.6.dylib + +This follows: https://trac.macports.org/ticket/37395 +and https://trac.macports.org/changeset/100816 +Alternative would be to use Quartz build instead: +https://sourceforge.net/p/tktoolkit/bugs/3048/ +--- + unix/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unix/Makefile.in b/unix/Makefile.in +index f21fdbb..1b89256 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -283,7 +283,7 @@ CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@ + LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ + + # support for embedded libraries on Darwin / Mac OS X +-DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} ++DYLIB_INSTALL_DIR = $(libdir) + + # support for building the Aqua resource file + TK_RSRC_FILE = @TK_RSRC_FILE@ +-- +2.7.1 + diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 1c1426d969e8..5020ab3f2df5 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xerces-c-${version}"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; - sha256 = "0dl7jr26vlh5p3hps86xrwyafq6f21schc9q4zyxb48b3vvqa9x4"; + sha256 = "0jav1cbwcyq4miy790dd62yrypf7n0j98vdin9ny30f9nwyzgm7k"; }; meta = { diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix index d5a2dce66828..298177296a6c 100644 --- a/pkgs/development/tools/build-managers/cargo/head.nix +++ b/pkgs/development/tools/build-managers/cargo/head.nix @@ -5,7 +5,7 @@ with rustPlatform; with ((import ./common.nix) { inherit stdenv rustc; - version = "2016-01-10"; + version = "2016-02-25"; }); buildRustPackage rec { @@ -14,11 +14,11 @@ buildRustPackage rec { # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules src = fetchgit { url = "git://github.com/rust-lang/cargo"; - rev = "ca373452de159491354cf38279dbc19308c91e72"; - sha256 = "0fx88b3ndvzhfwq159xavs0z5c7jww231kd65cbzyih9g0ab9x65"; + rev = "e7212896dc1b182493a0252a2a126db8be067153"; + sha256 = "1qbic7gp7cpihi40kfv3kagja8zsngica8sq9jcm9czb6ba44dsa"; }; - depsSha256 = "0csagk2dnwg5z0vbxilz1kzcygd4llw7s81ka0xn1g05x30jqrnn"; + depsSha256 = "1xfpj1233p4314j6jmip0jjl5m3kj2wbac1ll3yvh7383zb83i1s"; buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index 1dc8f8def337..c8c35330e30e 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, makeWrapper, docker }: +{ stdenv, lib, bundlerEnv, makeWrapper, docker, git }: stdenv.mkDerivation rec { name = "cide-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin makeWrapper ${env}/bin/cide $out/bin/cide \ - --set PATH ${docker}/bin + --set PATH ${docker}/bin:${git}/bin ''; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index c2473ce754c3..f416345028f9 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.649"; + version = "1.650"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "10lvrdd6mfgkz0rdc41hg9fai44vzxy6qlayfvkjg29xgqm0n9ya"; + sha256 = "0iypkyjcsfj36j683a6yis4q0wil6m8l065fx8v2p7ba4j2ql00n"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 26b186c11eab..584095c904d5 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ simons ]; platforms = platforms.unix; + + # So that Exuberant ctags is preferred over emacs's ctags + priority = 1; }; } diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix new file mode 100644 index 000000000000..10a19d9e0963 --- /dev/null +++ b/pkgs/development/tools/nimble/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, nim }: + +let + srcs = { + nimble = fetchFromGitHub { + owner = "nim-lang"; + repo = "nimble"; + rev = "v0.7.2"; + sha256 = "0j9b519cv91xwn6k0alynakh7grbq4m6yy5bdwdrqmc7lag35r0i"; + }; + nim = fetchFromGitHub { + owner = "nim-lang"; + repo = "nim"; + rev = "v0.13.0"; + sha256 = "14grhkwdva4wmvihm1413ly86sf0qk96bd473pvsbgkp46cg8rii"; + }; + }; +in +stdenv.mkDerivation rec { + name = "nimble-${version}"; + version = "0.7.2"; + + src = srcs.nimble; + + buildInputs = [ nim ]; + + postUnpack = '' + mkdir -p $sourceRoot/vendor + ln -s ${srcs.nim} $sourceRoot/vendor/nim + ''; + buildPhase = '' + nim c src/nimble + ''; + installPhase = "installBin src/nimble"; + + meta = with stdenv.lib; { + description = "Package manager for the Nim programming language"; + homepage = https://github.com/nim-lang/nimble; + license = licenses.bsd2; + maintainers = with maintainers; [ kamilchm ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index f67b1f00a0f8..28c88d6c15a2 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -3,15 +3,15 @@ with rustPlatform; buildRustPackage rec { - name = "rustfmt-git-2015-12-23"; + name = "rustfmt-git-2016-02-15"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "c0b7de7c521dc65b2ad2b5a3c81fb56030f4af22"; - sha256 = "1axnp8w26c3dwlx7bby3qi6385n301rlk1ndh5yaz7vkbpn4w9km"; + rev = "65bc5c242de86f0651b34fd913ca338a880696e8"; + sha256 = "02rdim0y5zg1r2zkfy6kj53idlbdybf3ckardbjsvdna5idc1hpz"; }; - depsSha256 = "1s2as7qc7jbksc16gj5cxxm52zw8h4nfgka66dmwwjlv9679wj9f"; + depsSha256 = "1297vy5sgiq4xqdm27pa8f99qiwrl15hb2r1dydzgk7n4iqyir6c"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 7f925da376b8..cc904153baf8 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -1,21 +1,27 @@ -{ stdenv, lib, fetchurl, zlib }: +{ stdenv, lib, fetchurl, zlib, unzip }: with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.3.6"; + version = "4.3.13"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; sha1 = "0d7d2dc12766ac137e62a3e4dad3025b590f9782"; - } else { + } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; sha1 = "ee2c3002eae3b29df801a2ac1db77bb5f1c97bcc"; + } else { + url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; + sha1 = "ihr4ynnyi464pafgqyl5xkhfi13yi76j"; } ); + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase" + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase"); + patchPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -35,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; homepage = https://docs.saucelabs.com/reference/sauce-connect/; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } |