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: 35a537df2ee1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e267ad39b2b
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 12, 2019

  1. gettext: 0.19.8.1 -> 0.20.1 

    - 0.20 release information: https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00006.html
- 0.20.1 release information: https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html
    @lsix @FRidh
    lsix authored and FRidh committed Nov 12, 2019
    Copy the full SHA
    3e267ad View commit details
Showing with 3 additions and 343 deletions.
  1. +0 −323 pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
  2. +3 −20 pkgs/development/libraries/gettext/default.nix
323 changes: 0 additions & 323 deletions pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
View file

This file was deleted.

23 changes: 3 additions & 20 deletions pkgs/development/libraries/gettext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }:
{ stdenv, lib, fetchurl, libiconv, xz }:

let allowBisonDependency = !stdenv.isDarwin; in
stdenv.mkDerivation rec {
pname = "gettext";
version = "0.19.8.1";
version = "0.20.1";

src = fetchurl {
url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
sha256 = "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6";
};
patches = [
./absolute-paths.diff
(fetchurl {
name = "CVE-2018-18751.patch";
url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4";
sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn";
})
] ++ lib.optionals (!allowBisonDependency) [
# Only necessary for CVE-2018-18751.patch:
./CVE-2018-18751-bison.patch
];

outputs = [ "out" "man" "doc" "info" ];
@@ -54,14 +45,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
xz
xz.bin
]
# Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch
# is also applied):
++ lib.optional allowBisonDependency bison
++ [
# Only necessary for CVE-2018-18751.patch:
automake115x
autoconf
];
# HACK, see #10874 (and 14664)
buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;