diff options
-rw-r--r-- | pkgs/applications/misc/tint2/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 7 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-reactor-elm.nix | 10 | ||||
-rwxr-xr-x | pkgs/development/compilers/elm/update-elm.rb | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 2 | ||||
-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 | 8 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 12 |
13 files changed, 55 insertions, 46 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 533d2d953665..163c4a60eba4 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "0da28ykid84i4pw0cvgaxw0wq2yn03i68g54dzmajgsl1wvkqb0z"; + sha256 = "0gfxbxslc8h95q7cq84a69yd7qdhyks978l3rmk48jhwwixdp0hr"; }; enableParallelBuilding = true; @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { meta = { homepage = https://gitlab.com/o9000/tint2; + description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = stdenv.lib.licenses.gpl2; - description = "Simple panel/taskbar unintrusive and light (memory / cpu / aestetic)"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } 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/desktops/gnome-3/3.18/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix index ac95070b5f59..ad05a219b253 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.18.0"; + name = "gitg-3.20.0"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.18/gitg-3.18.0.tar.xz; - sha256 = "fa4b7b9c492f13f5f1d864af1281ea377ac8c7619c856e05f533b18989edf421"; + url = mirror://gnome/sources/gitg/3.20/gitg-3.20.0.tar.xz; + sha256 = "1f09f61208349d003f228e51dc9709bd3426960f5585c0e38197bd02b51f3346"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix index 8bf571189961..3c8111c0b251 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgit2-glib-0.23.6"; + name = "libgit2-glib-0.24.0"; src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.23/libgit2-glib-0.23.6.tar.xz; - sha256 = "5c8d6b5cb81ab64b96cb0c52ef37463b6d8998a40ce77a08eda9db66fb781144"; + url = mirror://gnome/sources/libgit2-glib/0.24/libgit2-glib-0.24.0.tar.xz; + sha256 = "d616c268821c28ff8dc1a6419dbf8555fa48e31dc6509c10f5151be7690f4845"; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 87211ff6e6ed..360273a7eca9 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,5 +1,11 @@ { lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }: +# To update: +# 1) Update versions in ./update-elm.rb and run it. +# 2) Checkout elm-reactor and run `elm-package install -y` inside. +# 3) Run ./elm2nix.rb in elm-reactor's directory. +# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'. + let makeElmStuff = deps: let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps); @@ -61,9 +67,6 @@ let in elmPkgs // { inherit elmPkgs; elmVersion = elmRelease.version; - - # To unbreak elm-compiler - language-ecmascript = self.language-ecmascript_0_17_0_2; }; }; in hsPkgs.elmPkgs // { diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix index be37b2084f10..a84f9e48ba03 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix @@ -5,18 +5,18 @@ }; "evancz/elm-markdown" = { version = "3.0.0"; - sha256 = "1wlr8sgnyq6qgh5rcjy7imfmpqxrxgmmqcfx6p541fs70yiqya12"; + sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6"; }; "elm-lang/html" = { version = "1.0.0"; sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4"; }; - "elm-lang/core" = { - version = "4.0.0"; - sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw"; - }; "elm-lang/svg" = { version = "1.0.0"; sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx"; }; + "elm-lang/core" = { + version = "4.0.0"; + sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw"; + }; } diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb index 363655415a95..53dd0f88fa02 100755 --- a/pkgs/development/compilers/elm/update-elm.rb +++ b/pkgs/development/compilers/elm/update-elm.rb @@ -1,12 +1,12 @@ #!/usr/bin/env ruby # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs -$elm_version = "0.16.0" -$elm_packages = { "elm-compiler" => "0.16", - "elm-package" => "0.16", - "elm-make" => "0.16", - "elm-reactor" => "0.16", - "elm-repl" => "0.16" +$elm_version = "0.17" +$elm_packages = { "elm-compiler" => "0.17", + "elm-package" => "0.17", + "elm-make" => "0.17", + "elm-reactor" => "0.17", + "elm-repl" => "0.17" } for pkg, ver in $elm_packages diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index bb8a98d61b1f..dcbdee46da89 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz"; - sha256 = "0riyry246a6km4mw1q9iiw6p75ww2f8s81i34g151zwwdygk7qpf"; + sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh"; }; patches = [ 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 491a502611bc..c7e68726fec1 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 { }; @@ -16755,8 +16753,8 @@ in pulseaudioSupport = config.pulseaudio or stdenv.isLinux; }; wineStable = wine.override { wineRelease = "stable"; }; - wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; }); - wineStaging = lowPrio (wine.override { wineRelease = "staging"; }); + wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); + wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; 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 ]; }; |