Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 91b286c8935b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f115a926496b
Choose a head ref
  • 8 commits
  • 5 files changed
  • 7 contributors

Commits on Jun 22, 2018

  1. chrony: disable the whole timesyncd module when chronyd is enabled 

    Peviously only the timesyncd systemd unit was disabled. This meant
that when you activate a system that has chronyd enabled the following
strange startup behaviour takes place:

  systemd[1]: Starting chrony NTP daemon...
  systemd[1]: Stopping Network Time Synchronization...
  systemd[1]: Stopped chrony NTP daemon.
  systemd[1]: Starting Network Time Synchronization...

(cherry picked from commit 56ef106)
    @basvandijk
    basvandijk committed Jun 22, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samueljsb Samuel Searles-Bryant
    SSH Key Fingerprint: UG1vbpwfv/yF8hRSqV7FLQGL2iSyjGsdQ/WDrm5be+I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    942097d View commit details

Commits on Jun 24, 2018

  1. strongswan: include curl plugin by default (#39506) 

    This is necessary for OCSP and/or remote CRL verification of server
certificates to work, which is a fairly common thing to need.

(cherry picked from commit 1022dc5)
    @benley @basvandijk
    benley authored and basvandijk committed Jun 24, 2018
    Copy the full SHA
    8c9510b View commit details

  2. strongswan: 5.6.2 -> 5.6.3 (#41237) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/strongswan/versions.

These checks were done:

- built on NixOS
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/pki passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-cmd passed the binary check.
- Warning: no invocation of /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-systemd had a zero exit code or showed the expected version
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/ipsec passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/swanctl passed the binary check.
- 4 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 5.6.3 with grep in /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3
- directory tree listing: https://gist.github.com/258736889db4e822d054b65e7035147b
- du listing: https://gist.github.com/478dbb4f44b4ed18b112076b17451a4e

(cherry picked from commit 30c3a7f)
    @r-ryantm @basvandijk
    r-ryantm authored and basvandijk committed Jun 24, 2018
    Copy the full SHA
    196d2f9 View commit details

  3. nvidia_x11: 390.48 -> 390.67 

    (cherry picked from commit 95ee1bc)
I don't experience any regressions.
    @bkchr @vcunat
    bkchr authored and vcunat committed Jun 24, 2018
    Copy the full SHA
    444d3d5 View commit details

  4. Merge pull request #42519 from LumiGuide/strongswan-5.6.3-release-18.03 

    cherry-pick strongswan-5.6.3 on release-18.03
    @pSub
    pSub authored Jun 24, 2018
    Copy the full SHA
    170937e View commit details

  5. php: 7.2.5 -> 7.2.6 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar.phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phpdbg passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-cgi passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pear passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/peardev passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pecl passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.6 with grep in /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6
- directory tree listing: https://gist.github.com/409d2cfaa7e805714825281fbaba0d0f
- du listing: https://gist.github.com/7fbd8e3d56524f70b3dfb94c045fccd2

(cherry picked from commit 98c4ac2)
    @xeji
    R. RyanTM authored and xeji committed Jun 24, 2018
    Copy the full SHA
    1f6b527 View commit details

  6. php: 7.2.6 -> 7.2.7 (#42461) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar.phar passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phpdbg passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-cgi passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pear passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/peardev passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pecl passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.7 with grep in /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7
- directory tree listing: https://gist.github.com/6ecb6c21e261466b865908a41564ca3e
- du listing: https://gist.github.com/2ca1dc05af5d5240a6b63fadd59ee0d0

(cherry picked from commit 15ec13d)
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Jun 24, 2018
    Copy the full SHA
    4c4e26b View commit details

  7. Merge pull request #42366 from LumiGuide/fix-chronyd-release-18.03 

    chrony: disable the whole timesyncd module when chronyd is enabled (cherry-pick on release-18.03)
    @xeji
    xeji authored Jun 24, 2018
    Copy the full SHA
    f115a92 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/chrony.nix
View file
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ in
home = stateDir;
};

systemd.services.timesyncd.enable = mkForce false;
services.timesyncd.enable = mkForce false;

systemd.services.chronyd =
{ description = "chrony NTP daemon";
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -353,7 +353,7 @@ in {
};

php72 = generic {
version = "7.2.5";
sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk";
version = "7.2.7";
sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc";
};
}
12 changes: 5 additions & 7 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,11 @@ in
rec {
# Policy: use the highest stable version as the default (on our master).
stable = generic {
version = "390.48";
sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";

patches = [ ./fix_missing_symbol.patch ];
version = "390.67";
sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg";
sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd";
settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7";
persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw";
};

beta = stable; # not enough interest to maintain beta ATM
19 changes: 0 additions & 19 deletions pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
View file

This file was deleted.

20 changes: 12 additions & 8 deletions pkgs/tools/networking/strongswan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,28 +3,32 @@
, gmp, python, iptables, ldns, unbound, openssl, pcsclite
, openresolv
, systemd, pam

, enableTNC ? false, curl, trousers, sqlite, libxml2
, curl
, enableTNC ? false, trousers, sqlite, libxml2
, enableNetworkManager ? false, networkmanager
}:

# Note on curl support: If curl is built with gnutls as its backend, the
# strongswan curl plugin may break.
# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info.

with stdenv.lib;

stdenv.mkDerivation rec {
name = "strongswan-${version}";
version = "5.6.2";
version = "5.6.3";

src = fetchurl {
url = "http://download.strongswan.org/${name}.tar.bz2";
sha256 = "14ifqay54brw2b2hbmm517bxw8bs9631d7jm4g139igkxcq0m9p0";
sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3";
};

dontPatchELF = true;

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs =
[ gmp python iptables ldns unbound openssl pcsclite ]
++ optionals enableTNC [ curl trousers sqlite libxml2 ]
[ curl gmp python iptables ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ]
++ optionals stdenv.isLinux [ systemd.dev pam ]
++ optionals enableNetworkManager [ networkmanager ];

@@ -61,12 +65,12 @@ stdenv.mkDerivation rec {
"--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth"
"--enable-forecast" "--enable-connmark" "--enable-acert"
"--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
"--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ]
"--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly"
"--enable-curl" ]
++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
++ optional (stdenv.system == "i686-linux") "--enable-padlock"
++ optionals enableTNC [
"--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
"--enable-curl"
"--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
"--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
"--enable-tnc-imv" "--enable-imv-attestation"