Merge branch 'master' into staging-next

Indentation conflict in vulkan-related src fetches.
This commit is contained in:
Vladimír Čunát 2023-04-08 11:32:55 +02:00
commit fd77cd7a01
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
55 changed files with 266 additions and 272 deletions

View file

@ -262,6 +262,7 @@ in
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ lovek323 jwiegley adisbladis matthewbauer atemu ]; maintainers = with maintainers; [ lovek323 jwiegley adisbladis matthewbauer atemu ];
platforms = if withMacport then platforms.darwin else platforms.all; platforms = if withMacport then platforms.darwin else platforms.all;
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
longDescription = '' longDescription = ''
GNU Emacs is an extensible, customizable text editorand more. At its GNU Emacs is an extensible, customizable text editorand more. At its

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "pluto"; pname = "pluto";
version = "5.15.1"; version = "5.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FairwindsOps"; owner = "FairwindsOps";
repo = "pluto"; repo = "pluto";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qCWKmn0buITZo86hQncXWuEDQq0rITrCz/aRVR1+Zt4="; sha256 = "sha256-M5zTnzuei/sECvRe89Dau72iIUuMtaLJyYTGeEF4GPo=";
}; };
vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U="; vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U=";

View file

@ -73,11 +73,11 @@
"vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="
}, },
"argocd": { "argocd": {
"hash": "sha256-fmIbmjXOwIvtNMNQHtg3ucKzwXdh0do8DW5c6iYlil0=", "hash": "sha256-IDPX+j9bxQGoBpG/XpLpsFx48iDLcCUzDso08xAsOf0=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd", "homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili", "owner": "oboukili",
"repo": "terraform-provider-argocd", "repo": "terraform-provider-argocd",
"rev": "v5.0.1", "rev": "v5.1.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk=" "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk="
}, },
@ -327,13 +327,13 @@
"vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
}, },
"dnsimple": { "dnsimple": {
"hash": "sha256-fLYaGjQy4NtXuVePYQ8/dI7W04QM6UV3h6f2qU8hM6k=", "hash": "sha256-40ueiX2LrtTyiMgCgHRq07hMYrLKh6N+7wfrXr+MC7w=",
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
"owner": "dnsimple", "owner": "dnsimple",
"repo": "terraform-provider-dnsimple", "repo": "terraform-provider-dnsimple",
"rev": "v0.16.3", "rev": "v0.17.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-gARkcCVDxamHHyLhUaJ85OGDmUjeOW8LUxVyM348QUY=" "vendorHash": "sha256-LXRNq5nxoZ6xZdKioT6cjyLaYChRAN28PzKsJ5BRako="
}, },
"docker": { "docker": {
"hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@ -539,11 +539,11 @@
"vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y="
}, },
"huaweicloud": { "huaweicloud": {
"hash": "sha256-oPwvZClbKk4fbYc+cVHINcxNBU55w8LK53oyTUsCrTw=", "hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud", "owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud", "repo": "terraform-provider-huaweicloud",
"rev": "v1.47.0", "rev": "v1.47.1",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
@ -764,13 +764,13 @@
"vendorHash": null "vendorHash": null
}, },
"newrelic": { "newrelic": {
"hash": "sha256-BGfIem4k0fQ6C5igNRBIOvd7ZRD7RKtTD59n5gdzht4=", "hash": "sha256-/q1kKXdeVjxliE1HeGiusscLM4pYylgik88nxk5gPcs=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic", "owner": "newrelic",
"repo": "terraform-provider-newrelic", "repo": "terraform-provider-newrelic",
"rev": "v3.20.1", "rev": "v3.20.2",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-X/piLF1xMA/epnL/g0ZY0N+5PUjFZhNBV/lmsrwqwpA=" "vendorHash": "sha256-WF4AdTu6lxoNSCsFKLMeQbHgH6j+hM0VNBRsue+azJA="
}, },
"nomad": { "nomad": {
"hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",

View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20230329"; version = "20230404";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-i0slUBtJE3gYIKO7IxA0rDA4OOZYWYswuLOvece7Ejk="; hash = "sha256-uDQeXEG3xTIXdzj9LaI+p5cLYy9nR2w7QTiZIJlZyQw=";
}; };
postPatch = '' postPatch = ''

View file

@ -76,7 +76,6 @@ stdenv.mkDerivation rec {
version = "4.7.1"; version = "4.7.1";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "telegramdesktop"; owner = "telegramdesktop";
repo = "tdesktop"; repo = "tdesktop";

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whatsapp-for-linux"; pname = "whatsapp-for-linux";
version = "1.6.1"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eneshecan"; owner = "eneshecan";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-oghO6DNVJqWFHRjUAkqfnoWc7qHJnK3givVLq6xGJeo="; sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kubo"; pname = "kubo";
version = "0.19.0"; # When updating, also check if the repo version changed and adjust repoVersion below version = "0.19.1"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}"; rev = "v${version}";
passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
@ -10,7 +10,7 @@ buildGoModule rec {
# Kubo makes changes to it's source tarball that don't match the git source. # Kubo makes changes to it's source tarball that don't match the git source.
src = fetchurl { src = fetchurl {
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
hash = "sha256-PAxWijTAGOJKRDIKaulNPr/4uOJkm+vqNWAY7AjhFUw="; hash = "sha256-gQIJKV5MD0TZ0GYdLFWNePnExThqEjUmZKCAHhGwtMU=";
}; };
# tarball contains multiple files/directories # tarball contains multiple files/directories

View file

@ -2,12 +2,12 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "fava"; pname = "fava";
version = "1.24.3"; version = "1.24.4";
format = "pyproject"; format = "pyproject";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-eK0JMwu+WN3s6isCt124Cu9fjtL7Lig3+mice4FkwwU="; hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc=";
}; };
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];

