colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-02-20 00:02:56 +00:00 committed by GitHub
commit 2b6e1df1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
96 changed files with 656 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -686,6 +686,12 @@
wrapper for <literal>assert</literal> conditions.
</para>
</listitem>
<listitem>
<para>
The <literal>vpnc</literal> package has been changed to use
GnuTLS instead of OpenSSL by default for licensing reasons.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to
@ -935,6 +941,12 @@
<literal>programs.starship.settings</literal>.
</para>
</listitem>
<listitem>
<para>
The <link xlink:href="https://dino.im">Dino</link> XMPP client
was updated to 0.3, adding support for audio and video calls.
</para>
</listitem>
<listitem>
<para>
<literal>services.mattermost.plugins</literal> has been added

4
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -215,6 +215,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions.
- The `vpnc` package has been changed to use GnuTLS instead of OpenSSL by default for licensing reasons.
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
@ -313,6 +315,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new module was added for the [Starship](https://starship.rs/) shell prompt,
providing the options `programs.starship.enable` and `programs.starship.settings`.
- The [Dino](https://dino.im) XMPP client was updated to 0.3, adding support for audio and video calls.
- `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins.
Plugins are automatically repackaged using autoPatchelf.

4
nixos/modules/hardware/network/b43.nix
View File

@ -24,10 +24,6 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in
###### implementation
config = mkIf config.networking.enableB43Firmware {
assertions = singleton
{ assertion = lessThan 0 (builtins.compareVersions kernelVersion "3.2");
message = "b43 firmware for kernels older than 3.2 not packaged yet!";
};
hardware.firmware = [ pkgs.b43Firmware_5_1_138 ];
};

5
nixos/modules/hardware/video/capture/mwprocapture.nix
View File

@ -16,11 +16,6 @@ in
config = mkIf cfg.enable {
assertions = singleton {
assertion = versionAtLeast kernelPackages.kernel.version "3.2";
message = "Magewell Pro Capture family module is not supported for kernels older than 3.2";
};
boot.kernelModules = [ "ProCapture" ];
environment.systemPackages = [ kernelPackages.mwprocapture ];

1
nixos/modules/security/wrappers/default.nix
View File

@ -92,7 +92,6 @@ let
, permissions
, ...
}:
assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
''
cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}"
echo -n "${source}" > "$wrapperDir/${program}.real"

2
nixos/modules/services/networking/firewall.nix
View File

@ -433,8 +433,6 @@ in
drop the packet if the source address is not reachable via any
interface) or false. Defaults to the value of
kernelHasRPFilter.
(needs kernel 3.3+)
'';
};

15
nixos/modules/services/networking/multipath.nix
View File

@ -242,21 +242,6 @@ in {
'';
};
retain_attached_hw_handler = mkOption {
type = nullOr (enum [ "yes" "no" ]);
default = null; # real default: "yes"
description = ''
(Obsolete for kernels >= 4.3) If set to "yes" and the SCSI layer has
already attached a hardware_handler to the device, multipath will not
force the device to use the hardware_handler specified by mutipath.conf.
If the SCSI layer has not attached a hardware handler, multipath will
continue to use its configured hardware handler.
Important Note: Linux kernel 4.3 or newer always behaves as if
"retain_attached_hw_handler yes" was set.
'';
};
detect_prio = mkOption {
type = nullOr (enum [ "yes" "no" ]);
default = null; # real default: "yes"

11
nixos/modules/tasks/network-interfaces.nix
View File

@ -1325,22 +1325,13 @@ in
val = tempaddrValues.${opt}.sysctl;
in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val));
# Capabilities won't work unless we have at-least a 4.3 Linux
# kernel because we need the ambient capability
security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then {
security.wrappers = {
ping = {
owner = "root";
group = "root";
capabilities = "cap_net_raw+p";
source = "${pkgs.iputils.out}/bin/ping";
};
} else {
ping = {
setuid = true;
owner = "root";
group = "root";
source = "${pkgs.iputils.out}/bin/ping";
};
};
security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter ''
/run/wrappers/bin/ping {

22
pkgs/applications/audio/helvum/default.nix
View File

@ -16,20 +16,20 @@
stdenv.mkDerivation rec {
pname = "helvum";
version = "0.3.2";
version = "0.3.4";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ryuukyu";
owner = "pipewire";
repo = pname;
rev = version;
sha256 = "sha256-Kt6gnMRTOVXqjAjEZKlylcGhzl52ZzPNVbJhwzLhzkM=";
sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-kxJRY9GSPwnb431iYCfJdGcl5HjpFr2KkWrFDpGajp8=";
hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY";
};
nativeBuildInputs = [
@ -51,21 +51,9 @@ stdenv.mkDerivation rec {
LIBCLANG_PATH = "${libclang.lib}/lib";
patches = [
# enables us to use gtk4-update-icon-cache instead of gtk3 one
(fetchpatch {
url = "https://gitlab.freedesktop.org/ryuukyu/helvum/-/merge_requests/24.patch";
sha256 = "sha256-WmI6taBL/6t587j06n0mwByQ8x0eUA5ECvGNjg2/vtk=";
})
];
postPatch = ''
patchShebangs build-aux/cargo.sh
'';
meta = with lib; {
description = "A GTK patchbay for pipewire";
homepage = "https://gitlab.freedesktop.org/ryuukyu/helvum";
homepage = "https://gitlab.freedesktop.org/pipewire/helvum";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;

4
pkgs/applications/blockchains/aeon/default.nix
View File

@ -4,7 +4,7 @@
}:
let
version = "0.13.0.0";
version = "0.14.1.0";
in
stdenv.mkDerivation {
pname = "aeon";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
repo = "aeon";
rev = "v${version}-aeon";
fetchSubmodules = true;
sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch";
sha256 = "sha256-yej4w/2m9YXsMobqHwzA5GBbduhaeTVvmnHUJNWX87E=";
};
nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ];

4
pkgs/applications/blockchains/exodus/default.nix
View File

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "21.10.25";
version = "21.12.3";
src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "a85ddda4e73dfadddbb77cf9bc84c30fc6b893ead46367d702976bbf4da5afa4";
sha256 = "sha256-8Jgg9OxptkhD1SBjVBoklHQVCUOO+EePWnyEajqlivE=";
};
sourceRoot = ".";

4
pkgs/applications/emulators/attract-mode/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "attract-mode";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "mickelson";
repo = "attract";
rev = "v${version}";
sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii";
sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c=";
};
nativeBuildInputs = [ pkg-config ];

46
pkgs/applications/emulators/mednafen/default.nix
View File

@ -1,28 +1,46 @@
{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2
, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }:
{ lib
, stdenv
, fetchurl
, SDL2
, SDL2_net
, alsa-lib
, flac
, freeglut
, libGL
, libGLU
, libX11
, libcdio
, libjack2
, libsamplerate
, libsndfile
, pkg-config
, zlib
}:
stdenv.mkDerivation rec {
pname = "mednafen";
version = "1.26.1";
version = "1.29.0";
src = fetchurl {
url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4";
hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
freeglut
libGLU libGL
libcdio
libjack2
alsa-lib
libsamplerate
libsndfile
libX11
SDL2
SDL2_net
alsa-lib
flac
freeglut
libGL
libGLU
libX11
libcdio
libjack2
libsamplerate
libsndfile
zlib
];
@ -34,6 +52,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://mednafen.github.io/";
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
longDescription = ''
Mednafen is a portable, utilizing OpenGL and SDL,
@ -66,8 +85,7 @@ stdenv.mkDerivation rec {
- Sega Saturn (experimental, x86_64 only)
- Sony PlayStation
'';
homepage = "https://mednafen.github.io/";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};

17
pkgs/applications/graphics/xrgears/default.nix
View File

@ -9,18 +9,22 @@
, vulkan-headers
, vulkan-loader
, xxd
, SDL2
, makeWrapper
, libGL
, glib
}:
stdenv.mkDerivation rec {
pname = "xrgears";
version = "unstable-2020-04-15";
version = "unstable-2021-06-19";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "demos/xrgears";
rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154";
sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i";
rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461";
sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc=";
};
nativeBuildInputs = [
@ -29,6 +33,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
xxd
makeWrapper
];
buildInputs = [
@ -36,8 +41,14 @@ stdenv.mkDerivation rec {
openxr-loader
vulkan-headers
vulkan-loader
glib
];
fixupPhase = ''
wrapProgram $out/bin/xrgears \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]}
'';
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears";
description = "An OpenXR example using Vulkan for rendering";

14
pkgs/applications/misc/stork/default.nix
View File

@ -3,29 +3,35 @@
, fetchFromGitHub
, openssl
, pkg-config
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "stork";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "jameslittle230";
repo = "stork";
rev = "v${version}";
sha256 = "sha256-or8PDEj97ChZq6r3WlwETYbU6EvoEuh8HfTyBIbbO8M=";
sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60=";
};
cargoSha256 = "sha256-UpIPbY2beO1H0YR9kV1SkG6C3qcO4x2acfgqI3x5jiM=";
cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
meta = with lib; {
description = "Impossibly fast web search, made for static sites";
homepage = "https://github.com/jameslittle230/stork";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ chuahou ];
# TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin
# Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError"
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

4
pkgs/applications/networking/browsers/vieb/default.nix
View File

@ -2,13 +2,13 @@
mkYarnPackage rec {
pname = "vieb";
version = "6.1.0";
version = "6.2.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
sha256 = "sha256-MJJeHnwfXouBygRT/wFWFMRHxQVf/3k2c7vp/tkD5co=";
sha256 = "sha256-FuaN9iUxR5Y6SnNmuegmNJXn1BYKgcobquTL3thuByM=";
};
packageJSON = ./package.json;

4
pkgs/applications/networking/cluster/cilium/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EgIs5/0Nk4AtOCK7I+Lt50cqOGzvEegzV0Fb8Tv3bAg=";
sha256 = "sha256-nE2mrFALJCGxUce8anJ3ErUO8575GgR6pupG06rRCCM=";
};
vendorSha256 = null;

10
pkgs/applications/networking/cluster/kconf/default.nix
View File

@ -2,16 +2,20 @@
buildGoModule rec {
pname = "kconf";
version = "1.10.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = "particledecay";
repo = "kconf";
rev = "v${version}";
sha256 = "NlTpHQFOJJcIt/xMT3fvdrlxANyg//wtYMmXzEtaFXo=";
sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY=";
};
vendorSha256 = "2d4o87wE9QZltk2YOHc20XVYF8n0EOrDf5mJ6i6EB0c=";
vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4=";
ldflags = [
"-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}"
];
meta = with lib; {
description = "An opinionated command line tool for managing multiple kubeconfigs";

4
pkgs/applications/networking/cluster/kubedb-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubedb-cli";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "kubedb";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-b5LbA2qEsEA7J0djEMhDeBY9iV1cvGVtxTlmneQGKYY=";
sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg=";
};
vendorSha256 = null;

13
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -13,17 +13,19 @@
, pcre
, qrencode
, icu
, gspell
, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good
}:
stdenv.mkDerivation rec {
pname = "dino";
version = "0.2.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c=";
sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q=";
};
nativeBuildInputs = [
@ -56,6 +58,13 @@ stdenv.mkDerivation rec {
icu
libsignal-protocol-c
librsvg
gspell
srtp
libnice
gnutls
gstreamer
gst-plugins-base
gst-plugins-good
] ++ lib.optionals (!stdenv.isDarwin) [
xorg.libxcb
xorg.libpthreadstubs

6
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "br-${version}";
sha256 = "sha256-3j2THRqhKK+bXIvTjyYDL9vJ9eH+Yy2LHE49auTKL5k=";
sha256 = "sha256-8oDA1QU5ZjtQZoCPVDa1U3P2KLzXtegtOxm6rNh+Ahk=";
};
vendorSha256 = "sha256-LTsq3qk95LcgyDaEtTUJWCzQY0AjrMvgn61Dhcntdl8=";
vendorSha256 = "sha256-n+WwkNHT+/CrC4vWIVHqYs2a8Qe/LNc0L3uoPZWDTts=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/science/chemistry/marvin/default.nix
View File

@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
version = "21.20.0";
version = "22.3.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs=";
sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg=";
};
nativeBuildInputs = [ dpkg makeWrapper ];

4
pkgs/applications/science/math/getdp/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "getdp";
version = "3.3.0";
version = "3.4.0";
src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz";
sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf";
sha256 = "sha256-d5YxJgtMf94PD6EHvIXpPBFPKC+skI/2v1K5Sad51hA=";
};
inherit (petsc) mpiSupport;

4
pkgs/applications/video/lbry/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "lbry-desktop";
version = "0.52.2";
version = "0.52.4";
in appimageTools.wrapAppImage rec {
name = "${pname}-${version}";
@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec {
src = fetchurl {
url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage";
# Gotten from latest-linux.yml
sha512 = "+yymVTpEQ0hKrJYij9lNVxK5J8vnW1g5o1TkGJX/TkSAqIUFhwRUJyqDS3uCvgTrD8ywulewgk1TREd/PA615w==";
sha512 = "TWRFCVktSKs5PORtm8FvM6qNWuiL/1HN98ilr1busVUGvain0QXGZwB/Dzvsox1c+X9VofUdapzozSOT6r58qw==";
};
};

4
pkgs/applications/virtualization/x11docker/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec {
pname = "x11docker";
version = "7.0.1";
version = "7.1.0";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4=";
sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.21.4";
version = "0.21.5";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w=";
sha256 = "sha256-0maPT1NdWFkSupU6CL2cFd6hlZ2BMxAOK6f3rQbfFA8=";
};
cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg=";
cargoSha256 = "sha256-QUecTmw8pWqrTdcstbXoFf53dFfwFN51tQ7ngUzkyV0=";
nativeBuildInputs = [ pkg-config makeWrapper ];

6
pkgs/applications/window-managers/leftwm/default.nix
View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.2.10";
version = "0.2.11";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-WGss/XmryULq8Ly5MFmEqsL+9r4fnrvBEtetngJ05NY=";
sha256 = "sha256-GLHmX628UUdIM+xYJhPtqFg4whQqaF8hFxg0Z5grPac=";
};
cargoSha256 = "sha256-9qvXzsAu4H2TAcArajrGqXwKF3BBDvmZbny7hiVO9Yo=";
cargoSha256 = "sha256-4Pu3TDLmi0c2nyUj1lTRincgRqL40A/g0PkyJOen0is=";
buildInputs = rpathLibs;

4
pkgs/data/fonts/sahel-fonts/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "sahel-fonts";
version = "1.0.0-alpha22";
version = "3.4.0";
in fetchFromGitHub {
name = "${pname}-${version}";
@ -14,7 +14,7 @@ in fetchFromGitHub {
tar xf $downloadedFile --strip=1
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \;
'';
sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7";
sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8=";
meta = with lib; {
homepage = "https://github.com/rastikerdar/sahel-font";

4
pkgs/data/fonts/shabnam-fonts/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "shabnam-fonts";
version = "4.0.0";
version = "5.0.1";
in fetchFromGitHub {
name = "${pname}-${version}";
@ -14,7 +14,7 @@ in fetchFromGitHub {
tar xf $downloadedFile --strip=1
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \;
'';
sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba";
sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A=";
meta = with lib; {
homepage = "https://github.com/rastikerdar/shabnam-font";

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20210312";
version = "20211216";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA=";
sha256 = "sha256-CeznsOUhMw4x0SpZFx408JcYGny7zW+M1J+SiSO7EII=";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];

10
pkgs/development/compilers/passerine/default.nix
View File

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "passerine";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "vrtbl";
repo = "passerine";
rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98";
sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I=";
rev = "v${version}";
hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0=";
};
cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA=";
cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0=";
meta = with lib; {
description = "A small extensible programming language designed for concise expression with little code";
homepage = "https://github.com/vrtbl/passerine";
homepage = "https://www.passerine.io/";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};

4
pkgs/development/libraries/apache-activemq/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-activemq";
version = "5.16.3";
version = "5.16.4";
src = fetchurl {
sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI=";
sha256 = "sha256-+OBNioEBQbOGpcnDlgtfAej+c0YfTJmxkeEV1JOEBwE=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
};

1
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -162,6 +162,7 @@ stdenv.mkDerivation rec {
"-DARROW_ENGINE=ON"
"-DARROW_FILESYSTEM=ON"
"-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
"-DARROW_HDFS=ON"
"-DARROW_IPC=ON"
"-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
"-DARROW_JSON=ON"

4
pkgs/development/libraries/folly/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.02.07.00";
version = "2022.02.14.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-C/PQBXhOELNxQFfQhgQeU+QmsdtFeBESyWerC+QZBEI=";
sha256 = "sha256-tJuHzEi4nrj5jb6tmJeG21ggl4F+wvQyssEPNp/t6Ww=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/nv-codec-headers/11_x.nix
View File

@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
pname = "nv-codec-headers";
version = "11.1.5.0";
version = "11.1.5.1";
src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}";
sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM=";
sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU=";
};
makeFlags = [

50
pkgs/development/libraries/nvidia-vaapi-driver/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ stdenv
, fetchFromGitHub
, lib
, meson
, ninja
, pkg-config
, libGL
, gst_all_1
, nv-codec-headers-11
, libva
, addOpenGLRunpath
}:
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
version = "0.0.5";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
addOpenGLRunpath
];
buildInputs = [
libGL
gst_all_1.gstreamer
gst_all_1.gst-plugins-bad
nv-codec-headers-11
libva
];
postFixup = ''
addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so"
'';
meta = with lib;{
homepage = "https://github.com/elFarto/nvidia-vaapi-driver";
description = "A VA-API implemention using NVIDIA's NVDEC";
license = licenses.mit;
maintainers = with maintainers;[ nickcao ];
};
}

4
pkgs/development/libraries/opendht/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = version;
sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE=";
sha256 = "sha256-LevS9euBAFkI1ll79uqmVaRR/6FH6Z4cypHqvCIWxgU=";
};
nativeBuildInputs = [

61
pkgs/development/libraries/portmidi/default.nix
View File

@ -1,66 +1,27 @@
{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }:
{ lib, stdenv, fetchFromGitHub, unzip, cmake, alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }:
stdenv.mkDerivation rec {
pname = "portmidi";
version = "234";
version = "2.0.2";
src = fetchurl {
url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "zOmzJ2MLGhGXiN0XjcmnnUrk/uqxP9IaZbqCG5XchC4=";
};
prePatch = ''
cd portmidi/trunk
'';
cmakeFlags = let
#base = "${jdk}/jre/lib/${jdk.architecture}";
in [
"-DPORTMIDI_ENABLE_JAVA=0"
/* TODO: Fix Java support.
"-DJAVA_AWT_LIBRARY=${base}/libawt.so"
"-DJAVA_JVM_LIBRARY=${base}/server/libjvm.so"
*/
cmakeFlags = [
"-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release"
"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release"
"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_ARCHITECTURES=${if stdenv.isAarch64 then "arm64" else "x86_64"}"
"-DCOREAUDIO_LIB=${CoreAudio}"
"-DCOREFOUNDATION_LIB=${CoreFoundation}"
"-DCOREMIDI_LIB=${CoreMIDI}"
"-DCORESERVICES_LIB=${CoreServices}"
];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [
"-framework CoreAudio"
"-framework CoreFoundation"
"-framework CoreMIDI"
"-framework CoreServices"
];
patches = [
# XXX: This is to deactivate Java support.
(fetchurl {
url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
})
] ++ lib.optionals stdenv.isDarwin [
# Remove hardcoded variables so we can set them properly
./remove-darwin-variables.diff
# Add missing header include
./missing-header.diff
];
postPatch = ''
sed -i -e 's|/usr/local/|'"$out"'|' -e 's|/usr/share/|'"$out"'/share/|' \
pm_common/CMakeLists.txt pm_dylib/CMakeLists.txt pm_java/CMakeLists.txt
sed -i \
-e 's|-classpath .|-classpath '"$(pwd)"'/pm_java|' \
-e 's|pmdefaults/|'"$(pwd)"'/pm_java/&|g' \
-e 's|jportmidi/|'"$(pwd)"'/pm_java/&|g' \
-e 's/WORKING_DIRECTORY pm_java//' \
pm_java/CMakeLists.txt
'';
postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
ln -s libportmidi${ext} "$out/lib/libporttime${ext}"
'';
@ -75,7 +36,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with lib; {
homepage = "http://portmedia.sourceforge.net/portmidi/";
homepage = "https://github.com/PortMidi/portmidi";
description = "Platform independent library for MIDI I/O";
license = licenses.mit;
maintainers = with maintainers; [ emilytrau ];

12
pkgs/development/libraries/portmidi/missing-header.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c
index 10c3554..712a974 100755
--- a/porttime/ptmacosx_mach.c
+++ b/porttime/ptmacosx_mach.c
@@ -12,6 +12,7 @@
#include "porttime.h"
#include "sys/time.h"
+#include "sys/qos.h"
#include "pthread.h"
#ifndef NSEC_PER_MSEC

52
pkgs/development/libraries/portmidi/remove-darwin-variables.diff
View File

@ -1,52 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4919b78..758eccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
-set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE)
-
PROJECT(portmidi)
if(UNIX)
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
index cbeeade..f765430 100644
--- a/pm_common/CMakeLists.txt
+++ b/pm_common/CMakeLists.txt
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
endif(APPLE OR WIN32)
if(APPLE)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE
+ set(CMAKE_OSX_SYSROOT / CACHE
PATH "-isysroot parameter for compiler")
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
@@ -54,10 +54,6 @@ if(UNIX)
include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon)
set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks)
- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework")
- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework")
- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework")
- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework")
set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB}
${COREMIDI_LIB} ${CORESERVICES_LIB}
CACHE INTERNAL "")
diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
index f693dd6..1dc5cd6 100644
--- a/pm_dylib/CMakeLists.txt
+++ b/pm_dylib/CMakeLists.txt
@@ -49,10 +49,6 @@ if(UNIX)
include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon)
set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks)
- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework")
- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework")
- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework")
- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework")
set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB}
${COREMIDI_LIB} ${CORESERVICES_LIB}
CACHE INTERNAL "")

85
pkgs/development/libraries/science/math/cudnn/default.nix
View File

@ -1,60 +1,77 @@
{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
, cudatoolkit_11_3, cudatoolkit_11_4
# The following version combinations are supported:
# * cuDNN 7.4.2, cudatoolkit 10.0
# * cuDNN 7.6.5, cudatoolkit 10.2
# * cuDNN 8.1.1, cudatoolkit 11.0-11.2
# * cuDNN 8.3.0, cudatoolkit 11.0-11.5
{ callPackage
, cudatoolkit_10_0
, cudatoolkit_10_2
, cudatoolkit_11_0
, cudatoolkit_11_1
, cudatoolkit_11_2
, cudatoolkit_11_3
, cudatoolkit_11_4
, cudatoolkit_11_5
}:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
generic = args: callPackage (import ./generic.nix (removeAttrs args [ "cudatoolkit" ])) {
inherit (args) cudatoolkit;
};
in rec {
cudnn_cudatoolkit_10_0 = generic rec {
in
rec {
# cuDNN 7.x
# Still used by libtensorflow-bin. It should be upgraded at some point.
cudnn_7_4_cudatoolkit_10_0 = generic rec {
version = "7.4.2";
cudatoolkit = cudatoolkit_10_0;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.4.2.24.tgz";
sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf";
};
cudnn_cudatoolkit_10_1 = generic rec {
version = "7.6.3";
cudatoolkit = cudatoolkit_10_1;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.3.30.tgz";
sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m";
};
cudnn_cudatoolkit_10_2 = generic rec {
# The `cudnn` alias still points to this in all-packages.nix. It should be
# upgraded at some point.
cudnn_7_6_cudatoolkit_10_2 = generic rec {
version = "7.6.5";
cudatoolkit = cudatoolkit_10_2;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz";
sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0";
};
cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2;
cudnn_7_6_cudatoolkit_10 = cudnn_7_6_cudatoolkit_10_2;
cudnn_cudatoolkit_11_0 = generic rec {
# cuDNN 8.x
# cuDNN 8.1 is still used by tensorflow at the time of writing (2022-02-17).
# See https://github.com/NixOS/nixpkgs/pull/158218 for more info.
cudnn_8_1_cudatoolkit_11_0 = generic rec {
version = "8.1.1";
cudatoolkit = cudatoolkit_11_0;
# 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2:
# https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions
# 8.1.0 is compatible with CUDA 11.0-11.2:
# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html
srcName = "cudnn-11.2-linux-x64-v8.1.1.33.tgz";
hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
};
cudnn_8_1_cudatoolkit_11_1 = cudnn_8_1_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; };
cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; };
cudnn_8_1_cudatoolkit_11 = cudnn_8_1_cudatoolkit_11_2;
cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_1;
# cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See
# https://github.com/google/jax/discussions/9455 for more info.
cudnn_8_3_cudatoolkit_11_0 = generic rec {
# 8.3.0 is the last version to respect the folder structure that generic.nix
# expects. Later versions have files in a subdirectory `local_installers`.
# See eg https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.1/.
version = "8.3.0";
cudatoolkit = cudatoolkit_11_0;
# 8.3.0 is compatible with CUDA 11.0-11.5:
# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-830/support-matrix/index.html
srcName = "cudnn-11.5-linux-x64-v8.3.0.98.tgz";
hash = "sha256-RMb1rVyxL7dPoMmh58qvTwTXVa3xGi5bbJ5BfaN2srI=";
};
cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_2;
};
cudnn_cudatoolkit_11_3 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_3;
};
cudnn_cudatoolkit_11_4 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_4;
};
cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_4;
cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; };
cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; };
cudnn_8_3_cudatoolkit_11_3 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_3; };
cudnn_8_3_cudatoolkit_11_4 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_4; };
cudnn_8_3_cudatoolkit_11_5 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_5; };
cudnn_8_3_cudatoolkit_11 = cudnn_8_3_cudatoolkit_11_5;
}

5
pkgs/development/libraries/science/math/cudnn/generic.nix
View File

@ -35,12 +35,15 @@ stdenv.mkDerivation {
nativeBuildInputs = [ addOpenGLRunpath ];
# Some cuDNN libraries depend on things in cudatoolkit, eg.
# libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch
# cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98.
installPhase = ''
runHook preInstall
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1
}
for lib in lib64/lib*.so; do

4
pkgs/development/libraries/spice-protocol/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "spice-protocol";
version = "0.14.3";
version = "0.14.4";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz";
sha256 = "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr";
sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI=";
};
nativeBuildInputs = [ meson ninja ];

4
pkgs/development/libraries/symengine/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "symengine";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "symengine";
repo = "symengine";
rev = "v${version}";
sha256 = "sha256-HTDOSgdWo9MWmKeXOkOHAJjgvihUAkSXoYTeMz9XXLI=";
sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/libraries/wxsqlite3/default.nix
View File

@ -8,23 +8,25 @@
, setfile
, rez
, derez
, wxmac
}:
stdenv.mkDerivation rec {
pname = "wxsqlite3";
version = "4.7.3";
version = "4.7.6";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g=";
hash = "sha256-QoICP66eluD5phYVi1iK8tg1FL04EQjY29/4n6SIz3s=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ wxGTK sqlite ]
++ lib.optionals stdenv.isDarwin [ Cocoa setfile rez derez ];
buildInputs = [ sqlite ]
++ lib.optionals (!stdenv.isDarwin) [ wxGTK ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez wxmac ];
meta = with lib; {
homepage = "https://utelle.github.io/wxsqlite3/";

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "breathe";
version = "4.32.0";
version = "4.33.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "michaeljones";
repo = pname;
rev = "v${version}";
hash = "sha256-U85iLVS6bmA2Ty0AC4z2qODy9u4rWg6Nb42/k2Ix+kk=";
hash = "sha256-S4wxlxluRjwlRGCa5Os/J3EpdekI/CEPMWw6j/wlZbw=";
};
propagatedBuildInputs = [

21
pkgs/development/python-modules/bugsnag/default.nix
View File

@ -2,29 +2,36 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, six
, webob
}:
buildPythonPackage rec {
pname = "bugsnag";
version = "4.1.1";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "cdbdb3e02ef0c0655bb55be8b05ec1cb830b5ec629923ccb24bfd71dede3d1c3";
hash = "sha256-NnTn4m9we40Ww2abP7mbz1CtdypZyN2GYBvj8zxhOpI=";
};
propagatedBuildInputs = [ six webob ];
propagatedBuildInputs = [
webob
];
pythonImportsCheck = [
"bugsnag"
];
# no tests
doCheck = false;
meta = with lib; {
description = "Automatic error monitoring for django, flask, etc.";
homepage = "https://www.bugsnag.com";
description = "Automatic error monitoring for Python applications";
homepage = "https://github.com/bugsnag/bugsnag-python";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ ];
};
}

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

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "2.11.1";
version = "2.11.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "zalando";
repo = pname;
rev = version;
sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE=";
sha256 = "sha256-kFNKRWl/Q8vxIELQURfzCRbVs2JYUwbKro/zKlzNcHU=";
};
propagatedBuildInputs = [

53
pkgs/development/python-modules/ffcv/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, libjpeg
, numba
, opencv4
, pandas
, pkgconfig
, pytorch-pfn-extras
, terminaltables
, tqdm
}:
buildPythonPackage rec {
pname = "ffcv";
version = "0.0.3";
src = fetchFromGitHub {
owner = "libffcv";
repo = pname;
# See https://github.com/libffcv/ffcv/issues/158.
rev = "131d56235eca3f1497bb84eeaec82c3434ef25d8";
sha256 = "0f7q2x48lknnf98mqaa35my05qwvdgv0h8l9lpagdw6yhx0a6p2x";
};
# See https://github.com/libffcv/ffcv/issues/159.
postPatch = ''
substituteInPlace setup.py \
--replace "'assertpy'," "" \
--replace "'fastargs'," "" \
--replace "'imgcat'," "" \
--replace "'matplotlib'," "" \
--replace "'psutil'," "" \
--replace "'sklearn'," "" \
--replace "'webdataset'," ""
'';
buildInputs = [ libjpeg pkgconfig ];
propagatedBuildInputs = [ opencv4 numba pandas pytorch-pfn-extras terminaltables tqdm ];
# `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some
# reason. See https://github.com/NixOS/nixpkgs/pull/160441#issuecomment-1045204722.
doCheck = false;
pythonImportsCheck = [ "ffcv" ];
meta = with lib; {
description = "FFCV: Fast Forward Computer Vision";
homepage = "https://ffcv.io";
license = licenses.asl20;
maintainers = with maintainers; [ samuela ];
};
}

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "jax";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "${pname}-v${version}";
sha256 = "0ndpngx5k6lf6jqjck82bbp0gs943z0wh7vs9gwbyk2bw0da7w72";
sha256 = "0bpqmyc4hg25i8cfnrx3y2bwgp6h5rri2a1q9i8gb6r0id97zvcn";
};
patches = [

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

@ -97,7 +97,8 @@ buildPythonPackage rec {
done
'';
# pip dependencies and optionally cudatoolkit.
# pip dependencies and optionally cudatoolkit. Note that cudatoolkit is
# necessary since jaxlib looks for "ptxas" in $PATH.
propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11;
pythonImportsCheck = [ "jaxlib" ];

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "mwparserfromhell";
version = "0.6.3";
version = "0.6.4";
src = fetchPypi {
inherit pname version;
sha256 = "1ad779f1bc0808d280ec1026c9de74f424de535568e21debd12830b5b0fa097e";
sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w=";
};
checkInputs = [

6
pkgs/development/python-modules/orjson/default.nix
View File

@ -15,20 +15,20 @@
buildPythonPackage rec {
pname = "orjson";
version = "3.6.6";
version = "3.6.7";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ijl";
repo = pname;
rev = version;
sha256 = "00s8pwvq830h2y77pwx1i2vfvnzisvp41qhzqcp1piyc3pwxfc13";
sha256 = "1a55f1ipii7hg42bvsii053xczbgwwv8w6wgdb14qyirm5c9szd3";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "0l1zvkr06kwclgxy1qz9fxa1gjrpf5nnx6hb12j4ymyyxpcmn8rz";
sha256 = "1piy0b1gh56n8srzhyd1n971a6pqpgmwhr4v9a81wg0xkbva8gdk";
};
format = "pyproject";

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.65";
version = "2.1.66";
format = "flit";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1LCTfspM/wdgDntJnjYh9nMHwIyrx4dJ64AXdSk2kl0=";
sha256 = "sha256-FYDudoCgxk2wkjPVXTnzHzCQRwtHmgJS+2mwoKbj3Ms=";
};
nativeBuildInputs = [

56
pkgs/development/python-modules/pyarrow/default.nix
View File

@ -1,4 +1,24 @@
{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:
{ lib
, stdenv
, buildPythonPackage
, python
, isPy3k
, arrow-cpp
, cffi
, cloudpickle
, cmake
, cython
, fsspec
, hypothesis
, numpy
, pandas
, pytestCheckHook
, pytest-lazy-fixture
, pkg-config
, scipy
, setuptools-scm
, six
}:
let
zero_or_one = cond: if cond then 1 else 0;
@ -15,21 +35,23 @@ buildPythonPackage rec {
sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ];
propagatedBuildInputs = [ numpy six ];
checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
propagatedBuildInputs = [ numpy six cloudpickle scipy fsspec cffi ];
checkInputs = [
hypothesis
pandas
pytestCheckHook
pytest-lazy-fixture
];
PYARROW_BUILD_TYPE = "release";
PYARROW_WITH_DATASET = zero_or_one true;
PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight;
PYARROW_WITH_PARQUET = zero_or_one true;
PYARROW_WITH_HDFS = zero_or_one true;
PYARROW_CMAKE_OPTIONS = [
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
# This doesn't use setup hook to call cmake so we need to workaround #54606
# ourselves
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
];
ARROW_HOME = _arrow-cpp;
@ -51,9 +73,6 @@ buildPythonPackage rec {
# enabled in nixpkgs.
# Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
"--deselect=pyarrow/tests/test_memory.py::test_env_var"
# Deselect a parquet dataset test because it erroneously fails to find the
# pyarrow._dataset module.
"--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties"
] ++ lib.optionals stdenv.isDarwin [
# Requires loopback networking
"--deselect=pyarrow/tests/test_ipc.py::test_socket_"
@ -61,12 +80,21 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
preCheck = ''
mv pyarrow/tests tests
rm -rf pyarrow
mkdir pyarrow
mv tests pyarrow/tests
shopt -s extglob
rm -r pyarrow/!(tests)
'';
pythonImportsCheck = map (module: "pyarrow.${module}") [
"compute"
"csv"
"dataset"
"flight"
"fs"
"hdfs"
"json"
"parquet"
];
meta = with lib; {
description = "A cross-language development platform for in-memory data";
homepage = "https://arrow.apache.org/";

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pycoin";
version = "0.91.20210515";
version = "0.92.20220213";
src = fetchPypi {
inherit pname version;
sha256 = "d2231a8d11b2524c26472d08cf1b76569849ab44507495d0510165ae0af4858e";
sha256 = "sha256-qb2jtb/bHJSmtnQbYTFgCgBY0OCsrxsWJ7SJFeEDytc=";
};
propagatedBuildInputs = [ setuptools ];

55
pkgs/development/python-modules/pytorch-pfn-extras/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, numpy
, onnx
, pytestCheckHook
, pytorch
, typing-extensions
}:
buildPythonPackage rec {
pname = "pytorch-pfn-extras";
version = "0.5.6";
src = fetchFromGitHub {
owner = "pfnet";
repo = pname;
rev = "v${version}";
sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g";
};
propagatedBuildInputs = [ numpy pytorch typing-extensions ];
checkInputs = [ onnx pytestCheckHook ];
pythonImportsCheck = [ "pytorch_pfn_extras" ];
disabledTestPaths = [
# Requires optuna which is currently (2022-02-16) marked as broken.
"tests/pytorch_pfn_extras_tests/test_config_types.py"
# Requires CUDA access which is not possible in the nix environment.
"tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py"
"tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py"
"tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py"
"tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_linear.py"
"tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy.py"
"tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py"
"tests/pytorch_pfn_extras_tests/runtime_tests/test_to.py"
"tests/pytorch_pfn_extras_tests/test_handler.py"
"tests/pytorch_pfn_extras_tests/test_logic.py"
"tests/pytorch_pfn_extras_tests/test_reporter.py"
"tests/pytorch_pfn_extras_tests/training_tests/test_trainer.py"
"tests/pytorch_pfn_extras_tests/utils_tests/test_checkpoint.py"
"tests/pytorch_pfn_extras_tests/utils_tests/test_comparer.py"
"tests/pytorch_pfn_extras_tests/utils_tests/test_new_comparer.py"
];
meta = with lib; {
description = "Supplementary components to accelerate research and development in PyTorch";
homepage = "https://github.com/pfnet/pytorch-pfn-extras";
license = licenses.mit;
maintainers = with maintainers; [ samuela ];
};
}

12
pkgs/development/python-modules/soco/default.nix
View File

@ -15,14 +15,16 @@
buildPythonPackage rec {
pname = "soco";
version = "0.26.2";
version = "0.26.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "sha256-VOGdv3g11OzNeTlBwm8hRy6fThDKVKIlgQxR4b07y/8=";
hash = "sha256-tMW5SCsO1XMQdbasMw3qIMwj+Y6wTQHAmTZ+9r8Mffs=";
};
propagatedBuildInputs = [
@ -39,15 +41,17 @@ buildPythonPackage rec {
requests-mock
];
pythonImportsCheck = [ "soco" ];
pythonImportsCheck = [
"soco"
];
passthru.updateScript = nix-update-script {
attrPath = "python3Packages.${pname}";
};
meta = with lib; {
description = "CLI and library to control Sonos speakers";
homepage = "http://python-soco.com/";
description = "A CLI and library to control Sonos speakers";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
};

18
pkgs/development/python-modules/swspotify/default.nix
View File

@ -1,26 +1,24 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 }:
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27
, poetry-core }:
buildPythonPackage rec {
pname = "SwSpotify";
version = "1.2.2";
version = "1.2.3";
disabled = isPy27;
format = "pyproject";
src = fetchFromGitHub {
owner = "SwagLyrics";
repo = "SwSpotify";
rev = "v${version}";
sha256 = "sha256-571knnY8LegIbqyPeKUfl+d0suTWAMQHYLN7edKFNdI=";
sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
};
propagatedBuildInputs = [
requests flask flask-cors dbus-python
];
nativeBuildInputs = [ poetry-core ];
postPatch = ''
substituteInPlace setup.py \
--replace 'flask==2.0.1' 'flask'
'';
propagatedBuildInputs = [ requests flask flask-cors ]
++ lib.optionals stdenv.isLinux [ dbus-python ];
doCheck = !stdenv.isDarwin;

4
pkgs/development/python-modules/total-connect-client/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2022.2";
version = "2022.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
hash = "sha256-k8ljkdNjYMIXMF2HFTks+kdOX9dwHSawjT8dsK706Eg=";
hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/build-managers/bloop/default.nix
View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "1.4.12";
version = "1.4.13";
bloop-coursier-channel = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = if stdenv.isLinux && stdenv.isx86_64 then "jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA="
else if stdenv.isDarwin && stdenv.isx86_64 then "15m2rahf9kihw29hp6bwd9xqav6dcr17w5c2rsw0ijpchr2av72q"
outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA="
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-WJytRIbsygi4zoIVfkJmzWyFe2p8mQuT4DDO5KDKopY="
else throw "unsupported platform";
};

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "031e092829365768db7f07cb676ef3642e24c1f4";
version = "2021-10-21";
rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df";
version = "2021-11-08";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "5e/tvRP6oqlstESY8NH752fujFcGZ9rF/rYW9ZFg0Gk=";
sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU=";
};
dontBuild = true;

6
pkgs/development/tools/build-managers/scala-cli/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
let
version = "0.1.0";
version = "0.1.1";
assets = {
x86_64-darwin = {
asset = "scala-cli-x86_64-apple-darwin.gz";
sha256 = "sha256-YoMwtaif7q7Ht8fWRQRGeP03Pl5KTIUk8fGGKhelc68=";
sha256 = "sha256-wULC0/n0ZFdBXOjxVe/VYsdsGBorNd51HczCK20Pmwc=";
};
x86_64-linux = {
asset = "scala-cli-x86_64-pc-linux.gz";
sha256 = "sha256-YjMdhuo9hQCGtq1qYFKUY8S6nz8dpZt+PsngbF6r/C8=";
sha256 = "sha256-tXcg+FOm+Ig61/Jw9ibEp0sHeXI9tpt+ya3Z/yS7MCk=";
};
};
in

4
pkgs/development/tools/earthly/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "earthly";
version = "0.6.7";
version = "0.6.8";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-H+gIN3I0qC2UeBow2N6KjECFiroeZACvrS3vo8+H6jY=";
sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc=";
};
vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04=";

4
pkgs/development/tools/lazygit/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.32.2";
version = "0.33";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tawsBfHz6gq8va9YLtCwp9Ec8EWcvhdbYwdVtvvtJeY=";
sha256 = "sha256-ltkBzhlxgNzioSBnlkBu9UtBHZlxFtnYlUhg/+lV0gc=";
};
vendorSha256 = null;

44
pkgs/development/tools/nodenv/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "nodenv";
version = "1.4.0";
src = fetchFromGitHub {
owner = "nodenv";
repo = "nodenv";
rev = "v${version}";
sha256 = "0fgc23jd95rjll3dy5hnli8ksfc7rwscw53sdgss4yaharwlg8l2";
};
buildPhase = ''
runHook preBuild
bash src/configure
make -C src
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r libexec $out/
cp -r bin $out/
runHook postInstall
'';
meta = with lib; {
description = "Manage multiple NodeJS versions";
homepage = "https://github.com/nodenv/nodenv/";
changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ alexnortung ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/development/web/deno/default.nix
View File

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.18.2";
version = "1.19.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vWA2Y1y5KatodTqr1+YwUXA2WYqQPMIMgXPuyRzmQW4=";
sha256 = "sha256-FLT4O542Q3qFjrsIsF9O/dgQQNAWhsZq+MaLqF8lLPA=";
};
cargoSha256 = "sha256-Go0Rj/NI56CZnRaR8QvOtOFNq/qpyujzpzVr3IHkEcg=";
cargoSha256 = "sha256-mKmMgAoEavv5kb2fo+X5dfpw0ftAho6aU3/wCTgwXao=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

10
pkgs/development/web/deno/librusty_v8.nix
View File

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.38.1";
version = "0.40.0";
shas = {
x86_64-linux = "sha256-vRkb5ZrIOYSKa84UbsJD+Oua0wve7f1Yf3kMg/kkYSY=";
aarch64-linux = "sha256-o9btdXct/HpUTXlJc2Ydzj2yo2lSV87uo/VyxaxN0fk=";
x86_64-darwin = "sha256-/J/MpXnzvBv70o8Zjc46yPzBrY309o4kDQ9kZzDfhb4=";
aarch64-darwin = "sha256-y4MJIA2HKPm9iLJSxDw43VHsoY5v2WGp7zEsll/EHhI=";
x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y=";
aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w=";
x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA=";
aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA=";
};
}

