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: d6c6c7fcec6d
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: 6115f4777031
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 20, 2018

  1. nixos tests: bring back non-blocking nfs tests 

    ... at least for the big combined jobset where it's easy.
I don't know what I was thinking; this is clearly a better way.
    @vcunat
    vcunat committed Jul 20, 2018
    Copy the full SHA
    99adfd0 View commit details

  2. postgresql93: 9.3.22 -> 9.3.23 

    Release notes: https://www.postgresql.org/docs/10/static/release-9-3-23.html

(cherry picked from commit 73aaf63)
    @infinisil @thoughtpolice
    infinisil authored and thoughtpolice committed Jul 20, 2018
    Copy the full SHA
    129ae17 View commit details

  3. postgresql94: 9.4.17 -> 9.4.18 

    Release notes: https://www.postgresql.org/docs/10/static/release-9-4-18.html

(cherry picked from commit 3d16732)
    @infinisil @thoughtpolice
    infinisil authored and thoughtpolice committed Jul 20, 2018
    Copy the full SHA
    0c23862 View commit details

  4. postgresql95: 9.5.12 -> 9.5.13 

    Release notes: https://www.postgresql.org/docs/10/static/release-9-5-13.html

(cherry picked from commit ac5fdda)
    @infinisil @thoughtpolice
    infinisil authored and thoughtpolice committed Jul 20, 2018
    Copy the full SHA
    88c6f0c View commit details

  5. postgresql96: 9.6.8 -> 9.6.9 

    Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-9-6-9.html

(cherry picked from commit d066cec)
    @infinisil @thoughtpolice
    infinisil authored and thoughtpolice committed Jul 20, 2018
    Copy the full SHA
    1eefe30 View commit details

  6. postgresql100: 10.3 -> 10.4 

    Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-10-4.html

(cherry picked from commit 446ec6d)
    @infinisil @thoughtpolice
    infinisil authored and thoughtpolice committed Jul 20, 2018
    Copy the full SHA
    6115f47 View commit details
Showing with 13 additions and 13 deletions.
  1. +1 −0 nixos/release-combined.nix
  2. +2 −3 nixos/release.nix
  3. +10 −10 pkgs/servers/sql/postgresql/default.nix
1 change: 1 addition & 0 deletions nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -113,6 +113,7 @@ in rec {
(all nixos.tests.networking.scripted.macvlan)
(all nixos.tests.networking.scripted.sit)
(all nixos.tests.networking.scripted.vlan)
# FIXME: temporarily disabled, see #43473
#(all nixos.tests.nfs3)
#(all nixos.tests.nfs4)
(all nixos.tests.openssh)
5 changes: 2 additions & 3 deletions nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -334,9 +334,8 @@ in rec {
tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
# TODO: put in networking.nix after the test becomes more complete
tests.networkingProxy = callTest tests/networking-proxy.nix {};
# FIXME: temporarily disabled, see #43473
#tests.nfs3 = callTest tests/nfs.nix { version = 3; };
#tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nfs3 = callTest tests/nfs.nix { version = 3; };
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };
20 changes: 10 additions & 10 deletions pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -93,33 +93,33 @@ let
in {

postgresql93 = common {
version = "9.3.22";
version = "9.3.23";
psqlSchema = "9.3";
sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x";
};

postgresql94 = common {
version = "9.4.17";
version = "9.4.18";
psqlSchema = "9.4";
sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2";
};

postgresql95 = common {
version = "9.5.12";
version = "9.5.13";
psqlSchema = "9.5";
sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l";
};

postgresql96 = common {
version = "9.6.8";
version = "9.6.9";
psqlSchema = "9.6";
sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr";
};

postgresql100 = common {
version = "10.3";
version = "10.4";
psqlSchema = "10.0";
sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v";
};

}