View file

@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec {
outputs = [ "out" "terminfo" ]; outputs = [ "out" "terminfo" ];
postPatch = '' postPatch = lib.optionalString (!xdg-utils.meta.broken) ''
substituteInPlace alacritty/src/config/ui_config.rs \ substituteInPlace alacritty/src/config/ui_config.rs \
--replace xdg-open ${xdg-utils}/bin/xdg-open --replace xdg-open ${xdg-utils}/bin/xdg-open
''; '';
@ -102,7 +102,7 @@ rustPlatform.buildRustPackage rec {
# patchelf generates an ELF that binutils' "strip" doesn't like: # patchelf generates an ELF that binutils' "strip" doesn't like:
# strip: not enough room for program headers, try linking with -N # strip: not enough room for program headers, try linking with -N
# As a workaround, strip manually before running patchelf. # As a workaround, strip manually before running patchelf.
strip -S $out/bin/alacritty $STRIP -S $out/bin/alacritty
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
'' ''

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-slim"; pname = "docker-slim";
version = "1.40.0"; version = "1.40.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "slimtoolkit"; owner = "slimtoolkit";
repo = "slim"; repo = "slim";
rev = version; rev = version;
sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; hash = "sha256-ec5Qedt6NrcWZilcN9dhosAN59orgS2xxjXWO9XDxVE=";
}; };
vendorSha256 = null; vendorHash = null;
subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; subPackages = [ "cmd/slim" "cmd/slim-sensor" ];

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-desktop"; pname = "cinnamon-desktop";
version = "5.6.1"; version = "5.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-h2Jl/4SreniZtxziDwM0iwHXgGBrnHu8NLkIX7VGP18="; hash = "sha256-X4jf7+QFjoev1K6ywxN0n9MYUv7xI1/su+hHeesG02Y=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gio-qt"; pname = "gio-qt";
version = "0.0.11"; version = "0.0.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug="; sha256 = "sha256-/wLaVR31T+EcT6D5Cw0QIjZasioPWC74KNmt1tckwXk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,37 +0,0 @@
diff --git a/math/complex/+test.ha b/math/complex/+test.ha
index a1cc0916..705a0a41 100644
--- a/math/complex/+test.ha
+++ b/math/complex/+test.ha
@@ -567,8 +567,8 @@ const TEST_COSSC: [](c128, c128) = [
(math::INF, math::NAN)), // real sign unspecified
((math::INF, math::NAN),
(math::NAN, math::NAN)),
- ((math::NAN, 0f64),
- (math::NAN, -0f64)), // imaginary sign unspecified
+// ((math::NAN, 0f64),
+// (math::NAN, -0f64)), // imaginary sign unspecified
((math::NAN, 1f64),
(math::NAN, math::NAN)),
((math::NAN, math::INF),
@@ -583,8 +583,8 @@ const TEST_COSHSC: [](c128, c128) = [
(1f64, 0f64)),
((0f64, math::INF),
(math::NAN, 0f64)), // imaginary sign unspecified
- ((0f64, math::NAN),
- (math::NAN, 0f64)), // imaginary sign unspecified
+// ((0f64, math::NAN),
+// (math::NAN, 0f64)), // imaginary sign unspecified
((1f64, math::INF),
(math::NAN, math::NAN)),
((1f64, math::NAN),
@@ -627,8 +627,8 @@ const TEST_EXPSC: [](c128, c128) = [
(0f64, 0f64)), // real and imaginary sign unspecified
((math::INF, math::INF),
(math::INF, math::NAN)), // real sign unspecified
- ((-math::INF, math::NAN),
- (0f64, 0f64)), // real and imaginary sign unspecified
+// ((-math::INF, math::NAN),
+// (0f64, 0f64)), // real and imaginary sign unspecified
((math::INF, math::NAN),
(math::INF, math::NAN)), // real sign unspecified
((math::NAN, 0f64),

View file

@ -23,10 +23,6 @@ stdenv.mkDerivation (self: {
hash = "sha256-1cSXWD8jpW1VJZDTDOkIabczqbaDCOWsyaUSGtsKsUM="; hash = "sha256-1cSXWD8jpW1VJZDTDOkIabczqbaDCOWsyaUSGtsKsUM=";
}; };
patches = [
./000-disable-failing-test-cases.diff
];
nativeBuildInputs = [ nativeBuildInputs = [
binutils-unwrapped binutils-unwrapped
harec harec

View file

@ -197,9 +197,9 @@ in {
major = "3"; major = "3";
minor = "12"; minor = "12";
patch = "0"; patch = "0";
suffix = "a6"; suffix = "a7";
}; };
hash = "sha256-KYRAJSxLa04SDgFMFdcp6vird5MA3Mph1CLFN+ToXso="; hash = "sha256-oZrk3Fr+vf9eExI0bxYAYqEeDb1fnmimqYHqN7IWCOE=";
inherit (darwin) configd; inherit (darwin) configd;
inherit passthruFun; inherit passthruFun;
}; };

View file

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
hash = "sha256-iitEA/x9QpbQrYTcV0OzBgnY6bQFhIm+mVq1ryIQ3+0="; hash = "sha256-iitEA/x9QpbQrYTcV0OzBgnY6bQFhIm+mVq1ryIQ3+0=";
}; };
passthru.updateScript = ./update.sh;
meta = with lib; { meta = with lib; {
description = "Vulkan Header files and API registry"; description = "Vulkan Header files and API registry";
homepage = "https://www.lunarg.com"; homepage = "https://www.lunarg.com";

View file

@ -0,0 +1,23 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq nix-update
set -euf -o pipefail
NEW_VERSION=$(curl https://vulkan.lunarg.com/sdk/latest/linux.json | jq -r '.linux')
VULKAN_SDK_PACKAGES=(
"vulkan-headers"
"spirv-headers"
"glslang"
"vulkan-loader"
"spirv-tools"
"spirv-cross"
"vulkan-validation-layers"
"vulkan-tools"
"vulkan-tools-lunarg"
"vulkan-extension-layer"
)
for P in "${VULKAN_SDK_PACKAGES[@]}"; do
nix-update "$P" --version "$NEW_VERSION" --commit
done

View file

@ -5,13 +5,12 @@ stdenv.mkDerivation rec {
pname = "vulkan-loader"; pname = "vulkan-loader";
version = "1.3.243.0"; version = "1.3.243.0";
src = (assert version == vulkan-headers.version; src = fetchFromGitHub {
fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-Loader"; repo = "Vulkan-Loader";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-DqgIg0jZxzhoyYrATDQMoNN/Pav9deKdltB7L0XDqPE="; hash = "sha256-DqgIg0jZxzhoyYrATDQMoNN/Pav9deKdltB7L0XDqPE=";
}); };
patches = [ ./fix-pkgconfig.patch ]; patches = [ ./fix-pkgconfig.patch ];
@ -41,5 +40,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (version != vulkan-headers.version);
}; };
} }

