JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-06-15 10:50:55 +02:00
commit 40ff73327d
6 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -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 <<EOL
${cfg.extraConfig}
EOL

5
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View File

@ -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

14
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View File

@ -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)

14
pkgs/development/mobile/cocoapods/Gemfile.lock
View File

@ -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)

16
pkgs/development/mobile/cocoapods/gemset-beta.nix
View File

@ -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";
};
}

16
pkgs/development/mobile/cocoapods/gemset.nix
View File

@ -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";
};
}