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

Commits on Nov 11, 2018

  1. gnused: fix Windows build

    volth committed Nov 11, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9d16458 View commit details

  2. Merge pull request #50224 from volth/sed-windows 

    gnused: fix Windows build
    @Mic92
    Mic92 authored Nov 11, 2018
    Copy the full SHA
    290eb75 View commit details
Showing with 7 additions and 2 deletions.
  1. +2 −0 pkgs/tools/text/gnused/422.nix
  2. +1 −1 pkgs/tools/text/gnused/default.nix
  3. +4 −1 pkgs/top-level/all-packages.nix
2 changes: 2 additions & 0 deletions pkgs/tools/text/gnused/422.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
};

configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no";

outputs = [ "out" "info" ];

meta = {
2 changes: 1 addition & 1 deletion pkgs/tools/text/gnused/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

license = stdenv.lib.licenses.gpl3Plus;

platforms = stdenv.lib.platforms.all;
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
};
}
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2964,7 +2964,10 @@ with pkgs;

gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };

gnused = callPackage ../tools/text/gnused { };
gnused = if !stdenv.hostPlatform.isWindows then
callPackage ../tools/text/gnused { } # broken on Windows
else
gnused_422;
# This is an easy work-around for [:space:] problems.
gnused_422 = callPackage ../tools/text/gnused/422.nix { };