View file

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-doctor"; pname = "ansible-doctor";
version = "2.0.3"; version = "2.0.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "thegeeklab"; owner = "thegeeklab";
repo = "ansible-doctor"; repo = "ansible-doctor";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-rhXhz6aUQ9hw83cfHmOLXMyyLQc7pSCGgurFhuglKjU="; hash = "sha256-nZv1PdR0kGrke2AjcDWjDWBdsw64UpHYFNDFAe/UoJo=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "app-model"; pname = "app-model";
version = "0.1.2"; version = "0.1.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "pyapp-kit"; owner = "pyapp-kit";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-W1DL6HkqXkfVE9SPD0cUhPln5FBW5vPICpbQulRhaWs="; hash = "sha256-GvMPWIvDydJ8C7wDR5DjmEGhVt0jd5e4WzP10a7mGm8=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bc-detect-secrets"; pname = "bc-detect-secrets";
version = "1.4.16"; version = "1.4.19";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = "detect-secrets"; repo = "detect-secrets";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-PBpxhZPFO4X4dhSYWG2TtHgaNx/SCQlnr2D57uB0kr4="; hash = "sha256-MIl0nobcQb8PRwLeam1tgP5JLHNAv3fP3wpwi64IJa4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, poetry-core
, keyring
}:
buildPythonPackage rec {
pname = "deepl";
version = "1.13.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-Rq7L/rgfJJ3ZspuL1IfZv+x60t8cZRPkrVryJf12WLk=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
requests
keyring
];
# Requires internet access and an API key
doCheck = false;
pythonImportsCheck = [
"deepl"
];
meta = with lib; {
description = "A language translation API that allows other computer programs to send texts and documents to DeepL's servers and receive high-quality translations";
homepage = "https://github.com/DeepLcom/deepl-python";
license = licenses.mit;
maintainers = with maintainers; [ MaskedBelgian ];
};
}

View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dsmr-parser"; pname = "dsmr-parser";
version = "1.2.0"; version = "1.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ndokter"; owner = "ndokter";
repo = "dsmr_parser"; repo = "dsmr_parser";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg="; hash = "sha256-a02bpC9CVecAtIfWbLM74K4thaGI2GferEnJQKtIiu8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lsassy"; pname = "lsassy";
version = "3.1.6"; version = "3.1.7";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Hackndo"; owner = "Hackndo";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Rdgz9hU2un1CKX2dRI8tVzL2lG7Ufd5HwninOxOsxjM="; hash = "sha256-q9zaKccgqj8haP7zQGS0rplfLylsPXggjzhN6VWV4/A=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,6 +1,6 @@
{ lib { lib
, aiohttp , aiohttp
, appdirs , platformdirs
, buildPythonPackage , buildPythonPackage
, docutils , docutils
, fetchFromGitHub , fetchFromGitHub
@ -20,8 +20,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nvchecker"; pname = "nvchecker";
version = "2.10"; version = "2.11";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "lilydjwg"; owner = "lilydjwg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NxHeHT56JCu8Gn/B4IcvPtgGcWH8V9CUQkJeKFcGk/Q="; hash = "sha256-b/EGn26gTpnYuy2h6shnJI1dRwhl41eKJHzDJoFG1YI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -39,7 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
appdirs platformdirs
packaging packaging
pycurl pycurl
setuptools setuptools

View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyswitchbot"; pname = "pyswitchbot";
version = "0.37.5"; version = "0.37.6";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Danielhiversen"; owner = "Danielhiversen";
repo = "pySwitchbot"; repo = "pySwitchbot";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-k4uTLiSODjAbwVZjd35RckbDb2DxFCV/Ixo3ErG9FHQ="; hash = "sha256-LZkAyfcDX48hR7lak2mc27lTQQR3VX1ozpdi2btDzbY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "reolink-aio"; pname = "reolink-aio";
version = "0.5.10"; version = "0.5.11";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG"; owner = "starkillerOG";
repo = "reolink_aio"; repo = "reolink_aio";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-UZURGOfNPccXukVoo1m/gY3tkOvpT5jy0AegQHFJqEQ="; hash = "sha256-vz4hkma/EzAUL9+I8umzyDkAUGcaiBUEtn+WysX6M7o=";
}; };
postPatch = '' postPatch = ''

