cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-09-28 06:01:55 +00:00 committed by GitHub
commit 46d4b6c758
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 63 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/zoneminder.nix
View file

@ -366,5 +366,5 @@ in {
}; };
}; };
meta.maintainers = with lib.maintainers; [ peterhoeg ]; meta.maintainers = with lib.maintainers; [ ];
} }

22
pkgs/applications/misc/firestarter/default.nix
View file

@ -2,6 +2,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchzip , fetchzip
, addOpenGLRunpath
, cmake , cmake
, glibc_multi , glibc_multi
, glibc , glibc
@ -9,7 +10,6 @@
, pkg-config , pkg-config
, cudatoolkit , cudatoolkit
, withCuda ? false , withCuda ? false
, linuxPackages
}: }:
let let
@ -60,13 +60,23 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake git pkg-config ]; nativeBuildInputs = [
cmake
git
pkg-config
] ++ lib.optionals withCuda [
addOpenGLRunpath
];
buildInputs = [ hwloc ] ++ (if withCuda then buildInputs = [ hwloc ] ++ (if withCuda then
[ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ] [ glibc_multi cudatoolkit ]
else else
[ glibc.static ]); [ glibc.static ]);
NIX_LDFLAGS = lib.optionals withCuda [
"-L${cudatoolkit}/lib/stubs"
];
cmakeFlags = [ cmakeFlags = [
"-DFIRESTARTER_BUILD_HWLOC=OFF" "-DFIRESTARTER_BUILD_HWLOC=OFF"
"-DCMAKE_C_COMPILER_WORKS=1" "-DCMAKE_C_COMPILER_WORKS=1"
@ -76,8 +86,14 @@ stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/ cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/
runHook postInstall
'';
postFixup = lib.optionalString withCuda ''
addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
''; '';
meta = with lib; { meta = with lib; {

8
pkgs/applications/misc/kile-wl/default.nix
View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kile-wl"; pname = "kile-wl";
version = "unstable-2021-08-03"; version = "unstable-2021-09-02";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "snakedye"; owner = "snakedye";
repo = "kile"; repo = "kile";
rev = "7f0b1578352d935084d3d56ef42487d2a8cfbfe8"; rev = "acd61f7e59cc34091c976b0cdc3067dd35b53cae";
sha256 = "sha256-Ir9LNQt7/7TjhCJ69HYx1tBXeq/i7F3ydmenvchZgDI="; sha256 = "sha256-O5sdPw9tR3GFPmJmb/QDmdBc7yeSGui4k+yn4Xo016A=";
}; };
passthru.updateScript = unstableGitUpdater { passthru.updateScript = unstableGitUpdater {
url = "https://gitlab.com/snakedye/kile.git"; url = "https://gitlab.com/snakedye/kile.git";
}; };
cargoSha256 = "sha256-195rPxX3BTxJ0xLgye14aWuBd5OuJ30wyUa4wrbQ3Xo="; cargoSha256 = "sha256-2QCv5fk0AH4sv0QJ/16zniHfg3HZLoHB7dl6vSfkxpE=";
nativeBuildInputs = [ scdoc ]; nativeBuildInputs = [ scdoc ];

37
pkgs/applications/networking/instant-messengers/quaternion/default.nix
View file

@ -1,17 +1,27 @@
{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake { mkDerivation
, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools , stdenv
, libquotient, libsecret , lib
, fetchFromGitHub
, cmake
, qtbase
, qtquickcontrols
, qtquickcontrols2
, qtkeychain
, qtmultimedia
, qttools
, libquotient
, libsecret
}: }:
mkDerivation rec { mkDerivation rec {
pname = "quaternion"; pname = "quaternion";
version = "0.0.9.5-beta2"; version = "0.0.95";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QMatrixClient"; owner = "QMatrixClient";
repo = "Quaternion"; repo = "Quaternion";
rev = version; rev = version;
sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8=";
}; };
buildInputs = [ buildInputs = [
@ -26,14 +36,15 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttools ]; nativeBuildInputs = [ cmake qttools ];
postInstall = if stdenv.isDarwin then '' postInstall =
mkdir -p $out/Applications if stdenv.isDarwin then ''
mv $out/bin/quaternion.app $out/Applications mkdir -p $out/Applications
rmdir $out/bin || : mv $out/bin/quaternion.app $out/Applications
'' else '' rmdir $out/bin || :
substituteInPlace $out/share/applications/com.github.quaternion.desktop \ '' else ''
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion" substituteInPlace $out/share/applications/com.github.quaternion.desktop \
''; --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
'';
meta = with lib; { meta = with lib; {
description = description =

6
pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
View file

@ -2,13 +2,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "pass-git-helper"; pname = "pass-git-helper";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "languitar"; owner = "languitar";
repo = "pass-git-helper"; repo = "pass-git-helper";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs="; sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI=";
}; };
propagatedBuildInputs = [ pyxdg ]; propagatedBuildInputs = [ pyxdg ];
@ -21,6 +21,6 @@ buildPythonApplication rec {
homepage = "https://github.com/languitar/pass-git-helper"; homepage = "https://github.com/languitar/pass-git-helper";
description = "A git credential helper interfacing with pass, the standard unix password manager"; description = "A git credential helper interfacing with pass, the standard unix password manager";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ vanzef ]; maintainers = with maintainers; [ hmenke vanzef ];
}; };
} }

