Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -22278,6 +22278,13 @@
|
||||
github = "renesat";
|
||||
githubId = 11363539;
|
||||
};
|
||||
Renna42 = {
|
||||
name = "Renna Z.";
|
||||
email = "is@renna.dev";
|
||||
github = "Renna42";
|
||||
githubId = 47046832;
|
||||
keys = [ { fingerprint = "7E33 7F70 6F89 4D13 D8E6 B718 9676 3FAE 10AC 74FC"; } ];
|
||||
};
|
||||
rennsax = {
|
||||
name = "Bojun Ren";
|
||||
email = "bj.ren.coding@outlook.com";
|
||||
|
||||
@@ -163,25 +163,6 @@ in
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
narinfoName =
|
||||
(lib.strings.removePrefix "/nix/store/" (
|
||||
lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath
|
||||
))
|
||||
+ ".narinfo";
|
||||
|
||||
narinfoNameChars = lib.strings.stringToCharacters narinfoName;
|
||||
|
||||
narinfoPath = lib.concatStringsSep "/" [
|
||||
(builtins.head nodes.minio.services.minio.dataDir)
|
||||
bucket
|
||||
"store/narinfo"
|
||||
(lib.lists.elemAt narinfoNameChars 0)
|
||||
((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1))
|
||||
narinfoName
|
||||
"xl.meta"
|
||||
];
|
||||
in
|
||||
''
|
||||
harmonia.start()
|
||||
minio.start()
|
||||
@@ -206,13 +187,5 @@ in
|
||||
|
||||
client0.wait_until_succeeds("curl -f http://ncps0:8501/ | grep '\"hostname\":\"${toString nodes.ncps0.services.ncps.cache.hostName}\"' >&2")
|
||||
client1.wait_until_succeeds("curl -f http://ncps1:8501/ | grep '\"hostname\":\"${toString nodes.ncps1.services.ncps.cache.hostName}\"' >&2")
|
||||
|
||||
client0.succeed("cat /etc/nix/nix.conf >&2")
|
||||
client0.succeed("nix-store --realise ${pkgs.emptyFile}")
|
||||
|
||||
client1.succeed("cat /etc/nix/nix.conf >&2")
|
||||
client1.succeed("nix-store --realise ${pkgs.emptyFile}")
|
||||
|
||||
minio.succeed("cat ${narinfoPath} >&2")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -145,25 +145,6 @@ in
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
narinfoName =
|
||||
(lib.strings.removePrefix "/nix/store/" (
|
||||
lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath
|
||||
))
|
||||
+ ".narinfo";
|
||||
|
||||
narinfoNameChars = lib.strings.stringToCharacters narinfoName;
|
||||
|
||||
narinfoPath = lib.concatStringsSep "/" [
|
||||
(builtins.head nodes.minio.services.minio.dataDir)
|
||||
bucket
|
||||
"store/narinfo"
|
||||
(lib.lists.elemAt narinfoNameChars 0)
|
||||
((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1))
|
||||
narinfoName
|
||||
"xl.meta"
|
||||
];
|
||||
in
|
||||
''
|
||||
harmonia.start()
|
||||
minio.start()
|
||||
@@ -184,13 +165,5 @@ in
|
||||
|
||||
client0.wait_until_succeeds("curl -f http://ncps0:8501/ | grep '\"hostname\":\"${toString nodes.ncps0.services.ncps.cache.hostName}\"' >&2")
|
||||
client1.wait_until_succeeds("curl -f http://ncps1:8501/ | grep '\"hostname\":\"${toString nodes.ncps1.services.ncps.cache.hostName}\"' >&2")
|
||||
|
||||
client0.succeed("cat /etc/nix/nix.conf >&2")
|
||||
client0.succeed("nix-store --realise ${pkgs.emptyFile}")
|
||||
|
||||
client1.succeed("cat /etc/nix/nix.conf >&2")
|
||||
client1.succeed("nix-store --realise ${pkgs.emptyFile}")
|
||||
|
||||
minio.succeed("cat ${narinfoPath} >&2")
|
||||
'';
|
||||
}
|
||||
|
||||
+4
-18
@@ -63,23 +63,6 @@
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
narinfoName =
|
||||
(lib.strings.removePrefix "/nix/store/" (
|
||||
lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath
|
||||
))
|
||||
+ ".narinfo";
|
||||
|
||||
narinfoNameChars = lib.strings.stringToCharacters narinfoName;
|
||||
|
||||
narinfoPath = lib.concatStringsSep "/" [
|
||||
nodes.ncps.services.ncps.cache.storage.local
|
||||
"store/narinfo"
|
||||
(lib.lists.elemAt narinfoNameChars 0)
|
||||
((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1))
|
||||
narinfoName
|
||||
];
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
|
||||
@@ -92,6 +75,9 @@
|
||||
client.succeed("cat /etc/nix/nix.conf >&2")
|
||||
client.succeed("nix-store --realise ${pkgs.emptyFile}")
|
||||
|
||||
ncps.succeed("cat ${narinfoPath} >&2")
|
||||
# Verify that the NAR file exists in the cache storage
|
||||
# We query the NAR hash from the client and then check if a file with that hash exists in the ncps storage
|
||||
nar_hash = client.succeed("nix-store -q --hash ${pkgs.emptyFile}").strip().split(":")[1]
|
||||
ncps.succeed(f"find ${nodes.ncps.services.ncps.cache.storage.local} -type f | grep {nar_hash}")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1310,11 +1310,11 @@
|
||||
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-l5aywIsyAlQCX8SjvjJkEizqH+aZGmFN9zBbt/V/ri8=",
|
||||
"hash": "sha256-gd7n5a+tusSXjkErYYD0YYQnJovGA3G81TW4si8PumQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.82.62",
|
||||
"rev": "v1.82.66",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1499,12 +1499,12 @@
|
||||
"vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
|
||||
},
|
||||
"yandex-cloud_yandex": {
|
||||
"hash": "sha256-UyrHFZDY2mQqF0yosPc1xS/Zm9nrGGhMH6awf3pdFdI=",
|
||||
"hash": "sha256-nLgu1FiStaNpKnzLR6A/n829/b1a6uj+9Y2KoACmRTg=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.181.0",
|
||||
"rev": "v0.183.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Gj6ApI9xUL42KF4xYdvC8uwsAPNHJmouRkoz69yVVXQ="
|
||||
"vendorHash": "sha256-CczUCzLIJgzcCO3zKpsiGg9x7G7RZcahfSHL3K/gxH0="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "frida-tools";
|
||||
version = "14.5.0";
|
||||
version = "14.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "frida_tools";
|
||||
hash = "sha256-Wdjx0NDGojpaycHcgXp+UiBsiAoR3V3UaWw9948HWZ0=";
|
||||
hash = "sha256-yan13hoxurv8cUzvBW8iEmhedSOms+lTLpOmlJFbz9U=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -138,6 +138,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
# Fixes:
|
||||
# error: 'struct cudaDeviceProp' has no member named 'clockRate'
|
||||
# Context: https://github.com/icl-utk-edu/magma/issues/61
|
||||
(fetchpatch {
|
||||
name = "fix-cuda13-compat.patch";
|
||||
url = "https://github.com/icl-utk-edu/magma/commit/235aefb7b064954fce09d035c69907ba8a87cbcd.patch";
|
||||
hash = "sha256-i9InbxD5HtfonB/GyF9nQhFmok3jZ73RxGcIciGBGvU=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
# TODO: Drop both these patches on next magma release
|
||||
(fetchpatch {
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
python3Packages,
|
||||
|
||||
cairo,
|
||||
mysql,
|
||||
mysql80,
|
||||
libiodbc,
|
||||
proj,
|
||||
|
||||
@@ -41,8 +41,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
mysql = mysql80;
|
||||
gdal' = gdal.override { libmysqlclient = mysql; };
|
||||
antlr = antlr4_13;
|
||||
|
||||
# for some reason the package doesn't build with swig 4.3.0
|
||||
swig_4_2 = swig.overrideAttrs (prevAttrs: {
|
||||
swig' = swig.overrideAttrs (prevAttrs: {
|
||||
version = "4.2.1";
|
||||
src = prevAttrs.src.override {
|
||||
hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
|
||||
@@ -99,14 +103,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
jre
|
||||
ninja
|
||||
pkg-config
|
||||
swig_4_2
|
||||
swig'
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
antlr4_13.runtime.cpp
|
||||
antlr.runtime.cpp
|
||||
boost
|
||||
gdal
|
||||
gdal'
|
||||
gtkmm3
|
||||
libiodbc
|
||||
libmysqlconnectorcpp
|
||||
@@ -147,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "MySQL_CONFIG_PATH" (lib.getExe' mysql "mysql_config"))
|
||||
(lib.cmakeFeature "IODBC_CONFIG_PATH" (lib.getExe' libiodbc "iodbc-config"))
|
||||
(lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr4_13.jarLocation}")
|
||||
(lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr.jarLocation}")
|
||||
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
|
||||
# Newer versions of connector still provide the legacy library when enabled
|
||||
# but the headers are in a different location.
|
||||
|
||||
@@ -33,16 +33,16 @@ let
|
||||
|
||||
finalAttrs = {
|
||||
pname = "ncps";
|
||||
version = "0.7.3";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalbasit";
|
||||
repo = "ncps";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6mpEe0i5NYQb5WK2/478VFkMNa6xqAIU1uwwhH2zc2M=";
|
||||
hash = "sha256-1VWEN1HYV52H/LCfAvFv3R9DxQbHNRnyay3p2BY8dCg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nnt4HIG4Fs7RhHjVb7mYJ39UgvFKc46Cu42cURMmr1s=";
|
||||
vendorHash = "sha256-AcgC+zTS3eVsbcs0jim4zDBGc3lIjwPbdVT7/KQ9Lkc=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/kalbasit/ncps/pkg/ncps.Version=v${finalAttrs.version}"
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -63,7 +63,6 @@
|
||||
"autoprefixer": "^10.4.21",
|
||||
"electron": "^39.2.7",
|
||||
"electron-builder": "^24.13.3",
|
||||
- "electron-icon-builder": "^2.0.1",
|
||||
"electron-rebuild": "^3.2.9",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-plugin-react-hooks": "^4.6.0",
|
||||
@@ -0,0 +1,125 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
electron_39,
|
||||
nodejs_22,
|
||||
nix-update-script,
|
||||
|
||||
nodejs ? nodejs_22,
|
||||
electron ? electron_39,
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
inherit nodejs;
|
||||
|
||||
pname = "openscreen";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siddharthvaddem";
|
||||
repo = "openscreen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eneZ/2oCjIimlqGpwKGdxiPPsDTdaBOHpTUfWOQSD54=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-TNUbF0YVpAGZFGYf3cgM2oTrSGTo6tTvckqLrvdiE6g=";
|
||||
|
||||
npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build`
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
patches = [
|
||||
# Avoid downloading `phantomjs` within the build sandbox
|
||||
# by completely removing `electron-icon-builder`
|
||||
./electron-avoid-phantomjs.patch
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
npm exec tsc
|
||||
npm exec vite build
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# electronDist needs to be modifiable on Darwin
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
# Disable code signing during build on macOS.
|
||||
# https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
|
||||
export CSC_IDENTITY_AUTO_DISCOVERY=false
|
||||
''}
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
ln -s ${electron.dist} electron-dist
|
||||
''}
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
mkdir -p $out/share/openscreen
|
||||
cp -r release/*/*-unpacked/{locales,resources{,.pak}} $out/share/openscreen
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/openscreen \
|
||||
--add-flags $out/share/openscreen/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
install -Dm644 icons/icons/png/512x512.png $out/share/icons/hicolor/512x512/apps/openscreen.png
|
||||
''}
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -R release/*/mac*/Openscreen.app $out/Applications/
|
||||
makeWrapper $out/Applications/Openscreen.app/Contents/MacOS/Openscreen $out/bin/openscreen
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "openscreen";
|
||||
desktopName = "OpenScreen";
|
||||
comment = finalAttrs.meta.description;
|
||||
icon = "openscreen";
|
||||
exec = "openscreen %u";
|
||||
categories = [
|
||||
"AudioVideo"
|
||||
"Video"
|
||||
"Utility"
|
||||
];
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Free, open-source alternative to Screen Studio (sort of)";
|
||||
homepage = "https://openscreen.vercel.app";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
Renna42
|
||||
];
|
||||
mainProgram = "openscreen";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "2.0.52";
|
||||
version = "2.0.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvndrsslr";
|
||||
repo = "sketchybar-app-font";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rxqAzqOL8tB6QbJoYBGwxnxWAEmUZaxapIGTIAaRUhk=";
|
||||
hash = "sha256-4ZiFJDNb/VyQhxCbvp1H/BZG0Kc0zffYc3xtUJ6W/IU=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spirit";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "block";
|
||||
repo = "spirit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vGrIDXm3QXOitzIGV3Plt+SmUEih4gPJGTv6bGBwITE=";
|
||||
hash = "sha256-lgDEYIc6NgDkqoYdwluaZ9VCockE3gbyP8O7LfoTrl0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WSMziaE6ldYa915fAAecXGmJkFhh8Sk/IHjfBqXf9FI=";
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wrangler";
|
||||
version = "4.61.1";
|
||||
version = "4.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-sdk";
|
||||
rev = "wrangler@${finalAttrs.version}";
|
||||
hash = "sha256-SGySz1FlWcgGMGdlnYnywYyBVTpfoA3PzQHeCa8K+Og=";
|
||||
hash = "sha256-o6ARRNObHtRqAD71j7L2HkpIalPwGWR+PyQQuHJBKZE=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-K7TVb0YFqTRfswnkyDVPbDwQvj6YeMdgnzO1TcNZGZk=";
|
||||
hash = "sha256-Crtjchu17OFPWqd3L0AYCpA76YRN4jJc+vLVLo1WLe4=";
|
||||
};
|
||||
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
callPackage ./generic.nix (
|
||||
{
|
||||
version = "29.5";
|
||||
hash = "sha256-nraqBM87DJYU69Zx0dV9OMnI0Jhn8Axg8DvzUQDQ90Y=";
|
||||
version = "29.6";
|
||||
hash = "sha256-IIFqEKOlyQMuxzW3HNhCNM/x1gYmW7gaNu7IxY3VMAU=";
|
||||
}
|
||||
// args
|
||||
)
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.41";
|
||||
version = "1.42.42";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-z6erIbmTyD6Ncsbfe6huQaawMOoiuVViIFymSM1iRCY=";
|
||||
hash = "sha256-TQXMsLbQPCxekCcsHFjk6HVlGwiODuG+YYu0HggrhTA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -347,8 +347,8 @@ in
|
||||
"sha256-omWYUcr7Aj6r1F1kKAmM32fn9577UeUgqesnIiBIpPQ=";
|
||||
|
||||
mypy-boto3-connectcases =
|
||||
buildMypyBoto3Package "connectcases" "1.42.35"
|
||||
"sha256-y/EYsonfz1GwySCHmcVK5i3gVGarbM3bLvDIj/nFh9o=";
|
||||
buildMypyBoto3Package "connectcases" "1.42.42"
|
||||
"sha256-3L8y44S2aXjc3E6DRz87M0b5zlbI69YBJ+V9F9k71eo=";
|
||||
|
||||
mypy-boto3-connectparticipant =
|
||||
buildMypyBoto3Package "connectparticipant" "1.42.3"
|
||||
@@ -467,8 +467,8 @@ in
|
||||
"sha256-lNlav7BQkVjbYE9cdnvcdNki9IDo6tTlerD+lt69Rio=";
|
||||
|
||||
mypy-boto3-eks =
|
||||
buildMypyBoto3Package "eks" "1.42.28"
|
||||
"sha256-8mDaLGqdD3M6ECsteVw6QMwcY7+VCCGZ2eJAEgwbBl4=";
|
||||
buildMypyBoto3Package "eks" "1.42.42"
|
||||
"sha256-pXTA2pR+HeMrI9BRE3GUGBQwCCzaqXoIukf9Ht/sQ6k=";
|
||||
|
||||
mypy-boto3-elastic-inference =
|
||||
buildMypyBoto3Package "elastic-inference" "1.36.0"
|
||||
@@ -862,8 +862,8 @@ in
|
||||
"sha256-Z+TiVg/mjr0vTU+awHlS7GCynOeSl+IPl0n9GaLTsYE=";
|
||||
|
||||
mypy-boto3-medialive =
|
||||
buildMypyBoto3Package "medialive" "1.42.36"
|
||||
"sha256-XBfcemUPy5FRouYK1nMgcC8YFLHaZX62PaEpCVW6QI8=";
|
||||
buildMypyBoto3Package "medialive" "1.42.42"
|
||||
"sha256-Dd+4rZcLa6mnVHVXt30ty1Cl56bH+TC/93ZzzOX0SOQ=";
|
||||
|
||||
mypy-boto3-mediapackage =
|
||||
buildMypyBoto3Package "mediapackage" "1.42.3"
|
||||
@@ -1090,8 +1090,8 @@ in
|
||||
"sha256-XHcwFnP9i2zw5yPwvhcMMCSTmBpQy7ZdxQ4eMR0ao4M=";
|
||||
|
||||
mypy-boto3-redshift =
|
||||
buildMypyBoto3Package "redshift" "1.42.28"
|
||||
"sha256-5OKcDz0wEDr7eDg1cNPSXemjvquYIHI+ozK2doNGAi8=";
|
||||
buildMypyBoto3Package "redshift" "1.42.42"
|
||||
"sha256-hQyZdqznZ8uJVoiwuiVRQRG8fDVWykuyWGJ6BOEc0bE=";
|
||||
|
||||
mypy-boto3-redshift-data =
|
||||
buildMypyBoto3Package "redshift-data" "1.42.3"
|
||||
@@ -1426,8 +1426,8 @@ in
|
||||
"sha256-M+FLFC+5NZyLL9opOIIqXF6H5g3YvbqHJ4rpDKL0uKw=";
|
||||
|
||||
mypy-boto3-workspaces-web =
|
||||
buildMypyBoto3Package "workspaces-web" "1.42.14"
|
||||
"sha256-e7Qxen4pJIb+8N8ybp6DXwlul8WHKx7Lj5pnGC0yJJc=";
|
||||
buildMypyBoto3Package "workspaces-web" "1.42.42"
|
||||
"sha256-FHSL5KRc6cvB+vv/K/09WH7uvGE+2lJ17X1lduIOdzM=";
|
||||
|
||||
mypy-boto3-xray =
|
||||
buildMypyBoto3Package "xray" "1.42.3"
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "protobuf";
|
||||
version = "5.29.5";
|
||||
version = "5.29.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vBRjuv1LCSkhbDX0N6jihzGit/49mLt3pgDvztWhXIQ=";
|
||||
hash = "sha256-2p7mpUJLazD9XkXF6mY671QMqV+a2Z0eiH6BnN+bhyM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -39,14 +39,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scipp";
|
||||
version = "25.12.0";
|
||||
version = "26.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipp";
|
||||
repo = "Scipp";
|
||||
tag = version;
|
||||
hash = "sha256-Gv5Lgufsj5kCtOC+zTgeWTwwYm8j2Ct8cTK1RJ5+XDg=";
|
||||
hash = "sha256-4Ha2Gz6yYBCYBGXMWPJjuooyKeJJBBVmmByFXbTLans=";
|
||||
};
|
||||
env = {
|
||||
SKIP_REMOTE_SOURCES = "true";
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.15.901";
|
||||
version = "2.15.902";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-RffHaGJmbfI56QKgIIgSdGSaKZ/WGSNTZce8kck8neY=";
|
||||
hash = "sha256-0ntDskOZX0T1k1avDiJ/xLiNMtHoWdLXMmSUAdSYsoQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lovelace-card-mod";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasloven";
|
||||
repo = "lovelace-card-mod";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w2ky3jSHRbIaTzl0b0aJq4pzuCNUV8GqYsI2U/eoGfs=";
|
||||
hash = "sha256-Dvm2i8ll7Fyuw/+7+3a50HJAmWF4PoxnyPcWExP47e8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-7VoPQGUQLuQYaB3xAbvv0Ux7kiE/usnIxX2+jYGQXqA=";
|
||||
npmDepsHash = "sha256-KgN2+Zla4FYCw8YfFlW9sK4JHJUkrwVJS5jsrqfan5k=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -12833,18 +12833,6 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
mysql-workbench = callPackage ../by-name/my/mysql-workbench/package.nix (
|
||||
let
|
||||
mysql = mysql80;
|
||||
in
|
||||
{
|
||||
gdal = gdal.override {
|
||||
libmysqlclient = mysql;
|
||||
};
|
||||
mysql = mysql;
|
||||
}
|
||||
);
|
||||
|
||||
pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };
|
||||
|
||||
philipstv = with python3Packages; toPythonApplication philipstv;
|
||||
|
||||
Reference in New Issue
Block a user