4
pkgs/games/tetrio-desktop/default.nix
View File

@ -4,6 +4,7 @@
, autoPatchelfHook
, alsa-lib
, cups
, libpulseaudio
, libX11
, libXScrnSaver
, libXtst
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
version = "8.0.0";
src = fetchurl {
url = "https://web.archive.org/web/20211130172544/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb";
url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb";
name = "tetrio-desktop.deb";
sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf";
};
@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [
alsa-lib
cups
libpulseaudio
libX11
libXScrnSaver
libXtst

4
pkgs/games/unciv/default.nix
View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "3.19.7";
version = "3.19.8";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-I6qU/qojUjwCQf7DLoeUwoYROo4N5SEtWCs1DazaZXw=";
sha256 = "sha256-ubMREVcislhkA3pzxuqI+HpBHq9vbMa8nyq0qhTh2x8=";
};
dontUnpack = true;

1
pkgs/os-specific/linux/mwprocapture/default.nix
View File

@ -60,6 +60,5 @@ stdenv.mkDerivation rec {
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ MP2E ];
platforms = platforms.linux;
broken = kernel.kernelOlder "3.2.0";
};
}

6
pkgs/servers/minio/default.nix
View File

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2022-02-16T00-35-27Z";
version = "2022-02-18T01-50-10Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-Lh51R5CAidPmqScwzmQEGlSlv2sNJbqa+z9fsTnQb+s=";
sha256 = "sha256-4SUmnUrO89hRcr2w1v6qZiY3swlIZsPgmCHa+q+iFK0=";
};
vendorSha256 = "sha256-V8hCSpdIYQKFlHuV2GI9dt2rEhhr5q3cCSd8kEyMiDM=";
vendorSha256 = "sha256-5OJntT5ed4pmugB1yw0fa906McREzv5aPuC8vBVx5o0=";
doCheck = false;

