From 30facde98c9e1b7a5d27a11d7eb0c87cbc8cbd1a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 10 Jul 2015 13:42:39 +0300 Subject: [PATCH 01/30] zsnes: use Debian patches, fix segfault on saving state --- pkgs/misc/emulators/zsnes/default.nix | 31 +++++-- .../emulators/zsnes/zsnes-1.51-libpng15.patch | 12 --- pkgs/misc/emulators/zsnes/zsnes.patch | 80 ------------------- 3 files changed, 23 insertions(+), 100 deletions(-) delete mode 100644 pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch delete mode 100644 pkgs/misc/emulators/zsnes/zsnes.patch diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index bca81a4b6b3..23930ac624c 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa}: +{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa}: stdenv.mkDerivation { name = "zsnes-1.51"; @@ -8,12 +8,27 @@ stdenv.mkDerivation { sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8"; }; - # copied from arch linux, fixes gcc-4.8 compatibility - patches = [ ./zsnes.patch ]; - - postPatch = '' - patch -p0 < ${./zsnes-1.51-libpng15.patch} - ''; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0003-gcc-4.3-ftbfs.patch"; + sha256 = "1rlqjxnx21iz03414bamqrpysaxbvmfacfnk111233yxjd4vhq89"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0009-hat-events.patch"; + sha256 = "1az5vxjff22hqlsv0nmliax3ziwcr9kc75na805v9f66s8fmj5rf"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0010-Fix-build-with-libpng-1.5.patch"; + sha256 = "1vjfraxjw6f496j3w8r581m3lbn16s0nx3hskzj14hl9ycfskhnr"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0012-Fix-build-with-gcc-4.7.patch"; + sha256 = "1d8m0vxi8wf9z4wfjx2cc48p1wy2qadgvcm88dg1jncg334jwfrg"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/zsnes-linux-resume-freeze-fix.patch"; + sha256 = "0gvf6gsqxxfah1s80ya2l5yils2kv9xa6faajdyby7xipzkc6qc7"; + }) + ]; buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; @@ -22,7 +37,7 @@ stdenv.mkDerivation { sed -i "/^STRIP/d" configure ''; - configureFlags = "--enable-release"; + configureFlags = [ "--enable-release" ]; meta = { description = "A Super Nintendo Entertainment System Emulator"; diff --git a/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch b/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch deleted file mode 100644 index b32c3096754..00000000000 --- a/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch +++ /dev/null @@ -1,12 +0,0 @@ -Use existing png_set_IHDR() and stop accessing PNG structure members directly - ---- src/zip/zpng.c -+++ src/zip/zpng.c -@@ -129,7 +129,6 @@ - png_set_IHDR(png_ptr, info_ptr, width, height, 8, - PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; - - //Allocate an array of scanline pointers - row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep)); diff --git a/pkgs/misc/emulators/zsnes/zsnes.patch b/pkgs/misc/emulators/zsnes/zsnes.patch deleted file mode 100644 index d5d681ae67a..00000000000 --- a/pkgs/misc/emulators/zsnes/zsnes.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in ---- zsnes_1_51//src/Makefile.in 2007-01-24 21:54:12.000000000 +0100 -+++ zsnes_1_51_new//src/Makefile.in 2010-09-06 00:03:04.715810431 +0200 -@@ -95,7 +95,7 @@ - %.o: %.cpp - @CXX@ @CXXFLAGS@ -o $@ -c $< - %.o %.h: %.psr $(PSR) -- ./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $< -+ ./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $< - - default: main - all: main tools -@@ -133,7 +133,7 @@ - - include makefile.dep - makefile.dep: $(TOOL_D)/depbuild Makefile -- $(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep -+ $(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep - - Makefile: Makefile.in config.status - ./config.status -diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp ---- zsnes_1_51//src/parsegen.cpp 2007-10-31 05:30:26.000000000 +0100 -+++ zsnes_1_51_new//src/parsegen.cpp 2010-09-05 15:48:36.903333444 +0200 -@@ -19,6 +19,9 @@ - Config file handler creator by Nach (C) 2005-2007 - */ - -+#include -+#include -+ - #if !defined(__GNUC__) && !defined(_MSC_VER) - #error You are using an unsupported compiler - #endif -@@ -1822,7 +1825,7 @@ - } - } - --int main(size_t argc, const char *const *const argv) -+int main(int argc, const char *const *const argv) - { - const char *cheader_file = 0; - bool compile = false; -diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp ---- zsnes_1_51//src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100 -+++ zsnes_1_51_new//src/tools/depbuild.cpp 2010-09-05 15:48:36.903333444 +0200 -@@ -183,7 +183,7 @@ - } - } - --int main(size_t argc, const char *const *const argv) -+int main(int argc, const char *const *const argv) - { - if (argc < 5) - { -diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h ---- zsnes_1_51//src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100 -+++ zsnes_1_51_new//src/tools/strutil.h 2010-09-05 15:48:36.903333444 +0200 -@@ -15,6 +15,9 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include -+#include -+ - /* - This is part of a toolkit used to assist in ZSNES development - */ -diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp ---- zsnes_1_51/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100 -+++ zsnes_1_51-fix/src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200 -@@ -26,6 +26,8 @@ - #include - using namespace std; - -+#include -+ - #include "fileutil.h" - #include "strutil.h" - From a9a41bc506fe42abe27bef1748566032d54d6f3c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Aug 2015 16:18:51 +0200 Subject: [PATCH 02/30] kubernetes: fix build --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f09918d0a5..c899b875400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1521,7 +1521,7 @@ let lp_solve = callPackage ../applications/science/math/lp_solve { }; lprof = callPackage ../tools/graphics/lprof { }; - + fatresize = callPackage ../tools/filesystems/fatresize {}; fdk_aac = callPackage ../development/libraries/fdk-aac { }; @@ -11903,7 +11903,9 @@ let ksuperkey = callPackage ../tools/X11/ksuperkey { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { + go = go_1_4; + }; lame = callPackage ../development/libraries/lame { }; From d1c30dc5aa3daa47186ed584611d85d25038f016 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Aug 2015 20:34:35 +0200 Subject: [PATCH 03/30] Give the chromium test more memory Hopefully fixes random failures like http://hydra.nixos.org/build/24861987/nixlog/446 --- nixos/tests/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 26e179c3944..2ce47c23775 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -15,7 +15,7 @@ import ./make-test.nix ( enableOCR = true; machine.imports = [ ./common/x11.nix ]; - machine.virtualisation.memorySize = 1024; + machine.virtualisation.memorySize = 4096; startupHTML = pkgs.writeText "chromium-startup.html" '' From c51f0dbd522b9c7ed84c13743734b57481ca23dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 20 Aug 2015 21:49:15 +0200 Subject: [PATCH 04/30] haskell: disable haddock on GHC <7.8 on darwin Fixes NixOS/nixpkgs#812 --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4f142cd932d..c6b969d3088 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -27,7 +27,7 @@ , jailbreak ? false , license , maintainers ? [] -, doHaddock ? true +, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] , platforms ? ghc.meta.platforms From 58c02a0cbef10cd1d21dbbea3df59ca9c07161c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2015 22:02:48 +0200 Subject: [PATCH 05/30] emacs-haskell-mode: update to latest Git version Hopefully, this update fixes the TAB-completion issues in ghci. --- pkgs/applications/editors/emacs-modes/haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 2f8848ca0dd..022827952b6 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: let - version = "13.14-130-ga03bd9b"; # git describe --tags + version = "13.14-153-g318ccab"; # git describe --tags in stdenv.mkDerivation { name = "haskell-mode-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "haskell"; repo = "haskell-mode"; rev = "v${version}"; - sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma"; + sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4"; }; buildInputs = [ emacs texinfo ]; From 2e917466615563827ad7a87fc6e334c10d65f68e Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 20 Aug 2015 22:05:45 +0200 Subject: [PATCH 06/30] gnome-calendar: Depend on gnome3.defaultIconTheme instead of hicolor_icon_theme --- pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix index 38c4b930b03..805c2482e9b 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib, hicolor_icon_theme }: +, glib }: stdenv.mkDerivation rec { name = "gnome-calendar-${gnome3.version}.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib hicolor_icon_theme + sqlite libxml2 libsoup glib gnome3.defaultIconTheme ]; meta = with stdenv.lib; { From ab6c8643d451b04884e938cd7ed2186663d32a96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2015 22:56:41 +0200 Subject: [PATCH 07/30] nix-gc.nix: prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed" Works around https://github.com/NixOS/nix/issues/609. --- nixos/modules/services/misc/nix-gc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 6a7a7f4cee7..98129935257 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -52,7 +52,7 @@ in systemd.services.nix-gc = { description = "Nix Garbage Collector"; - script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}"; + script = "exec ${config.nix.package}/bin/nix-store --gc ${cfg.options}"; startAt = optionalString cfg.automatic cfg.dates; }; From 7d7bbf125ecbbc229b7882dc1d5c06c4013df076 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 21 Aug 2015 00:51:27 +0300 Subject: [PATCH 08/30] teamviewer 10: new sha256 --- pkgs/applications/networking/remote/teamviewer/10.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix index 4b919d36fb6..7e97a31c3a9 100644 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "teamviewer-10.0.37742"; src = fetchurl { url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb"; - sha256 = config.teamviewer10.sha256 or "0n2lzphvsqnlvm7pd7hjlislqj9rr57lai8jyw4wpqcy9j2xwxd2"; + sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk"; }; buildInputs = [ makeWrapper patchelf ]; From b3fb6dc5aaec8af0a7a223738b812c863d34edcf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 13:12:09 -0700 Subject: [PATCH 09/30] htop: Update to fix issues with ncurses 6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` william@exodus ~> htop htop 1.0.3 aborting. Please report bug at http://hisham.hm/htop Please include in your report the following backtrace: htop(CRT_handleSIGSEGV+0x32)[0x4177b2] /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(+0x33460)[0x7f9fb9157460] /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(+0x33f91)[0x7f9fb97faf91] /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(doupdate_sp+0xc1d)[0x7f9fb97fe0ad] /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wrefresh+0x39)[0x7f9fb97ecf09] /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(_nc_wgetch+0x12a)[0x7f9fb97e583a] /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wgetch+0x25)[0x7f9fb97e6555] htop(ScreenManager_run+0x15a)[0x40ee8a] htop(main+0x487)[0x4069b7] /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(__libc_start_main+0xf5)[0x7f9fb9144995] htop(_start+0x29)[0x406af9] Additionally, in order to make the above backtrace useful, please also run the following command to generate a disassembly of your binary: objdump -d `which htop` > ~/htop.objdump and then attach the file ~/htop.objdump to your bug report. Thank you for helping to improve htop! fish: “htop” terminated by signal SIGABRT (Abort) ``` --- pkgs/os-specific/linux/htop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index 6c83783bc6a..873795c9752 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,11 +1,11 @@ { fetchFromGitHub, stdenv, autoreconfHook, ncurses }: stdenv.mkDerivation rec { - name = "htop-1.0.3-186-gf2c053a"; + name = "htop-1.0.3-584-8f07868f"; src = fetchFromGitHub { - sha256 = "017aihyg0bjli1hlvcqgqxpwzy2ayvwv6byhqd97n9sqfkmi9i0p"; - rev = "f2c053a88497f3ad5ae786c16ecf1275212c13be"; + sha256 = "0s7l9v7n7hw32hznvdq2sykyxgb30hmzycwcjxw8f0c2mww61xcd"; + rev = "8f07868fefeb844a852fab704c0763b0e9a9bf01"; repo = "htop"; owner = "hishamhm"; }; From 8aece3d1eef59d42538ced3fd72cb50553f421c0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 15:32:29 -0700 Subject: [PATCH 10/30] nspr: 4.10.8 -> 4.10.9 --- pkgs/development/libraries/nspr/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 1494092fc47..03558817fce 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,23 +1,27 @@ { stdenv, fetchurl }: -let version = "4.10.8"; in +let version = "4.10.9"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15"; + sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881"; }; - preConfigure = "cd nspr"; + preConfigure = '' + cd nspr + ''; - configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}"; + configureFlags = [ + "--enable-optimize" + "--disable-debug" + ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; - postInstall = - '' - find $out -name "*.a" | xargs rm - ''; + postInstall = '' + find $out -name "*.a" -delete + ''; enableParallelBuilding = true; From b5d599af8c95393d8e73d9d7c705101e525f0a3d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 15:32:40 -0700 Subject: [PATCH 11/30] nss: 3.19.3 -> 3.20 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5c73f5db26f..0a25e24fc54 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.19.3"; + version = "3.20"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_3_RTM/src/${name}.tar.gz"; - sha256 = "c56bdad20736a8227afb3c97b25d6d2eb3982e979ddc9be1d66cb7199ae8ca8f"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz"; + sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c"; }; buildInputs = [ nspr perl zlib sqlite ]; From 8255ac0d68f937b46b3b86aa90c390e68ce7fe75 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 15:57:25 -0700 Subject: [PATCH 12/30] vim: 7.4.826 -> 7.4.827 Fix the version string to match the new versioning scheme after the github migration. --- pkgs/applications/editors/vim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 54b3127898e..3bdd44529dd 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.826"; + version = "7.4.827"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; - rev = "v${stdenv.lib.replaceChars ["."] ["-"] version}"; - sha256 = "147lkcjdd0jbc7y2hflfzwnyjhdgi1971pmkizihybxmmj1a4g8y"; + rev = "v${version}"; + sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs"; }; # this makes maintainers very sad From 901dd019de477bbf759d178ad3001b4709d3250b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Aug 2015 00:52:21 +0200 Subject: [PATCH 13/30] prompt_toolkit: update 0.45 -> 0.46 --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f989d05fe74..e3ca5e5d4b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9421,6 +9421,10 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9751,10 +9755,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.45"; + version = "0.46"; src = pkgs.fetchurl { - sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; From 5adba5cf6fb66b40c20f91bb5b0a30cc9d71af3c Mon Sep 17 00:00:00 2001 From: Tanner Doshier Date: Thu, 20 Aug 2015 21:43:54 -0500 Subject: [PATCH 14/30] elm: fix patch hashes --- pkgs/development/compilers/elm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 4a056e61de9..51e19614ddd 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -45,14 +45,14 @@ let buildTools = drv.buildTools or [] ++ [ self.elm-make ]; patches = [ (fetchpatch { url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch"; - sha256 = "1msq7rvjid27m11lwcz9r1vyczlk7bfknyywqln300c8bgqyl45j"; + sha256 = "0cjcv5rvrq7v1j8n8w87ljgza522cm32cy4n4rq5ysjq3qnaxwcq"; }) ]; preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix); }); elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch { url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch"; - sha256 = "0yq5vawmp9qq5w6qfy12r32ahpvccra749pnhg0zdykrj369m8a8"; + sha256 = "1l66i4qssp0mcq8yypcn1ps3n2bskyfiqf0qr8gan6wz3znafpy9"; }); elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: { From a2b718fc80c58caf525f1a867ed127f1cf7c0e1b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 21 Aug 2015 08:58:36 +0300 Subject: [PATCH 15/30] Switch to the git version for now to get Gecko 40 compatibility --- pkgs/development/tools/slimerjs/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index a35816e2511..5fd7be063f5 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,13 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.6"; + version="0.9.6.2015.08.20"; name="${baseName}-${version}"; hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; - url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; - sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; + #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; + url = "https://github.com/laurentj/slimerjs.git"; + rev = "87e0ff1d666897754a914131d8f1744195ee4d7a"; + sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc"; }; buildInputs = [ unzip zip @@ -16,12 +18,12 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - #src = fetchgit { - # inherit (s) url sha256 rev; + #src = fetchurl { + # inherit (s) url sha256; #}; + src = fetchgit { + inherit (s) url sha256 rev; + }; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */ From 8871d1672352ce77a11736fad0fd27b9fbfea386 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 17 Aug 2015 12:40:02 +0200 Subject: [PATCH 16/30] ceptre: init at 2015-08-15 A linear logic programming language for modeling generative interactive systems --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c899b875400..4829d7be174 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4862,6 +4862,8 @@ let chibi = callPackage ../development/interpreters/chibi { }; + ceptre = callPackage ../development/interpreters/ceptre { }; + clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good From 218948587bca55477c0a2d37ace843482c7344e2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 21 Aug 2015 08:44:39 +0200 Subject: [PATCH 17/30] osmo: update from 0.2.12 to 0.2.14 --- pkgs/applications/office/osmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 81f5773a453..6da3bf6df83 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "osmo-${version}"; - version = "0.2.12"; + version = "0.2.14"; src = fetchurl { url = "mirror://sourceforge/osmo-pim/${name}.tar.gz"; - sha256 = "0y3bpsi18v3dxb3vsy0dr7cgf692g4p62l84hj9l2bpr2hbabgck"; + sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05"; }; buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive From 53ea7bcbdafd5af392f9305bad7401c32975809b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 21 Aug 2015 08:45:48 +0200 Subject: [PATCH 18/30] pdf2djvu: update from 0.8 to 0.8.1 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 942f40a0cf0..fbafbaad27c 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.8"; + version = "0.8.1"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz"; - sha256 = "0xdxx5c7hvhzfmi37cf9p17smm2y55wc8z1vsncqqvf1sxqpjmbn"; + sha256 = "1sgqz7y4zn6xg0wicmyy83hbwbhv076vd81kigpcz3rjqk11lsvi"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; From d73829576d775caa2e228fa4f12a487e77082eef Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 21 Aug 2015 08:49:17 +0200 Subject: [PATCH 19/30] rrdtool: update from 1.5.3 to 1.5.4 --- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 1688c2d329f..6e2ba20875d 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }: stdenv.mkDerivation rec { - name = "rrdtool-1.5.3"; + name = "rrdtool-1.5.4"; src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr"; + sha256 = "169zbidc5h88w064qmj6x5rzczkrrfrcgwc3f2i2h8f0hzda7viz"; }; buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]; From c757628f0a89786c421a286979609208d24faa35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Aug 2015 13:20:05 +0200 Subject: [PATCH 20/30] mcelog: 122 -> 123 Also flesh out descriptions and restrict to Linux platforms. --- pkgs/os-specific/linux/mcelog/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f2b03e1be92..aa1b197e83f 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "122"; in +let version = "123"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "0g3bp6wfgpjh345n988r2bxzdkbac8mls9v7fsylmfxf78y7n92d"; + sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; @@ -22,9 +22,18 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; - description = "Log machine checks (memory, IO, and CPU hardware errors)"; + description = "Log x86 machine checks: memory, IO, and CPU hardware errors"; + longDescription = '' + The mcelog daemon accounts memory and some other errors in various ways + on modern x86 Linux systems. The daemon can be queried and/or execute + triggers when configurable error thresholds are exceeded. This is used to + implement a range of automatic predictive failure analysis algorithms, + including bad page offlining and automatic cache error handling. All + errors are logged to /var/log/mcelog or syslog or the journal. + ''; homepage = http://mcelog.org/; license = licenses.gpl2; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } From 5dd593dea5a6a7ee6453e7be9f5519c98daee69c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Aug 2015 13:23:59 +0200 Subject: [PATCH 21/30] prompt_toolkit: 0.46 -> 0.47 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3ca5e5d4b9..45dc9ede883 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9755,10 +9755,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.46"; + version = "0.47"; src = pkgs.fetchurl { - sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; + sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; From ff162a70c652de2d4476f68808cc08b13f36b864 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 21 Aug 2015 13:23:28 +0200 Subject: [PATCH 22/30] chicken: 4.9.0.1 -> 4.10.0 --- pkgs/development/compilers/chicken/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 3b9d4d39118..82cf23e8be4 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let - version = "4.9.0.1"; + version = "4.10.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -16,8 +16,8 @@ stdenv.mkDerivation { binaryVersion = 7; src = fetchurl { - url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; - sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"; + url = "http://code.call-cc.org/releases/4.10.0/chicken-${version}.tar.gz"; + sha256 = "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf"; }; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; From 93462307438b910e612d8a318186a0878ecf1bff Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 21 Aug 2015 13:23:44 +0200 Subject: [PATCH 23/30] weechat: 1.2 -> 1.3 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 060be8ab1eb..bd7d37ea342 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -4,12 +4,12 @@ , extraBuildInputs ? [] }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw"; + sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh"; }; buildInputs = From 726a3804570583dd8deaa19e5264d62b88314e48 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 21 Aug 2015 15:42:49 +0200 Subject: [PATCH 24/30] cura(engine): 15.02.1 -> 15.04. --- pkgs/applications/misc/cura/default.nix | 4 ++-- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a13004ecd02..a711cc1db87 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "15.02.1"; + version = "15.04"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6"; + sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index bbd94406635..6afd11a555c 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "15.02.1"; + version = "15.04"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53"; + sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym"; }; installPhase = '' From 2fc59dc2dbc7c9bb1b7513d6347974767a7b30d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Aug 2015 16:48:37 +0200 Subject: [PATCH 25/30] Revert "ceptre: init at 2015-08-15" This reverts commit 8871d1672352ce77a11736fad0fd27b9fbfea386. Missing file breaks evaluation. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4829d7be174..c899b875400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4862,8 +4862,6 @@ let chibi = callPackage ../development/interpreters/chibi { }; - ceptre = callPackage ../development/interpreters/ceptre { }; - clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good From 6a54ca7990498033301a3b8bd4600fadfacef7ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Aug 2015 17:03:23 +0200 Subject: [PATCH 26/30] dhcpcd: Update to 6.9.2 Upstream recommends this as an important upgrade to 6.9.1 because it fixes a race that could cause an empty resolv.conf to be created. --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d4ec7f7f0ad..d9310e2372e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.9.1"; + name = "dhcpcd-6.9.2"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0vq6gjgn2sjq2rwvd23gvf55k2v9l6970z8fmii0p2g23w77afy0"; + sha256 = "0w4aqpn6wczvrffc51lq87acvqwqdskk7948z3sz9laslci29y79"; }; buildInputs = [ pkgconfig udev ]; From 3ebe6fa802f19b05eea7923287d1cd7ee6c2bcc9 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 21 Aug 2015 20:29:09 +0300 Subject: [PATCH 27/30] open-vm-tools: temp fix for https://github.com/NixOS/nixpkgs/issues/9262 --- .../virtualization/open-vm-tools/default.nix | 2 + .../open-vm-tools/recognize_nixos.patch | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 4f32ec55a0e..cfe4ad3a8e1 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -26,6 +26,8 @@ in stdenv.mkDerivation { sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am ''; + patches = [ ./recognize_nixos.patch ]; + preConfigure = "autoreconf"; configureFlags = "--without-kernel-modules --without-xmlsecurity"; diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch new file mode 100644 index 00000000000..b69731179c1 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch @@ -0,0 +1,46 @@ +From d1b753212ee5151db941de0e2b826dcf9722f2f3 Mon Sep 17 00:00:00 2001 +From: Arseniy Seroka +Date: Fri, 21 Aug 2015 20:20:16 +0300 +Subject: [PATCH] [PATCH]: recognize NixOS Linux + +--- + open-vm-tools/lib/include/guest_os.h | 1 + + open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h +index 4fc9ea7..f5104fd 100644 +--- a/open-vm-tools/lib/include/guest_os.h ++++ b/open-vm-tools/lib/include/guest_os.h +@@ -215,6 +215,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); + #define STR_OS_MANDRAKE_FULL "Mandrake Linux" + #define STR_OS_MANDRIVA "mandriva" + #define STR_OS_MKLINUX "MkLinux" ++#define STR_OS_NIXOS "NixOS" + #define STR_OS_NOVELL "nld9" + #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" + #define STR_OS_ORACLE "oraclelinux" +diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c +index 6c13fe3..5b82983 100644 +--- a/open-vm-tools/lib/misc/hostinfoPosix.c ++++ b/open-vm-tools/lib/misc/hostinfoPosix.c +@@ -184,6 +184,7 @@ static const DistroInfo distroArray[] = { + {"Mandrake", "/etc/mandrake-release"}, + {"Mandriva", "/etc/mandriva-release"}, + {"Mandrake", "/etc/mandrakelinux-release"}, ++ {"NixOS", "/etc/os-release"}, + {"TurboLinux", "/etc/turbolinux-release"}, + {"Fedora Core", "/etc/fedora-release"}, + {"Gentoo", "/etc/gentoo-release"}, +@@ -613,6 +614,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name + Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize); + } else if (strstr(distroLower, "mklinux")) { + Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize); ++ } else if (strstr(distroLower, "nixos")) { ++ Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); + } else if (strstr(distroLower, "pld")) { + Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize); + } else if (strstr(distroLower, "slackware")) { +-- +2.5.0 + From 8712a2d8d11ccdafdde22bab8bccab03bfa06aec Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 21 Aug 2015 11:05:11 -0700 Subject: [PATCH 28/30] chromium: Updates --- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 8fd959e8c60..17df6492efa 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "46.0.2478.0"; - sha256 = "15h6gq9vzycamdx01cyz3dv8raprdrd4k97c8pigxbli3n18b41k"; - sha256bin32 = "0q10zacsl82nadfvp59ppidai74pc53000qsh4ixdji3xqcbisk4"; - sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng"; + version = "46.0.2486.0"; + sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah"; + sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9"; + sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy"; }; beta = { - version = "45.0.2454.37"; - sha256 = "1vbkyxvr8k3hmdysh063rl5d2bmag7nq3wxysivsdmi23b1dz6l6"; - sha256bin32 = "0b4nxijijwk0n1as9l4wf0gxmwz4qs6ag0gi11cag3yp5z5p9cgi"; - sha256bin64 = "0l0hs2vh1bhh6bqq7453fc7hpi0lamdlzqpdhgcz64k94bi0d748"; + version = "45.0.2454.46"; + sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37"; + sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w"; + sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc"; }; stable = { - version = "44.0.2403.155"; - sha256 = "0g4z46vbqwnsbmhlbyqm3lm5dz6sxjz0m51cnxhxs850231738pb"; - sha256bin32 = "11f8224b8p14py5abi78m74l5hsrhdhipcf2dw7bgqddhykzr4h6"; - sha256bin64 = "1mhbga7s43qg13rv6ss0xsn8hkf9fdmgd293ymj564ih39l9bnbm"; + version = "44.0.2403.157"; + sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971"; + sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq"; + sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3"; }; } From 46203a790da3d4953f7830c281441a84aa4916ee Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Aug 2015 20:53:53 +0200 Subject: [PATCH 29/30] kubernetes service: fix option conversion --- nixos/modules/services/cluster/kubernetes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 0abef29dd19..99915438f92 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -412,7 +412,7 @@ in { --service-cluster-ip-range=${cfg.apiserver.portalNet} \ ${optionalString (cfg.apiserver.runtimeConfig!="") "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ - --admission_control=${cfg.apiserver.admissionControl} \ + --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.apiserver.extraOpts} From 123946531456c5e562da59add0abc1ccb3460240 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 21 Aug 2015 02:26:10 -0500 Subject: [PATCH 30/30] nixpkgs: lean 20150328 -> 20150821 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/lean/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 2d93fdd6196..5a4e2cbbc05 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,14 @@ , gperftools, ninja }: stdenv.mkDerivation rec { - name = "lean-20150328"; + name = "lean-${version}"; + version = "20150821"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "1b15036dba469020d37f7d6b77b88974d8a36cb1"; - sha256 = "0w38g83gp7d3ybfiz9jpl2jz3ljad70bxmar0dnnv45wx42clg96"; + rev = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b"; + sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka"; }; buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];