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

Commits on May 26, 2020

  1. sad: use patch file extension

    @zowoq
    zowoq committed May 26, 2020
    Copy the full SHA
    cb4cc7a View commit details

  2. cernlib: use patch file extension

    @zowoq
    zowoq committed May 26, 2020
    Copy the full SHA
    6fa13a7 View commit details

  3. transfig: use patch file extension

    @zowoq
    zowoq committed May 26, 2020
    Copy the full SHA
    1d38f9f View commit details

Commits on May 27, 2020

  1. Merge pull request #88916 from zowoq/patches

    @Mic92
    Mic92 authored May 27, 2020
    Copy the full SHA
    660854a View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/sad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
};
buildInputs = [ haskell.compiler.ghc844 spass ];
patches = [
./patch
./patch.patch
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
# the <> operator with a different meaning defined by this package
./monoid.patch
0 pkgs/applications/science/logic/sad/patch → ...pplications/science/logic/sad/patch.patch
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/physics/cernlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gnumake imake makedepend ];
sourceRoot = ".";

patches = [ ./patch ];
patches = [ ./patch.patch ];

postPatch = ''
substituteInPlace 2006/src/config/site.def \
0 ...velopment/libraries/physics/cernlib/patch → ...ent/libraries/physics/cernlib/patch.patch
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions pkgs/tools/graphics/transfig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
buildInputs = [ zlib libjpeg libpng ];

patches = [
./patch-fig2dev-dev-Imakefile
./patch-fig2dev-Imakefile
./patch-transfig-Imakefile
./patch-fig2dev-fig2dev.h
./patch-fig2dev-dev-gensvg.c
./patch-fig2dev-dev-Imakefile.patch
./patch-fig2dev-Imakefile.patch
./patch-transfig-Imakefile.patch
./patch-fig2dev-fig2dev.h.patch
./patch-fig2dev-dev-gensvg.c.patch
];

patchPhase = ''
0 ...graphics/transfig/patch-fig2dev-Imakefile → ...cs/transfig/patch-fig2dev-Imakefile.patch
View file
File renamed without changes.
0 ...hics/transfig/patch-fig2dev-dev-Imakefile → ...ransfig/patch-fig2dev-dev-Imakefile.patch
View file
File renamed without changes.
0 ...phics/transfig/patch-fig2dev-dev-gensvg.c → ...transfig/patch-fig2dev-dev-gensvg.c.patch
View file
File renamed without changes.
0 ...graphics/transfig/patch-fig2dev-fig2dev.h → ...cs/transfig/patch-fig2dev-fig2dev.h.patch
View file
File renamed without changes.
0 ...raphics/transfig/patch-transfig-Imakefile → ...s/transfig/patch-transfig-Imakefile.patch
View file
File renamed without changes.