6
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.72.7";
version = "0.72.8";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SnEvY5pwjBHH/m9bB46bcEFvKy0r9lutft0YsuDvT8U=";
sha256 = "sha256-IejLCi1TJ2Q0lpA2ZK3hea18YX483FV4IisYRRVD1Vg=";
};
nativeBuildInputs = [ makeWrapper ];
checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorSha256 = "sha256-Pi/m/T4eBhKHH4Zl0hc13aQ0icolyAP/9sjXZwduKUA=";
vendorSha256 = "sha256-4hdy+Yr9EoUjJ4+pJ2ZEPGlnq+4sx5JLm92eFFav6tU=";
subPackages = [ "." ];

6
pkgs/servers/monitoring/prometheus/promscale/default.nix
View File

@ -7,20 +7,20 @@
buildGoModule rec {
pname = "promscale";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
sha256 = "sha256-snbQVkJ4J5ElVNfHuSfb7VCZ64TqJ8Lx5uUaJPqBHl4=";
sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY=";
};
patches = [
./0001-remove-jaeger-test-dep.patch
];
vendorSha256 = "sha256-1t4WNoJrfKTtrpwi9p+L1WQR7mTsD70CRW+RYT7E9Lo=";
vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ=";
ldflags = [
"-s"

4
pkgs/servers/monitoring/sensu-go/default.nix
View File

@ -4,14 +4,14 @@ let
generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
version = "6.6.5";
version = "6.6.6";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-mdql8bGSkPfs9wNxNUIIpux5t89CSjOQoFfHXTiScr4=";
sha256 = "sha256-//ZJV34H5c16QjppIH5hyk9eKrfEzKdL6GCVTp/k8Uo=";
};
inherit subPackages postInstall;

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.20.4";
version = "1.21.4";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-AK2KCbwFHeryqdK7iYtKEaP8JYINdX1i42/EHCAGkFk=";
sha256 = "sha256-0z6pMZY6/d+oC0TlJrymCeYWf+IjLWnR1M4eo/lnpw0=";
};
vendorSha256 = "sha256-35jcieU/EdJ3d4WfYhwXpDNZRrS+DQsWZYp2EoxpKU4";
vendorSha256 = "sha256-igeRWLaYbHjZdbYBrynyjZPj1bwCXtnnU4UJM/CdaO0=";
proxyVendor = true;
ldflags = [

6
pkgs/servers/soft-serve/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "soft-serve";
version = "0.1.3";
version = "0.2.2";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "soft-serve";
rev = "v${version}";
sha256 = "sha256-DEtWFWzUytj9xhNCVTPgSy2vR3sL2VYG76UmF6Dx78M=";
sha256 = "sha256-x4N1JRnx1vyb6VbQkpgguHsBssqJKmG0bSpmvEG38Qc=";
};
vendorSha256 = "sha256-ljbUAsbgonEFDVY6cSeVPkjieXWgF9JFGl6c7J6/164=";
vendorSha256 = "sha256-m5xwxs6XvmPffDX9dkkEG0/LdlDDm6Eq9CC0tVdauVI=";
doCheck = false;