View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sqlmap"; pname = "sqlmap";
version = "1.7.3"; version = "1.7.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Madz55RkI+SEtkBep1rcQt2iIwd/LqfzCCKP+4jRHUE="; hash = "sha256-U0mfnTteVPYP7gxRci/+poUf1QTdZ0Kk+f59e9S/A+4=";
}; };
postPatch = '' postPatch = ''

View file

@ -16,6 +16,7 @@
, mock , mock
, scipy , scipy
, wheel , wheel
, jax
, opt-einsum , opt-einsum
, backports_weakref , backports_weakref
, tensorflow-estimator-bin , tensorflow-estimator-bin
@ -66,6 +67,7 @@ in buildPythonPackage {
protobuf protobuf
numpy numpy
scipy scipy
jax
termcolor termcolor
grpcio grpcio
six six
@ -102,6 +104,7 @@ in buildPythonPackage {
# - Relax flatbuffers, gast, protobuf, tensorboard, and tensorflow-estimator version requirements that don't match what we have packaged # - Relax flatbuffers, gast, protobuf, tensorboard, and tensorflow-estimator version requirements that don't match what we have packaged
# - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet
# - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now.
# - numpy was pinned to fix some internal tests: https://github.com/tensorflow/tensorflow/issues/60216
sed -i *.dist-info/METADATA \ sed -i *.dist-info/METADATA \
-e "/Requires-Dist: flatbuffers/d" \ -e "/Requires-Dist: flatbuffers/d" \
-e "/Requires-Dist: gast/d" \ -e "/Requires-Dist: gast/d" \
@ -110,7 +113,8 @@ in buildPythonPackage {
-e "/Requires-Dist: protobuf/d" \ -e "/Requires-Dist: protobuf/d" \
-e "/Requires-Dist: tensorboard/d" \ -e "/Requires-Dist: tensorboard/d" \
-e "/Requires-Dist: tensorflow-estimator/d" \ -e "/Requires-Dist: tensorflow-estimator/d" \
-e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" -e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" \
-e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/"
) )
wheel pack ./unpacked/tensorflow* wheel pack ./unpacked/tensorflow*
mv *.whl $orig_name # avoid changes to the _os_arch.whl suffix mv *.whl $orig_name # avoid changes to the _os_arch.whl suffix
@ -199,26 +203,5 @@ in buildPythonPackage {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar cdepillabout ]; maintainers = with maintainers; [ jyp abbradar cdepillabout ];
platforms = [ "x86_64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
knownVulnerabilities = optionals (versionOlder packages.version "2.12.0") [
"CVE-2023-27579"
"CVE-2023-25801"
"CVE-2023-25676"
"CVE-2023-25675"
"CVE-2023-25674"
"CVE-2023-25673"
"CVE-2023-25671"
"CVE-2023-25670"
"CVE-2023-25669"
"CVE-2023-25668"
"CVE-2023-25667"
"CVE-2023-25665"
"CVE-2023-25666"
"CVE-2023-25664"
"CVE-2023-25663"
"CVE-2023-25662"
"CVE-2023-25660"
"CVE-2023-25659"
"CVE-2023-25658"
];
}; };
} }

View file

