diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
| commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
| tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/misc/frescobaldi/setup.cfg.patch | |
| parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
| parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
| download | nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc/frescobaldi/setup.cfg.patch')
| -rw-r--r-- | pkgs/misc/frescobaldi/setup.cfg.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch deleted file mode 100644 index 502cdd61966d..000000000000 --- a/pkgs/misc/frescobaldi/setup.cfg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build -Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app -Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx -diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg ---- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100 -+++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200 -@@ -1,6 +1,2 @@ --[bdist_wininst] --bitmap=frescobaldi-wininst.bmp --install-script=frescobaldi-wininst.py -- - [sdist] - force-manifest=1 |