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: f4bb9c421f6a
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: 090f5e095533
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 7, 2018

  1. nano: 3.0 -> 3.1 

    (cherry picked from commit 65eb3e3)
Backport of #47991
    @samueldr @srhb
    samueldr authored and srhb committed Oct 7, 2018
    Copy the full SHA
    be47bab View commit details

  2. gdal: Add libxml2 to build 

    (cherry picked from commit 4af38a2)
Backport of #47972
    @Hodapp87 @srhb
    Hodapp87 authored and srhb committed Oct 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    090f5e0 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 pkgs/applications/editors/nano/default.nix
  2. +3 −2 pkgs/development/libraries/gdal/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/nano/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ let

in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "3.0";
version = "3.1";

src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0";
sha256 = "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l";
};

nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
5 changes: 3 additions & 2 deletions pkgs/development/libraries/gdal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv
, libiconv, libxml2
, netcdfSupport ? true, netcdf, hdf5, curl
}:

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};

buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat ]
libspatialite poppler hdf4 qhull giflib expat libxml2 ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin libiconv
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"--with-proj=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional
"--with-hdf4=${hdf4.dev}" # optional
"--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
];