@ -1,51 +1,39 @@
{ {
version = "2.11.0"; version = "2.12.0";
linux_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "0m360pj7ix57d30s9inq9g5cbv7jrgnk2ryygj8irfw569rrzk7x";
};
linux_py_38_cpu = { linux_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1kx4rj15fnbmznpyjjbkw5mf0b03gw97h7ijlqf1kcdjzmbm24la"; sha256 = "1lqdb3n8dp2f1vignddfqfbbghidkbrq9g78fqkjir8g318zf1m4";
}; };
linux_py_39_cpu = { linux_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1isvyiwrhis8i2xjx5mmsrxv2i7fl0hg1jaa1pgw70c6sz5vqm0r"; sha256 = "1k595l4gpmar9rg4kim2i41fv25i8p018fdmgxcb5v6836d5ns2m";
}; };
linux_py_310_cpu = { linux_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1ni7yrk33xdh6zpy840y3hbidmfgj9dxp690yxrjwarr3694465k"; sha256 = "1mhq429j9v82jwyqk6dcaz0sh57n0kyf2bfjrjz13xjblssij6rn";
};
linux_py_37_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "14r2sa25gmpda6kysv7dbbrzmaxb47jq2fpy9dfcfbiwsrzszwhi";
}; };
linux_py_38_gpu = { linux_py_38_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1z8g3j1a8bzpfl3cwf74wal9npfyzr89l14wrrjmd311w9c06z25"; sha256 = "009wyvzdlzghb39mmrv36fvjrrrbllyadny9jzb7ixzry4r07193";
}; };
linux_py_39_gpu = { linux_py_39_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1nfhw5fwkvwyvcap41756avrg4c8xm0xrdgj8spqfjvamc3chcqp"; sha256 = "0l1cwsfw91vfgx8xqwz7cdphj1dy6ppfifm7f7f0n0i6rda6l382";
}; };
linux_py_310_gpu = { linux_py_310_gpu = {
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "1vckr15ys8cks8pj9yld4zyhm8w7bjnc8yq6q1g3145fl99ygac1"; sha256 = "0dl3nvr4pk4zknx484qd2mqdkjkms6s4alqrxqkqv2hqa4l9sz9m";
};
mac_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp37-cp37m-macosx_10_14_x86_64.whl";
sha256 = "12lk1wx5dqklc210xya3sbm3gl4163454k13d2nnk94z2iwi376j";
}; };
mac_py_38_cpu = { mac_py_38_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp38-cp38-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp38-cp38-macosx_10_15_x86_64.whl";
sha256 = "1j4y6vhlpz27xllwr9n0gswmwld221ws8sl5wdn56hi347r2jv85"; sha256 = "0jkxd9ccbq2czn16w3his6k1hxx0nhkrb56bkrskwzss9is4w6d7";
}; };
mac_py_39_cpu = { mac_py_39_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp39-cp39-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp39-cp39-macosx_10_15_x86_64.whl";
sha256 = "11ylm1a2mxf9lz958p39q2pag4mqss6zsfxagk3ybwj1lsy2bkyr"; sha256 = "0n7rsrxlkn143y80579bm8wwsabg2a9x6sx1h7ksw3s2x4sjdz22";
}; };
mac_py_310_cpu = { mac_py_310_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp310-cp310-macosx_10_14_x86_64.whl"; url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp310-cp310-macosx_10_15_x86_64.whl";
sha256 = "1l6jnmi14sbxbrpwqw3bq6mv1mn5rhbkx9j3dxfnhh10dkn9y13c"; sha256 = "18fj2jxl8b69jrzjkixhyyrml8qjwcid76y15ggzc5ksrkgw0jmy";
}; };
} }

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
version="2.11.0" version="2.12.0"
bucket="https://storage.googleapis.com/tensorflow" bucket="https://storage.googleapis.com/tensorflow"
@ -8,18 +8,15 @@ bucket="https://storage.googleapis.com/tensorflow"
# on the following page: # on the following page:
# https://www.tensorflow.org/install/pip?lang=python3#package-location # https://www.tensorflow.org/install/pip?lang=python3#package-location
url_and_key_list=( url_and_key_list=(
"linux_py_37_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_37_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_38_gpu $bucket/linux/gpu/tensorflow-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_38_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_39_gpu $bucket/linux/gpu/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_39_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_310_gpu $bucket/linux/gpu/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"linux_py_310_gpu $bucket/linux/gpu/tensorflow_gpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_15_x86_64.whl"
"mac_py_37_cpu $bucket/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_14_x86_64.whl" "mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_15_x86_64.whl"
"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_14_x86_64.whl" "mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_15_x86_64.whl"
"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_14_x86_64.whl"
"mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_14_x86_64.whl"
) )
hashfile=binary-hashes.nix hashfile=binary-hashes.nix

View file

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, cairocffi , cairocffi
, cython , cython
, fetchFromGitHub , fetchPypi
, igraph , igraph
, leidenalg , leidenalg
, pandas , pandas
@ -20,16 +20,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "textnets"; pname = "textnets";
version = "0.8.7"; version = "0.8.8";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchPypi {
owner = "jboynyc"; inherit pname version;
repo = pname; hash = "sha256-rjXEiaPYctrONIZz1Dd5OSDw5z8D2FPXi5TneKizFUQ=";
rev = "refs/tags/v${version}";
hash = "sha256-BBndY+3leJBxiImuyRL7gMD5eocE4i96+97I9hDEwec=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -50,12 +48,6 @@ buildPythonPackage rec {
wasabi wasabi
]; ];
# Deselect test of experimental feature that fails due to having an
# additional dependency.
disabledTests = [
"test_context"
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
en_core_web_sm en_core_web_sm

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "goda"; pname = "goda";
version = "0.5.5"; version = "0.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "loov"; owner = "loov";
repo = "goda"; repo = "goda";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yKhgk/DRcifh+exxTZFti1Aac/sgpvUsNKdioLAzmX0="; sha256 = "sha256-l9ehpDAqZqNV+07ENXJ2GJEY6bb6W37Ls6UqjE9DEWQ=";
}; };
vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms=";

View file

