From 421ac6983090d2f153e1e6e480f050cbbadbe15c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 14:40:31 +0100 Subject: [PATCH 01/78] libcommuni: fix darwin build /cc ZHF #36454 --- pkgs/development/libraries/libcommuni/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 6192266bd4a..0788236b601 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -19,12 +19,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; dontUseQmakeConfigure = true; - configureFlags = "-config release"; + configureFlags = [ "-config" "release" ]; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; - doCheck = true; + # The tests fail on darwin because of install_name if they run + # before the frameworks are installed. + doInstallCheck = true; + installCheckTarget = "check"; # Hack to avoid TMPDIR in RPATHs. preFixup = "rm -rf lib"; From 99d56c542e4914b3f6dd06deeb14e0495a2abd31 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 14:46:02 +0100 Subject: [PATCH 02/78] communi: fix darwin build /cc ZHF #36454 --- pkgs/applications/networking/irc/communi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 25e5a61f272..917de745d27 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { " ''; - postInstall = '' + postInstall = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; From 2b7fe3bf5ae5de32318bf79839d4b57175e51c6e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 19 May 2018 17:21:40 -0300 Subject: [PATCH 03/78] xorg: replace edits to generated script - update versions in .list files to match - move cf-files postInstall to overrides.nix --- pkgs/servers/x11/xorg/default.nix | 3 --- pkgs/servers/x11/xorg/old.list | 2 +- pkgs/servers/x11/xorg/overrides.nix | 6 ++++++ pkgs/servers/x11/xorg/tarballs-7.7.list | 8 ++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07faa8d3cc7..f5d7f54eb5c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2570,9 +2570,6 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" - ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 801f6e0b797..fd6eae91639 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 -mirror://xorg/individual/app/xinit-1.3.4.tar.bz2 +mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0da75f941f0..01e990b5574 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -650,6 +650,12 @@ in ]; }; + xorgcffiles = attrs: attrs // { + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" + ''; + }; + xwd = attrs: attrs // { buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index dd48748dceb..70f3a35505e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 -mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 +mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 @@ -101,7 +101,7 @@ mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 -mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2 +mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 @@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -164,7 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 From 456d0e280e0cbc517a89a396420fb024f48ed425 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 19 May 2018 17:40:04 -0300 Subject: [PATCH 04/78] xorg: fix missing gbm dependency for amdgpu driver --- pkgs/servers/x11/xorg/default.nix | 4 ++-- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f5d7f54eb5c..adb5da606df 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1839,9 +1839,9 @@ let sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoark = (mkDerivation "xf86videoark" { name = "xf86-video-ark-0.7.5"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9f21d3c2024..dfde730fbea 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; +$pcMap{"gbm"} = "mesa_noglu"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$DRI3PROTO"} = "dri3proto"; From e166aee826f7f58b53a583837e2399811ff61eaa Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 15 May 2018 20:55:59 +0200 Subject: [PATCH 05/78] nixos/gitea: Allow customizing derivation to use --- nixos/modules/services/misc/gitea.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 63e976ae566..9f7e1ea8c49 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.gitea; + gitea = cfg.package; pg = config.services.postgresql; usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' @@ -57,6 +58,13 @@ in description = "Enable Gitea Service."; }; + package = mkOption { + default = pkgs.gitea; + type = types.package; + defaultText = "pkgs.gitea"; + description = "gitea derivation to use"; + }; + useWizard = mkOption { default = false; type = types.bool; @@ -203,7 +211,7 @@ in staticRootPath = mkOption { type = types.str; - default = "${pkgs.gitea.data}"; + default = "${gitea.data}"; example = "/var/lib/gitea/data"; description = "Upper level of template and static files path."; }; @@ -223,7 +231,7 @@ in description = "gitea"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gitea.bin ]; + path = [ gitea.bin ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -253,7 +261,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -261,7 +269,7 @@ in if [ ! -d ${cfg.stateDir}/conf/locale ] then mkdir -p ${cfg.stateDir}/conf - cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale + cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale fi '' + optionalString (usePostgresql && cfg.database.createDatabase) '' if ! test -e "${cfg.stateDir}/db-created"; then @@ -288,7 +296,7 @@ in User = cfg.user; WorkingDirectory = cfg.stateDir; PermissionsStartOnly = true; - ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; + ExecStart = "${gitea.bin}/bin/gitea web"; Restart = "always"; }; From ce42182d13db1721d49709779ea6b3f8a93280fd Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 15 May 2018 21:17:51 +0200 Subject: [PATCH 06/78] nixos/gitea: Add options to enable a timer with optional interval This will run gitea dump and create a backup file for gitea every so often as the interval is defined to do. --- nixos/modules/services/misc/gitea.nix | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 9f7e1ea8c49..2d0f66de037 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -164,6 +164,30 @@ in }; }; + dump = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable a timer that runs gitea dump to generate backup-files of the + current gitea database and repositories. + ''; + }; + + interval = mkOption { + type = types.str; + default = "04:31"; + example = "hourly"; + description = '' + Run a gitea dump at this interval. Runs by default at 04:31 every day. + + The format is described in + systemd.time + 7. + ''; + }; + }; + appName = mkOption { type = types.str; default = "gitea: Gitea Service"; @@ -326,5 +350,32 @@ in name = "gitea-database-password"; text = cfg.database.password; }))); + + systemd.services.gitea-dump = { + description = "gitea dump"; + after = [ "gitea.service" ]; + wantedBy = [ "default.target" ]; + path = [ gitea.bin ]; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + GITEA_WORK_DIR = cfg.stateDir; + }; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + ExecStart = "${gitea.bin}/bin/gitea dump"; + WorkingDirectory = cfg.stateDir; + }; + }; + + systemd.timers.gitea-dump = { + description = "Update timer for gitea-dump"; + partOf = [ "gitea-dump.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.dump.interval; + }; }; } From 430bfa5ae58fb462ca9142e622375baf4940ca5c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 20 May 2018 14:30:24 +0300 Subject: [PATCH 07/78] kmscube: Fix src Someone sedded a bit too eagerly. --- pkgs/os-specific/linux/kmscube/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 27ffaca61e7..99ef7d4a550 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; src = fetchgit { - url = git://anongit.freedesktop.org/libGLU_combined/kmscube; + url = git://anongit.freedesktop.org/mesa/kmscube; rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; From 5188ef371f3d5d96e8775cd39fdf18714f58f774 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 19 Apr 2018 19:10:51 +0000 Subject: [PATCH 08/78] libnatpmp: init at 20150609 --- .../libraries/libnatpmp/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libnatpmp/default.nix diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix new file mode 100644 index 00000000000..17626bb23e1 --- /dev/null +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libnatpmp-${version}"; + version = "20150609"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; + }; + + makeFlags = [ "INSTALLPREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://miniupnp.free.fr/libnatpmp.html; + description = "NAT-PMP client"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1634bf343ca..f2b880ad696 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10119,6 +10119,8 @@ with pkgs; mysql = mysql57; }; + libnatpmp = callPackage ../development/libraries/libnatpmp { }; + libnatspec = callPackage ../development/libraries/libnatspec { }; libndp = callPackage ../development/libraries/libndp { }; From 75e66b558102492631ceef1600c836a91b27e64a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 19 Apr 2018 19:11:16 +0000 Subject: [PATCH 09/78] swift-im: init at 4.0.2 (cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b) --- .../instant-messengers/swift-im/default.nix | 48 +++++++++++++++++ .../instant-messengers/swift-im/scons.patch | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 105 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/scons.patch diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix new file mode 100644 index 00000000000..e3b3d719189 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, qttools, scons +, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 +, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib +}: + +let + _scons = "scons -j$NIX_BUILD_CORES"; +in stdenv.mkDerivation rec { + name = "swift-im-${version}"; + version = "4.0.2"; + + src = fetchurl { + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; + }; + + patches = [ ./scons.patch ]; + + nativeBuildInputs = [ pkgconfig qttools scons ]; + + buildInputs = [ + GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 + lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib + ]; + + propagatedUserEnvPkgs = [ GConf ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-I${miniupnpc}/include/miniupnpc" + ]; + + buildPhase = '' + ${_scons} Swift + ''; + + installPhase = '' + ${_scons} SWIFT_INSTALLDIR=$out $out + ''; + + meta = with stdenv.lib; { + homepage = https://swift.im/; + description = "Qt XMPP client"; + license = licenses.gpl3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch new file mode 100644 index 00000000000..c63b05d7acb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch @@ -0,0 +1,53 @@ +diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot +index 40f242513..53e1ff26a 100644 +--- a/BuildTools/SCons/SConscript.boot ++++ b/BuildTools/SCons/SConscript.boot +@@ -508,6 +508,7 @@ if env.get("distcc", False) : + if var.startswith("DISTCC_") : + env["ENV"][var] = os.environ[var] + ++env["ENV"] = os.environ + conf_env = env.Clone() + + Export("env") +diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct +index 70bffbcfe..fef281899 100644 +--- a/BuildTools/SCons/SConstruct ++++ b/BuildTools/SCons/SConstruct +@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] + gconf_env = conf_env.Clone() + conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) + if conf.CheckPKG("gconf-2.0") : +- gconf_bare_env = Environment() ++ gconf_bare_env = Environment(ENV = os.environ) + gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') + if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : + gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] +@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) + env["HAVE_HUNSPELL"] = 0; + if env.get("hunspell_enable", False) : + hunspell_conf = Configure(hunspell_env) +- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : ++ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : + env["HAVE_HUNSPELL"] = 1 +- hunspell_flags["LIBS"] = ["hunspell"] ++ hunspell_flags["LIBS"] = ["hunspell-1.6"] + env["HUNSPELL_FLAGS"] = hunspell_flags + hunspell_conf.Finish() + +diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py +index 89f8963dc..b8559f7a6 100644 +--- a/BuildTools/SCons/Tools/textfile.py ++++ b/BuildTools/SCons/Tools/textfile.py +@@ -113,7 +113,10 @@ def _action(target, source, env): + lsep = None + for s in source: + if lsep: fd.write(lsep) +- fd.write(_do_subst(s, subs)) ++ b = _do_subst(s, subs) ++ if isinstance(b, unicode): ++ b = b.encode('UTF-8') ++ fd.write(b) + lsep = linesep + fd.close() + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b880ad696..182bc498df0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18072,6 +18072,10 @@ with pkgs; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; + swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { + inherit (gnome2) GConf; + }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; symlinks = callPackage ../tools/system/symlinks { }; From 95b1827682dc30ff1ccffb4f46c197289cea3e1c Mon Sep 17 00:00:00 2001 From: Euan T Date: Sun, 20 May 2018 14:33:22 +0100 Subject: [PATCH 10/78] nim: 0.17.2 -> 0.18.0 (#40556) * Nim 0.17.2 -> 0.18.0 * Add missing dependencies for Nim 0.18.0 Solved GC and SFML-related test failures. Attempting to download nimble packages. * Fix tzdata test * Fix tworkingdir test * Replace outdated nodejs * Disable non-runnable tests --- pkgs/development/compilers/nim/default.nix | 47 ++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index a49b1b82439..de383410b9c 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }: +# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml + +{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }: stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.17.2"; + version = "0.18.0"; src = fetchurl { url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa"; + sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0"; }; doCheck = true; @@ -18,6 +20,7 @@ stdenv.mkDerivation rec { "-lpcre" "-lreadline" "-lsqlite3" + "-lgc" ]; # 1. nodejs is only needed for tests @@ -25,12 +28,12 @@ stdenv.mkDerivation rec { # used for bootstrapping, but koch insists on moving the nim compiler around # as part of building it, so it cannot be read-only - buildInputs = [ - makeWrapper nodejs - openssl pcre readline sqlite + buildInputs = [ + makeWrapper nodejs-slim-8_x tzdata coreutils + openssl pcre readline sqlite boehmgc sfml ]; - buildPhase = '' + buildPhase = '' sh build.sh ./bin/nim c koch ./koch boot -d:release \ @@ -48,7 +51,35 @@ stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; - checkPhase = "./koch tests"; + postPatch = + let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' ''; + disableCompile = ''sed -i -e 's/^/#/' ''; + in '' + substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep" + substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin" + substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + + # disable supposedly broken tests + ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim + ${disableTest} ./tests/vm/trgba.nim + + # disable tests requiring network access (not available in the build container) + ${disableTest} ./tests/stdlib/thttpclient.nim + ${disableTest} ./tests/cpp/tasync_cpp.nim + ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim + + # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase) + ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim + ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim + ${disableCompile} ./tests/manyloc/nake/nakefile.nim + ${disableTest} ./tests/manyloc/nake/nakefile.nim + ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim + ${disableTest} ./tests/manyloc/named_argument_bug/main.nim + ''; + + checkPhase = '' + ./koch tests + ''; meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; From 65df48a6dedf35668233bf8eb3862fe9004ed14d Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 19 May 2018 13:41:26 -0400 Subject: [PATCH 11/78] pidgin: 2.12.0 -> 2.13.0 closes #40798 --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 3ec45702b17..430357cc666 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -15,11 +15,11 @@ let unwrapped = stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; - version = "${majorVersion}.12.0"; + version = "${majorVersion}.13.0"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc"; + sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; inherit nss ncurses; From 410be1aa1da9f081e622369bbf1abc73705b959a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 10:13:23 -0700 Subject: [PATCH 12/78] wireguard: 0.0.20180514 -> 0.0.20180519 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions. These checks were done: - built on NixOS - /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg passed the binary check. - /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg-quick passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.0.20180519 with grep in /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519 - directory tree listing: https://gist.github.com/64bccf9c57ca84c49486890ccbf17239 - du listing: https://gist.github.com/f28d6cfd8bcbf6ab1a6c39ad40ce1606 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index f34119893c4..c9e48d61c35 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180514"; + version = "0.0.20180519"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj"; + sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070"; }; preConfigure = "cd src"; From 69038bf7b1ed7af0e3f4a52dca245a5a7578622a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 10:20:10 -0700 Subject: [PATCH 13/78] python27Packages.youtube-dl: 2018.05.09 -> 2018.05.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/youtube-dl/versions. These checks were done: - built on NixOS - /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/.youtube-dl-wrapped passed the binary check. - /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/youtube-dl passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 2018.05.18 with grep in /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18 - directory tree listing: https://gist.github.com/d85bbc7695f5c7236d2de010c6381975 - du listing: https://gist.github.com/c5ad848ac823c72e329d20063defbc67 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f76b439b920..b639397388b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.05.09"; + version = "2018.05.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d"; + sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w"; }; nativeBuildInputs = [ makeWrapper ]; From 1f348e41a4960e00bc2b511411c3f7884d6e00d1 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 20 May 2018 13:24:28 -0400 Subject: [PATCH 14/78] Dont test enclosed exceptions --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 011f307e8a8..83d97c64b48 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -408,6 +408,9 @@ self: super: { jailbreak = true; }); + # https://github.com/jcristovao/enclosed-exceptions/issues/12 + enclosed-exceptions = dontCheck super.enclosed-exceptions; + # Older versions don't compile. base-compat = self.base-compat_0_10_1; brick = self.brick_0_37; From 4db2d4d1fda550d480faa72e32b0e4e07c7862b5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 May 2018 20:59:53 +0200 Subject: [PATCH 15/78] nixos/xsslock: wait until `pgrep xlock` succeeds (#40810) Please refer to the conversation in the original PR (#40619) for further reference: https://github.com/NixOS/nixpkgs/pull/40619#issuecomment-390437845 It takes some time after the standby to trigger the locker which might break the test on Hydra. --- nixos/tests/xss-lock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix index 3e3864cab77..045667bdcde 100644 --- a/nixos/tests/xss-lock.nix +++ b/nixos/tests/xss-lock.nix @@ -20,6 +20,6 @@ with lib; $machine->fail("pgrep xlock"); $machine->succeed("su -l alice -c 'xset dpms force standby'"); - $machine->succeed("pgrep xlock"); + $machine->waitUntilSucceeds("pgrep xlock"); ''; }) From d0f3fc1be408d3b3c42330d0c007542569faf192 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 12:04:36 -0700 Subject: [PATCH 16/78] trackballs: 1.3.0 -> 1.3.1 (#40829) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/trackballs/versions. These checks were done: - built on NixOS - /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1/bin/trackballs passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.3.1 with grep in /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1 - directory tree listing: https://gist.github.com/adba0c7480e5b6838c65b78eea5a190e - du listing: https://gist.github.com/280989936dc7851623de29d3fb610355 --- pkgs/games/trackballs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 29bf399087b..06bd2a8bc4d 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "trackballs-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "trackballs"; repo = "trackballs"; rev = "v${version}"; - sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd"; + sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl"; }; buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ]; From d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 May 2018 03:32:03 +0800 Subject: [PATCH 17/78] 0ad: 0.0.22 -> 0.0.23 (#40807) --- pkgs/games/0ad/data.nix | 6 +++--- pkgs/games/0ad/default.nix | 4 ++-- pkgs/games/0ad/game.nix | 21 +++++++++------------ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 2c6abd7972f..20921a61b8c 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.22"; + inherit (zeroad-unwrapped) version; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"; + sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx"; }; installPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 983e8accc20..d53942766bb 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,10 +1,10 @@ -{ newScope }: +{ wxGTK, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; }; zeroad-data = callPackage ./data.nix { }; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 4d5a4fe8379..0cf1b6f5e67 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 -, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng +, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"; + sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; @@ -23,14 +23,13 @@ stdenv.mkDerivation rec { spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox - nvidia-texture-tools + nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" - "-I${SDL.dev}/include/SDL" "-I${SDL2}/include/SDL2" ]; @@ -77,16 +76,14 @@ stdenv.mkDerivation rec { ''} # Copy l10n data. - mkdir -p "$out"/share/0ad/data - cp -r binaries/data/l10n "$out"/share/0ad/data + install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* # Copy libraries. - mkdir -p "$out"/lib/0ad - cp binaries/system/*.so "$out"/lib/0ad/ + install -Dm644 -t $out/lib/0ad binaries/system/*.so # Copy icon. - install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png - install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop + install -D build/resources/0ad.png $out/share/icons/hicolor/128x128/0ad.png + install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182bc498df0..9052b09c372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19736,7 +19736,9 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; - zeroadPackages = callPackage ../games/0ad { }; + zeroadPackages = callPackage ../games/0ad { + wxGTK = wxGTK30; + }; zeroad = zeroadPackages.zeroad; From 74a0ff512c98c64ada1d95193784e77b7406cdaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 12:42:01 -0700 Subject: [PATCH 18/78] worker: 3.15.0 -> 3.15.1 (#40820) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/worker/versions. These checks were done: - built on NixOS - /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1/bin/worker passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.15.1 with grep in /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1 - directory tree listing: https://gist.github.com/25a3c6e8ffd32fd4b88511e305669c51 - du listing: https://gist.github.com/6f5f0c3dfcb21b2d414fafa466d13283 --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 968539336a9..bfb43d3e49d 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; + sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi"; }; buildInputs = [ libX11 ]; From e92d68e3ab44e818876bdc1431c4d5d66b03e104 Mon Sep 17 00:00:00 2001 From: averelld Date: Sun, 20 May 2018 21:53:45 +0200 Subject: [PATCH 19/78] x2goclient: qt4 -> qt5 (#40811) --- .../networking/remote/x2goclient/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index b470c6b39d3..a4d2e85a911 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, +makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; @@ -9,18 +10,19 @@ stdenv.mkDerivation rec { sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; }; - buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ]; + buildInputs = [ cups libssh libXpm nxproxy openldap openssh + qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; patchPhase = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ - --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ - --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ + --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \ --replace "-o root -g root" "" ''; - makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9052b09c372..49ed30dc8a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18692,7 +18692,7 @@ with pkgs; x11vnc = callPackage ../tools/X11/x11vnc { }; - x2goclient = callPackage ../applications/networking/remote/x2goclient { }; + x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; x2vnc = callPackage ../tools/X11/x2vnc { }; From 65f58cfaf8fd9ec2b15bb0d08f8b7c6e39938336 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 20 May 2018 16:11:43 -0400 Subject: [PATCH 20/78] vim_configurable: unpin from old lua 5.1 (#40749) This pin was added in 2014 during a lua upgrade, but it appears vim today builds fine with lua 5.2, so we can have it just depend on the `lua` package. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49ed30dc8a4..2d7d8e93b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18345,9 +18345,9 @@ with pkgs; vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; + inherit lua; features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5_1; gui = config.vim.gui or "auto"; # optional features by flags From b6539403d737eca2c6c956dd658fc18ac8169e6d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 20 May 2018 22:16:01 +0200 Subject: [PATCH 21/78] lf: 3 -> 4 --- pkgs/tools/misc/lf/default.nix | 4 ++-- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b78bb977dbc..79f70da9e26 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "3"; + version = "4"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1w4nly8g1p28ixq1vjg7qv07mb1vryys7cf6b7jdb523swra6a97"; + sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 35becb00263..e22a31a8fe2 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "7cbfaac9e282b3ea0cefeddc67b2c3ed3aaf97bc"; # master - sha256 = "0pb5p8q2x31aqs307lla75mm1a01mr2qyqxsfqix1pgwg16xbad8"; + rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master + sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; }; } { From 10b4de1a8db1897dcebf9c2bf36418f15e10b321 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 13:35:09 -0700 Subject: [PATCH 22/78] xonsh: 0.6.3 -> 0.6.4 (#40821) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xonsh/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xon.sh had a zero exit code or showed the expected version - /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/.xonsh-wrapped passed the binary check. - /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xonsh passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 2 of 3 passed binary check by having the new version present in output. - found 0.6.4 with grep in /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4 - directory tree listing: https://gist.github.com/f4e56948f12666dc9fa8965e32e1844e - du listing: https://gist.github.com/de490af4f1967c7d07e86d7068da2c32 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 8f117b788e7..93add8a6913 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi"; + sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7"; }; LC_ALL = "en_US.UTF-8"; From 1a611d4f4e25b513387ec3d09f942035a52102cc Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 8 May 2018 11:35:28 +0200 Subject: [PATCH 23/78] kcgi: init -> 0.10.5 --- pkgs/development/web/kcgi/default.nix | 33 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/web/kcgi/default.nix diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix new file mode 100644 index 00000000000..6d91007e486 --- /dev/null +++ b/pkgs/development/web/kcgi/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgconfig, fetchFromGitHub, libbsd }: + +stdenv.mkDerivation rec { + pname = "kcgi"; + version = "0.10.5"; + underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "kristapsdz"; + repo = pname; + rev = "VERSION_${underscoreVersion}"; + sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw"; + }; + patchPhase = ''substituteInPlace configure \ + --replace /usr/local / + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ; + + dontAddPrefix = true; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://kristaps.bsd.lv/kcgi; + description = "Minimal CGI and FastCGI library for C/C++"; + license = licenses.isc; + platforms = platforms.all; + maintainers = [ maintainers.leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 519403cb73f..a32af50429f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8030,6 +8030,8 @@ with pkgs; gperf = gperf_3_0; }; + kcgi = callPackage ../development/web/kcgi { }; + kcov = callPackage ../development/tools/analysis/kcov { }; kube-aws = callPackage ../development/tools/kube-aws { }; From bc309f5c57ebfff399d0488aa19ef1b6ec1d7088 Mon Sep 17 00:00:00 2001 From: leenaars Date: Sun, 20 May 2018 23:27:34 +0200 Subject: [PATCH 24/78] webmetro: init => unstable-20180426 (#39673) --- pkgs/servers/webmetro/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/webmetro/default.nix diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix new file mode 100644 index 00000000000..45369f5f5a0 --- /dev/null +++ b/pkgs/servers/webmetro/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "webmetro"; + name = "${pname}-${version}"; + version = "unstable-20180426"; + + src = fetchFromGitHub { + owner = "Tangent128"; + repo = pname; + rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9"; + sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; + }; + + cargoSha256 = "0drf331qic1gf58j7izwp0q2l4w0dyrhr19rd2y5k43cw4m1nq59"; + + meta = with stdenv.lib; { + description = "Simple relay server for broadcasting a WebM stream"; + longDescription = '' + Webmetro is a simple relay server for broadcasting a WebM stream + from one uploader to many downloaders, via HTTP. + The initialization segment is remembered, so that viewers can join + mid-stream. Cluster timestamps are rewritten to be monotonic, so multiple + (compatibly-encoded) webm files can be chained together without + clients needing to reconnect. + ''; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40c67171503..17613fbc67d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13073,6 +13073,8 @@ with pkgs; wallabag = callPackage ../servers/web-apps/wallabag { }; + webmetro = callPackage ../servers/webmetro { }; + winstone = callPackage ../servers/http/winstone { }; xinetd = callPackage ../servers/xinetd { }; From a14ffe567b4fed5d10d9e28c6bb864308ab44234 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 19 May 2018 16:47:04 -0400 Subject: [PATCH 25/78] add emmanuelrosa as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd5c335ad1..0c3175823b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1236,6 +1236,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + emmanuelrosa = { + email = "emmanuel_rosa@aol.com"; + github = "emmanuelrosa"; + name = "Emmanuel Rosa"; + }; endgame = { email = "jack@jackkelly.name"; github = "endgame"; From 3dadae4cd241961eb457543be1c01878a0dc75ae Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 19 May 2018 16:48:05 -0400 Subject: [PATCH 26/78] purple-lurch: init at 0.6.7 Adds XEP-0384: OMEMO Encryption for libpurple --- .../pidgin-plugins/purple-lurch/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix new file mode 100644 index 00000000000..bcfcbee8556 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: + +stdenv.mkDerivation rec { + name = "purple-lurch-${version}"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "gkdr"; + repo = "lurch"; + rev = "v${version}"; + sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ]; + + dontUseCmakeConfigure = true; + + installPhase = '' + install -Dm755 -t $out/lib/purple-2 build/lurch.so + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gkdr/lurch; + description = "XEP-0384: OMEMO Encryption for libpurple"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17613fbc67d..1ebedcec4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1451,7 +1451,7 @@ with pkgs; mcrypt = callPackage ../tools/misc/mcrypt { }; mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; mozlz4a = callPackage ../tools/compression/mozlz4a { @@ -1467,7 +1467,7 @@ with pkgs; }; antibody = callPackage ../shells/zsh/antibody { }; - + antigen = callPackage ../shells/zsh/antigen { }; apparix = callPackage ../tools/misc/apparix { }; @@ -17446,6 +17446,8 @@ with pkgs; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; + purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; + purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; From 1ba24058af6b7911f9b824798c62c434ff863c4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 15:48:26 -0700 Subject: [PATCH 27/78] praat: 6.0.38 -> 6.0.40 (#40836) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/praat/versions. These checks were done: - built on NixOS - /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40/bin/praat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 6.0.40 with grep in /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40 - directory tree listing: https://gist.github.com/48461f433362d4c7c4143942011a22d6 - du listing: https://gist.github.com/621b0b6d55906c1ba560361af3d25bcb --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index ada12eefaf7..8d49c49f0c6 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.38"; + version = "6.0.40"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; + sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x"; }; configurePhase = '' From 641fa3d1c2539b1ac27688ed4d619ae6d1799d02 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 20 May 2018 23:14:29 +0200 Subject: [PATCH 28/78] =?UTF-8?q?babl:=200.1.48=20=E2=86=92=200.1.50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index ac9056d1e03..f3e7fc7f162 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.48"; + name = "babl-0.1.50"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy"; + sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m"; }; doCheck = true; From d6a68d4b2da826b90e925813828ff4729ee7c5ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 21 May 2018 00:16:19 +0200 Subject: [PATCH 29/78] =?UTF-8?q?gimp:=202.10.0=20=E2=86=92=202.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gimp/default.nix | 32 ++++----------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 80bc2d49efc..f92594f08e1 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,37 +9,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w"; }; - patches = [ - # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371482; - sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; - }) - - # fix absolute paths stored in configuration - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; - sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; - }) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; - sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; - }) - - # fix pc file (needed e.g. for building plug-ins) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; - sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ @@ -80,6 +56,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/var/run/current-system/sw/share/color/icc" ]; doCheck = true; From f5ca57b6d909b8224acdacfcc587537e169e6683 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 May 2018 17:55:21 -0500 Subject: [PATCH 30/78] powerline-rs: Fix darwin build (#40840) --- pkgs/tools/misc/powerline-rs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index e48816db935..138145683cb 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; - nativeBuildInputs = [ pkgconfig file perl cmake ]; - buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ]; + nativeBuildInputs = [ pkgconfig file perl cmake curl ]; + buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ebedcec4fe..d2b566ab5f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14632,7 +14632,9 @@ with pkgs; powerline-go = callPackage ../tools/misc/powerline-go { }; - powerline-rs = callPackage ../tools/misc/powerline-rs { }; + powerline-rs = callPackage ../tools/misc/powerline-rs { + inherit (darwin.apple_sdk.frameworks) Security; + }; profont = callPackage ../data/fonts/profont { }; From de18e296da59b9b3e0ba3df1f2999a729b6d4bcb Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sun, 20 May 2018 20:05:24 -0400 Subject: [PATCH 31/78] purple-facebook: 0.9.3 -> 0.9.5 --- .../pidgin-plugins/purple-facebook/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 37b490304c4..8eb086a9807 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -5,18 +5,18 @@ let pidginHg = fetchhg { url = "https://bitbucket.org/pidgin/main"; # take from VERSION file - rev = "c9b74a765767"; - sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3"; + rev = "9ff9acf9fa14"; + sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv"; }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.3"; + name = "purple-facebook-0.9.5"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.3-c9b74a765767"; - sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb"; + rev = "v0.9.5-9ff9acf9fa14"; + sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; }; postPatch = '' From 2287c5f6a55c3c4edf1d244c7dbf7b331aa94783 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 20 May 2018 22:43:35 +0000 Subject: [PATCH 32/78] dpdk: extract from linuxPackages.dpdk DPDK kernel modules are optional and its libraries do not reference them. This allows to move the packages that depend on DPDK out of linuxPackages, since they do not depend on kernel version. --- pkgs/os-specific/linux/dpdk/default.nix | 50 ++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index fd45e83c26b..808feaff02c 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,7 +1,13 @@ -{ stdenv, kernel, fetchurl, pkgconfig, numactl }: +{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }: -stdenv.mkDerivation rec { - name = "dpdk-${version}-${kernel.version}"; +let + + kver = kernel.modDirVersion or null; + + mod = kernel != null; + +in stdenv.mkDerivation rec { + name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; version = "17.11.2"; src = fetchurl { @@ -9,35 +15,45 @@ stdenv.mkDerivation rec { sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2"; }; - nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies; - buildInputs = [ numactl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ numactl ] ++ lib.optional mod kernel.moduleBuildDependencies; - RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; # we need sse3 instructions to build NIX_CFLAGS_COMPILE = [ "-msse3" ]; - - enableParallelBuilding = true; - outputs = [ "out" "kmod" ]; - hardeningDisable = [ "pic" ]; + postPatch = lib.optionalString (!mod) '' + # Do not build kernel modules. + cat >>config/defconfig_$RTE_TARGET < Date: Mon, 21 May 2018 00:50:08 +0000 Subject: [PATCH 33/78] odp-dpdk, ofp, pktgen: move from linuxPackages These packages do not depend on the kernel. ofp is not aliased because it is marked as broken. --- pkgs/top-level/all-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe6e71d83d..5e5e294064c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13585,6 +13585,9 @@ with pkgs; inherit kernel; inherit (kernel) stdenv; # in particular, use the same compiler by default + # Obsolete aliases (these packages do not depend on the kernel). + inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + acpi_call = callPackage ../os-specific/linux/acpi-call {}; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; @@ -13611,14 +13614,8 @@ with pkgs; evdi = callPackage ../os-specific/linux/evdi { }; - pktgen = callPackage ../os-specific/linux/pktgen { }; - hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; - - ofp = callPackage ../os-specific/linux/ofp { }; - e1000e = callPackage ../os-specific/linux/e1000e {}; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -13966,8 +13963,12 @@ with pkgs; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; + odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + ofp = callPackage ../os-specific/linux/ofp { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -14013,6 +14014,8 @@ with pkgs; pipework = callPackage ../os-specific/linux/pipework { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { }; From ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 21 May 2018 01:04:31 +0000 Subject: [PATCH 34/78] dpdk: install files in the standard layout --- pkgs/os-specific/linux/dpdk/default.nix | 2 +- pkgs/os-specific/linux/odp-dpdk/default.nix | 2 +- pkgs/os-specific/linux/pktgen/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 808feaff02c..78b11c7b18f 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -40,7 +40,7 @@ EOF installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc installFlags = [ - "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include" + "prefix=$(out)" ] ++ lib.optionals mod [ "kerneldir=$(kmod)/lib/modules/${kver}" ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index cf4f9df2677..ff408b6a624 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ dpdk libconfig libpcap numactl openssl ]; - RTE_SDK = dpdk; + RTE_SDK = "${dpdk}/share/dpdk"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index c443da7df3b..a7bb4a81510 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { [ dpdk libpcap numactl ] ++ stdenv.lib.optionals withGtk [gtk2]; - RTE_SDK = "${dpdk}"; + RTE_SDK = "${dpdk}/share/dpdk"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; GUI = stdenv.lib.optionalString withGtk "true"; From 66002a0e07ac9a05bd2ae518310797819bba29fd Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 21 May 2018 01:59:30 +0000 Subject: [PATCH 35/78] spdk: init at 18.04 Closes #39138. --- pkgs/development/libraries/spdk/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/spdk/default.nix diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix new file mode 100644 index 00000000000..b712d426304 --- /dev/null +++ b/pkgs/development/libraries/spdk/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }: + +stdenv.mkDerivation rec { + name = "spdk-${version}"; + version = "18.04"; + + src = fetchFromGitHub { + owner = "spdk"; + repo = "spdk"; + rev = "v${version}"; + sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n"; + }; + + nativeBuildInputs = [ python ]; + + buildInputs = [ cunit dpdk libaio libuuid numactl openssl ]; + + configureFlags = [ "--with-dpdk=${dpdk}" ]; + + NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Set of libraries for fast user-mode storage"; + homepage = http://www.spdk.io; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e5e294064c..3acb4e4f729 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11632,6 +11632,8 @@ with pkgs; spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; + spdk = callPackage ../development/libraries/spdk { }; + speechd = callPackage ../development/libraries/speechd { }; speech-tools = callPackage ../development/libraries/speech-tools {}; From f1a202396195009461bb59552bc90a03055c3ff0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 21 May 2018 02:32:18 +0000 Subject: [PATCH 36/78] dpdk: support static/shared build mode switch The default is false because upstream default is false (for performance). --- pkgs/os-specific/linux/dpdk/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 78b11c7b18f..b4c4af8c2e2 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }: +{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl, shared ? false }: let @@ -25,9 +25,14 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-msse3" ]; hardeningDisable = [ "pic" ]; - postPatch = lib.optionalString (!mod) '' - # Do not build kernel modules. + postPatch = '' cat >>config/defconfig_$RTE_TARGET <>config/defconfig_$RTE_TARGET < Date: Sun, 20 May 2018 22:44:54 -0400 Subject: [PATCH 37/78] linux: 4.9.100 -> 4.9.101 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3a7dc9353f8..15a8d63651d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.100"; + version = "4.9.101"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5"; + sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg"; }; } // (args.argsOverride or {})) From a91a0ce16c39bcdf9eb0a73fc4413c12fabcff7a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 May 2018 22:45:08 -0400 Subject: [PATCH 38/78] linux: 4.14.41 -> 4.14.42 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f44adb6bc94..16d597e1640 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.41"; + version = "4.14.42"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc"; + sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb"; }; } // (args.argsOverride or {})) From 950e17fdd94cb7c4e2a064adac00da8aeb085844 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 May 2018 22:45:20 -0400 Subject: [PATCH 39/78] linux: 4.16.9 -> 4.16.10 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index c1df425280e..7039c460c5c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.9"; + version = "4.16.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0"; + sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0"; }; } // (args.argsOverride or {})) From 3995b586a5c1b9122212bdc3837f6da54a8b5667 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 May 2018 22:45:32 -0400 Subject: [PATCH 40/78] linux: 4.17-rc5 -> 4.17-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 691c0d7a0a9..e61e9a354de 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc5"; - modDirVersion = "4.17.0-rc5"; + version = "4.17-rc6"; + modDirVersion = "4.17.0-rc6"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk"; + sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8"; }; # Should the testing kernels ever be built on Hydra? From 691e8e64c449925b59c577379f879943495ff287 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 19:52:28 -0700 Subject: [PATCH 41/78] csound: 6.10.0 -> 6.11.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/csound/versions. These checks were done: - built on NixOS - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csound passed the binary check. - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csbeats passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csdebugger had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/atsa had a zero exit code or showed the expected version - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csanalyze passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cvanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/dnoise had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/envext had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extractor had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/hetro had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/mixer had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvlook had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scale had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sndinfo had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/srconv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/src_conv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sdif2ad had a zero exit code or showed the expected version - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scsort passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extract had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cs had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csb64enc had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/makecsd had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scot had a zero exit code or showed the expected version - 4 of 31 passed binary check by having a zero exit code. - 0 of 31 passed binary check by having the new version present in output. - found 6.11.0 with grep in /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0 - directory tree listing: https://gist.github.com/a9a7303309eb2e6e6ce70fc3f368e8af - du listing: https://gist.github.com/c8d61a997a4e56d47eab852cdae66f01 --- pkgs/applications/audio/csound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 191074eba27..c8ac0a938ef 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.10.0"; + version = "6.11.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n"; + sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp From 4558ba5b794ca2c6897c1a845e3de208f2f9e8fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 19:56:07 -0700 Subject: [PATCH 42/78] feh: 2.26.1 -> 2.26.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/feh/versions. These checks were done: - built on NixOS - /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/feh passed the binary check. - /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/.feh-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.26.3 with grep in /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3 - directory tree listing: https://gist.github.com/8a7c95c1c856e51ed0f4fab74284bffe - du listing: https://gist.github.com/6e5a4734d20a27553f39cb1b99cb0ac9 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 96d4a397c90..eb7daf2797b 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.1"; + version = "2.26.3"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd"; + sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; }; outputs = [ "out" "man" "doc" ]; From 03c61b71f9f578db76b667a699732dfc46b6b229 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 21 May 2018 03:39:54 +0000 Subject: [PATCH 43/78] spdk: fix sandboxed build --- pkgs/development/libraries/spdk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index b712d426304..14672c78d21 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ cunit dpdk libaio libuuid numactl openssl ]; + postPatch = '' + patchShebangs . + ''; + configureFlags = [ "--with-dpdk=${dpdk}" ]; NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. From d2329184a9204a61d9505e27790bf65b5eb773a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 20:57:32 -0700 Subject: [PATCH 44/78] bind: 9.12.1 -> 9.12.1-P2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bind/versions. These checks were done: - built on NixOS - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/delv passed the binary check. - Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/arpaname had a zero exit code or showed the expected version - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-rrchecker passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/mdig passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/ddns-confgen passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-cds passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-dsfromkey passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-importkey passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keyfromlabel passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keygen passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-revoke passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-settime passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-signzone passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-verify passed the binary check. - Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/genrandom had a zero exit code or showed the expected version - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkconf passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkzone passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-compilezone passed the binary check. - Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-journalprint had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/nsec3hash had a zero exit code or showed the expected version - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc-confgen passed the binary check. - /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/tsig-keygen passed the binary check. - 20 of 24 passed binary check by having a zero exit code. - 14 of 24 passed binary check by having the new version present in output. - found 9.12.1-P2 with grep in /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2 - directory tree listing: https://gist.github.com/d95b236ef147c4c8ad6a99ca42db1acd - du listing: https://gist.github.com/f6bcea6b6bdce7df3f66bbf02768bd20 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4002c6b3542..d266f534d66 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -6,14 +6,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.1"; in +let version = "9.12.1-P2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n"; + sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 80bfd2f371d64d0d81c0820166f98f49a5501988 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 May 2018 15:44:50 +0800 Subject: [PATCH 45/78] musescore: 2.1.0 -> 2.2.1 Fixes #29519 --- pkgs/applications/audio/musescore/default.nix | 46 +++++-------------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index f56ca009f1e..7ed9021e3e0 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,59 +1,37 @@ -{ stdenv, fetchzip, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.1.0"; + version = "2.2.1"; - src = fetchzip { - url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls"; + src = fetchFromGitHub { + owner = "musescore"; + repo = "MuseScore"; + rev = "v${version}"; + sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs"; }; - hardeningDisable = [ "relro" "bindnow" ]; - - makeFlags = [ - "PREFIX=$(out)" - ]; - cmakeFlags = [ - "-DAEOLUS=OFF" - "-DZERBERUS=ON" - "-DOSC=ON=ON" - "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error - "-DOCR=OFF" # Not necessary without OMR - "-DSOUNDFONT3=ON" - "-DHAS_AUDIOFILE=ON" - "-DBUILD_JACK=ON" - ]; - - preBuild = '' - make lrelease - ''; - - postBuild = '' - make manpages - ''; + ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qtbase qtdeclarative qtscript qtsvg qttools - qtwebkit qtxmlpatterns #tesseract + portaudio portmidi # tesseract + qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns ]; meta = with stdenv.lib; { description = "Music notation and composition software"; homepage = https://musescore.org/; license = licenses.gpl2; + maintainers = with maintainers; [ vandenoever ]; platforms = platforms.linux; - maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acb4e4f729..cdc4ed881e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17096,6 +17096,7 @@ with pkgs; else null; }; + # TODO: we should probably merge these 2 musescore = if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } From ad399afd6f3af6e21924919f136e776ae1b42d3a Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 8 Mar 2018 10:38:26 +0100 Subject: [PATCH 46/78] pythonPackages.pysdl2: init at 0.9.6 --- .../python-modules/pysdl2/PySDL2-dll.patch | 119 ++++++++++++++++++ .../python-modules/pysdl2/default.nix | 41 ++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 162 insertions(+) create mode 100644 pkgs/development/python-modules/pysdl2/PySDL2-dll.patch create mode 100644 pkgs/development/python-modules/pysdl2/default.nix diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch new file mode 100644 index 00000000000..ca723a0e573 --- /dev/null +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -0,0 +1,119 @@ +diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py +--- PySDL2-0.9.6-old/sdl2/dll.py 2018-03-08 10:18:37.583471745 +0100 ++++ PySDL2-0.9.6/sdl2/dll.py 2018-03-08 10:20:06.705517520 +0100 +@@ -45,29 +45,31 @@ + """Function wrapper around the different DLL functions. Do not use or + instantiate this one directly from your user code. + """ +- def __init__(self, libinfo, libnames, path=None): +- self._dll = None +- foundlibs = _findlib(libnames, path) +- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") +- if len(foundlibs) == 0: +- raise RuntimeError("could not find any library for %s (%s)" % +- (libinfo, dllmsg)) +- for libfile in foundlibs: +- try: +- self._dll = CDLL(libfile) +- self._libfile = libfile +- break +- except Exception as exc: +- # Could not load the DLL, move to the next, but inform the user +- # about something weird going on - this may become noisy, but +- # is better than confusing the users with the RuntimeError below +- warnings.warn(repr(exc), DLLWarning) +- if self._dll is None: +- raise RuntimeError("found %s, but it's not usable for the library %s" % +- (foundlibs, libinfo)) +- if path is not None and sys.platform in ("win32",) and \ +- path in self._libfile: +- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ def __init__(self, libfile): ++ self._dll = CDLL(libfile) ++ self._libfile = libfile ++ # self._dll = None ++ # foundlibs = _findlib(libnames, path) ++ # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ # if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ # for libfile in foundlibs: ++ # try: ++ # self._dll = CDLL(libfile) ++ # self._libfile = libfile ++ # break ++ # except Exception as exc: ++ # # Could not load the DLL, move to the next, but inform the user ++ # # about something weird going on - this may become noisy, but ++ # # is better than confusing the users with the RuntimeError below ++ # warnings.warn(repr(exc), DLLWarning) ++ # if self._dll is None: ++ # raise RuntimeError("found %s, but it's not usable for the library %s" % ++ # (foundlibs, libinfo)) ++ # if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) + + def bind_function(self, funcname, args=None, returns=None, optfunc=None): + """Binds the passed argument and return value types to the specified +@@ -110,7 +112,7 @@ + return + + try: +- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2") + except RuntimeError as exc: + raise ImportError(exc) + +diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py +--- PySDL2-0.9.6-old/sdl2/sdlgfx.py 2018-03-08 10:18:37.585471769 +0100 ++++ PySDL2-0.9.6/sdl2/sdlgfx.py 2018-03-08 10:20:06.705517520 +0100 +@@ -34,8 +34,7 @@ + ] + + try: +- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_gfx") + except RuntimeError as exc: + raise ImportError(exc) + +diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py +--- PySDL2-0.9.6-old/sdl2/sdlimage.py 2018-03-08 10:18:37.585471769 +0100 ++++ PySDL2-0.9.6/sdl2/sdlimage.py 2018-03-08 10:20:06.705517520 +0100 +@@ -26,8 +26,7 @@ + ] + + try: +- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_image") + except RuntimeError as exc: + raise ImportError(exc) + +diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py +--- PySDL2-0.9.6-old/sdl2/sdlmixer.py 2018-03-08 10:18:37.585471769 +0100 ++++ PySDL2-0.9.6/sdl2/sdlmixer.py 2018-03-08 10:20:27.415758478 +0100 +@@ -50,8 +50,7 @@ + ] + + try: +- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_mixer") + except RuntimeError as exc: + raise ImportError(exc) + +diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py +--- PySDL2-0.9.6-old/sdl2/sdlttf.py 2018-03-08 10:18:37.585471769 +0100 ++++ PySDL2-0.9.6/sdl2/sdlttf.py 2018-03-08 10:20:06.705517520 +0100 +@@ -38,8 +38,7 @@ + ] + + try: +- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_ttf") + except RuntimeError as exc: + raise ImportError(exc) + diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix new file mode 100644 index 00000000000..6681b1b199a --- /dev/null +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }: + +buildPythonPackage rec { + pname = "PySDL2"; + version = "0.9.6"; + # The tests use OpenGL using find_library, which would have to be + # patched; also they seem to actually open X windows and test stuff + # like "screensaver disabling", which would have to be cleverly + # sandboxed. Disable for now. + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm"; + }; + + # Deliberately not in propagated build inputs; users can decide + # which library they want to include. + buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ]; + propagatedBuildInputs = [ SDL2 ]; + patches = [ ./PySDL2-dll.patch ]; + postPatch = '' + substituteInPlace sdl2/dll.py --replace \ + "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')" + substituteInPlace sdl2/sdlttf.py --replace \ + "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')" + substituteInPlace sdl2/sdlimage.py --replace \ + "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')" + substituteInPlace sdl2/sdlgfx.py --replace \ + "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')" + substituteInPlace sdl2/sdlmixer.py --replace \ + "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')" + ''; + + meta = { + description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; + homepage = https://github.com/marcusva/py-sdl2; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ pmiddend ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3be39ded656..204a49e63b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18194,6 +18194,8 @@ EOF pyowm = callPackage ../development/python-modules/pyowm { }; prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; }); in fix' (extends overrides packages) From b34f0a11dc451efea8d4aa877803b46c7609be01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 14:57:21 -0700 Subject: [PATCH 47/78] pari: 2.9.4 -> 2.9.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pari/versions. These checks were done: - built on NixOS - /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp passed the binary check. - /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/tex2mail passed the binary check. - /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gphelp passed the binary check. - /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp-2.9 passed the binary check. - 4 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 2.9.5 with grep in /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5 - directory tree listing: https://gist.github.com/63c5da24ace1d863b434a462fc0d0123 - du listing: https://gist.github.com/d275cd2f3b274f52576dbab1bf9ebc9c --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 8c24881f215..07c6af0926d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g"; + sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; }; buildInputs = [ From 249c043d8d42eaf122ef3a2df9ac2a931e2c22f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 May 2018 06:02:39 -0700 Subject: [PATCH 48/78] krusader: 2.6.0 -> 2.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/krusader/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/krusader had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/.krusader-wrapped had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.7.0 with grep in /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0 - directory tree listing: https://gist.github.com/d2f674d471fc7a978cf2d1c9e4920a4e - du listing: https://gist.github.com/00387b725fabb991524a07962b9bf2fb --- pkgs/applications/misc/krusader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index bcf351ff46a..6dc448c6bf4 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -6,13 +6,13 @@ let pname = "krusader"; - version = "2.6.0"; + version = "2.7.0"; in mkDerivation rec { name = "krusader-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh"; + sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb"; }; meta = with lib; { From a58e93bd78d4b0d12d71ecbea9e105a0bc70d444 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 13:07:07 -0700 Subject: [PATCH 49/78] simpleitk: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/simpleitk/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.1.0 with grep in /nix/store/926vcv62wgj9nyj4z4yw6hxi64yaqha8-simpleitk-1.1.0 - directory tree listing: https://gist.github.com/fc471fd5a722b3d1303143f4ca87457d - du listing: https://gist.github.com/6f050e82917acd9dc266df3c2c3cb81b --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 4802683079d..c807325b155 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "1.0.0"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; - sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673"; + sha256 = "01y8s73mw4yabqir2f8qp5zc1c0y6szi18rr4zwgsxz62g4drzgm"; }; nativeBuildInputs = [ cmake git swig ]; From 415f5ee000e173cf4b037418f24efa9540e8b741 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 14:21:03 -0700 Subject: [PATCH 50/78] powerstat: 0.02.15 -> 0.02.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/powerstat/versions. These checks were done: - built on NixOS - /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16/bin/powerstat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.02.16 with grep in /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16 - directory tree listing: https://gist.github.com/07ed4981848777e18cca2c072d0fb30c - du listing: https://gist.github.com/5766491662635d4a960a7cd3a4911db0 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 88151fca2f5..2d4d8f8266f 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.15"; + version = "0.02.16"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx"; + sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From c57afb8ca2cee72174b63418781e4706189cec96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 16:08:02 -0700 Subject: [PATCH 51/78] neofetch: 4.0.0 -> 4.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neofetch/versions. These checks were done: - built on NixOS - /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2/bin/neofetch passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 4.0.2 with grep in /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2 - directory tree listing: https://gist.github.com/33741fc29ddd44c6fb85d08f2f1a04d5 - du listing: https://gist.github.com/ebad77e50a02ef38e4df2b5db0a93c4f --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index cece77b8d3e..af6c17433f1 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn"; + sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2"; }; dontBuild = true; From fca8ce870c9fe8c8cac5e0dee6774ac3dc2ba24e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 15:26:12 -0700 Subject: [PATCH 52/78] osinfo-db: 20180502 -> 20180514 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 20180514 with grep in /nix/store/4lgxl3vd6h691mx9hn2znln8idhv5bnn-osinfo-db-20180514 - directory tree listing: https://gist.github.com/557cda4c5d9742fc2f03e3eb6c73b7ee - du listing: https://gist.github.com/17de36b5bae99c6d771de2b293c347b5 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 82122335f69..7f0fbd71021 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180502"; + name = "osinfo-db-20180514"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram"; + sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 932c1f7650241a2dd8330de420a9112b521e3de8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 16:29:58 -0700 Subject: [PATCH 53/78] metabase: 0.29.2 -> 0.29.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/metabase/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/b7bpmc5h45cq2afcmrrsw2w60im3420w-metabase-0.29.3/bin/metabase had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/986f43a4bd9effc51da98989246f0267 - du listing: https://gist.github.com/cec3ac2b5a9a0226fbb8653fbe98ce5e --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index f329b108849..588f1dda50c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.29.2"; + version = "0.29.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1"; + sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv"; }; nativeBuildInputs = [ makeWrapper ]; From 910ac0ff47a33052ffdca80ed1f0c96217245cfc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 18:18:15 -0700 Subject: [PATCH 54/78] krita: 4.0.2 -> 4.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/krita/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3/bin/krita had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 4.0.3 with grep in /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3 - directory tree listing: https://gist.github.com/23ba1bbd1767e4a61fafcd9646d63898 - du listing: https://gist.github.com/4eed85b1634be0fb42b59cdc55799267 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index f86694ebc6c..690253947a1 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf"; + sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 1fd9740efbabc5cb5f90296e47a641f440eab822 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 20:18:46 -0700 Subject: [PATCH 55/78] debootstrap: 1.0.98 -> 1.0.99 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99/bin/debootstrap passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.0.99 with grep in /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99 - directory tree listing: https://gist.github.com/1c31f499b4a365254573c6c37df9e41c - du listing: https://gist.github.com/bb42785bdce49536fc4aec7913c57bdf --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 0ed883bf342..22bf8340156 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.98"; + version = "1.0.99"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8"; + sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb"; }; buildInputs = [ dpkg gettext gawk perl ]; From b5204da735c9485e0eb747528bea2115209e0822 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 11:22:32 -0700 Subject: [PATCH 56/78] urlwatch: 2.9 -> 2.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urlwatch/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/.urlwatch-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/urlwatch had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.11 with grep in /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11 - directory tree listing: https://gist.github.com/f36eb5277839d9ca3d15995cec7cc592 - du listing: https://gist.github.com/47f738cad88e3941c1c0f149f8aa4fc7 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3e77117e55f..3efc9e6be23 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.9"; + version = "2.11"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz"; + sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi"; }; propagatedBuildInputs = with python3Packages; [ From 7d0f84b9091d17425eaa6db2077330575e17b924 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 20:32:07 -0700 Subject: [PATCH 57/78] ddcutil: 0.8.6 -> 0.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ddcutil/versions. These checks were done: - built on NixOS - /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0/bin/ddcutil passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.9.0 with grep in /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0 - directory tree listing: https://gist.github.com/39ac3ce627e1198f84287e5a42257663 - du listing: https://gist.github.com/b896a17a17dd52041097af423a55aea6 --- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 052f52e2ebd..e5af0c8d726 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf"; + sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 48b9d00c6b62faefa001eec168cb0a4fbaa70815 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 21:08:16 -0700 Subject: [PATCH 58/78] adapta-gtk-theme: 3.93.1.14 -> 3.93.1.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/1f7d6359cc7a8a9633e6baffccd4c6e7 - du listing: https://gist.github.com/976b4a761384960b8a30216a39131cee --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c8e7d860bcf..d696a43b3bc 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.1.14"; + version = "3.93.1.16"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2"; + sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx"; }; preferLocalBuild = true; From 7f7b1daf944aed1619a48486599db3bb8e6dd1b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 19:25:12 -0700 Subject: [PATCH 59/78] gqrx: 2.11.4 -> 2.11.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gqrx/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5/bin/gqrx had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.11.5 with grep in /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5 - directory tree listing: https://gist.github.com/45186a693bdf1b1c7ae2be1c9457ddf8 - du listing: https://gist.github.com/fe434d6ba0c5f72ef74629f65efea48f --- pkgs/applications/misc/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 5c449451e70..f7c7ca5472e 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.11.4"; + version = "2.11.5"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm"; + sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf"; }; nativeBuildInputs = [ cmake ]; From 80fe329faf037b8dc7bb0d5a743e807a7f52ea0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 17:11:39 -0700 Subject: [PATCH 60/78] jackett: 0.8.953 -> 0.8.997 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997/bin/Jackett passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.8.997 with grep in /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997 - directory tree listing: https://gist.github.com/725e5ff70be355ede10316c73e49da01 - du listing: https://gist.github.com/46fe05a40289b5eb82e68af6ef0dd0d0 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2bbb4674440..ef4b8239693 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.953"; + version = "0.8.997"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi"; + sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w"; }; buildInputs = [ makeWrapper ]; From 96ad842c473c385db9386a38ab95c18695781536 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 16:54:22 -0700 Subject: [PATCH 61/78] librealsense: 2.11.0 -> 2.11.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librealsense/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2.11.1 with grep in /nix/store/qyy6s8nbpifg33h0hvnpf3fizwdycpvz-librealsense-2.11.1 - directory tree listing: https://gist.github.com/020e7e6cfc0e9cc89911d68349e47bc7 - du listing: https://gist.github.com/dfc212b0151822573970980eb31f8289 --- pkgs/development/libraries/librealsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index c61000066f4..796954b356d 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0"; + sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid"; }; buildInputs = [ From 8870e3a510cd3b39e99bfa82972ff024417be747 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 18:25:49 -0700 Subject: [PATCH 62/78] irqbalance: 1.3.0 -> 1.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/irqbalance/versions. These checks were done: - built on NixOS - /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance passed the binary check. - Warning: no invocation of /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance-ui had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/786f267f8a2d5f1ed39214c1c32e4ffa - du listing: https://gist.github.com/0fd6680f29f78791a2d23a08bc831456 --- pkgs/os-specific/linux/irqbalance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 76c10f0a06e..439b2aff6af 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "009777p5v72x4r58skqgaf03qv3app9b8lkxkpxq0226l0x3j4qh"; + sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From cdd0d9944ad0ad2d3fbd1e793300a7959a22284f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 19:54:21 -0700 Subject: [PATCH 63/78] dash: 0.5.10.1 -> 0.5.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dash/versions. These checks were done: - built on NixOS - /nix/store/shdckmx580jc9c283dxlnl47gfj5lykc-dash-0.5.10.2/bin/dash passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/f099316518721d966018e207da80b59f - du listing: https://gist.github.com/943c0fa7050582ee37c58883869edf64 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index c852e1feb33..2db8edd5e0c 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.10.1"; + name = "dash-0.5.10.2"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s"; + sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw"; }; hardeningDisable = [ "format" ]; From bd0dbed3ff6c9e1c415ce669d1152761a9c64f97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 10:42:20 -0700 Subject: [PATCH 64/78] uncrustify: 0.66.1 -> 0.67 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uncrustify/versions. These checks were done: - built on NixOS - /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67/bin/uncrustify passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.67 with grep in /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67 - directory tree listing: https://gist.github.com/71da32610fd0c4196f8b0f19061ca051 - du listing: https://gist.github.com/6af9737f25aad6d34b2ee37f3d3a056e --- pkgs/development/tools/misc/uncrustify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 3cf707c6beb..d85cd1a8216 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.66.1"; + version = "0.67"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx"; + sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3"; }; nativeBuildInputs = [ cmake ]; From fbf82900c49afb8ea4ab688b82fdaf6157fa142c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 20:54:59 -0700 Subject: [PATCH 65/78] chirp: 20180512 -> 20180519 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/.chirpw-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/chirpw had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 20180519 with grep in /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519 - directory tree listing: https://gist.github.com/a05ef55580a6032a5b40aabb92e6dfd7 - du listing: https://gist.github.com/13517a738616514609c44b95f30fc5a1 --- pkgs/applications/misc/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 54f36663454..90d7ecd082c 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180512"; + version = "20180519"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm"; + sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv"; }; nativeBuildInputs = [ makeWrapper ]; From d9bdd77eb59079f1ebefb522325cf117ae575982 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 21 May 2018 11:46:44 +0200 Subject: [PATCH 66/78] vimNox: pin to lua 5.1 vimNox is currently built from a patched vim 7.3 source from 2012 that requires lua 5.1. Temporary fix, see discussion in #40749. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdc4ed881e0..c19e956e7a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18374,7 +18374,10 @@ with pkgs; xxd = callPackage ../tools/misc/xxd { }; - vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + vimNox = lowPrio (vim_configurable.override { + source = "vim-nox"; + lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua + }); qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; From d239113bb0a2b471ea72d8a8af2331ec87d72a93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 May 2018 08:42:51 -0700 Subject: [PATCH 67/78] palemoon: 27.9.1 -> 27.9.2 (#40838) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/palemoon/versions. These checks were done: - built on NixOS - /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2/bin/palemoon passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 27.9.2 with grep in /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2 - directory tree listing: https://gist.github.com/97521481792d6df556c4536742a77bb4 - du listing: https://gist.github.com/7f246d760956bb748d5e09cfd1193a6b --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 3f44d157660..e6b5ee641ee 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.9.1"; + version = "27.9.2"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k"; + sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r"; }; desktopItem = makeDesktopItem { From e8ef471df4fb1f9e7712fc9498437790c440201f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 May 2018 14:41:14 -0400 Subject: [PATCH 68/78] linux-copperhead: 4.16.9.a -> 4.16.10.a --- pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index 5c65f2064b4..fea27b649f5 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.9"; + version = "4.16.10"; revision = "a"; - sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl"; + sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From d775dc916080ed52eac84cdd6b68ab8feaeb0cb2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 May 2018 14:41:34 -0400 Subject: [PATCH 69/78] linux-copperhead: 4.14.41 -> 4.14.42 --- pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index 8054ba0be6a..f9af5e5f602 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.41"; + version = "4.14.42"; revision = "a"; - sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3"; + sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 2a5b2550f38afc92dfe33acb0e9d3c20a139f941 Mon Sep 17 00:00:00 2001 From: Alvar Date: Mon, 21 May 2018 21:53:50 +0200 Subject: [PATCH 70/78] pythonPackages.pypcap: 1.2.0 -> 1.2.2 (#40882) --- .../python-modules/pypcap/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index e2d4e1efe28..dc916213fcd 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -1,13 +1,12 @@ -{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }: +{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }: buildPythonPackage rec { pname = "pypcap"; - version = "1.2.0"; - name = "${pname}-${version}"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9"; + sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3"; }; patches = [ @@ -17,26 +16,24 @@ buildPythonPackage rec { '' --- a/setup.py +++ b/setup.py - @@ -27,7 +27,8 @@ def recursive_search(path, target_files): + @@ -28,6 +28,7 @@ def recursive_search(path, target_files): - def get_extension(): - # A list of all the possible search directories - - dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \ - + dirs = ['${libpcap}', '/usr', sys.prefix] + \ - + glob.glob('/opt/libpcap*') + \ - glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \ - glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' + - 'MacOSX.platform/Developer/SDKs/*') + def find_prefix_and_pcap_h(): + prefixes = chain.from_iterable(( + + '${libpcap}', + ('/usr', sys.prefix), + glob.glob('/opt/libpcap*'), + glob.glob('../libpcap*'), '') ]; buildInputs = [ libpcap ]; - nativeBuildInputs = [ dpkt ]; + checkInputs = [ dpkt ]; - meta = { + meta = with lib; { homepage = https://github.com/pynetwork/pypcap; description = "Simplified object-oriented Python wrapper for libpcap"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ geistesk ]; + license = licenses.bsd3; + maintainers = with maintainers; [ geistesk ]; }; } From 3709e30d067675956bce99a70bb4c55c10b3711a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 May 2018 22:15:33 +0200 Subject: [PATCH 71/78] restic: 0.8.3 -> 0.9.0 --- pkgs/tools/backup/restic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 158d7f1d2cf..9f9714e6d99 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "restic-${version}"; - version = "0.8.3"; + version = "0.9.0"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9"; + sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y"; }; buildPhase = '' @@ -31,7 +31,7 @@ buildGoPackage rec { --man $bin/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://restic.net; description = "A backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; From 5f9b2597105876afb4388e122a9545c1c0000571 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 May 2018 15:36:25 -0500 Subject: [PATCH 72/78] heaptrack: 2018-01-28 -> 1.1.0 use new stable release! --- pkgs/development/tools/profiling/heaptrack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index f5f9a15dd00..5ff0d2ca2b1 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "heaptrack-${version}"; - version = "2018-01-28"; + version = "1.1.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; - rev = "a4534d52788ab9814efca1232d402b2eb319342c"; - sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a"; + rev = "v${version}"; + sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 07723f14bb132f6d65c74b953bef39cd80457273 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 22 May 2018 00:10:32 +0200 Subject: [PATCH 73/78] shotcut: 18.03.06 -> 18.05.08 (#40887) --- pkgs/applications/video/shotcut/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0a786312214..6572164c797 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -3,15 +3,18 @@ , qtgraphicaleffects, libmlt , qmake, makeWrapper }: +assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; +assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; + stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.03.06"; + version = "18.05.08"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash"; + sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk"; }; enableParallelBuilding = true; From 050d07d6726ca650599af9108fb7ed0977caa152 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 21 May 2018 17:43:22 -0500 Subject: [PATCH 74/78] gn: fix patch url Fixes #40891 --- pkgs/development/tools/build-managers/gn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 35f54369abd..f49456a86ea 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch"; + url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch"; sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a"; }) ]; From fe79fc0be4f3e27d634fbcb27c43eed948d285ce Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Tue, 22 May 2018 01:22:12 +0200 Subject: [PATCH 75/78] nixos/tests/mysql-replication: fix test (#40850) Failed non-deterministically on hydra because replcation sometimes was not finished yet when checking the results. --- nixos/tests/mysql-replication.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 75c6d793feb..ed09ac10b75 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -57,18 +57,25 @@ in $master->start; $master->waitForUnit("mysql"); $master->waitForOpenPort(3306); + # Wait for testdb to be fully populated (5 rows). + $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave1->start; $slave2->start; $slave1->waitForUnit("mysql"); $slave1->waitForOpenPort(3306); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + + # wait for replications to finish + $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->succeed("systemctl stop mysql"); $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N"); $slave2->succeed("systemctl start mysql"); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); + $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); ''; }) From 9ec53a397ff52ec8a94a5bc6b603bff357c1fdd0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 21 May 2018 19:19:29 -0400 Subject: [PATCH 76/78] requireFile: Use stdenvNoCC There's no need for a C compiler --- pkgs/build-support/trivial-builders.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 2ec56c94763..73da775f7f5 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -157,14 +157,14 @@ rec { hash = if sha256 != null then sha256 else sha1; name_ = if name == null then baseNameOf (toString url) else name; in - stdenv.mkDerivation { + stdenvNoCC.mkDerivation { name = name_; outputHashMode = hashMode; outputHashAlgo = hashAlgo; outputHash = hash; preferLocalBuild = true; builder = writeScript "restrict-message" '' - source ${stdenv}/setup + source ${stdenvNoCC}/setup cat <<_EOF_ *** From 9cf701f856df2cdb7ec18cf7bc3829bf40c0cdcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 May 2018 17:03:26 -0700 Subject: [PATCH 77/78] mutt: 1.9.5 -> 1.10.0 (#40846) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mutt/versions. These checks were done: - built on NixOS - /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/mutt passed the binary check. - /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpring passed the binary check. - Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpewrap had a zero exit code or showed the expected version - /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/muttbug passed the binary check. - /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/flea passed the binary check. - Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/smime_keys had a zero exit code or showed the expected version - 4 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 1.10.0 with grep in /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0 - directory tree listing: https://gist.github.com/2b53d5dc44b600872e77911ba7099e1c - du listing: https://gist.github.com/4caca5d9043a5281a6b192ebaf30065f --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index bbd56b188df..81cf4541222 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz"; + sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582"; }; patches = optional smimeSupport (fetchpatch { From 0106dfcbeb56742503a89309c60a95433514226e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 May 2018 17:07:27 -0700 Subject: [PATCH 78/78] rust-bindgen: 0.36.1 -> 0.37.0 (#40833) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rust-bindgen/versions. These checks were done: - built on NixOS - /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/bindgen passed the binary check. - Warning: no invocation of /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/.bindgen-wrapped had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 1 of 2 passed binary check by having the new version present in output. - found 0.37.0 with grep in /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0 - directory tree listing: https://gist.github.com/dab90e1565932370211bc1cb47b526d9 - du listing: https://gist.github.com/1ea884a58cb25990e712703124f8a6da --- pkgs/development/tools/rust/bindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 36fa1019705..aeeae494e58 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz"; + sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93"; }; nativeBuildInputs = [ makeWrapper ];