Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 703827f36cc6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e44e002a2a2
Choose a head ref
  • 17 commits
  • 14 files changed
  • 8 contributors

Commits on Dec 5, 2018

  1. govers: 20150109 -> 20160623

    @zimbatm
    zimbatm committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lukekarrys Luke Karrys
    GPG key ID: 586238713720A638
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5360ce View commit details

  2. gox: 0.4.0 -> 20181025 

    We need the latest gox to support the latest go releases better.
Unfortunately the author doesn't seem interesting in making new releases
(1y already since the last release).
    @zimbatm
    zimbatm committed Dec 5, 2018
    Copy the full SHA
    3064dd1 View commit details

  3. vault: 0.11.5 -> 1.0.0

    @zimbatm
    zimbatm committed Dec 5, 2018
    Copy the full SHA
    c8091a8 View commit details

  4. leela-zero: init at 0.16

    Averell Dalton committed Dec 5, 2018
    Copy the full SHA
    b47d83f View commit details

  5. pythonPackages.parsimonious: 0.7.0 -> 0.8.1

    @costrouc
    costrouc committed Dec 5, 2018
    Copy the full SHA
    47f54a4 View commit details

  6. stdenv/darwin: fix portable libsystem hook 

    Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.
    @matthewbauer
    matthewbauer committed Dec 5, 2018
    Copy the full SHA
    0b85745 View commit details

  7. Merge pull request #51575 from costrouc/costrouc/update-parsimonious 

    pythonPackages.parsimonious: 0.7.0 -> 0.8.1
    @worldofpeace
    worldofpeace authored Dec 5, 2018
    Copy the full SHA
    e9a44ba View commit details

  8. gimp: fix on darwin 

    Fixes #41071
    @matthewbauer
    matthewbauer committed Dec 5, 2018
    Copy the full SHA
    73a87b5 View commit details

  9. Merge pull request #51469 from matthewbauer/gimp-fix 

    gimp: fix on darwin
    @matthewbauer
    matthewbauer authored Dec 5, 2018
    Copy the full SHA
    ab22183 View commit details

  10. Merge pull request #51524 from zimbatm/vault-1.0.0 

    vault: 0.11.5 -> 1.0.0
    @zimbatm
    zimbatm authored Dec 5, 2018
    Copy the full SHA
    7faa672 View commit details

  11. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.12-5-g7b287a8 from Hackage revision
commercialhaskell/all-cabal-hashes@47cd70c.
    @peti
    peti committed Dec 5, 2018
    Copy the full SHA
    0325f01 View commit details

  12. haskell-brick: update override for the new version

    @peti
    peti committed Dec 5, 2018
    Copy the full SHA
    8e11a25 View commit details

  13. haskell-json-autotype: disable the test suite to fix the build

    @peti
    peti committed Dec 5, 2018
    Copy the full SHA
    db6aeea View commit details

  14. all-cabal-hashes: update to Hackage at 2018-12-05T19:25:40Z

    @peti
    peti committed Dec 5, 2018
    Copy the full SHA
    8fbbee1 View commit details

  15. Merge pull request #51562 from averelld/leela-zero 

    leela-zero: init at 0.16
    @rasendubi
    rasendubi authored Dec 5, 2018
    Copy the full SHA
    9a75598 View commit details

  16. firefox-devedition-bin: 64.0b10 -> 65.0b1

    @adisbladis
    adisbladis committed Dec 5, 2018
    Copy the full SHA
    db8002c View commit details

  17. firefox-beta-bin: 64.0b10 -> 64.0b14

    @adisbladis
    adisbladis committed Dec 5, 2018
    Copy the full SHA
    2e44e00 View commit details
13 changes: 9 additions & 4 deletions pkgs/applications/graphics/gimp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr
, AppKit, Cocoa, gtk-mac-integration }:
, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }:

let
inherit (python2Packages) pygtk wrapPython python;
@@ -23,8 +23,11 @@ in stdenv.mkDerivation rec {
freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
] ++ stdenv.lib.optionals stdenv.isDarwin [
# cf-private is needed to get some things not in swift-corefoundation.
# For instance _OBJC_CLASS_$_NSArray is missing.
AppKit Cocoa gtk-mac-integration-gtk2 cf-private
] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];

pythonPath = [ pygtk ];

@@ -69,7 +72,9 @@ in stdenv.mkDerivation rec {
"--with-icc-directory=/var/run/current-system/sw/share/color/icc"
];

doCheck = true;
# on Darwin,
# test-eevl.c:64:36: error: initializer element is not a compile-time constant
doCheck = !stdenv.isDarwin;

enableParallelBuilding = true;

Loading