4
pkgs/servers/tegola/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tegola";
version = "0.13.0";
version = "0.14.0";
goPackagePath = "github.com/go-spatial/tegola";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "go-spatial";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ=";
sha256 = "sha256-/1UhgcMLCB1/HtDX6HvVXybn3jOCRLuz2AF+M52Aye0=";
};
ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];

4
pkgs/servers/traefik/default.nix
View File

@ -2,11 +2,11 @@
buildGoModule rec {
pname = "traefik";
version = "2.6.0";
version = "2.6.1";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "sha256-+95GB4D6upo6s0K+rxpuolzF5Knind0bYCzgO33mNis=";
sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0=";
stripRoot = false;
};

10
pkgs/servers/web-apps/galene/default.nix
View File

@ -2,16 +2,19 @@
buildGoModule rec {
pname = "galene";
version = "0.3.5";
version = "0.4.4";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s=";
hash = "sha256-5ngX9VakQlcAVGDQ1R62oNfChGPjbu48ILFA3pBqP7k=";
};
vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA=";
vendorSha256 = "0rkn6lpy4n5ra1jy3m0ysdjpwh3hq2z4xwda2pzvp99sgszxl5g3";
ldflags = [ "-s" "-w" ];
preCheck = "export TZ=UTC";
outputs = [ "out" "static" ];
@ -23,6 +26,7 @@ buildGoModule rec {
meta = with lib; {
description = "Videoconferencing server that is easy to deploy, written in Go";
homepage = "https://github.com/jech/galene";
changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ rgrunbla ];

4
pkgs/shells/zsh/pure-prompt/default.nix
View File

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "pure-prompt";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "sindresorhus";
repo = "pure";
rev = "v${version}";
sha256 = "sha256-CI2ontloLNIzUJghZzPZ2UPbIS+cJAfKvKeetwvW6vg=";
sha256 = "sha256-d5qjJHNbZVOb7e9sv2YV6ht/0IHctWIJs/dJP6aGCa4=";
};
installPhase = ''

