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: 3e55299b4142
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: 0a198954beb8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 2, 2018

  1. nvtop: use version-independent libnvidia-ml.so symlink 

    (cherry picked from commit 7812062)
    @WilliButz @globin
    WilliButz authored and globin committed Oct 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samueljsb Samuel Searles-Bryant
    SSH Key Fingerprint: UG1vbpwfv/yF8hRSqV7FLQGL2iSyjGsdQ/WDrm5be+I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8ef448 View commit details

  2. gdal: 2.3.1 -> 2.3.2 

    (cherry picked from commit f80730d)
Backport of #47565
    @mpickering @srhb
    mpickering authored and srhb committed Oct 2, 2018
    Copy the full SHA
    0a19895 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/development/libraries/gdal/default.nix
  2. +1 −1 pkgs/tools/system/nvtop/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gdal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "gdal-${version}";
version = "2.3.1";
version = "2.3.2";

src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw";
sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z";
};

buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
2 changes: 1 addition & 1 deletion pkgs/tools/system/nvtop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

cmakeFlags = [
"-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
"-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so.390.67"
"-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so"
"-DCMAKE_BUILD_TYPE=Release"
];