From 26cd1be5b2c0085629f4b4ccedd5464c924c5495 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Sep 2016 20:21:40 +0200 Subject: [PATCH 01/24] go_1_7: 1.7 -> 1.7.1 --- pkgs/development/compilers/go/1.7.nix | 4 ++-- pkgs/development/compilers/go/remove-tools-1.7.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb86..d623d800bd79 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc5..b53e48e1a515 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. From 34008984f048aa8574543aa586ee67402cd186af Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 30 Sep 2016 14:44:00 -0500 Subject: [PATCH 02/24] dropbox: 11.4.20 -> 11.4.21 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 1b4e3e7d19f0..51e7e671175d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "11.4.20"; + version = "11.4.21"; sha256 = { - "x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6"; - "i686-linux" = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5"; + "x86_64-linux" = "179ajawqy43jhgvysc386hdyz9hdandwvh8m2y2rassvycn9kr8z"; + "i686-linux" = "1y4z9rb06f2a3cj51xawgpzgar9x7gvr4jrazncqfpfqkv7zayv1"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 6014df7ea990d64ac1aa144100285edcb272d1e2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 19 Sep 2016 16:32:55 +0300 Subject: [PATCH 03/24] perlPackages.DBIxClass: Add upstream patch to fix build Apply an upstream commit destined for next release like Debian is doing: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835731 Should fix http://hydra.nixos.org/build/40815848 (cherry picked from commit c08a84186f7f0145aebc063606bd654fea3efcf9) --- .../perl-modules/dbiclassx-fix.patch | 24 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/perl-modules/dbiclassx-fix.patch diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch new file mode 100644 index 000000000000..a46ffaa7bd9e --- /dev/null +++ b/pkgs/development/perl-modules/dbiclassx-fix.patch @@ -0,0 +1,24 @@ +From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 +From: Peter Rabbitson +Date: Tue, 13 Sep 2016 17:15:48 +0200 +Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) + libsqlite version + +--- + Changes | 2 ++ + t/prefetch/grouped.t | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t +index 4aad6b1..c0d2224 100644 +--- a/t/prefetch/grouped.t ++++ b/t/prefetch/grouped.t +@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; + + # add an extra track to one of the cds, and then make sure we can get it on top + # (check if limit works) +- my $top_cd = $cd_rs->slice (1,1)->next; ++ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; + $top_cd->create_related ('tracks', { + title => 'over the top', + }); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d914bb14f85a..c80ee76c8583 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3608,6 +3608,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; }; + patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { From 140f82a8d91ae8b778024d35df41414edeecbd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Oct 2016 14:34:08 +0200 Subject: [PATCH 04/24] Revert "mesa_drivers: work around #16779" This reverts commit 4cf7839305df45d83b97fd14b27169b7d6a56ff7. Breaks kde5 test. http://hydra.nixos.org/build/41374761 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46fa8a580e15..81013f5847d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8785,7 +8785,6 @@ in mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - wayland = wayland_1_9; # work-around for #16779 }; in mo.drivers ); From db6a20b1a179d1056d5070b96de219e04e37c6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Oct 2016 14:37:36 +0200 Subject: [PATCH 05/24] document #16779 --- nixos/doc/manual/release-notes/rl-1609.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 56d08bf1c2d6..4668f020a036 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -108,6 +108,13 @@ following incompatible changes: + + + Using packages compiled with older Wayland may yield an error "undefined reference to `wl_proxy_*`". + Please upgrade those packages and see bug report for more details. + + + Gitlab's maintainance script gitlab-runner was removed and split up into the From 557b2625d7899454280f7adbf323db3e8c56bc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Oct 2016 14:43:02 +0200 Subject: [PATCH 06/24] Document new NixOS services --- nixos/doc/manual/release-notes/rl-1609.xml | 57 +++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 4668f020a036..e762f064cd13 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -49,7 +49,62 @@ has the following highlights: The following new services were added since the last release: - (this will get automatically generated at release time) + hardware/video/amdgpu.nix + hardware/video/displaylink.nix + programs/info.nix + programs/mosh.nix + programs/spacefm.nix + programs/tmux.nix + programs/xonsh.nix + security/chromium-suid-sandbox.nix + security/hidepid.nix + services/audio/squeezelite.nix + services/backup/znapzend.nix + services/continuous-integration/buildkite-agent.nix + services/continuous-integration/hydra/default.nix + services/continuous-integration/gocd-agent/default.nix + services/continuous-integration/gocd-server/default.nix + services/development/hoogle.nix + services/editors/emacs.nix + services/games/factorio.nix + services/games/terraria.nix + services/logging/awstats.nix + services/logging/graylog.nix + services/misc/emby.nix + services/misc/mantisbt.nix + services/misc/nzbget.nix + services/misc/packagekit.nix + services/misc/sonarr.nix + services/misc/spice-vdagentd.nix + services/misc/taskserver + services/network-filesystems/tahoe.nix + services/networking/coturn.nix + services/networking/ferm.nix + services/networking/gdomap.nix + services/networking/libreswan.nix + services/networking/logmein-hamachi.nix + services/networking/mfi.nix + services/networking/mjpg-streamer.nix + services/networking/mosquitto.nix + services/networking/nntp-proxy.nix + services/networking/offlineimap.nix + services/networking/pptpd.nix + services/networking/sniproxy.nix + services/networking/smokeping.nix + services/networking/toxvpn.nix + services/networking/xl2tpd.nix + services/networking/zerobin.nix + services/security/oauth2_proxy.nix + services/torrent/flexget.nix + services/web-apps/mattermost.nix + services/web-apps/tt-rss.nix + services/web-servers/caddy.nix + services/web-servers/lighttpd/inginious.nix + services/x11/compton.nix + services/x11/xbanish.nix + system/boot/loader/systemd-boot/systemd-boot.nix + system/boot/plymouth.nix + virtualisation/xe-guest-utilities.nix When upgrading from a previous release, please be aware of the From eaa160cd351a5d818c26906243bb18d2856076c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Oct 2016 14:55:15 +0200 Subject: [PATCH 07/24] fix manual syntax --- nixos/doc/manual/release-notes/rl-1609.xml | 110 ++++++++++----------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index e762f064cd13..43fb2b0a3a30 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -50,61 +50,61 @@ has the following highlights: hardware/video/amdgpu.nix - hardware/video/displaylink.nix - programs/info.nix - programs/mosh.nix - programs/spacefm.nix - programs/tmux.nix - programs/xonsh.nix - security/chromium-suid-sandbox.nix - security/hidepid.nix - services/audio/squeezelite.nix - services/backup/znapzend.nix - services/continuous-integration/buildkite-agent.nix - services/continuous-integration/hydra/default.nix - services/continuous-integration/gocd-agent/default.nix - services/continuous-integration/gocd-server/default.nix - services/development/hoogle.nix - services/editors/emacs.nix - services/games/factorio.nix - services/games/terraria.nix - services/logging/awstats.nix - services/logging/graylog.nix - services/misc/emby.nix - services/misc/mantisbt.nix - services/misc/nzbget.nix - services/misc/packagekit.nix - services/misc/sonarr.nix - services/misc/spice-vdagentd.nix - services/misc/taskserver - services/network-filesystems/tahoe.nix - services/networking/coturn.nix - services/networking/ferm.nix - services/networking/gdomap.nix - services/networking/libreswan.nix - services/networking/logmein-hamachi.nix - services/networking/mfi.nix - services/networking/mjpg-streamer.nix - services/networking/mosquitto.nix - services/networking/nntp-proxy.nix - services/networking/offlineimap.nix - services/networking/pptpd.nix - services/networking/sniproxy.nix - services/networking/smokeping.nix - services/networking/toxvpn.nix - services/networking/xl2tpd.nix - services/networking/zerobin.nix - services/security/oauth2_proxy.nix - services/torrent/flexget.nix - services/web-apps/mattermost.nix - services/web-apps/tt-rss.nix - services/web-servers/caddy.nix - services/web-servers/lighttpd/inginious.nix - services/x11/compton.nix - services/x11/xbanish.nix - system/boot/loader/systemd-boot/systemd-boot.nix - system/boot/plymouth.nix - virtualisation/xe-guest-utilities.nix + hardware/video/displaylink.nix + programs/info.nix + programs/mosh.nix + programs/spacefm.nix + programs/tmux.nix + programs/xonsh.nix + security/chromium-suid-sandbox.nix + security/hidepid.nix + services/audio/squeezelite.nix + services/backup/znapzend.nix + services/continuous-integration/buildkite-agent.nix + services/continuous-integration/hydra/default.nix + services/continuous-integration/gocd-agent/default.nix + services/continuous-integration/gocd-server/default.nix + services/development/hoogle.nix + services/editors/emacs.nix + services/games/factorio.nix + services/games/terraria.nix + services/logging/awstats.nix + services/logging/graylog.nix + services/misc/emby.nix + services/misc/mantisbt.nix + services/misc/nzbget.nix + services/misc/packagekit.nix + services/misc/sonarr.nix + services/misc/spice-vdagentd.nix + services/misc/taskserver + services/network-filesystems/tahoe.nix + services/networking/coturn.nix + services/networking/ferm.nix + services/networking/gdomap.nix + services/networking/libreswan.nix + services/networking/logmein-hamachi.nix + services/networking/mfi.nix + services/networking/mjpg-streamer.nix + services/networking/mosquitto.nix + services/networking/nntp-proxy.nix + services/networking/offlineimap.nix + services/networking/pptpd.nix + services/networking/sniproxy.nix + services/networking/smokeping.nix + services/networking/toxvpn.nix + services/networking/xl2tpd.nix + services/networking/zerobin.nix + services/security/oauth2_proxy.nix + services/torrent/flexget.nix + services/web-apps/mattermost.nix + services/web-apps/tt-rss.nix + services/web-servers/caddy.nix + services/web-servers/lighttpd/inginious.nix + services/x11/compton.nix + services/x11/xbanish.nix + system/boot/loader/systemd-boot/systemd-boot.nix + system/boot/plymouth.nix + virtualisation/xe-guest-utilities.nix When upgrading from a previous release, please be aware of the From 5526517da91e0aa719c672b54479182e896db716 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 11 Sep 2016 17:27:07 +0200 Subject: [PATCH 08/24] nixos/lib/testing: Fix unsetting $xchg Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83. Unsetting the environment variable shortly before using it is not going to end up very well, so let's just filter out the variable from the output of export and unset it shortly afterwards. This fixes the runInMachine NixOS test. Signed-off-by: aszlig (cherry picked from commit b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4) --- nixos/lib/testing.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd5126..7fad5cbc3cd9 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ From 8d8796141b744770d63c0a326737078623957ff1 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 9 Sep 2016 11:24:00 -0400 Subject: [PATCH 09/24] Fix borgbackup dependency on lz4 (cherry picked from commit 739b058779620bc0c8938b98b8c6172b59d8979b) --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 9649e35c074b..911819f48aae 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl.dev}" - export BORG_LZ4_PREFIX="${lz4}" + export BORG_LZ4_PREFIX="${lz4.dev}" ''; postInstall = '' From ca6dbe9ed69b02c99ecdd811cdd4a19681374964 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 2 Oct 2016 00:11:13 +0300 Subject: [PATCH 10/24] openjpeg_2_0: Fix hash (cherry picked from commit 82c0aa7d85183da8031d4c0ac7fd562887d03b89) --- pkgs/development/libraries/openjpeg/2.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix index 80026af7be04..dd30b18e97c7 100644 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix (args // rec { version = "2.0.1"; branch = "2"; revision = "version.2.0.1"; - sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw"; + sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; }) From f22817d8d2bc17d2bcdb8ac4308a4bce6f5d1d2b Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sat, 1 Oct 2016 14:45:22 -0500 Subject: [PATCH 11/24] kibana: fix 4.6.0 for i686 (cherry picked from commit c3e57f3095d3c5e4631a5978702226ee2b6bd8cd) --- pkgs/development/tools/misc/kibana/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index d851741405ff..677ffa49c998 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -3,8 +3,12 @@ with stdenv.lib; let inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; info = splitString "-" stdenv.system; - arch = elemAt info 0; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; @@ -16,7 +20,7 @@ in stdenv.mkDerivation rec { version = "4.6.0"; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz"; + url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.system}"; }; From 9ee0d65cc93c9cb48577ff1eb5af42ee1d3e0065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Oct 2016 14:52:02 +0200 Subject: [PATCH 12/24] flashplayer: preferLocalBuild = true; The builder does almost nothing, and I hate to have to copy hundreds of megabytes to a builds slave because of that. (cherry picked from commit a745f87b7f6c67e602fd45e93757a5749c89bd9c) --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 61eca26555b4..4fab984c62ee 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + preferLocalBuild = true; + outputs = [ "out" ] ++ lib.optional is-i686 "sa"; installPhase = '' From 39ed101bebf6c704bce8ddaf0ed182d8e6afbb4d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 6 Sep 2016 15:17:14 +0800 Subject: [PATCH 13/24] syncthing: 0.14.5 -> 0.14.6 (cherry picked from commit 6c6ebf5d33fea5dd55e6753840372837d40f2477) A bugfix release, recommended for all users by upstream. In particular, it resolves an issue that potentially could result in unwanted data loss. --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 276550e3afd1..99a9e7462c26 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.5"; + version = "0.14.6"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz"; + sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz"; }; buildInputs = [ go ]; From cb272cb66a55518a03d817373f7b08738f054cee Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 26 Sep 2016 16:07:14 +0800 Subject: [PATCH 14/24] syncthing: 0.14.6 -> 0.14.7 (cherry picked from commit 0230d923f13d8d716f8e57c6882c80815b4ce790) A bugfix release, recommended for all users by upstream. Of note is a deadlock fix. --- pkgs/applications/networking/syncthing/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 99a9e7462c26..82e0cce47d66 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.6"; + version = "0.14.7"; name = "syncthing-${version}"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz"; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279"; }; buildInputs = [ go ]; From 924c22e34a5fc911e4a02902ba879ae13597bcaf Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 1 Oct 2016 08:46:31 +0200 Subject: [PATCH 15/24] linux_4_7: 4.7.5 -> 4.7.6 (cherry picked from commit 22108b7a10cd06a96baa2486d52ccdae3e66cc9e) --- pkgs/os-specific/linux/kernel/linux-4.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index 85be8019dfca..f08d594a3957 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.6"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv"; }; kernelPatches = args.kernelPatches; From 3dc0897331bfbe4eee30e167d3db1bf8b8005a41 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 1 Oct 2016 08:47:30 +0200 Subject: [PATCH 16/24] grsecurity: 4.7.5-201609261522 -> 4.7.6-201609301918 (cherry picked from commit 2ec9a1a955d49c538206c64424d553da9a379df1) --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 85be8019dfca..f08d594a3957 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.6"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d4e9f1e72750..0a577bb4e316 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.5"; - grrev = "201609261522"; - sha256 = "1306lw3byw6cyi0dqh0dcl67l0bi043zmp3582hjpkwj934bahf7"; + { kver = "4.7.6"; + grrev = "201609301918"; + sha256 = "153x97vvd3jl2i7fs6d5ilqnmz2v2iyzsf3pg3frrackv6xaisa5"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 37d17e9dd05c50af69b70ad3c5471514147a891a Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Fri, 30 Sep 2016 00:38:20 -0400 Subject: [PATCH 17/24] gnome-maps: add webkitgtk to buildInputs Per #17143 on GitHub, `gnome-maps` currently fails due to missing Webkit2. Adding `webkitgtk` to `buildInputs` fixes the issue. (cherry picked from commit ecd41c19b85852c7400ba9af7b24d8365bc91ecc) --- pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix index caff53dcc1d6..8625f21f3db7 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 , gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup +, webkitgtk }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg autoreconfHook gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; + gnome3.gnome_online_accounts gnome3.defaultIconTheme + webkitgtk ]; patches = [ ./soup.patch ]; From a3af3ac407995eae91d34917f4ee0289ce57d34a Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 2 Oct 2016 19:30:10 +0100 Subject: [PATCH 18/24] remmina: 1.0.0 -> 1.2.0-rcgit.15 Fixes build post FreeRDP upgrade (5abb36b) (cherry picked from commit 7a8d300823897f2b2b6944a3bb7c19a5e2a3290d) --- .../networking/remote/remmina/default.nix | 48 +++++++++++++------ .../networking/remote/remmina/lgthread.patch | 16 ------- 2 files changed, 34 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/networking/remote/remmina/lgthread.patch diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95ebc..90c80db0a02a 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,9 +1,13 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 -, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem +, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 +, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon +, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core +, openssl }: let - version = "1.0.0"; + version = "1.2.0-rcgit.15"; desktopItem = makeDesktopItem { name = "remmina"; @@ -15,29 +19,45 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; + # Latest release of remmina refers to thing that aren't yet in + # a FreeRDP release so we need to build one from git source + # See also https://github.com/FreeRDP/Remmina/pull/731 + # Remove when FreeRDP release catches up with this commit + freerdp_git = stdenv.lib.overrideDerivation freerdp (args: { + name = "freerdp-git-2016-09-30"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec"; + sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y"; + }; + }); + in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchurl { - url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz"; - sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "Remmina"; + rev = "v${version}"; + sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 - freerdp libssh libgcrypt gnutls ]; + glib gtk3 gettext libxkbfile libgnome_keyring libX11 + freerdp_git libssh libgcrypt gnutls + pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 + libvncserver libpthreadstubs libXdmcp libxkbcommon + libsecret spice_protocol spice_gtk epoxy at_spi2_core + openssl ]; - cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; - - patches = [ ./lgthread.patch ]; + cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; postInstall = '' mkdir -pv $out/share/applications - mkdir -pv $out/share/icons cp ${desktopItem}/share/applications/* $out/share/applications - cp -r $out/share/remmina/icons/* $out/share/icons wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ''; diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch deleted file mode 100644 index 2d8e60f75726..000000000000 --- a/pkgs/applications/networking/remote/remmina/lgthread.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix [undefined reference to `g_thread_init'] as suggested by -http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html - -diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt ---- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400 -+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400 -@@ -132,6 +132,8 @@ - endif() - endif() - -+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" ) -+ - add_subdirectory(po) - add_subdirectory(icons) - add_subdirectory(desktop) - From 37389502b652f439d5319b816288960f6b745beb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Sep 2016 21:15:25 +0200 Subject: [PATCH 19/24] haskell-stack: fix build of the new version --- .../haskell-modules/configuration-common.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02c7b40485be..7504c40626a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -971,11 +971,17 @@ self: super: { }); # https://github.com/commercialhaskell/stack/issues/2263 - stack = appendPatch super.stack (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; - sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; + stack = (dontJailbreak super.stack).overrideScope (self: super: { + http-client = self.http-client_0_5_3_2; + http-client-tls = self.http-client-tls_0_3_3; + http-conduit = self.http-conduit_2_2_2_1; + optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; + criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # Test suite fails a QuickCheck property. + optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. From edd8a530d115ba0650fafea44dfb48ccd75c0e74 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 15 Sep 2016 17:23:45 -0400 Subject: [PATCH 20/24] czmqpp: init at 1.2.0 (cherry picked from commit 295bb3adf73ce721cd5b0a3ba0189731167c50b6) --- pkgs/development/libraries/czmqpp/default.nix | 28 +++++++++++++++++++ .../development/libraries/czmqpp/socket.patch | 17 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/czmqpp/default.nix create mode 100644 pkgs/development/libraries/czmqpp/socket.patch diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix new file mode 100644 index 000000000000..672a89cc3c02 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: + +stdenv.mkDerivation rec { + name = "czmqpp-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "czmqpp"; + rev = "v${version}"; + sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + propagatedBuildInputs = [ czmq ]; + + # https://github.com/zeromq/czmqpp/issues/42 + patches = [ ./socket.patch ]; +} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch new file mode 100644 index 000000000000..0464bcf77971 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/socket.patch @@ -0,0 +1,17 @@ +--- /src/socket.cpp ++++ /src/socket.cpp +@@ -60,12 +60,12 @@ + int socket::bind(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_bind(self_, address.c_str()); ++ return zsocket_bind(self_, "%s", address.c_str()); + } + int socket::connect(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_connect(self_, address.c_str()); ++ return zsocket_connect(self_, "%s", address.c_str()); + } + + bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81013f5847d2..3987eb6b5cb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9900,6 +9900,8 @@ in czmq = callPackage ../development/libraries/czmq { }; + czmqpp = callPackage ../development/libraries/czmqpp { }; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; From c8553698fbd972852d8645e6aacbf64455c701cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Sep 2016 20:09:54 +0200 Subject: [PATCH 21/24] openshot-qt: 2.0.7 -> 2.1.0 Also update libopenshot (0.1.1 -> 0.1.2) and libopenshot-audio (0.1.1 -> 0.1.2). Both libraries seem to be somewhat version coupled with openshot (all three projects had a release at the same time). Openshot now depends on ZMQ. Test notes: the application runs, but I managed to crash it after doing this: * Import pictures and video * Add two pictures to the timeline (next to each other) * Drag the 2nd picture partly over over the first (creates an effect). App dies. The last output from the app is: timeline_webview:INFO addTransition... Unhandled Python exception Aborted The same crash happens with v2.0.7 though. (cherry picked from commit 3e6ce75b8fc9d8d705e375d655f4609b4784481a) --- pkgs/applications/video/openshot-qt/default.nix | 6 +++--- .../video/openshot-qt/libopenshot-audio.nix | 4 ++-- pkgs/applications/video/openshot-qt/libopenshot.nix | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 1fc0182a68ac..eb184933964b 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { name = "openshot-qt-${version}"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh"; + sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; }; buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt chmod +x $out/bin/openshot-qt wrapProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH" + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" ''; doCheck = false; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 8b583d4ec5cb..fdaa049fa428 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7"; + sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; buildInputs = [ diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 2737c48ec83d..841587fcab30 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}: +, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp +, cppzmq, czmqpp +}: with stdenv.lib; @@ -8,13 +10,13 @@ let in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903"; + sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; }; patchPhase = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake doxygen imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp + unittest-cpp cppzmq czmqpp ]; LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; From d8d270d6cc9d93c0a65c95020e3c702ac6d1f767 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Oct 2016 08:45:45 -0400 Subject: [PATCH 22/24] Linux 4.8 (cherry picked from commit e4958d54b13909281ee01ef241abab5d955f6f75) --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 18 +++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.8.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix new file mode 100644 index 000000000000..5c2112686235 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.8"; + modDirVersion = "4.8.0"; + extraMeta.branch = "4.8"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3987eb6b5cb5..f8c92df212b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11230,6 +11230,21 @@ in ]; }; + linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11383,7 +11398,7 @@ in linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_7; + linuxPackages_latest = self.linuxPackages_4_8; linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11396,6 +11411,7 @@ in linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); + linuxPackages_4_8 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_8 linuxPackages_4_8); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From 31bb717fa41dfefed28bfd0b7879c036a686fa3c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Oct 2016 18:01:01 +0200 Subject: [PATCH 23/24] Add NixOS 16.09.666.3738950 AMIs (cherry picked from commit 39b75f3b9f39760f3966e4a15894a7403b875442) --- nixos/modules/virtualisation/ec2-amis.nix | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index bdf6ed4dcd29..2df8e1fdd7a8 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -134,4 +134,50 @@ "16.03".us-west-2.hvm-s3 = "ami-925c9ff2"; "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; "16.03".us-west-2.pv-s3 = "ami-734c8f13"; + + # 16.09.666.3738950 + "16.09".ap-northeast-1.hvm-ebs = "ami-35578954"; + "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7"; + "16.09".ap-northeast-1.pv-ebs = "ami-07548a66"; + "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90"; + "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba"; + "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222"; + "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4"; + "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2"; + "16.09".ap-south-1.hvm-ebs = "ami-922450fd"; + "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02"; + "16.09".ap-south-1.pv-ebs = "ami-4d394d22"; + "16.09".ap-south-1.pv-s3 = "ami-17384c78"; + "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b"; + "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a"; + "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc"; + "16.09".ap-southeast-1.pv-s3 = "ami-5826823b"; + "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23"; + "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b"; + "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc"; + "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83"; + "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472"; + "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473"; + "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3"; + "16.09".eu-central-1.pv-s3 = "ami-3488775b"; + "16.09".eu-west-1.hvm-ebs = "ami-15662766"; + "16.09".eu-west-1.hvm-s3 = "ami-476b2a34"; + "16.09".eu-west-1.pv-ebs = "ami-876928f4"; + "16.09".eu-west-1.pv-s3 = "ami-70682903"; + "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b"; + "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88"; + "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21"; + "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b"; + "16.09".us-east-1.hvm-ebs = "ami-93347684"; + "16.09".us-east-1.hvm-s3 = "ami-5e347649"; + "16.09".us-east-1.pv-ebs = "ami-b0387aa7"; + "16.09".us-east-1.pv-s3 = "ami-51357746"; + "16.09".us-west-1.hvm-ebs = "ami-06337a66"; + "16.09".us-west-1.hvm-s3 = "ami-76307916"; + "16.09".us-west-1.pv-ebs = "ami-fd327b9d"; + "16.09".us-west-1.pv-s3 = "ami-cc347dac"; + "16.09".us-west-2.hvm-ebs = "ami-49fe2729"; + "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; + "16.09".us-west-2.pv-ebs = "ami-14fe2774"; + "16.09".us-west-2.pv-s3 = "ami-74f12814"; } From c89c1ba08b8a6dc18d51c73e57aef18ddef53066 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Oct 2016 18:16:34 +0200 Subject: [PATCH 24/24] ec2-amis.nix: Create a "latest" attribute for NixOps (cherry picked from commit 4b89d478870d211672737fc492b52aefb98ac574) --- nixos/modules/virtualisation/ec2-amis.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 2df8e1fdd7a8..ffd1cbec3ce3 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -1,4 +1,4 @@ -{ +let self = { "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; @@ -180,4 +180,6 @@ "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; "16.09".us-west-2.pv-ebs = "ami-14fe2774"; "16.09".us-west-2.pv-s3 = "ami-74f12814"; -} + + latest = self."16.09"; +}; in self