Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a4d225c27849
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c0f1a40da312
Choose a head ref
  • 6 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 16, 2018

  1. gnupg22: 2.2.9 -> 2.2.11

    See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for
    release information
    
    (cherry picked from commit ace631b)
    lsix committed Nov 16, 2018
    Copy the full SHA
    76a06b0 View commit details
  2. postgresql_9_3: 9.3.24 -> 9.3.25

    See https://www.postgresql.org/about/news/1905/ for release information.
    Fixes CVE-2018-16850
    
    (cherry picked from commit 5d37d63)
    lsix committed Nov 16, 2018
    Copy the full SHA
    2f35733 View commit details
  3. postgresql_9_4: 9.4.19 -> 9.4.20

    See https://www.postgresql.org/about/news/1905/ for release information.
    Fixes CVE-2018-16850
    
    (cherry picked from commit 882c3b5)
    lsix committed Nov 16, 2018
    Copy the full SHA
    c022a69 View commit details
  4. postgresql_9_5: 9.5.14 -> 9.5.15

    See https://www.postgresql.org/about/news/1905/ for release information.
    Fixes CVE-2018-16850
    
    (cherry picked from commit f703ea6)
    lsix committed Nov 16, 2018
    Copy the full SHA
    16f5419 View commit details
  5. postgresql_9_6: 9.6.10 -> 9.6.11

    See https://www.postgresql.org/about/news/1905/ for release information.
    Fixes CVE-2018-16850
    
    (cherry picked from commit 1670fd1)
    lsix committed Nov 16, 2018
    Copy the full SHA
    8d2a122 View commit details
  6. postgresql_10: 10.5 -> 10.6

    See https://www.postgresql.org/about/news/1905/ for release information.
    Fixes CVE-2018-16850
    
    (cherry picked from commit 575151e)
    lsix committed Nov 16, 2018
    Copy the full SHA
    c0f1a40 View commit details
Showing with 12 additions and 12 deletions.
  1. +10 −10 pkgs/servers/sql/postgresql/default.nix
  2. +2 −2 pkgs/tools/security/gnupg/22.nix
20 changes: 10 additions & 10 deletions pkgs/servers/sql/postgresql/default.nix
Original file line number Diff line number Diff line change
@@ -100,33 +100,33 @@ let
in {

postgresql93 = common {
version = "9.3.24";
version = "9.3.25";
psqlSchema = "9.3";
sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542";
sha256 = "1nxn0hjrg4y5v5n2jgzrbicgv4504r2yfjyk6g6rq0sx8603x5g4";
};

postgresql94 = common {
version = "9.4.19";
version = "9.4.20";
psqlSchema = "9.4";
sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3";
sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf";
};

postgresql95 = common {
version = "9.5.14";
version = "9.5.15";
psqlSchema = "9.5";
sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y";
sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
};

postgresql96 = common {
version = "9.6.10";
version = "9.6.11";
psqlSchema = "9.6";
sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6";
sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
};

postgresql100 = common {
version = "10.5";
version = "10.6";
psqlSchema = "10.0";
sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
};

}
4 changes: 2 additions & 2 deletions pkgs/tools/security/gnupg/22.nix
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";

version = "2.2.9";
version = "2.2.11";

src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0r11mx8nkh7ysrnshs560amha5csx8zcaggb5kxcksx1zymyly32";
sha256 = "1ncwqjhcxh46fgkp84g2lhf91amcha7abk6wdm1kagzm7q93wv29";
};

nativeBuildInputs = [ pkgconfig ];