@ -13,47 +13,47 @@
let let
phpMajor = lib.versions.majorMinor php.version; phpMajor = lib.versions.majorMinor php.version;
version = "1.86.5"; version = "1.86.6";
hashes = { hashes = {
"x86_64-linux" = { "x86_64-linux" = {
system = "amd64"; system = "amd64";
sha256 = { sha256 = {
"8.0" = "N+SRigtolwNjxdH5/jWazPq7oBh2dxoT6tNBugyVdL0="; "8.0" = "DbaawNIl1ZbSaITFUZE0GC0RgrJrjn0Wlb+o3OMhsAc=";
"8.1" = "MCxZcIduGTbGJsUR16wwUlxc1CbeSAIvNTfI76WQUrs="; "8.1" = "VM7RljXwdGgF2ZVvsJ00YIGVfM5JqdRNrALSw+pMJks=";
"8.2" = "OoQt4zAPUQTPCLnNxnc0/e0osjo0eDP7I6sn2n90ZgQ="; "8.2" = "hrFNkAX4Am+78xxFfoSWn+bUZIklhb5uKRo1rGWumOA=";
}; };
}; };
"i686-linux" = { "i686-linux" = {
system = "i386"; system = "i386";
sha256 = { sha256 = {
"8.0" = "Vv/rqRvt9ganet4z84rN2uJ6LCvn8rop9jFQdlnYMB8="; "8.0" = "FdM+HsVytE5XdjlXDV6mrdylLDQdzCYjxkFrqWwTMbI=";
"8.1" = "lFRY2yWOuWY4Zu3Y7FYbvTSmpZl4epgPKzHffncwXpk="; "8.1" = "Z6RZShh/Gcu9qLcj/yKJu7qy0RnA+nNFwz1IXCEZlKg=";
"8.2" = "VSRaPib7RfA5W0FG3JgaXTlGTnOLKaw3tz8p/Mkmpx8="; "8.2" = "mytoRBpSCR4Gibpi7AptgbTq+axBXlpfag9LAnVzUM4=";
}; };
}; };
"aarch64-linux" = { "aarch64-linux" = {
system = "arm64"; system = "arm64";
sha256 = { sha256 = {
"8.0" = "XvLZrfYbyiAV0q/S3ANcafyLGQWkcJuRa1RUWSpaNH8="; "8.0" = "6sl3RXgBfXlJpmUDRGCmpLRKSmf1dy0vbRVHFnl7TyI=";
"8.1" = "msezMA7yhC16ATxN7c4xDdy6PrZ7HVito4x1L3mzh70="; "8.1" = "hDv6G2L+fJylaqmOle0ND9iO28BA2ZPDfDlIhL2gqBQ=";
"8.2" = "Q7LTst4OBPrQ91vI/V9eN9MHo0qxTD1ZCWMFeYXT21s="; "8.2" = "ASm65Jwsc2x6R0sfWHyDWTw/FTeQap+SckG4Jdg2Zn8=";
}; };
}; };
"aarch64-darwin" = { "aarch64-darwin" = {
system = "arm64"; system = "arm64";
sha256 = { sha256 = {
"8.0" = "OSnjO2nmcqy+vytRNWFYMi8Y20n7AwAwmhDBS7K5MBQ="; "8.0" = "zEAd+8v7j1mFOIMc2dThOY7e1XKHyMOx9dYWnJlJWAE=";
"8.1" = "VyPY1Gj6q4PpXDLPS9ARt9LUmYIG3hsGlEJjh9944Hc="; "8.1" = "ZaGwlLcBUSwGoAypw42rIkeXaeVegh05xwVMXfaAtgg=";
"8.2" = "M+8Lwx2nzlxLEP+F1vcjB9HgInsz5vOc3AIEzQHrC2I="; "8.2" = "gz8eKNLHlje3gUiXSIyE2csnOq9blS3GWZscTZbA9W4=";
}; };
}; };
"x86_64-darwin" = { "x86_64-darwin" = {
system = "amd64"; system = "amd64";
sha256 = { sha256 = {
"8.0" = "1xRcZic2XQLFkBhh2H9ZgCpG+1xq4oqhef7qEjhSeLQ="; "8.0" = "yUcxwya/oTmu0acbuhe2ft2pyKroeWHQMouE2ch94EM=";
"8.1" = "MmI3TjvmLymRxo/Iy9s49A6le+pZiiflGq+CfU/xmW0="; "8.1" = "u14WbwGRsDDhd6oZsvGKOgXpTQw3KMVeV1i9wl/vI+I=";
"8.2" = "n0Cy59tVUO70oTidB9lIPUXMkQ8ndzYHtYfXuQYQ2Mc="; "8.2" = "oYYgo2qSkCuwNjUrJdhFziWyyWfwm1g+ZyqhudDuuoA=";
}; };
}; };
}; };

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "patchelf"; pname = "patchelf";
version = "unstable-2023-03-18"; version = "unstable-2023-03-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "patchelf"; repo = "patchelf";
rev = "265b31ae22c6e1d20b01295aaa7bcf28fd31a5cf"; rev = "99db062953e88c26e1b1ae5120b8f8bd9f8d9b90";
sha256 = "sha256-+iGvdjXvhk5mN8jp3u+M9fICKFqbtyZCx+WjQszaB1o="; sha256 = "sha256-6UQR7pmaeIv4G/eymgrFXXfrh3ODfsqIIAu0A44N/6g=";
}; };
# Drop test that fails on musl (?) # Drop test that fails on musl (?)

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rbspy"; pname = "rbspy";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-yM3bE79flvFSZvpkHXhhEh1MJrSSJzqZcX9aVRmz1ew="; hash = "sha256-NshDX7sbXnmK6k/EDD5thUcNKvSV4bNdJ5N2hNLlsnA=";
}; };
cargoHash = "sha256-qvx5zPEIwvh2AIFCGNbVMNIRFtVjSLR9+exbSeQ9oXI="; cargoHash = "sha256-JzspNL4T28awa/1Uajw0gLM3bYyUBYTjnfCXn9qG7SY=";
doCheck = true; doCheck = true;
# The current implementation of rbspy fails to detect the version of ruby # The current implementation of rbspy fails to detect the version of ruby