6
pkgs/applications/window-managers/river/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "river"; pname = "river";
version = "unstable-2021-08-03"; version = "unstable-2021-08-19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ifreund"; owner = "ifreund";
repo = pname; repo = pname;
rev = "2fc0875a3e17a0328d14d0c6323bd8022d5b15de"; rev = "e59c2a73d72853cb54f55eecc446f337c94cda24";
sha256 = "sha256-Cs9RRubxy0DY6ILRZY36HtcoqBvzbN7NEfpREq1KBBQ="; sha256 = "sha256-R/Wg8KLh4v3ccX1Uh0Q+7026tRH7XLxHpX9/BgsGGdA=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

2
pkgs/development/compilers/vala/default.nix
View file

@ -100,7 +100,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala"; homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ] ++ teams.pantheon.members; maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members;
}; };
}); });

4
pkgs/development/libraries/science/math/tensorflow/bin.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, addOpenGLRunpath , addOpenGLRunpath
, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn
}: }:
with lib; with lib;
@ -17,7 +17,7 @@ let
platform = "x86_64"; platform = "x86_64";
rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]);
packages = import ./binary-hashes.nix; packages = import ./binary-hashes.nix;

5
pkgs/development/python-modules/tensorflow/bin.nix
View file

@ -23,7 +23,6 @@
, cudaSupport ? false , cudaSupport ? false
, cudatoolkit ? null , cudatoolkit ? null
, cudnn ? null , cudnn ? null
, nvidia_x11 ? null
, zlib , zlib
, python , python
, symlinkJoin , symlinkJoin
@ -41,8 +40,7 @@
# - the source build is currently brittle and not easy to maintain # - the source build is currently brittle and not easy to maintain
assert cudaSupport -> cudatoolkit != null assert cudaSupport -> cudatoolkit != null
&& cudnn != null && cudnn != null;
&& nvidia_x11 != null;
# unsupported combination # unsupported combination
assert ! (stdenv.isDarwin && cudaSupport); assert ! (stdenv.isDarwin && cudaSupport);
@ -126,7 +124,6 @@ in buildPythonPackage {
cudatoolkit.out cudatoolkit.out
cudatoolkit.lib cudatoolkit.lib
cudnn cudnn
nvidia_x11
]; ];
libpaths = [ libpaths = [

4
pkgs/development/tools/analysis/flow/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flow"; pname = "flow";
version = "0.160.0"; version = "0.160.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pgNxiNzL7Mb/ueBhWBtUi4BGnLnemk3o05K/fqXWE6Q="; sha256 = "sha256-tIKQBJ+nlUzY3+jHlXOAMfCLVJfRXZiveSkKaDMz/hI=";
}; };
installPhase = '' installPhase = ''

2
pkgs/development/tools/heroku/default.nix
View file

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://devcenter.heroku.com/articles/heroku-cli"; homepage = "https://devcenter.heroku.com/articles/heroku-cli";
description = "Everything you need to get started using Heroku"; description = "Everything you need to get started using Heroku";
maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; maintainers = with lib.maintainers; [ aflatter mirdhyn marsam ];
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = with lib.platforms; unix; platforms = with lib.platforms; unix;
}; };

4
pkgs/tools/filesystems/catcli/default.nix
View file

@ -7,13 +7,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "catcli"; pname = "catcli";
version = "0.7.2"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deadc0de6"; owner = "deadc0de6";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "12928pvwd6jr4x81nxi5691axianm4vz5gql1jazlij0ahc2f905"; sha256 = "03yf9sjqdg3xcbvkn1591zxd2d0r8wz1b749zrn55k3a03c7jzf5";
}; };
propagatedBuildInputs = [ docopt anytree ]; propagatedBuildInputs = [ docopt anytree ];

1
pkgs/top-level/all-packages.nix
View file

@ -2062,7 +2062,6 @@ with pkgs;
libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
cudaSupport = config.cudaSupport or false; cudaSupport = config.cudaSupport or false;
inherit (linuxPackages) nvidia_x11;
cudatoolkit = cudatoolkit_10_0; cudatoolkit = cudatoolkit_10_0;
cudnn = cudnn_cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_10_0;
}; };

1
pkgs/top-level/python-packages.nix
View file

@ -8859,7 +8859,6 @@ in {
tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false; cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_11_0; cudatoolkit = pkgs.cudatoolkit_11_0;
cudnn = pkgs.cudnn_cudatoolkit_11_0; cudnn = pkgs.cudnn_cudatoolkit_11_0;
}; };