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: 0ef2bffe5bef
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: 409b46d8369d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 26, 2019

  1. lispPackages.stumpwm: mimic Query-FS tricks for adding extra deps 

    (cherry picked from commit 83cb84e)

This is a no-op by default (intended for easier overriding) with low risk, and
requested by a user for backporting.
    @7c6f434c
    7c6f434c committed Mar 26, 2019
    Copy the full SHA
    13ff17b View commit details

  2. python.pkgs.pylint: pytestrunner belongs in nativeBuildInputs 

    because it's in `setup_requires`. Noticed when building with `doCheck =
false;`.

(cherry picked from commit a1a4ff7)
    @FRidh
    FRidh committed Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    46f7d78 View commit details

  3. python.pkgs.cartopy: fix build (#58361) 

    fallout of NixOS/nixpkgs#54182

(cherry picked from commit 29cec94)
    @dotlambda
    dotlambda authored and Robert Schütz committed Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    409b46d View commit details
4 changes: 3 additions & 1 deletion pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,13 @@ in
{
stumpwm = x:{
overrides = y: (x.overrides y) // {
linkedSystems = [];
preConfigure = ''
export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
'';
postInstall = ''
export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'"
export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \
'(function stumpwm:stumpwm)' '$linkedSystems'"
"$out/bin/stumpwm-lisp-launcher.sh"
cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin"
13 changes: 10 additions & 3 deletions pkgs/development/python-modules/cartopy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,12 +25,19 @@ buildPythonPackage rec {
-k "not test_nightshade_image"
'';

buildInputs = [ cython glibcLocales ];
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [
cython
geos # for geos-config
proj
];

buildInputs = [
geos proj
];

propagatedBuildInputs = [
# required
six pyshp shapely geos proj numpy
six pyshp shapely numpy

# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/pylint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@ buildPythonPackage rec {
sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492";
};

checkInputs = [ pytest pytestrunner pyenchant ];
nativeBuildInputs = [ pytestrunner ];

checkInputs = [ pytest pyenchant ];

propagatedBuildInputs = [ astroid isort mccabe ];