4
pkgs/tools/backup/autorestic/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "autorestic";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "cupcakearmy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T34+oHEe+BWFJwWfYnC71+mP4+uhTMYr9r426I4fXcY=";
sha256 = "sha256-9nYLjnJZlwmDkamip1BVF/2NeFmGP+Oot3vRfl2Pcy0=";
};
vendorSha256 = "sha256-eKsPdmPJXiCwvb2A28tNxF4xStry3iA6aLb+XYFJYSg=";

6
pkgs/tools/graphics/netpbm/default.nix
View File

@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
version = "10.97.2";
version = "10.97.3";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "4242";
sha256 = "ljfowjaa3whNXavrLTFVUq87nG47sykYtrtGSrZb/rE=";
rev = "4263";
sha256 = "qELSUQqzufKjaWwXgkrVFROozD4Wjj/BzN8iUuVffwQ=";
};
nativeBuildInputs = [

6
pkgs/tools/misc/chezmoi/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.11.2";
version = "2.12.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-EwWV1Z+N2r8mW4Y9D1C0fnd5/s3xaijvmIT0eAwS9N4=";
sha256 = "sha256-wBt3tlEKN5Woid43hdXm0+JPdb7axRPYCJD6KQEOZ3M=";
};
vendorSha256 = "sha256-ipOuwV7HJWRtaj0/c9CrgQZsRrUc1BTUlWWpRypu9AA=";
vendorSha256 = "sha256-7PwqekYz/Um67gKeU7v8p9gIEYGCQ4l9K0jew5HCSo4=";
doCheck = false;

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk=";
sha256 = "sha256-H7LgADzES5Zi5+lcooix+WCjDxqkThIIGvwa8IiHDHo=";
};
vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs=";
vendorSha256 = "sha256-4Hb+SmmPk4+c4QoOJADinKGD1xd0RYzn2wniuBxatAw=";
ldflags = [
"-s"

4
pkgs/tools/networking/haproxy/default.nix
View File

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.5.1";
version = "2.5.2";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-PpB5DfyDKvpspP30Uo3izi508+H3S+0NcK1UvVkg6VQ=";
sha256 = "sha256-LeNCT9dFK+HBwT1eCZQGEoUFXFcEaxyzwiDWdhHQ2n4=";
};
buildInputs = [ openssl zlib ]

