mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
519e2c40ec
85 changed files with 262 additions and 515 deletions
|
|
@ -519,3 +519,7 @@ pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor
|
|||
/pkgs/build-support/build-nim-package.nix @NixOS/nim
|
||||
/pkgs/build-support/build-nim-sbom.nix @NixOS/nim
|
||||
/pkgs/top-level/nim-overrides.nix @NixOS/nim
|
||||
|
||||
# Radicle
|
||||
/pkgs/build-support/fetchradicle/ @NixOS/radicle
|
||||
/pkgs/build-support/fetchradiclepatch/ @NixOS/radicle
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ lua-resty-jwt,,,,,,
|
|||
lua-resty-openidc,,,,,,
|
||||
lua-resty-openssl,,,,,,
|
||||
lua-resty-session,,,,,,
|
||||
lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/main/lua-rtoml-0.2-0.rockspec,,,,,lblasc
|
||||
# we have to set url because luarocks.org lua-rtoml is squatted by another package
|
||||
lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/eb89439070c72ccf05efb8576abae7643abab354/lua-rtoml-0.3-0.rockspec,,,,,lblasc
|
||||
lua-subprocess,https://raw.githubusercontent.com/0x0ade/lua-subprocess/master/subprocess-scm-1.rockspec,,,,5.1,scoder12
|
||||
lua-term,,,,,,
|
||||
lua-toml,,,,,,
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 68.
|
|
|
@ -687,6 +687,10 @@ with lib.maintainers;
|
|||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
radicle = {
|
||||
github = "radicle";
|
||||
};
|
||||
|
||||
rocm = {
|
||||
github = "rocm";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ defelo ];
|
||||
meta.teams = [ lib.teams.radicle ];
|
||||
|
||||
options.services.radicle.ci.adapters.native = {
|
||||
instances = lib.mkOption {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ defelo ];
|
||||
meta.teams = [ lib.teams.radicle ];
|
||||
|
||||
options.services.radicle.ci.broker = {
|
||||
enable = lib.mkEnableOption "radicle-ci-broker";
|
||||
|
|
|
|||
|
|
@ -437,9 +437,5 @@ in
|
|||
]
|
||||
);
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
defelo
|
||||
julm
|
||||
lorenzleutgeb
|
||||
];
|
||||
meta.teams = [ lib.teams.radicle ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
{
|
||||
name = "radicle-ci-broker";
|
||||
meta.maintainers = with lib.maintainers; [ defelo ];
|
||||
meta.maintainers = lib.teams.radicle.members;
|
||||
|
||||
nodes.seed = {
|
||||
virtualisation.credentials = {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# and verifies that an alice peer can host a repository on the seed,
|
||||
# and that a bob peer can send alice a patch via the seed.
|
||||
|
||||
{ pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
# The Node ID depends on nodes.seed.services.radicle.privateKeyFile
|
||||
|
|
@ -63,13 +63,7 @@ in
|
|||
{
|
||||
name = "radicle";
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
defelo
|
||||
julm
|
||||
lorenzleutgeb
|
||||
];
|
||||
};
|
||||
meta.maintainers = lib.teams.radicle.members;
|
||||
|
||||
nodes = {
|
||||
seed =
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
brotli,
|
||||
bzip2,
|
||||
celt,
|
||||
ffmpeg,
|
||||
ffmpeg_7,
|
||||
gmp,
|
||||
jack2,
|
||||
lame,
|
||||
|
|
@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
patches = [
|
||||
(replaceVars ./fix-finding-libs.patch {
|
||||
ffmpeg = lib.getDev ffmpeg;
|
||||
ffmpeg = lib.getDev ffmpeg_7;
|
||||
x264 = lib.getDev x264;
|
||||
})
|
||||
];
|
||||
|
|
@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
brotli
|
||||
bzip2
|
||||
celt
|
||||
ffmpeg
|
||||
ffmpeg_7
|
||||
gmp
|
||||
jack2
|
||||
lame
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cariddi";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = "cariddi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ULeG+TmpRbHT+GsEuEsSSCzlOwRzDzUZmPZNN7KZdrA=";
|
||||
hash = "sha256-+nVZmifJvsNbYJ0TYTSQfYB/B0NJaU3wPn/e/2A3j60=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DgyDRMDYBC4GVuffJCrNpoDsqtpZ/LH++q5zXdkC1YE=";
|
||||
vendorHash = "sha256-/xnnkzoS1+fow5audoa4SllSzGMwrxvbjCjCHzOguYU=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
|
|
|||
|
|
@ -66,13 +66,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cyrus-imapd";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyrusimap";
|
||||
repo = "cyrus-imapd";
|
||||
tag = "cyrus-imapd-${finalAttrs.version}";
|
||||
hash = "sha256-fwt8ierxM4bMp+ZfYINXUIcKNMnkTIWJTNWyv8GyX0c=";
|
||||
hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
openssl,
|
||||
rustfmt,
|
||||
makeWrapper,
|
||||
wasm-bindgen-cli_0_2_108,
|
||||
esbuild,
|
||||
wasm-bindgen-cli_0_2_114,
|
||||
testers,
|
||||
dioxus-cli,
|
||||
withTelemetry ? false,
|
||||
|
|
@ -15,15 +16,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "dioxus-cli";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-6uG737MNk+wTKqNWgFEd8MsOOvllZLDnIrJPAn5Wjuw=";
|
||||
hash = "sha256-6ZKVnLMq2eB6kj2Ly3z0/dWpZ+x9bJwPtyxE8Ef6haI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BdPsdWah/f2pveQViPikIV2riSwjSo+qGOFoP+hHaiM=";
|
||||
cargoHash = "sha256-VrJuT3ori25joRe7kjSr6j8xfbKn5udETviV3id2mG4=";
|
||||
buildFeatures = [
|
||||
"no-downloads"
|
||||
]
|
||||
|
|
@ -68,7 +69,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/dx \
|
||||
--suffix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]}
|
||||
--suffix PATH : ${
|
||||
lib.makeBinPath [
|
||||
esbuild
|
||||
wasm-bindgen-cli_0_2_114
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,27 +2,26 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
fetchNpmDeps,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
fixup-yarn-lock,
|
||||
npm-lockfile-fix,
|
||||
makeWrapper,
|
||||
darwin,
|
||||
nodejs,
|
||||
yarn,
|
||||
electron,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drawio";
|
||||
version = "29.0.3";
|
||||
version = "29.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-YVkGt096Vy1s/ZjvuWUWVE2eiaI7Wg/YdWSueTsKzEg=";
|
||||
hash = "sha256-g2p6PEKWynS/+yvy6TUNrJJi4fQjBMq4koihSeVfxU4=";
|
||||
};
|
||||
|
||||
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
|
||||
|
|
@ -31,16 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
|
||||
'';
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-/CzHvGUKhB2RBaz+LVXaHr5q6KLkQR0asFZRruOUmqU=";
|
||||
offlineCache = fetchNpmDeps {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-53QqN5FBn7K13BjLoM4B6EgMsxPRNNXpQ0ecXjxpGpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
fixup-yarn-lock
|
||||
npm-lockfile-fix
|
||||
makeWrapper
|
||||
nodejs
|
||||
yarn
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
copyDesktopItems
|
||||
|
|
@ -55,12 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook preConfigure
|
||||
|
||||
export HOME="$TMPDIR"
|
||||
yarn config --offline set yarn-offline-mirror "$offlineCache"
|
||||
fixup-yarn-lock yarn.lock
|
||||
# Ensure that the node_modules folder is created by yarn install.
|
||||
# See https://github.com/yarnpkg/yarn/issues/5500#issuecomment-1221456246
|
||||
echo "nodeLinker: node-modules" > .yarnrc.yml
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
npm config set cache "$offlineCache"
|
||||
npm-lockfile-fix package-lock.json
|
||||
npm ci --offline --ignore-scripts --no-audit --no-fund
|
||||
patchShebangs node_modules/
|
||||
|
||||
runHook postConfigure
|
||||
|
|
@ -77,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sed -i "/afterSign/d" electron-builder-linux-mac.json
|
||||
''
|
||||
+ ''
|
||||
yarn --offline run electron-builder --dir \
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \
|
||||
-c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exaile";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exaile";
|
||||
repo = "exaile";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-eH7JhoGd5jiaye8ZLx836tgEXsRpEd3D3z6gvnVrbIs=";
|
||||
sha256 = "sha256-8q7OP9imTaoxqNgDOcVmvGSb5Sra0JtPOtZPo7zgkHM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-pages-cli";
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "git-pages";
|
||||
repo = "git-pages-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VImFTyV1REHIWWEY5Kqd3WJ+YF5OupQhEa4/VWnrHi4=";
|
||||
hash = "sha256-xM2/7cg9ZZ5wWzlJdtmU1lHYhXQQinp8S643IKzTb7U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vp6cqGM4Lhsfhjgv0Tz6Bmdz20EAGyPGR2Y91dnGejA=";
|
||||
vendorHash = "sha256-lGnl1onxJ9x0UIf2uPZcZgx2qbj/43VG+UcQvqwd1uw=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-ethereum";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "go-ethereum";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Fg+xitRROkLVXIpCoQ78eY/RFRcj7pBPI4kTSLLl+pw=";
|
||||
hash = "sha256-7otn9F+S4HJ2tWyn8w96NX3hWSLdApTwUL2zAyAW9Xw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-S/CkTWx4fUI54JVCW9ixhNADdBuMD2i7NI5U8aDy66k=";
|
||||
vendorHash = "sha256-rHTZmwy/ZHpsHNFh00mWXe6F8wEtL0JcLaehBwyvtJw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
pkg-config,
|
||||
glibc,
|
||||
openssl,
|
||||
libcap_ng,
|
||||
libepoxy,
|
||||
libdrm,
|
||||
pipewire,
|
||||
|
|
@ -33,13 +34,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkrun" + lib.optionalString (variant != null) "-${variant}";
|
||||
version = "1.17.0";
|
||||
version = "1.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libkrun";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6HBSL5Zu29sDoEbZeQ6AsNIXUcqXVVGMk0AR2X6v1yU=";
|
||||
hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-UIzbtBJH6aivoIxko1Wxdod/jUN44pERX9Hd+v7TC3Q=";
|
||||
hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU=";
|
||||
};
|
||||
|
||||
# Make sure libkrunfw can be found by dlopen()
|
||||
|
|
@ -65,11 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.bindgenHook
|
||||
cargo
|
||||
pkg-config
|
||||
rustc
|
||||
]
|
||||
++ lib.optional (variant == "sev" || variant == "tdx" || withGpu) pkg-config;
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libcap_ng
|
||||
libkrunfw'
|
||||
glibc
|
||||
glibc.static
|
||||
|
|
|
|||
|
|
@ -21,18 +21,18 @@ assert lib.elem variant [
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}";
|
||||
version = "5.1.0";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "libkrunfw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x9HQP+EqCteoCq2Sl/TQcfdzQC5iuE4gaSKe7tN5dAA=";
|
||||
hash = "sha256-fhG/bP1HzmhyU2N+wnr1074WEGsD9RdTUUBhYUFpWlA=";
|
||||
};
|
||||
|
||||
kernelSrc = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz";
|
||||
hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM=";
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.76.tar.xz";
|
||||
hash = "sha256-u7Q+g0xG5r1JpcKPIuZ5qTdENATh9lMgTUskkp862JY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
|
@ -32,6 +31,5 @@ buildGoModule (finalAttrs: {
|
|||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "librespeed-cli";
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
python3Packages,
|
||||
python3,
|
||||
nltk-data,
|
||||
writeShellScript,
|
||||
nix-update-script,
|
||||
|
|
@ -22,16 +22,8 @@ let
|
|||
|
||||
frontend = callPackage (import ./mealie-frontend.nix src version) { };
|
||||
|
||||
pythonpkgs = python3Packages;
|
||||
python = pythonpkgs.python;
|
||||
pyhumps38 = python3Packages.pyhumps.overrideAttrs (oldAttrs: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "nficano";
|
||||
repo = "humps";
|
||||
tag = "v3.8.0";
|
||||
hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";
|
||||
};
|
||||
});
|
||||
python = python3;
|
||||
pythonpkgs = python.pkgs;
|
||||
in
|
||||
pythonpkgs.buildPythonApplication rec {
|
||||
pname = "mealie";
|
||||
|
|
@ -75,7 +67,7 @@ pythonpkgs.buildPythonApplication rec {
|
|||
psycopg2 # pgsql optional-dependencies
|
||||
pydantic
|
||||
pydantic-settings
|
||||
pyhumps38
|
||||
pyhumps
|
||||
pyjwt
|
||||
python-dateutil
|
||||
python-dotenv
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
electron,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
autoPatchelfHook,
|
||||
writeScript,
|
||||
_7zz,
|
||||
commandLineArgs ? "",
|
||||
|
|
@ -71,6 +72,7 @@ let
|
|||
meta
|
||||
;
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
imagemagick
|
||||
];
|
||||
|
|
@ -81,6 +83,7 @@ let
|
|||
--add-flags $out/share/obsidian/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
install -m 755 -D obsidian-cli $out/bin/obsidian-cli
|
||||
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
|
|
@ -118,7 +121,8 @@ let
|
|||
runHook preInstall
|
||||
mkdir -p $out/{Applications/${appname}.app,bin}
|
||||
cp -R . $out/Applications/${appname}.app
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/obsidian
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/obsidian-cli $out/bin/obsidian-cli
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "octoscan";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synacktiv";
|
||||
repo = "octoscan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BFq4PXW5V8L4NP6wn2t2hG5xBKwxlgS+YC75VDTKKjs=";
|
||||
hash = "sha256-wdxuFYdM/0oEPQzr4EZ8fqNGo5CZrpz014kaVQXB3Bs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+TQDZXqWNBFAPES0qsrpBdl/jQZAfHXBcav2HcS0d7o=";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
makeBinaryWrapper,
|
||||
models-dev,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
ripgrep,
|
||||
sysctl,
|
||||
|
|
@ -15,13 +16,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.3.2";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-04eOIBHX9e8Brwn+uL/7q8szvRUilr4G0B8eB76dhKU=";
|
||||
hash = "sha256-DL/3AFyYevK4SD3pC+goTHLrlD29dRoyL0QAlxZDLcU=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
|
@ -46,8 +47,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
bun install \
|
||||
--cpu="*" \
|
||||
--frozen-lockfile \
|
||||
--filter ./packages/opencode \
|
||||
--filter ./packages/app \
|
||||
--filter ./packages/desktop \
|
||||
--filter ./packages/opencode \
|
||||
--ignore-scripts \
|
||||
--no-progress \
|
||||
--os="*"
|
||||
|
|
@ -70,13 +72,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-LRLKvI1tfIebiVP6SQIs7heoOqAsB+FaCnrpFE0VLe4=";
|
||||
outputHash = "sha256-//yE+ngjobja2Y5yIcvW0oEVSu85nqNAvjWu5OyISGU=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
nodejs
|
||||
installShellFiles
|
||||
makeBinaryWrapper
|
||||
models-dev
|
||||
|
|
@ -94,6 +97,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
runHook preConfigure
|
||||
|
||||
cp -R ${finalAttrs.node_modules}/. .
|
||||
patchShebangs node_modules
|
||||
patchShebangs packages/*/node_modules
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentelemetry-cpp";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/iuAv8UcRYkuQjV6Hgs1HHqW0SSVH+By5narF+vy7JU=";
|
||||
hash = "sha256-jYYTPcTFIrgMn1NUjwacZC1J26TZRKdGlq+5yw7NNsU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -110,11 +110,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "petsc";
|
||||
version = "3.24.5";
|
||||
version = "3.24.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-tuJRRWh+xyVV7Ek/99mOn0gNjZmXplLv3UJabbXXWPc=";
|
||||
hash = "sha256-PIW+dnIgnzQjpHqNBi4k730Bg7goO3G9zYVYoehvn7k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ let
|
|||
python = python312.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_4;
|
||||
django = super.django_5;
|
||||
|
||||
django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: {
|
||||
version = "2.3.0";
|
||||
|
|
@ -25,6 +25,12 @@ let
|
|||
tag = "v${version}";
|
||||
hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY=";
|
||||
};
|
||||
disabledTests = [
|
||||
# error message mismatch
|
||||
"test_validation_failed_message"
|
||||
# fails dns resolution
|
||||
"test_response_when_auth_server_response_return_404"
|
||||
];
|
||||
});
|
||||
|
||||
stripe = super.stripe.overridePythonAttrs rec {
|
||||
|
|
@ -45,13 +51,13 @@ let
|
|||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2026.2.0";
|
||||
version = "2026.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S8HcCtTBTU9oU7X+XD6avSZVtlRkXeF7pIqnggqJRPs=";
|
||||
hash = "sha256-D8i8wRdPak1L0D451WP7upr3yn+8SzG/0wuWD/EsemM=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
|
|
@ -59,7 +65,7 @@ let
|
|||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-n4Gd4DKdP4b6LT34uy9aJDWcTz9okk4imq6vtw1cC+k=";
|
||||
npmDepsHash = "sha256-+84WFNs0iPhMb4YIKfHYByYeFQHITyWeF5yIM8pvQSs=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
@ -96,7 +102,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"django-phonenumber-field"
|
||||
"dnspython"
|
||||
"drf_ujson2"
|
||||
"importlib-metadata"
|
||||
"importlib_metadata"
|
||||
"kombu"
|
||||
"markdown"
|
||||
"oauthlib"
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-mollie";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-mollie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Q9cofG4etT8Lb/RZbOVkSYlN1ONS3vPGkE53ph92cLg=";
|
||||
hash = "sha256-fWfevPhwpdHkpvuedf16b/f2QfHLy1/FAS3nVV4utwM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-passbook";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-passbook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Qy9VQBhC6SvLqmQvf4nVFhHPRNYDn1W6eEdCOGbD0y8=";
|
||||
hash = "sha256-cTXgDr845TGMGWr9bSaFvRPQ0GynXn3CVnZxcf96orc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pretix-payone";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-payone";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8DXORej+OJ65l/KGcanavHU4rabK9qTSnRPbdCidkgQ=";
|
||||
hash = "sha256-y1BO8Hz/pGKalURCbF3QJ49xn+L/sd8SWTGdCIl43yw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-worldlinedirect";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-worldlinedirect";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ofDGbRYTA2GTnVexn0dE6Iftq6+MkigOXWVR4kPUJzY=";
|
||||
hash = "sha256-SqXXnYetz52OFPKM61mANA71hrCEK7FgsdEoxskR5bk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-zugferd";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-zugferd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C2Z/S3lEKmdi6fch/erjPc9evnKc69tBRTInXRgi24E=";
|
||||
hash = "sha256-HE3L5VS0n1NL/jprcnMwaNriFKIN1pogPM2cDw2ZPdk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "cib";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -129,11 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
defelo
|
||||
faukah
|
||||
];
|
||||
teams = [ lib.teams.radicle ];
|
||||
maintainers = with lib.maintainers; [ faukah ];
|
||||
mainProgram = "radicle-desktop";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -111,11 +111,8 @@ lib.fix (
|
|||
homepage = "https://radicle.xyz";
|
||||
license = lib.licenses.gpl3;
|
||||
|
||||
maintainers = with lib.maintainers; [
|
||||
tazjin
|
||||
lorenzleutgeb
|
||||
defelo
|
||||
];
|
||||
teams = [ lib.teams.radicle ];
|
||||
maintainers = with lib.maintainers; [ tazjin ];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -86,11 +86,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
asl20
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
gador
|
||||
lorenzleutgeb
|
||||
defelo
|
||||
];
|
||||
teams = [ lib.teams.radicle ];
|
||||
maintainers = with lib.maintainers; [ gador ];
|
||||
mainProgram = "radicle-httpd";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "rad-job";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "radicle-native-ci";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
xdg-utils,
|
||||
versionCheckHook,
|
||||
|
||||
version ? "1.7.1",
|
||||
srcHash ? "sha256-MPanUDVKol7mWVJDrGoGUkKqmcje+MsiK0WfqXQ27iI=",
|
||||
cargoHash ? "sha256-Lru4ps9FYi03NVtRLtwZX9jhozAvBDsJ72ihdIpQcQ8=",
|
||||
version ? "1.8.0",
|
||||
srcHash ? "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=",
|
||||
cargoHash ? "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=",
|
||||
updateScript ? ./update.sh,
|
||||
}:
|
||||
|
||||
|
|
@ -171,11 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mit
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
amesgen
|
||||
lorenzleutgeb
|
||||
defelo
|
||||
];
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "rad";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ radicle-node }:
|
||||
|
||||
radicle-node.override {
|
||||
version = "1.8.0-rc.3";
|
||||
srcHash = "sha256-W94Vwf7ozwkENLueKF9Lvkns7HRX7PbMtvMHMCujV/s=";
|
||||
cargoHash = "sha256-9+mlNQwV2bUyAXkPN7aflGuN/Xd32uT+JEjl48ZDeXY=";
|
||||
version = "1.8.0";
|
||||
srcHash = "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=";
|
||||
cargoHash = "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,10 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
defelo
|
||||
];
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "rad-tui";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ren-find";
|
||||
version = "0-unstable-2024-01-11";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robenkleene";
|
||||
repo = "ren-find";
|
||||
rev = "50c40172e354caffee48932266edd7c7a76a20f";
|
||||
hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DipYEem+Vr6lvnsSMAePjYF3yx0qWMM7CLG9ORcehJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg=";
|
||||
cargoHash = "sha256-LeYd2FFdzW35ylghEoq6Tqrg7bUXwegmWfxfQi7/tpI=";
|
||||
|
||||
meta = {
|
||||
description = "Command-line utility that takes find-formatted lines and batch renames them";
|
||||
|
|
@ -24,4 +24,4 @@ rustPlatform.buildRustPackage {
|
|||
maintainers = with lib.maintainers; [ philiptaron ];
|
||||
mainProgram = "ren";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rep-grep";
|
||||
version = "0-unstable-2024-02-06";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robenkleene";
|
||||
repo = "rep-grep";
|
||||
rev = "10510d47e392cb9d30a861c69f702fd194b3fa88";
|
||||
hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GJXpzqc9reFFyZWPsaiohFsPj3PseijSLn6Td8Ouidk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4=";
|
||||
cargoHash = "sha256-ugQxJsu/U7O3S8SQwhGGDAdEIDesW7JbwFBkNYRe13w=";
|
||||
|
||||
meta = {
|
||||
description = "Command-line utility that takes grep-formatted lines and performs a find-and-replace on them";
|
||||
|
|
@ -24,4 +24,4 @@ rustPlatform.buildRustPackage {
|
|||
maintainers = with lib.maintainers; [ philiptaron ];
|
||||
mainProgram = "rep";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-wanxiang";
|
||||
version = "15.2.0";
|
||||
version = "15.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzxyz";
|
||||
repo = "rime_wanxiang";
|
||||
tag = "v" + finalAttrs.version;
|
||||
hash = "sha256-jX3QJO5gi5zk8ZbRTT2GGnevPDXzqs/H0MoxKiFOuJY=";
|
||||
hash = "sha256-MbPTW+Bams2Zze8PjSHsNnUzpyvZ/l7xS8wnCTQn8MA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -14,13 +15,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.stixfonts.org/";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -16,14 +17,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
hash = "sha256-hfQmrw7HjlhQSA0rVTs84i3j3iMVR0k7tCRBcB6hEpU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 */*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 */*.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.stixfonts.org/";
|
||||
|
|
|
|||
|
|
@ -66,11 +66,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
substituteInPlace src/config.rs \
|
||||
--replace-fail "@serverjs@" "${placeholder "out"}/share/stremio/server.js"
|
||||
|
||||
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
|
||||
substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/lib.rs \
|
||||
substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/lib.rs \
|
||||
--replace-fail "libxkbcommon.so.0" "${libxkbcommon}/lib/libxkbcommon.so.0"
|
||||
substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/x11.rs \
|
||||
substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/x11.rs \
|
||||
--replace-fail "libxkbcommon-x11.so.0" "${libxkbcommon}/lib/libxkbcommon-x11.so.0"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store";
|
||||
version = "2.21.45";
|
||||
version = "2.21.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GjHlz3MicNKDaGYdRE/SJ6Xx5avkLt3oRnoAtVvpqiM=";
|
||||
hash = "sha256-aCDGOCtIojNnPK33GWGhYKZMmByrC5ywjxr6QVlemrM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
|
@ -41,7 +41,7 @@ buildNpmPackage (finalAttrs: {
|
|||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-VsK6qvBeOF2smXRFmMk4gWxQgAD1GG/ExvZdIERdz9g=";
|
||||
hash = "sha256-4RFzky/KaRSNvBizH717KtiwavO+KB69AwPKAAnTmh4=";
|
||||
};
|
||||
|
||||
npmConfigHook = pnpmConfigHook;
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
prefetch-npm-deps,
|
||||
rsync,
|
||||
stdenv,
|
||||
nodejs_22,
|
||||
nodejs_24,
|
||||
}:
|
||||
let
|
||||
electron = electron_39;
|
||||
nodejs = nodejs_22;
|
||||
nodejs = nodejs_24;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "super-productivity";
|
||||
version = "17.2.1";
|
||||
version = "18.1.0";
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ buildNpmPackage rec {
|
|||
owner = "johannesjo";
|
||||
repo = "super-productivity";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yt3HXOhpy2uzzpFInZbTHCWA9LfHB2bqEFCHzHwIv70=";
|
||||
hash = "sha256-gIRnc+UqrDBcYxq0BXxS8rrOOVylTwH2WYne7h2A5fk=";
|
||||
|
||||
postFetch = ''
|
||||
find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
|
||||
|
|
@ -69,7 +69,7 @@ buildNpmPackage rec {
|
|||
dontInstall = true;
|
||||
|
||||
outputHashMode = "recursive";
|
||||
hash = "sha256-hNmM8Ln0klZBnC5TwtL7Bog82MlC4D0sCb9+uMqB0D0=";
|
||||
hash = "sha256-/D6pI8Kbih+bQalyE7Jb42OhYesneKsXPC2ghdMumRQ=";
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "watchexec";
|
||||
version = "2.3.2";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "watchexec";
|
||||
repo = "watchexec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs=";
|
||||
hash = "sha256-QXoqRJl4eLBE2rmOBvAhlBRE4OavvEWpGMKlBrxwbaU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VtSRC4lyjMo2O9dNbVllcDEx08zQWJMQmQ/2bNMup6U=";
|
||||
cargoHash = "sha256-svDmGwI7YYbGdI5/TMJGPo0wVgBF6aDec9C3fYsHxYQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -46,7 +46,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
--zsh completions/zsh
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(.+)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Executes commands in response to file modifications";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xbyak";
|
||||
version = "7.35.3";
|
||||
version = "7.35.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herumi";
|
||||
repo = "xbyak";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qsv0cgm5AmH9Ip1cNX8fKEA5D2b/255ZhYtCQb9Kr5I=";
|
||||
hash = "sha256-UPqqsG7GeWelOO9AKzveLNa1AYcHFBU6eLjOghDuS1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
fetchMixDeps,
|
||||
}:
|
||||
let
|
||||
version = "0.1.0-rc.6";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lang";
|
||||
repo = "expert";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-w3jRpQLbigQVNuuPlyoOHp6wO0gPsgdR0kwHP6Zul6Y=";
|
||||
hash = "sha256-r/SovUjU12ENT6OqbYuGK7XAmoxchUgiHTswlON/WeI=";
|
||||
};
|
||||
|
||||
engineDeps = fetchMixDeps {
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ let
|
|||
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
|
||||
"22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
|
||||
"23.0.0-git".gitRelease = {
|
||||
rev = "c911b8492374942bf4cfe35411e90a35d3837f6a";
|
||||
rev-version = "23.0.0-unstable-2026-03-22";
|
||||
sha256 = "sha256-LrA705BjLHt8U2qazT6+tOLglxNxTbwiCdTkYYIzIfU=";
|
||||
rev = "3e015b89e8bd9c71f6bb1cf38747d2862f5d5a3d";
|
||||
rev-version = "23.0.0-unstable-2026-03-29";
|
||||
sha256 = "sha256-sCyBinGy0kytpxK39OxiOrWMS3UPOHOxxwtm02vIIPk=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
|
|
|||
|
|
@ -2178,13 +2178,13 @@ final: prev: {
|
|||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-rtoml";
|
||||
version = "0.2-0";
|
||||
version = "0.3-0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lblasc";
|
||||
repo = "lua-rtoml";
|
||||
rev = "c83f56b9519d85968d663308e303f384c55c7b18";
|
||||
hash = "sha256-PRoaUQSSvzl9VFK+aGHbJqCW37AsO+oFXNYgM0OdIoY=";
|
||||
rev = "aedc4030912e1c86a1490428dc547f35a1a99be6";
|
||||
hash = "sha256-Ge2Acy1XuAQENhoJpuRudazY2D8HSiVv1Ab+jqMjo0U=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ in
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (old) src;
|
||||
hash = "sha256-7mFn4dLgaxfAxtPFCc3VzcBx2HuywcZTYqCGTbaGS0k=";
|
||||
hash = "sha256-nkWQOjqShgDcLfQDOGsB9CMHZxI/Lrx/+tC4ZeUl/Ak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ [
|
||||
|
|
|
|||
23
pkgs/development/ocaml-modules/caqti/miou.nix
Normal file
23
pkgs/development/ocaml-modules/caqti/miou.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
buildDunePackage,
|
||||
caqti,
|
||||
logs,
|
||||
miou,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "caqti-miou";
|
||||
inherit (caqti) version src;
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
caqti
|
||||
logs
|
||||
miou
|
||||
];
|
||||
|
||||
meta = caqti.meta // {
|
||||
description = "Miou support for Caqti";
|
||||
};
|
||||
}
|
||||
|
|
@ -460,8 +460,8 @@ with self;
|
|||
|
||||
core = janePackage {
|
||||
pname = "core";
|
||||
version = "0.17.1";
|
||||
hash = "sha256-XkABcvglVJLVnWJmvfr5eVywyclPSDqanVOLQNqdNtQ=";
|
||||
version = "0.17.2";
|
||||
hash = "sha256-KIpQ6W2gsuq44TtGPpIs/j1kwbSP3GMmIwvZAYMYtNo=";
|
||||
meta.description = "Industrial strength alternative to OCaml's standard library";
|
||||
buildInputs = [ jst-config ];
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiorussound";
|
||||
version = "4.9.0";
|
||||
version = "4.9.1";
|
||||
pyproject = true;
|
||||
|
||||
# requires newer f-strings introduced in 3.12
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "noahhusby";
|
||||
repo = "aiorussound";
|
||||
tag = version;
|
||||
hash = "sha256-okuDbY4Dx57a7zQc+LYCwe+FOjQS+hbAzSAK47uhGFg=";
|
||||
hash = "sha256-vDGNb2eXvNLWzEs9ZI2vOk4+7RJQ/ISu9PCkIWCBJQw=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -10,18 +10,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiotractive";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhulik";
|
||||
repo = "aiotractive";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pU6Ugd4l9+oUWJAd1hT3oBPfXK5NEjOg+k3YN52C3B8=";
|
||||
hash = "sha256-DP0dFDXaa0PyaERmhL6dNCOpiNs+N7ojMIapcajfMrk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"orjson"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
orjson
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
pytestCheckHook,
|
||||
# for passthru.tests
|
||||
asyncssh,
|
||||
django_4,
|
||||
django,
|
||||
fastapi,
|
||||
paramiko,
|
||||
twisted,
|
||||
|
|
@ -57,7 +57,7 @@ buildPythonPackage rec {
|
|||
passthru.tests = {
|
||||
inherit
|
||||
asyncssh
|
||||
django_4
|
||||
django
|
||||
fastapi
|
||||
paramiko
|
||||
twisted
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "claude-agent-sdk";
|
||||
version = "0.1.50";
|
||||
version = "0.1.52";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthropics";
|
||||
repo = "claude-agent-sdk-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uRuJqcUR+23SsI4i4W0tDCFQSE4lJWGxBcCap+ij7Ns=";
|
||||
hash = "sha256-4sj9jqf06RSec9xUhJ1gDbfuYaxFODvM5pz9uVpsLTo=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-statici18n";
|
||||
version = "2.6.0";
|
||||
version = "2.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyegfryed";
|
||||
repo = "django-statici18n";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G1JF/AQEDgvDamvjCYiQM7b6HfbdMBhfEUvT3yL1io0=";
|
||||
hash = "sha256-e6sCH/9h+Ki96hfG4ftuLo34HfZbwImThi9YxmZOmRc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -1,174 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pythonAtLeast,
|
||||
replaceVars,
|
||||
|
||||
# build
|
||||
setuptools,
|
||||
|
||||
# patched in
|
||||
geos,
|
||||
gdal,
|
||||
withGdal ? false,
|
||||
|
||||
# propagates
|
||||
asgiref,
|
||||
sqlparse,
|
||||
|
||||
# extras
|
||||
argon2-cffi,
|
||||
bcrypt,
|
||||
|
||||
# tests
|
||||
aiosmtpd,
|
||||
docutils,
|
||||
geoip2,
|
||||
jinja2,
|
||||
numpy,
|
||||
pillow,
|
||||
pylibmc,
|
||||
pymemcache,
|
||||
python,
|
||||
pywatchman,
|
||||
pyyaml,
|
||||
pytz,
|
||||
redis,
|
||||
selenium,
|
||||
tblib,
|
||||
tzdata,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "4.2.29";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django";
|
||||
repo = "django";
|
||||
tag = version;
|
||||
hash = "sha256-30OcLxtACSxLJ1jT+k7fmM8CyMyleXSPc+l7/3JZKzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./django_4_set_zoneinfo_dir.patch {
|
||||
zoneinfo = tzdata + "/share/zoneinfo";
|
||||
})
|
||||
# make sure the tests don't remove packages from our pythonpath
|
||||
# and disable failing tests
|
||||
./django_4_tests.patch
|
||||
|
||||
# fix filename length limit tests on bcachefs
|
||||
# FIXME: remove if ever backported
|
||||
(fetchpatch {
|
||||
url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch";
|
||||
hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
|
||||
})
|
||||
|
||||
# backport fix for https://code.djangoproject.com/ticket/36056
|
||||
# FIXME: remove if ever backported upstream
|
||||
(fetchpatch {
|
||||
url = "https://github.com/django/django/commit/ec0e784f91b551c654f0962431cc31091926792d.patch";
|
||||
includes = [ "django/*" ]; # tests don't apply
|
||||
hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU=";
|
||||
})
|
||||
|
||||
]
|
||||
++ lib.optionals withGdal [
|
||||
(replaceVars ./django_4_set_geos_gdal_lib.patch {
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/utils_tests/test_autoreload.py \
|
||||
--replace "/usr/bin/python" "${python.interpreter}"
|
||||
''
|
||||
+ lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
# Test regression after xz was reverted from 5.6.0 to 5.4.6
|
||||
# https://hydra.nixos.org/build/254630990
|
||||
substituteInPlace tests/view_tests/tests/test_debug.py \
|
||||
--replace-fail "test_files" "dont_test_files"
|
||||
''
|
||||
+ lib.optionalString (pythonAtLeast "3.13") ''
|
||||
# Fixed CommandTypes.test_help_default_options_with_custom_arguments test on Python 3.13+.
|
||||
# https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
|
||||
substituteInPlace tests/admin_scripts/tests.py --replace-fail \
|
||||
"test_help_default_options_with_custom_arguments" \
|
||||
"dont_test_help_default_options_with_custom_arguments"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
sqlparse
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
argon2 = [ argon2-cffi ];
|
||||
bcrypt = [ bcrypt ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
# tests/requirements/py3.txt
|
||||
aiosmtpd
|
||||
docutils
|
||||
geoip2
|
||||
jinja2
|
||||
numpy
|
||||
pillow
|
||||
pylibmc
|
||||
pymemcache
|
||||
pywatchman
|
||||
pyyaml
|
||||
pytz
|
||||
redis
|
||||
selenium
|
||||
tblib
|
||||
tzdata
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
|
||||
doCheck =
|
||||
!stdenv.hostPlatform.isDarwin
|
||||
# pywatchman depends on folly which does not support 32bits
|
||||
&& !stdenv.hostPlatform.is32bit;
|
||||
|
||||
preCheck = ''
|
||||
# make sure the installed library gets imported
|
||||
rm -rf django
|
||||
|
||||
# provide timezone data, works only on linux
|
||||
export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
pushd tests
|
||||
${python.interpreter} runtests.py --settings=test_sqlite
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/";
|
||||
description = "High-level Python Web framework that encourages rapid development and clean, pragmatic design";
|
||||
mainProgram = "django-admin";
|
||||
homepage = "https://www.djangoproject.com";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
|
||||
index 05b5732..91fafee 100644
|
||||
--- a/django/contrib/gis/gdal/libgdal.py
|
||||
+++ b/django/contrib/gis/gdal/libgdal.py
|
||||
@@ -14,7 +14,7 @@ try:
|
||||
from django.conf import settings
|
||||
lib_path = settings.GDAL_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@gdal@/lib/libgdal@extension@"
|
||||
|
||||
if lib_path:
|
||||
lib_names = None
|
||||
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
|
||||
index 2cdb5d3..fac2d04 100644
|
||||
--- a/django/contrib/gis/geos/libgeos.py
|
||||
+++ b/django/contrib/gis/geos/libgeos.py
|
||||
@@ -24,7 +24,7 @@ def load_geos():
|
||||
from django.conf import settings
|
||||
lib_path = settings.GEOS_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@geos@/lib/libgeos_c@extension@"
|
||||
|
||||
# Setting the appropriate names for the GEOS-C library.
|
||||
if lib_path:
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
|
||||
index cb70a71791..5156f7dd73 100644
|
||||
--- a/django/conf/__init__.py
|
||||
+++ b/django/conf/__init__.py
|
||||
@@ -227,7 +227,7 @@ class Settings:
|
||||
if hasattr(time, "tzset") and self.TIME_ZONE:
|
||||
# When we can, attempt to validate the timezone. If we can't find
|
||||
# this file, no check happens and it's harmless.
|
||||
- zoneinfo_root = Path("/usr/share/zoneinfo")
|
||||
+ zoneinfo_root = Path("@zoneinfo@")
|
||||
zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
|
||||
if zoneinfo_root.exists() and not zone_info_file.exists():
|
||||
raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
|
||||
index 6d67c2931a..0c1f407f88 100644
|
||||
--- a/tests/admin_scripts/tests.py
|
||||
+++ b/tests/admin_scripts/tests.py
|
||||
@@ -127,6 +127,7 @@ class AdminScriptTestCase(SimpleTestCase):
|
||||
del test_environ["DJANGO_SETTINGS_MODULE"]
|
||||
python_path = [base_dir, django_dir, tests_dir]
|
||||
python_path.extend(ext_backend_base_dirs)
|
||||
+ python_path.extend(sys.path)
|
||||
test_environ["PYTHONPATH"] = os.pathsep.join(python_path)
|
||||
test_environ["PYTHONWARNINGS"] = ""
|
||||
|
||||
diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py
|
||||
index 36f22d5f09..6cc6888980 100644
|
||||
--- a/tests/auth_tests/test_hashers.py
|
||||
+++ b/tests/auth_tests/test_hashers.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-from unittest import mock, skipUnless
|
||||
+from unittest import mock, skipUnless, skip
|
||||
|
||||
from django.conf.global_settings import PASSWORD_HASHERS
|
||||
from django.contrib.auth.hashers import (
|
||||
@@ -241,6 +241,7 @@ class TestUtilsHashPass(SimpleTestCase):
|
||||
|
||||
@ignore_warnings(category=RemovedInDjango50Warning)
|
||||
@skipUnless(crypt, "no crypt module to generate password.")
|
||||
+ @skip("Legacy crypt algorithms are unsupported in nixpkgs")
|
||||
@override_settings(
|
||||
PASSWORD_HASHERS=["django.contrib.auth.hashers.CryptPasswordHasher"]
|
||||
)
|
||||
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
|
||||
index 62cbffbee9..2f0ec718f8 100644
|
||||
--- a/tests/settings_tests/tests.py
|
||||
+++ b/tests/settings_tests/tests.py
|
||||
@@ -2,7 +2,7 @@ import os
|
||||
import sys
|
||||
import unittest
|
||||
from types import ModuleType, SimpleNamespace
|
||||
-from unittest import mock
|
||||
+from unittest import mock, skip
|
||||
|
||||
from django.conf import (
|
||||
ENVIRONMENT_VARIABLE,
|
||||
@@ -342,6 +342,7 @@ class SettingsTests(SimpleTestCase):
|
||||
getattr(s, "foo")
|
||||
|
||||
@requires_tz_support
|
||||
+ @skip("Assertion fails, exception does not get raised")
|
||||
@mock.patch("django.conf.global_settings.TIME_ZONE", "test")
|
||||
def test_incorrect_timezone(self):
|
||||
with self.assertRaisesMessage(ValueError, "Incorrect timezone setting: test"):
|
||||
|
|
@ -2,10 +2,14 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
libgpiod,
|
||||
setuptools,
|
||||
}:
|
||||
buildPythonPackage {
|
||||
inherit (libgpiod) pname version src;
|
||||
format = "setuptools";
|
||||
pname = "gpiod";
|
||||
inherit (libgpiod) version src;
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ libgpiod ];
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
fetchFromGitHub,
|
||||
hatchling,
|
||||
hatch-fancy-pypi-readme,
|
||||
libgpiod,
|
||||
gpiod,
|
||||
mock,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
dependencies = [
|
||||
libgpiod
|
||||
gpiod
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "griffelib";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8lrpIlWuf9/4Lm+YWLC6GHKwRE7vh+lqBIJIO/WnnSg=";
|
||||
hash = "sha256-Fxa9lrBVQ/enVLiU7hUc0d5x9ItI19EGnbxa7MX6Plc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/griffelib";
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "groq";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "groq";
|
||||
repo = "groq-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rXKuQKrpI3cnJbADDgvL/3vwC25ydTNEbKCwVhjYtFg=";
|
||||
hash = "sha256-uOTttpjV2iislaink/0Jewkinyb2hYt0J+sv/OSuhJ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202603281";
|
||||
version = "0.1.202603301";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wl9GlMr8Y7jLjw6uYLb4JtLIzoQo8WZm0vOL9np1xPU=";
|
||||
hash = "sha256-cJ+CvwbPLyZZazeKVZywBLsIChvZKZ8huQbEh3yIsto=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "json-timeseries";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
|
@ -16,9 +16,7 @@ buildPythonPackage {
|
|||
src = fetchFromGitHub {
|
||||
owner = "slaxor505";
|
||||
repo = "json-timeseries-py";
|
||||
# asked upstream for tags
|
||||
# https://github.com/slaxor505/json-timeseries-py/issues/2
|
||||
rev = "d5a4f6307ce38f790c2594c3eae0f64bbc7c353e";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5+eS+e6d61CBIqBXFaIQta95nenF5XK2mA9pQ+Rj0vQ=";
|
||||
};
|
||||
|
||||
|
|
@ -36,9 +34,10 @@ buildPythonPackage {
|
|||
pythonImportsCheck = [ "json_timeseries" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/slaxor505/json-timeseries-py/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "JSON Time Series (JTS) spec Python library";
|
||||
homepage = "https://github.com/slaxor505/json-timeseries-py";
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyblu";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LouisChrist";
|
||||
repo = "pyblu";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Cmc0GXucoSSBWii+Xkx2jhG81kO+UeQUX3fKHUgLNS4=";
|
||||
hash = "sha256-qLB9o40tRYgmbYJEEx8r3SodH1hB8MM4yLXbdKIs/xA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "aiohttp" ];
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydantic-ai-slim";
|
||||
version = "1.70.0";
|
||||
version = "1.73.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pydantic-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo=";
|
||||
hash = "sha256-bcL/ZquuJTbaXu1DKzZGNdRluUUhwhakqnYVOqQ84Ts=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydantic-graph";
|
||||
version = "1.70.0";
|
||||
version = "1.73.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pydantic-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo=";
|
||||
hash = "sha256-bcL/ZquuJTbaXu1DKzZGNdRluUUhwhakqnYVOqQ84Ts=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pydantic_graph";
|
||||
|
|
|
|||
|
|
@ -1,40 +1,35 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
deprecated,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
typing-extensions,
|
||||
zeroconf,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyvlx";
|
||||
version = "0.2.30";
|
||||
version = "0.2.32";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julius2342";
|
||||
repo = "pyvlx";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-owrWYBAb/5JAangGwt56gdjJf99C3i04IiKAh1P/MYY=";
|
||||
hash = "sha256-ArNWXvYZ/eZWPUvV8z/+6WsAcm5MTnKblMrUFj51JhM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools-scm>=8.0" "setuptools-scm"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
deprecated
|
||||
pyyaml
|
||||
typing-extensions
|
||||
zeroconf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
# for passthru.tests
|
||||
django,
|
||||
django_4,
|
||||
django-silk,
|
||||
pgadmin4,
|
||||
}:
|
||||
|
|
@ -36,7 +35,6 @@ buildPythonPackage rec {
|
|||
passthru.tests = {
|
||||
inherit
|
||||
django
|
||||
django_4
|
||||
django-silk
|
||||
pgadmin4
|
||||
;
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "swift";
|
||||
version = "2.37.0";
|
||||
version = "2.37.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-EO50/6S6fXIZtYsCAO8VmpWotKdwgnmY48W6XKCypGU=";
|
||||
hash = "sha256-d5Jol5iCY8o+Ix+xrviufMLOh3T0UN2bVa+GrsA8D6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual";
|
||||
version = "8.1.1";
|
||||
version = "8.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jYjw4iqJ/CrawQwcwqAfQLc04tfdTqq6ERJsfx4FDMs=";
|
||||
hash = "sha256-GFn+DNpR10G/0qii6wKnh3InbIaDuvriJCCN9M9rsWg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "uiprotect";
|
||||
version = "10.2.2";
|
||||
version = "10.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-C0daz9PY7UI/jUo1zZvvT7qN6YRp+VXiNl+Rm5H7uac=";
|
||||
hash = "sha256-vEpdGUl2eceF32U8HcCrOVGxsdM0AdcV3v5Ya1ej7Mk=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
click,
|
||||
coloredlogs,
|
||||
crc,
|
||||
libgpiod,
|
||||
gpiod,
|
||||
pyserial-asyncio-fast,
|
||||
typing-extensions,
|
||||
zigpy,
|
||||
|
|
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
zigpy
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux) [ gpiod ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
buildHomeAssistantComponent,
|
||||
fetchFromCodeberg,
|
||||
libgpiod,
|
||||
gpiod,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
|
|
@ -17,7 +17,7 @@ buildHomeAssistantComponent rec {
|
|||
hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk=";
|
||||
};
|
||||
|
||||
dependencies = [ libgpiod ];
|
||||
dependencies = [ gpiod ];
|
||||
|
||||
meta = {
|
||||
description = "Home Assistant GPIO custom integration";
|
||||
|
|
|
|||
|
|
@ -223,6 +223,8 @@ let
|
|||
|
||||
caqti-lwt = callPackage ../development/ocaml-modules/caqti/lwt.nix { };
|
||||
|
||||
caqti-miou = callPackage ../development/ocaml-modules/caqti/miou.nix { };
|
||||
|
||||
caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { };
|
||||
|
||||
carton = callPackage ../development/ocaml-modules/carton {
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@ mapAliases {
|
|||
django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
|
||||
django-modelsearch = modelsearch; # added 2026-03-02
|
||||
django_3 = throw "Django 3 has reached it's EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
|
||||
django_4 = throw "Django 4 has reached it's EOL in 2026-04 and has therefore been removed."; # added 2026-03-30
|
||||
django_5_1 = throw "Django 5.1 has reached it's EOL in 2025-12 and has therefore been removed."; # added 2025-11-30"
|
||||
django_5_2 = django_5; # added 2026-01-18
|
||||
django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
|
||||
|
|
@ -286,6 +287,7 @@ mapAliases {
|
|||
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
|
||||
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
|
||||
libgpiod = gpiod; # added 2026-03-30
|
||||
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
|
||||
line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
|
||||
linear-garage-door = throw "'linear-garage-door' has been superseded by 'nice-go'"; # Added 2025-11-16
|
||||
|
|
|
|||
|
|
@ -4443,8 +4443,6 @@ self: super: with self; {
|
|||
{ };
|
||||
|
||||
# LTS in extended support phase
|
||||
django_4 = callPackage ../development/python-modules/django/4.nix { };
|
||||
|
||||
django_5 = callPackage ../development/python-modules/django/5.nix { };
|
||||
|
||||
django_6 = callPackage ../development/python-modules/django/6.nix { };
|
||||
|
|
@ -6599,6 +6597,8 @@ self: super: with self; {
|
|||
|
||||
gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { };
|
||||
|
||||
gpiod = callPackage ../development/python-modules/gpiod { inherit (pkgs) libgpiod; };
|
||||
|
||||
gpiodevice = callPackage ../development/python-modules/gpiodevice { };
|
||||
|
||||
gpiozero = callPackage ../development/python-modules/gpiozero { };
|
||||
|
|
@ -8701,8 +8701,6 @@ self: super: with self; {
|
|||
|
||||
libfive = toPythonModule (pkgs.libfive.override { python3 = python; });
|
||||
|
||||
libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; };
|
||||
|
||||
libgravatar = callPackage ../development/python-modules/libgravatar { };
|
||||
|
||||
libiio =
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ with super;
|
|||
|
||||
six = disabled super.six;
|
||||
|
||||
wcwidth = disabled super.wcwitch;
|
||||
wcwidth = disabled super.wcwidth;
|
||||
|
||||
wheel = callPackage ../development/python2-modules/wheel { };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue