diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v6.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lm-sensors/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 12 |
6 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e35674052c0b..4940acfe811b 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms }: +, mesa_noglu, xcbutilkeysyms, xdg_utils }: let - version = "4.0.1631"; + version = "4.0.1637"; rpath = stdenv.lib.makeLibraryPath [ + xdg_utils xorg.libXext xorg.libSM xorg.libICE @@ -42,7 +43,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1ip79zq7j7842sf254296wvvd236w7c764r8wgjdyxzqyvfjfd81"; + sha256 = "043qcylqzkzgmlhhxnhm5wy3gvh2cyhjmxnnrrz7y183ji6rw6nd"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index ea733b5b4618..926aaeb94ccc 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ]; - cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; + cmakeFlags = [ + "-DCMAKE_C_FLAGS_RELEASE:STRING=" + "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" + "-Ddisable32bit=ON" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index d331686e4370..7ce41e3fcdfe 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -4,9 +4,9 @@ }@args: import ./nodejs.nix (args // rec { - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz"; - sha256 = "1hsbmr3yc6zmyhz058zfxg77dzjhk94g1k0y65p6xq8ihq5yyrwy"; + sha256 = "1fcldsnkk6px5fms405j9z2yv6mmscin5x7sma8bdavqgn283zgw"; }; }) diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 388ec857b4ab..90e373c7ee08 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, bison, flex, which, perl }: -let version = "3.3.5"; in - stdenv.mkDerivation rec { name = "lm-sensors-${version}"; + version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash src = fetchurl { - url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"; - sha256 = "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx"; + urls = [ + "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" + "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" + ]; + sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; buildInputs = [ bison flex which perl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31834d0542f..f15c65b0ff59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6360,9 +6360,7 @@ in rolespec = callPackage ../development/tools/misc/rolespec { }; - rr = callPackage ../development/tools/analysis/rr { - stdenv = stdenv_32bit; - }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e1ca1665c672..7ffdebd64156 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4394,11 +4394,11 @@ let self = _self // overrides; _self = with self; { }; }; - EmailValid = buildPerlPackage { - name = "Email-Valid-1.192"; + EmailValid = buildPerlPackage rec { + name = "Email-Valid-1.200"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.192.tar.gz; - sha256 = "0vpqgbr5bj4bvrd7c2fh9hs1mz0m6nfybl2rdn5yb4h67bmxfkbp"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "0nnvbqz0ls451b5p0w6lgqm6kklm115db2p2xf89lw0r5pvmkw54"; }; propagatedBuildInputs = [MailTools NetDNS]; doCheck = false; @@ -10779,10 +10779,10 @@ let self = _self // overrides; _self = with self; { }; Spiffy = buildPerlPackage rec { - name = "Spiffy-0.31"; + name = "Spiffy-0.46"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "11pnsbyjzpp8y8ss7mrmz8nnbvv5vr7x71f13pwii9m8cam04blj"; + sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; buildInputs = [ ExtUtilsMakeMaker ]; }; |