4
pkgs/tools/networking/kapp/default.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kapp";
version = "0.45.0";
version = "0.46.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-kapp";
rev = "v${version}";
sha256 = "sha256-GjDlJ5SEh0oPPx+U6RLWq4NmDCOhm3WUSCSnfBwtbv8=";
sha256 = "sha256-Z0BjwzTdKHAeETHya6M5OcsIIY//y6dDbbyZe/irCAY=";
};
vendorSha256 = null;

6
pkgs/tools/networking/ligolo-ng/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ligolo-ng";
version = "0.2";
version = "0.3.2";
src = fetchFromGitHub {
owner = "tnpitsecurity";
repo = "ligolo-ng";
rev = "v${version}";
sha256 = "sha256-VzK6WykC3UDlhhyu8LMRHgOMkdEssJuh1Aqp0rGx7F4=";
sha256 = "sha256-4VUzKTzeFC04c93PCnBnEoEoBDCyMg00uznv7ZOr+uY=";
};
postConfigure = ''
@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-extldflags '-static'" ];
vendorSha256 = "sha256-ZRUy6gsl4Q2Sdm8Bfo4ANPdwcNQi5LNV6SbynpwfnOc=";
vendorSha256 = "sha256-BoAEmgN+ufzT1vp7mzPzYcfdXKJVWaZq/fzA90e+z8M=";
doCheck = false; # tests require network access

