nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-18 22:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-17 12:20:00 +00:00
committed by GitHub
parent 3ed237717a 894829379c
commit f68cf6f574
36 changed files with 943 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Adafruit-PlatformDetect";
version = "3.1.0";
version = "3.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk=";
sha256 = "sha256-JcqDuTzR2sffEbmhJHRPJggLruc9lKQ4aO/Ab88yo/I=";
};
nativeBuildInputs = [ setuptools-scm ];

3
pkgs/development/python-modules/pytorch/bin.nix
View File

@@ -5,7 +5,6 @@
, isPy38
, isPy39
, python
, nvidia_x11
, addOpenGLRunpath
, future
, numpy
@@ -52,7 +51,7 @@ in buildPythonPackage {
'';
postFixup = let
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
in ''
find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "setting rpath for $lib..."