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: 5ac5f503b2a0
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: 8c6a5a26a764
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 9, 2020

  1. linuxPackages.nvidia_x11: 440.64 -> 440.82 

    (cherry picked from commit 73ff54e)
cc #84680
    @lovesegfault @veprbl
    lovesegfault authored and veprbl committed Apr 9, 2020
    Copy the full SHA
    f56a3e1 View commit details

  2. haskell.compiler.ghc822Binary: propagate llvm dependency 

    Fixes the following error when attempting to build packages using this
compiler:

  <no location info>: error:
      Warning: Couldn't figure out LLVM version!
               Make sure you have installed LLVM 3.9

  <no location info>: error: ghc: could not execute: opt

(cherry picked from commit 31f557c)
    @thefloweringash @bennofs
    thefloweringash authored and bennofs committed Apr 9, 2020
    Copy the full SHA
    48a0195 View commit details

  3. Merge pull request #84789 from bennofs/backport-ghc-llvm-aarch64 

    [20.03] haskell.compiler.ghc822Binary: propagate llvm dependency
    @domenkozar
    domenkozar authored Apr 9, 2020
    Copy the full SHA
    8c6a5a2 View commit details
Showing with 8 additions and 20 deletions.
  1. +4 −1 pkgs/development/compilers/ghc/8.2.2-binary.nix
  2. +4 −19 pkgs/os-specific/linux/nvidia-x11/default.nix
5 changes: 4 additions & 1 deletion pkgs/development/compilers/ghc/8.2.2-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{ stdenv, substituteAll
, fetchurl, perl, gcc, llvm
, ncurses5, gmp, glibc, libiconv
, llvmPackages
}:

# Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform;

let
useLLVM = !stdenv.targetPlatform.isx86;

libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ];
propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];

# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
23 changes: 4 additions & 19 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,25 +22,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "440.64";
sha256_64bit = "0xbm1dh95kz8h4d62pql2wmvw2gbgc7iif2bkixbnqijl4dryg71";
settingsSha256 = "1vdir8a8cky4kmipqsbyjhjn0aqbwgzsxq73hafikrp5n4nbclfh";
persistencedSha256 = "0lcnila7xyl5r87c88sq2fn5k6ylmdf1bk2wcvm6aw5x6pmnrkgi";

patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/Frogging-Family/nvidia-all/master/patches/linux-version.diff";
sha256 = "0c7ildivgv0ncic43mlj92jn2pf5plw5nbw5minb8lp23glkfm84";
stripLen = 2;
extraPrefix = "kernel/";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/Frogging-Family/nvidia-all/master/patches/kernel-5.6.patch";
sha256 = "1i0lj1jzwbpzd9vf424aylacwidqxa990qbi12jxxfvabbjq5fhi";
stripLen = 2;
extraPrefix = "kernel/";
})
];
version = "440.82";
sha256_64bit = "13km9800skyraa0s312fc4hwyw5pzb0jfkrv1yg6anppyan1bm7d";
settingsSha256 = "15psxvd65wi6hmxmd2vvsp2v0m07axw613hb355nh15r1dpkr3ma";
persistencedSha256 = "13izz9p2kg9g38gf57g3s2sw7wshp1i9m5pzljh9v82c4c22x1fw";
}
else legacy_390;