23
pkgs/tools/networking/vpnc/default.nix
View File

@ -1,4 +1,8 @@
{ lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
{ lib, stdenv, fetchsvn
, makeWrapper, pkg-config
, gawk, gnutls, libgcrypt, nettools, openresolv, perl
, opensslSupport ? false, openssl # Distributing this is a GPL violation.
}:
stdenv.mkDerivation {
pname = "vpnc";
@ -20,22 +24,22 @@ stdenv.mkDerivation {
# `ifconfig' as found in net-tools (not GNU Inetutils).
propagatedBuildInputs = [ nettools ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [libgcrypt perl openssl ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optional (!opensslSupport) pkg-config;
buildInputs = [ libgcrypt perl ]
++ (if opensslSupport then [ openssl ] else [ gnutls ]);
makeFlags = [
"PREFIX=$(out)"
"ETCDIR=$(out)/etc/vpnc"
"SCRIPT_PATH=$(out)/etc/vpnc/vpnc-script"
];
] ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes";
postPatch = ''
patchShebangs makeman.pl
'';
preConfigure = ''
sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
substituteInPlace "vpnc-script" \
--replace "which" "type -P" \
--replace "awk" "${gawk}/bin/awk" \
@ -56,11 +60,10 @@ stdenv.mkDerivation {
cp README nortel.txt ChangeLog $out/share/doc/vpnc/
'';
meta = {
meta = with lib; {
homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/";
description = "Virtual private network (VPN) client for Cisco's VPN concentrators";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
license = if opensslSupport then licenses.unfree else licenses.gpl2Plus;
platforms = platforms.linux;
};
}

6
pkgs/tools/security/aws-iam-authenticator/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
version = "0.5.3";
version = "0.5.5";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "0ga3vf5gn7533iqnxn7kchb6xg5wvk92livlqzkhi5qvqhl1sbw0";
sha256 = "sha256-5QtNAcInp1mUE8SHUUMS8/XURbPx/q8xMsvEEo/rnCs=";
};
# Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377
deleteVendor = true;
vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME=";
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];

4
pkgs/tools/security/cosign/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ=";
sha256 = "sha256-37jahAGgQn7HwwdRTlAS/oJQ3BxTkMViI6iJMBYFgjI=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)

4
pkgs/tools/security/keybase/default.nix
View File

@ -5,7 +5,7 @@
buildGoModule rec {
pname = "keybase";
version = "5.9.1";
version = "5.9.3";
modRoot = "go";
subPackages = [ "kbnm" "keybase" ];
@ -16,7 +16,7 @@ buildGoModule rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI=";
sha256 = "sha256-vPQ1hBd33DwsW0b79kNH1yd7mrwkoftIYFgmMVxC+78=";
};
vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo=";

6
pkgs/tools/system/evemu/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "evemu";
version = "2.6.0";
version = "2.7.0";
# We could have downloaded a release tarball from cgit, but it changes hash
# each time it is downloaded :/
src = fetchgit {
url = "git://git.freedesktop.org/git/evemu";
rev = "refs/tags/v${version}";
sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus=";
};
nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
homepage = "https://www.freedesktop.org/wiki/Evemu/";
repositories.git = "git://git.freedesktop.org/git/evemu";
license = licenses.gpl2;
license = with licenses; [ lgpl3Only gpl3Only ];
maintainers = [ maintainers.amorsillo ];
platforms = platforms.linux;
};

4
pkgs/tools/text/shfmt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "shfmt";
version = "3.4.2";
version = "3.4.3";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
sha256 = "sha256-xJlOEjGhxpfH3w+RvjXKjXoWPzQ6JkpldxLuKMkVvq0=";
sha256 = "sha256-tE7U/hE1Z/9VZTYt2jU0IE11cS01l6wTPVFuXH36sM4=";
};
vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8=";

39
pkgs/top-level/all-packages.nix
View File

@ -2280,7 +2280,7 @@ with pkgs;
libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
cudaSupport = config.cudaSupport or false;
cudatoolkit = cudatoolkit_10_0;
cudnn = cudnn_cudatoolkit_10_0;
cudnn = cudnn_7_4_cudatoolkit_10_0;
};
libtensorflow =
@ -2885,7 +2885,10 @@ with pkgs;
ditaa = callPackage ../tools/graphics/ditaa { };
dino = callPackage ../applications/networking/instant-messengers/dino { };
dino = callPackage ../applications/networking/instant-messengers/dino {
inherit (gst_all_1) gstreamer gst-plugins-base;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
djv = callPackage ../applications/graphics/djv { };
@ -4517,18 +4520,22 @@ with pkgs;
cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
inherit (cudnnPackages)
cudnn_cudatoolkit_10
cudnn_cudatoolkit_10_0
cudnn_cudatoolkit_10_1
cudnn_cudatoolkit_10_2
cudnn_cudatoolkit_11
cudnn_cudatoolkit_11_0
cudnn_cudatoolkit_11_1
cudnn_cudatoolkit_11_2
cudnn_cudatoolkit_11_3
cudnn_cudatoolkit_11_4;
cudnn_7_4_cudatoolkit_10_0
cudnn_7_6_cudatoolkit_10_2
cudnn_7_6_cudatoolkit_10
cudnn_8_1_cudatoolkit_11_0
cudnn_8_1_cudatoolkit_11_1
cudnn_8_1_cudatoolkit_11_2
cudnn_8_1_cudatoolkit_11
cudnn_8_3_cudatoolkit_11_0
cudnn_8_3_cudatoolkit_11_1
cudnn_8_3_cudatoolkit_11_2
cudnn_8_3_cudatoolkit_11_3
cudnn_8_3_cudatoolkit_11_4
cudnn_8_3_cudatoolkit_11_5
cudnn_8_3_cudatoolkit_11;
cudnn = cudnn_cudatoolkit_10;
cudnn = cudnn_7_6_cudatoolkit_10;
cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
inherit (cutensorPackages)
@ -7340,6 +7347,8 @@ with pkgs;
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
nodenv = callPackage ../development/tools/nodenv { };
nodejs = hiPrio nodejs-16_x;
nodejs-slim = nodejs-slim-16_x;
@ -19230,6 +19239,8 @@ with pkgs;
nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
nvidia-vaapi-driver = callPackage ../development/libraries/nvidia-vaapi-driver { };
nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { };
nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
@ -30957,7 +30968,7 @@ with pkgs;
katagoWithCuda = katago.override {
enableCuda = true;
cudnn = cudnn_cudatoolkit_11;
cudnn = cudnn_8_3_cudatoolkit_11;
cudatoolkit = cudatoolkit_11;
};

8
pkgs/top-level/python-packages.nix
View File

@ -100,7 +100,7 @@ let
# CUDA-related packages that are compatible with the currently packaged version
# of TensorFlow, used to keep these versions in sync in related packages like `jaxlib`.
tensorflow_compat_cudatoolkit = pkgs.cudatoolkit_11_2;
tensorflow_compat_cudnn = pkgs.cudnn_cudatoolkit_11_2;
tensorflow_compat_cudnn = pkgs.cudnn_8_1_cudatoolkit_11_2;
tensorflow_compat_nccl = pkgs.nccl_cudatoolkit_11;
in {
@ -1925,7 +1925,7 @@ in {
cupy = callPackage ../development/python-modules/cupy {
cudatoolkit = pkgs.cudatoolkit_11;
cudnn = pkgs.cudnn_cudatoolkit_11;
cudnn = pkgs.cudnn_8_1_cudatoolkit_11;
nccl = pkgs.nccl_cudatoolkit_11;
cutensor = pkgs.cutensor_cudatoolkit_11;
};
@ -2819,6 +2819,8 @@ in {
hdf5 = pkgs.hdf5_1_10;
};
ffcv = callPackage ../development/python-modules/ffcv { };
ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { };
@ -8221,6 +8223,8 @@ in {
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { };
pytorchWithCuda = self.pytorch.override {
cudaSupport = true;
};