From 861bbbcb3c406f4a5a7131e48f2621431514c91e Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 8 Jun 2019 01:13:52 -0400 Subject: [PATCH 1/6] nixos/sshd: fixes validation for cross-compilation See https://github.com/NixOS/nixpkgs/pull/62853 --- nixos/modules/services/networking/ssh/sshd.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 89f56a726f4..0f9d2420903 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -4,7 +4,15 @@ with lib; let - sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } '' + # The splicing information needed for nativeBuildInputs isn't available + # on the derivations likely to be used as `cfgc.package`. + # This middle-ground solution ensures *an* sshd can do their basic validation + # on the configuration. + validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform + then [ cfgc.package ] + else [ pkgs.buildPackages.openssh ]; + + sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } '' cat >$out < Date: Fri, 31 May 2019 08:05:17 -0700 Subject: [PATCH 2/6] python.pkgs.pip: 19.0.3 -> 19.1.1 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index da5fc24fb22..0364d89cc7f 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "19.0.3"; + version = "19.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; + sha256 = "0n09vnyn8q3vf31prb050s2nfx4gvwy1gwazgrfbc7hasg9xgls4"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From 3ac9699ae2cc8f8238bcd8533497676074a69d3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 15 Jun 2019 09:15:02 +0200 Subject: [PATCH 3/6] Revert "python.pkgs.pip: 19.0.3 -> 19.1.1" mass-rebuild... This reverts commit 44eac163ce8d08859e532ea0cba3768b04f85968. --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 0364d89cc7f..da5fc24fb22 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "19.1.1"; + version = "19.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0n09vnyn8q3vf31prb050s2nfx4gvwy1gwazgrfbc7hasg9xgls4"; + sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From 7e7efa6c6ec2b847c25f09540d7a7aa42687d050 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 15 Jun 2019 03:50:18 -0400 Subject: [PATCH 4/6] pantheon.wingpanel-applications-menu: drop libwnck3 Guess upstream documented that they used libwnck3 even though it was removed years ago. --- .../wingpanel-indicators/applications-menu/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index e905ce9d854..0d00ee2072d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus -, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 -, zeitgeist, bc }: +, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist +, bc }: stdenv.mkDerivation rec { pname = "applications-menu"; @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { libgee libsoup libunity - libwnck3 plank switchboard wingpanel From 6465fd49984142760a6fbe8315e9508ff109b5c1 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 15 Jun 2019 13:35:28 +0900 Subject: [PATCH 5/6] python3Packages.cmd2: 0.9.12 -> 0.9.13 Changelog: https://github.com/python-cmd2/cmd2/blob/master/CHANGELOG.md --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 3b76de33ce7..32f852a2b63 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.12"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "14pyvihikml1z7q21q9cvdfxvvlf8lhbaasj05hpiq6fjyvd7zsc"; + sha256 = "0f5f5rgwckci2fqwbzjk5sfpwxqn5gy0biz8sjll4v5zgvjsswxq"; }; LC_ALL="en_US.UTF-8"; From 96d79aff400104c0c4b6b391cf2fd521097beb0e Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 13 Jun 2019 16:56:27 -0700 Subject: [PATCH 6/6] cocoapods: 1.7.1 -> 1.7.2 Also update cocoapods-beta to match. --- .../mobile/cocoapods/Gemfile-beta.lock | 14 +++++++------- pkgs/development/mobile/cocoapods/Gemfile.lock | 14 +++++++------- .../development/mobile/cocoapods/gemset-beta.nix | 16 ++++++++-------- pkgs/development/mobile/cocoapods/gemset.nix | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index f78fafb1652..fa170a21f3b 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.1) + cocoapods (1.7.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.1) + cocoapods-core (= 1.7.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -22,13 +22,13 @@ GEM cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (>= 2.2.0, < 3.0) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.1) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -45,7 +45,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.2.0) + fourflusher (2.3.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.9.0) + xcodeproj (1.10.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 1b16ad4d318..cde74bbaedd 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.1) + cocoapods (1.7.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.1) + cocoapods-core (= 1.7.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -22,13 +22,13 @@ GEM cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (>= 2.2.0, < 3.0) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.1) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -45,7 +45,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.2.0) + fourflusher (2.3.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.9.0) + xcodeproj (1.10.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 0d898db82ed..919f540c19e 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs"; + sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x"; + sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -169,10 +169,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; + sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; fuzzy_match = { groups = ["default"]; @@ -292,9 +292,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; + sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index d503ca82fd4..d363a81ca0f 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs"; + sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x"; + sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; + sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; fuzzy_match = { source = { @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; + sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; } \ No newline at end of file