View file

@ -4,14 +4,12 @@ stdenv.mkDerivation rec {
pname = "spirv-tools"; pname = "spirv-tools";
version = "1.3.243.0"; version = "1.3.243.0";
src = (assert version == spirv-headers.version; src = fetchFromGitHub {
fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-l44Ru0WjROQEDNU/2YQJGti1uDZP9osRdfsXus5EGX0="; hash = "sha256-l44Ru0WjROQEDNU/2YQJGti1uDZP9osRdfsXus5EGX0=";
} };
);
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];
@ -43,5 +41,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (version != spirv-headers.version);
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "txtpbfmt"; pname = "txtpbfmt";
version = "unstable-2023-01-18"; version = "unstable-2023-03-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "protocolbuffers"; owner = "protocolbuffers";
repo = "txtpbfmt"; repo = "txtpbfmt";
rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1"; rev = "3462fbc510c07c0844c2e370719c9c18302f476f";
hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg="; hash = "sha256-vvkZWDGrId164K6jhMXNa5BtOxQSgFDhMACGAH+9F08=";
}; };
vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];

View file

@ -30,13 +30,12 @@ stdenv.mkDerivation rec {
outputs = ["out" "headers"]; outputs = ["out" "headers"];
outputInclude = "headers"; outputInclude = "headers";
src = (assert (lib.all (pkg: pkg.version == version) [vulkan-headers glslang spirv-tools spirv-headers]); src = fetchFromGitHub {
fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers"; repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M="; hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M=";
}); };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -85,5 +84,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (lib.all (pkg: pkg.version != version) [vulkan-headers glslang spirv-tools spirv-headers]);
}; };
} }

View file

@ -1,11 +1,11 @@
{ appimageTools, lib, fetchurl, polkit, udev }: { appimageTools, lib, fetchurl }:
let let
pname = "uhk-agent"; pname = "uhk-agent";
version = "2.1.1"; version = "2.1.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
name = "${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage";
sha256 = "sha256-NhDHwQeh+zbA7XykriSMaygNm1SorMd+yy/m6sPgAhg="; sha256 = "sha256-G/UT1ec7rWl8xONZnT+dpHAFOQh6/s0Vq7MTqAcmJSA=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

View file

@ -1,9 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, libxcrypt , libxcrypt
, ncurses , ncurses
, buildPackages
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,19 +16,16 @@ stdenv.mkDerivation rec {
}; };
strictDeps = true; strictDeps = true;
depsBuildBuild = [
buildPackages.stdenv.cc
];
buildInputs = [ buildInputs = [
libxcrypt libxcrypt
ncurses ncurses
]; ];
patches = lib.optional stdenv.hostPlatform.isMusl
# Use system malloc
(fetchpatch {
name = "sysmalloc.patch";
url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf";
sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67";
});
meta = with lib; { meta = with lib; {
homepage = "https://www.tcsh.org/"; homepage = "https://www.tcsh.org/";
description = "An enhanced version of the Berkeley UNIX C shell (csh)"; description = "An enhanced version of the Berkeley UNIX C shell (csh)";

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bom"; pname = "bom";
version = "0.4.1"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HgBpEIUaeVCMkbu1KtBh0LGZQGFLyj3rF0cYDt8vDRk="; sha256 = "sha256-/a+0kQn2m5JFxhlgs1pUeyWwwqVFrRbYCyUfcLsNGz8=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -25,7 +25,7 @@ buildGoModule rec {
''; '';
}; };
vendorSha256 = "sha256-m5IK/+mbwGSX8tQUMED8+H52o89QOJk8mhUXumZm+wo="; vendorSha256 = "sha256-+dFHVIE3YFQVgYwEDtUWJAfHSnBZox8qejJtuIMPS2I=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,8 +1,8 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, espeak-ng , espeak-ng
, tts
}: }:
let let
@ -115,6 +115,10 @@ python.pkgs.buildPythonApplication rec {
) )
''; '';
# tests get stuck when run in nixpkgs-review, tested in passthru
doCheck = false;
passthru.tests.pytest = tts.overridePythonAttrs (_: { doCheck = true; });
nativeCheckInputs = with python.pkgs; [ nativeCheckInputs = with python.pkgs; [
espeak-ng espeak-ng
pytestCheckHook pytestCheckHook

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "stratis-cli"; pname = "stratis-cli";
version = "3.5.0"; version = "3.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IfvI8DVjm68SewHtQbhGGU1oku4eZnF7cRyeVPB/Ctk="; hash = "sha256-aDWHXKmlKKJo+ckW1vA0bm4q5z2g/Zx5frVDR6Kwgjw=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -4,13 +4,12 @@ stdenv.mkDerivation rec {
pname = "vulkan-extension-layer"; pname = "vulkan-extension-layer";
version = "1.3.243.0"; version = "1.3.243.0";
src = (assert version == vulkan-headers.version; src = fetchFromGitHub {
fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ExtensionLayer"; repo = "Vulkan-ExtensionLayer";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-hxlfSnH4M3ui5nW0Ll5rhto0DnJIHW0tJzS+p4KV0R4="; hash = "sha256-hxlfSnH4M3ui5nW0Ll5rhto0DnJIHW0tJzS+p4KV0R4=";
}); };
nativeBuildInputs = [ cmake jq ]; nativeBuildInputs = [ cmake jq ];
@ -41,5 +40,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ expipiplus1 ]; maintainers = with maintainers; [ expipiplus1 ];
broken = (version != vulkan-headers.version);
}; };
} }

