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: 6f38c93e3c08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9078ca6c01c1
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 31, 2020

  1. gettext: Add macOS warning patch 

    gettext 0.20 fixed a bug with handling locale on macOS, but this caused
it to report an annoying warning on systems where “language”
differs from “region”. See Homebrew issue for details:
<Homebrew/homebrew-core#41139>.

Add upstream patch that has not been released yet.
Details:
<https://www.mail-archive.com/bug-gnulib@gnu.org/msg36768.html>.
    @kirelagin
    kirelagin committed Jan 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9e4fc3 View commit details

  2. gettext: Remove the rebuild optimisation hack

    @kirelagin
    kirelagin committed Jan 31, 2020
    Copy the full SHA
    c0d1f26 View commit details

  3. Merge pull request #78820 from kirelagin/macos-gettext-warn 

    gettext: Add macOS warning patch
    @LnL7
    LnL7 authored Jan 31, 2020
    Copy the full SHA
    9078ca6 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/libraries/gettext/default.nix
9 changes: 7 additions & 2 deletions pkgs/development/libraries/gettext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, libiconv, xz }:
{ stdenv, lib, fetchurl, libiconv, xz, fetchpatch }:

stdenv.mkDerivation rec {
pname = "gettext";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
patches = [
./absolute-paths.diff
./gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
];
]
++ lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://git.savannah.gnu.org/cgit/gettext.git/patch?id=ec0e6b307456ceab352669ae6bccca9702108753";
sha256 = "0xqs01c7xl7vmw6bqvsmrzxxjxk2a4spcdpmlwm3b4hi2wc2lxnf";
});

outputs = [ "out" "man" "doc" "info" ];