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: 1bb3a05a1120
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: 914d52623087
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 15, 2020

  1. jitsi-meet-electron: 2.2.0 -> 2.3.1 

    (cherry picked from commit 5b19fa9)
    @JesusMtnez @worldofpeace
    JesusMtnez authored and worldofpeace committed Sep 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3b8ddb2 View commit details

  2. pytorch: update to use passthru's for checks 

    This makes the checks a little easier to understand - we can just
check it in the passthru. Also increase major check for cuda 11.

(cherry picked from commit c85fc34)
    @matthewbauer
    matthewbauer committed Sep 15, 2020

    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
    914d526 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.2.0";
version = "2.3.1";

src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "0gqyqjj69x1gxwj4zhwazddnj5xzy598xqz7vwkpdm1ldzna2iyj";
sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x";
name = "${pname}-${version}.AppImage";
};

2 changes: 2 additions & 0 deletions pkgs/development/libraries/science/math/magma/default.nix
View file
Original file line number Diff line number Diff line change
@@ -50,4 +50,6 @@ in stdenv.mkDerivation {
platforms = platforms.unix;
maintainers = with maintainers; [ tbenst ];
};

passthru.cudatoolkit = cudatoolkit;
}
10 changes: 3 additions & 7 deletions pkgs/development/python-modules/pytorch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,15 +25,11 @@ assert !openMPISupport || openmpi != null;
assert !cudaSupport || cudatoolkit != null;
assert cudnn == null || cudatoolkit != null;
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
in majorIs == "9" || majorIs == "10");
in majorIs == "9" || majorIs == "10" || majorIs == "11");

let
hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs;
matchesCudatoolkit = hasDependency cudatoolkit;
in
# confirm that cudatoolkits are sync'd across dependencies
assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi;
assert !cudaSupport || matchesCudatoolkit magma;
assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit;
assert !cudaSupport || magma.cudatoolkit == cudatoolkit;

let
cudatoolkit_joined = symlinkJoin {