diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
commit | b1acaffe67afd838900fe22ad35cf0dda24eff63 (patch) | |
tree | facc558b711b96b0d302fe070963e696e17fa2f3 /pkgs/development | |
parent | 556a28908e01ca1d44962d8570b5e73be949eca6 (diff) | |
parent | b054851d18585daf67626d92b03fab418c590840 (diff) | |
download | nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.gz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.bz2 nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.lz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.xz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.zst nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development')
24 files changed, 152 insertions, 83 deletions
diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 30967ae2c158..32ae3ad0adc4 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 3b8916c67e90..d60ad0d11ec9 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.23"; + name = "orc-0.4.24"; src = fetchurl { url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn"; + sha256 = "16ykgdrgxr6pfpy931p979cs68klvwmk3ii1k0a00wr4nn9x931k"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 1ed31422d531..eda5157bb757 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.cs.uu.nl/wiki/UHC"; description = "Utrecht Haskell Compiler"; - maintainers = [ maintainers.phausmann ]; + maintainers = [ maintainers.phile314 ]; # UHC i686 support is broken, see # https://github.com/UU-ComputerScience/uhc/issues/52 diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 2ee0aeb20a17..09af50db971d 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq-flocq-${coq.coq-version}-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33979/flocq-${version}.tar.gz"; - sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml"; + url = https://gforge.inria.fr/frs/download.php/file/35430/flocq-2.5.1.tar.gz; + sha256 = "1a0gznvg32ckxgs3jzznc1368p8x2ny4vfwrnavb3h0ljcl1mlzy"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index b4048aa80037..b257c81e85f8 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { buildFlags = stdenv.lib.optionalString withDoc "doc"; preBuild = '' + patchShebangs etc/utils/ssrcoqdep cd mathcomp export COQBIN=${coq}/bin/ ''; diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index d7303ad8852c..891a4e2885a6 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { inherit patches; preBuild = '' + patchShebangs etc/utils/ssrcoqdep cd mathcomp/ssreflect export COQBIN=${coq}/bin/ ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3e5b205893c4..f826b0a4b079 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -926,6 +926,10 @@ self: super: { # https://github.com/sol/hpack/issues/53 hpack = dontCheck super.hpack; + # Tests require `docker` command in PATH + # Tests require running docker service :on localhost + docker = dontCheck super.docker; + # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fcb0354fd650..f31b62481d8b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35389,18 +35389,18 @@ self: { }) {}; "bindings-sane" = callPackage - ({ mkDerivation, base, bindings-DSL, saneBackends }: + ({ mkDerivation, base, bindings-DSL, sane-backends }: mkDerivation { pname = "bindings-sane"; version = "0.0.1"; sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b"; libraryHaskellDepends = [ base bindings-DSL ]; - libraryPkgconfigDepends = [ saneBackends ]; + libraryPkgconfigDepends = [ sane-backends ]; homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) saneBackends;}; + }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 40ac4dc6ea32..4869859960ae 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, mlton }: stdenv.mkDerivation rec { - name = "ceptre-2015-11-20"; + name = "ceptre-2016-01-01"; src = fetchgit { url = https://github.com/chrisamaphone/interactive-lp; - rev = "adb59d980f903e49a63b668618241d1b8beb28be"; - sha256 = "1pyl2imrvq2icr2rr4ys7djnizppbgqldgsv5525xsvzm78w3ac7"; + rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0"; + sha256 = "01f72q435kmf3mkgnn47hlnv6k3i5kjb26pbjrwvysc6am33jlcb"; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c1bd8a4b3a2a..62d61e6cb5d5 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,16 +3,16 @@ let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.14"; + name = "boolstuff-0.1.15"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6"; + sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; }; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Library for operations on boolean expression binary trees"; homepage = "${baseurl}/boolstuff.html"; license = "GPL"; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix new file mode 100644 index 000000000000..be60c18353ef --- /dev/null +++ b/pkgs/development/libraries/cmark/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "0.23.0"; + name = "cmark-${version}"; + + src = fetchurl { + url = "https://github.com/jgm/cmark/archive/${version}.tar.gz"; + sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596"; + }; + + buildInputs = [ cmake ]; + + meta = { + description = "CommonMark parsing and rendering library and program in C"; + homepage = https://github.com/jgm/cmark; + maintainers = [ stdenv.lib.maintainers.michelk ]; + }; +} diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 5c029adbf841..0d5bd8347870 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.12"; + name = "enet-1.3.13"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "02qxgsn20m306hg3pklfa35mjlc2fqcsd1x4pi3xnbfy1nyir1d5"; + sha256 = "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73"; }; meta = { diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 6f78c198f404..faf38ff4295d 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-2.20"; + name = "ffms-2.21"; src = fetchurl { - url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.20; + url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21; name = "${name}.tar.gz"; - sha256 = "183klnhl57zf0i8xlr7yvj89ih83pzd48c37qpr57hjn4wbq1n67"; + sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2"; }; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9723bf90eb03..6d43ea9a3091 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.13"; + version = "1.0.14"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd"; + sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 1412e1d59fad..b8ae3060a2ff 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu -, libxslt, pkgconfig }: +, libxslt, pkgconfig, python }: let @@ -13,23 +13,24 @@ let owner = "publicsuffix"; }; - libVersion = "0.11.0"; + libVersion = "0.12.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm"; + sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h + patchShebangs src/make_dafsa.py ''; preAutoreconf = '' @@ -41,7 +42,12 @@ in stdenv.mkDerivation { # The libpsl check phase requires the list's test scripts (tests/) as well cp -Rv "${listSources}"/* list ''; - configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; + configureFlags = [ + "--disable-builtin" + "--disable-static" + "--enable-gtk-doc" + "--enable-man" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch new file mode 100644 index 000000000000..830f0f30ff9b --- /dev/null +++ b/pkgs/development/libraries/libvirt/build-on-bsd.patch @@ -0,0 +1,58 @@ +diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c +--- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100 ++++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100 +@@ -6,6 +6,25 @@ + + #include "admin_protocol.h" + ++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t ++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 ++ */ ++#ifdef HAVE_XDR_U_INT64_T ++# define xdr_uint64_t xdr_u_int64_t ++#endif ++#ifndef IXDR_PUT_INT32 ++# define IXDR_PUT_INT32 IXDR_PUT_LONG ++#endif ++#ifndef IXDR_GET_INT32 ++# define IXDR_GET_INT32 IXDR_GET_LONG ++#endif ++#ifndef IXDR_PUT_U_INT32 ++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG ++#endif ++#ifndef IXDR_GET_U_INT32 ++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG ++#endif ++ + bool_t + xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp) + { +diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c +--- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100 ++++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100 +@@ -7,6 +7,25 @@ + #include "log_protocol.h" + #include "internal.h" + ++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t ++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 ++ */ ++#ifdef HAVE_XDR_U_INT64_T ++# define xdr_uint64_t xdr_u_int64_t ++#endif ++#ifndef IXDR_PUT_INT32 ++# define IXDR_PUT_INT32 IXDR_PUT_LONG ++#endif ++#ifndef IXDR_GET_INT32 ++# define IXDR_GET_INT32 IXDR_GET_LONG ++#endif ++#ifndef IXDR_PUT_U_INT32 ++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG ++#endif ++#ifndef IXDR_GET_U_INT32 ++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG ++#endif ++ + bool_t + xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp) + { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9e69bb8d56f6..980bccd39fb9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python +{ stdenv, fetchurl, fetchpatch +, pkgconfig, makeWrapper +, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, xen }: stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "1.2.19"; + version = "1.3.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0vnxmqf04frrj18lrvq7wc70wh179d382py14006879k0cgi8b18"; + sha256 = "ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64"; }; + patches = [ ./build-on-bsd.patch ]; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ - pkgconfig libxml2 gnutls perl python readline - gettext libtasn1 libgcrypt yajl makeWrapper + libxml2 gnutls perl python readline + gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ stdenv.lib.optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux udev libcap_ng diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix deleted file mode 100644 index f494710be638..000000000000 --- a/pkgs/development/libraries/policykit/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam -, intltool, gettext, libxslt, docbook_xsl }: - -stdenv.mkDerivation rec { - name = "policykit-0.9"; - - src = fetchurl { - url = http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz; - sha256 = "1dw05s4xqj67i3c13knzl04l8jap0kywzpav6fidpmqrximpq37l"; - }; - - buildInputs = - [ pkgconfig glib dbus_glib pam intltool gettext libxslt ]; - - propagatedBuildInputs = [ expat dbus.libs ]; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc"; - - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # keep `make install' happy - - # Read policy files from /etc/PolicyKit/policy instead of - # /usr/share/PolicyKit/policy. Using PACKAGE_DATA_DIR is hacky, but - # it works because it's only used in the C code for finding the - # policy directory. - NIX_CFLAGS_COMPILE = "-DPACKAGE_DATA_DIR=\"/etc\""; - - # Needed to build the manpages. - XML_CATALOG_FILES = "${docbook_xsl}/xml/xsl/docbook/catalog.xml"; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/PolicyKit; - description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 24e1d2c9b9c1..64d8570460cb 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/lib/qml/" + --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; configurePhase = "qmake PREFIX=$out"; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index a9cf08c4c3e9..8341f1a5bd90 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.13"; + version = "6.14.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "0k53kj0mx0shypagny134yrhkjgawzs5yixaxv87br52ablcqdvx"; + sha256 = "1dcg7libqs797v6x5vdvvc44rqfvwcjh125wczy9v87nl8imc2l3"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix index 67fe60f2c0eb..68af0c114c4c 100644 --- a/pkgs/development/tools/build-managers/gnustep/make/default.nix +++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl }: +let version = "2.6.7"; in stdenv.mkDerivation rec { name = "gnustep-make-${version}"; - version = "1.0"; src = fetchurl { - url = "http://ftpmain.gnustep.org/pub/gnustep/core/gnustep-make-2.6.6.tar.gz"; - sha256 = "07cqr8x17bia9w6clbmiv7ay6r9nplrjz2cyzinv4w7zfpc19vxw"; + url = "http://ftpmain.gnustep.org/pub/gnustep/core/${name}.tar.gz"; + sha256 = "1r2is23xdg4qirckb6bd4lynfwnnw5d9522wib3ndk1xgirmfaqi"; }; patchPhase = '' substituteInPlace GNUmakefile.in \ - --replace which type \ - --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \ - --replace 'makedir = $(DESTDIR)' 'makedir = ' \ - --replace 'mandir = $(DESTDIR)' 'mandir = ' + --replace which type substituteInPlace FilesystemLayouts/apple \ --replace /usr/local "" + + substituteInPlace configure \ + --replace /Library/GNUstep "$out" ''; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' mkdir -p $out/nix-support diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ed87428f98df..29fe621d6764 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, gcc, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }: let name = "ccache-${version}"; @@ -13,6 +13,15 @@ stdenv.mkDerivation { url = "mirror://samba/ccache/${name}.tar.xz"; }; + patches = [ + (fetchpatch { + sha256 = "1gwnxx1w2nx1szi0v5vgwcx9i23pxygkqqnrawhal68qgz5c34wh"; + name = "dont-update-manifest-in-readonly-modes.patch"; + # The primary git.samba.org doesn't seem to like our curl much... + url = "https://github.com/jrosdahl/ccache/commit/a7ab503f07e31ebeaaec34fbaa30e264308a299d.patch"; + }) + ]; + buildInputs = [ zlib ]; postPatch = '' diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 63b29fccd527..3b9eccb2ae65 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-6.5.1"; + name = "global-6.5.2"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "1y34nbazsw2p6r2jhv27z15qvm9mhy5xjchpz8pwps00shkm578f"; + sha256 = "07qx3dbjwkbd1dn42qs7zgj77rxdj2psfrf7bx7yx9al38f87z60"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 300cbbc0a0c1..8be574a8a4c6 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "${webpage}/downloads/${pname}-${version}.tar.gz"; + url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz"; sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv"; }; patchFlags = "-p0"; |