View file

@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
# The version must match that in vulkan-headers # The version must match that in vulkan-headers
version = "1.3.243.0"; version = "1.3.243.0";
src = (assert version == vulkan-headers.version; src = fetchFromGitHub {
fetchFromGitHub {
owner = "LunarG"; owner = "LunarG";
repo = "VulkanTools"; repo = "VulkanTools";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4="; hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4=";
fetchSubmodules = true; fetchSubmodules = true;
}); };
nativeBuildInputs = [ cmake python3 jq which pkg-config ]; nativeBuildInputs = [ cmake python3 jq which pkg-config ];
@ -103,5 +102,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.expipiplus1 ]; maintainers = [ maintainers.expipiplus1 ];
broken = (version != vulkan-headers.version);
}; };
} }

View file

@ -23,16 +23,12 @@ stdenv.mkDerivation rec {
pname = "vulkan-tools"; pname = "vulkan-tools";
version = "1.3.243.0"; version = "1.3.243.0";
# It's not strictly necessary to have matching versions here, however src = fetchFromGitHub {
# since we're using the SDK version we may as well be consistent with
# the rest of nixpkgs.
src = (assert (version) == vulkan-headers.version;
fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-Tools"; repo = "Vulkan-Tools";
rev = "sdk-${version}"; rev = "sdk-${version}";
hash = "sha256-8XJON+iBEPRtuQWf1bPXyOJHRkuRLnLXgTIjk7gYQwE="; hash = "sha256-8XJON+iBEPRtuQWf1bPXyOJHRkuRLnLXgTIjk7gYQwE=";
}); };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -107,5 +103,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (version != vulkan-headers.version);
}; };
} }

View file

@ -1,4 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: { lib
, stdenv
, buildGoModule
, fetchFromGitHub
, gnupg
, makeWrapper
}:
buildGoModule rec { buildGoModule rec {
pname = "browserpass"; pname = "browserpass";
version = "3.1.0"; version = "3.1.0";
@ -14,7 +21,7 @@ buildGoModule rec {
vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0="; vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
doCheck = false; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
postPatch = '' postPatch = ''
# Because this Makefile will be installed to be used by the user, patch # Because this Makefile will be installed to be used by the user, patch
@ -32,9 +39,11 @@ buildGoModule rec {
''; '';
buildPhase = '' buildPhase = ''
make make browserpass
''; '';
checkTarget = "test";
installPhase = '' installPhase = ''
make install make install

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2023-04-06"; version = "2023-04-07";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Y+UdrSTmqLLLdUwv6ruAHEfqCCN7Sil8OGmIuVlPfRs="; hash = "sha256-PcrnqlbhoE9clYCsGX6ttMr92a+2BhuDP8aT6wG9aN0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "trufflehog"; pname = "trufflehog";
version = "3.31.3"; version = "3.31.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trufflesecurity"; owner = "trufflesecurity";
repo = "trufflehog"; repo = "trufflehog";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Ik2zAcjLvsJc1c7WntamruAT3oZqkFK7CabfRQ6BQzA="; hash = "sha256-fZO2WU1gJsf3KRFNF/I8dX4YW7RPn5hmN0MfjQED98I=";
}; };
vendorHash = "sha256-PNEIuENQfSOTo4W4frx/e56OwphGZGSP6WBLLtQeS4M="; vendorHash = "sha256-PNEIuENQfSOTo4W4frx/e56OwphGZGSP6WBLLtQeS4M=";

View file

@ -1560,6 +1560,7 @@ mapAliases ({
tangogps = foxtrotgps; # Added 2020-01-26 tangogps = foxtrotgps; # Added 2020-01-26
taplo-cli = taplo; # Added 2022-07-30 taplo-cli = taplo; # Added 2022-07-30
taplo-lsp = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30
tdesktop = telegram-desktop; # Added 2023-04-07
tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead";
teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05
telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02

View file

@ -31399,7 +31399,7 @@ with pkgs;
then darwin.apple_sdk_11_0.stdenv then darwin.apple_sdk_11_0.stdenv
else stdenv; else stdenv;
# tdesktop has random crashes when jemalloc is built with gcc. # telegram-desktop has random crashes when jemalloc is built with gcc.
# Apparently, it triggers some bug due to usage of gcc's builtin # Apparently, it triggers some bug due to usage of gcc's builtin
# functions like __builtin_ffsl by jemalloc when it's built with gcc. # functions like __builtin_ffsl by jemalloc when it's built with gcc.
jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: { jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: {
@ -33945,7 +33945,7 @@ with pkgs;
taskopen = callPackage ../applications/misc/taskopen { }; taskopen = callPackage ../applications/misc/taskopen { };
tdesktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
abseil-cpp = abseil-cpp_202206; abseil-cpp = abseil-cpp_202206;
}; };

View file

@ -2382,6 +2382,8 @@ self: super: with self; {
deepdish = callPackage ../development/python-modules/deepdish { }; deepdish = callPackage ../development/python-modules/deepdish { };
deepl = callPackage ../development/python-modules/deepl { };
deepmerge = callPackage ../development/python-modules/deepmerge { }; deepmerge = callPackage ../development/python-modules/deepmerge { };
deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };