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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-03-04 06:05:24 +00:00
committed by GitHub
parent efd1b2b6ef 53673f1a34
commit 476a8a9af3
20 changed files with 329 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/mopidy/jellyfin.nix
+3 -3
View File
@@ -7,12 +7,12 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-jellyfin";
version = "1.0.5";
version = "1.0.6";
src = fetchPypi {
inherit version;
pname = "Mopidy-Jellyfin";
hash = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc=";
pname = "mopidy_jellyfin";
hash = "sha256-IKCPypMuluR0+mMALp8lB1oB1pSw4rN4rOl/eKn+Qvo=";
};
propagatedBuildInputs = [
pkgs/by-name/au/auto-editor/package.nix
+3 -8
View File
@@ -3,25 +3,23 @@
python3Packages,
fetchFromGitHub,
replaceVars,
ffmpeg,
yt-dlp,
}:
python3Packages.buildPythonApplication rec {
pname = "auto-editor";
version = "24w29a";
version = "26.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "WyattBlue";
repo = "auto-editor";
tag = version;
hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA=";
hash = "sha256-BYpt/EelCChhphfuTcqI/VIVis6dnt0J4FcNhWeiiyY=";
};
patches = [
(replaceVars ./set-exe-paths.patch {
ffmpeg = lib.getExe ffmpeg;
yt_dlp = lib.getExe yt-dlp;
})
];
@@ -29,12 +27,9 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
# pyav is a fork of av, but has since mostly been un-forked
substituteInPlace pyproject.toml \
--replace-fail '"pyav==12.2.*"' '"av"'
--replace-fail '"pyav==14.*"' '"av"'
'';
# our patch file also removes the dependency on ae-ffmpeg
pythonRemoveDeps = [ "ae-ffmpeg" ];
build-system = with python3Packages; [
setuptools
];
pkgs/by-name/au/auto-editor/set-exe-paths.patch
+3 -22
View File
@@ -1,29 +1,10 @@
diff --git a/auto_editor/ffwrapper.py b/auto_editor/ffwrapper.py
index b6df2d4..8409032 100644
--- a/auto_editor/ffwrapper.py
+++ b/auto_editor/ffwrapper.py
@@ -30,13 +30,7 @@ class FFmpeg:
return ff_location
if my_ffmpeg:
return "ffmpeg"
-
- try:
- import ae_ffmpeg
-
- return ae_ffmpeg.get_path()
- except ImportError:
- return "ffmpeg"
+ return "@ffmpeg@"
self.debug = debug
self.show_cmd = show_cmd
diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py
index ccd6581..a66e5e3 100644
index 931cc33..b0aecbc 100644
--- a/auto_editor/utils/types.py
+++ b/auto_editor/utils/types.py
@@ -218,7 +218,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
@@ -191,7 +191,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
@dataclass
@dataclass(slots=True)
class Args:
- yt_dlp_location: str = "yt-dlp"
+ yt_dlp_location: str = "@yt_dlp@"
pkgs/by-name/fr/framework-tool/Cargo.lock
Generated
-1390
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/fr/framework-tool/package.nix
+9 -17
View File
@@ -6,37 +6,29 @@
udev,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "framework-tool";
# Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock,
# so use unstable for now
version = "0.1.0-unstable-2024-06-14";
version = "0.2.1";
src = fetchFromGitHub {
owner = "FrameworkComputer";
repo = "framework-system";
rev = "705805ce3fd9acf23ae4e310227ca62b7d686a69";
hash = "sha256-crMA0jdCGNDvwTzYXiDpz+1O2Tk84j5cLcQAaplCDFs=";
tag = "v${version}";
hash = "sha256-wWattGkBn8WD3vfThlQnotQB4Q/C00AZT1BesoHcCyg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
"uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-kmrgtYXo2Xh4mBk64VE83UJdITHgA/y3VeBRE8gDUTY=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
meta = with lib; {
meta = {
description = "Swiss army knife for Framework laptops";
homepage = "https://github.com/FrameworkComputer/framework-system";
license = licenses.bsd3;
license = lib.licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
nickcao
leona
kloenk
pkgs/by-name/in/incus-ui-canonical/package.nix
+15 -4
View File
@@ -9,6 +9,7 @@
yarn,
nixosTests,
git,
nix-update-script,
}:
let
# this rarely changes https://github.com/zabbly/incus/blob/daily/patches/ui-canonical-renames.sed
@@ -19,18 +20,19 @@ let
in
stdenv.mkDerivation rec {
pname = "incus-ui-canonical";
version = "0.14.7";
version = "0.15.0";
src = fetchFromGitHub {
owner = "zabbly";
repo = "incus-ui-canonical";
# only use tags prefixed by incus- they are the tested fork versions
tag = "incus-${version}";
hash = "sha256-O8dXTtpeFs2muwXHuNZsXjr15gWYlPmdjW4aQHwDBpY=";
hash = "sha256-I0t2ShMkc/zYn7I6Vcd9A31ZAscY0D7cWAdF80NwRGg=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";
hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g=";
};
patchPhase = ''
@@ -72,7 +74,16 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.tests.default = nixosTests.incus.ui;
passthru = {
tests.default = nixosTests.incus.ui;
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"incus-([0-9\\.]+)"
];
};
};
meta = {
description = "Web user interface for Incus";
pkgs/by-name/in/incus/package.nix
+3 -3
View File
@@ -1,7 +1,7 @@
import ./generic.nix {
hash = "sha256-bi++GJLLYlX8JZwmxx4S2EGALuwVOGW4G7u2Nv6s26k=";
version = "6.9.0";
vendorHash = "sha256-aYQOKO5RMPqChV6hXPBfSLKdfCuS+BFVmpakJX7swKg=";
hash = "sha256-uuaJoUrAZ1kSeO2xdXhfdI8Zy4zbA9r1pIhPMqzUios=";
version = "6.10.1";
vendorHash = "sha256-/8aBG8RiC03+oVI9lgPFwbi3b4juumziXL4WH0k/4PA=";
patches = [ ];
nixUpdateExtraArgs = [
"--override-filename=pkgs/by-name/in/incus/package.nix"
pkgs/by-name/me/mesos-dns/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "mesos-dns";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "m3scluster";
repo = "mesos-dns";
rev = "v${version}";
hash = "sha256-6uuaSCPBY+mKfU2Xku9M1oF5jwxogR2Rki4AIdsjLr0=";
hash = "sha256-/zcjQ2AxZ17rAxrRmfztj5gH1pu2QswJgaCE022FieU=";
};
vendorHash = "sha256-k47kxdkwhf9b8DdvWzwhj12ebvPYezxyIJ8w1Zn+Xew=";
vendorHash = "sha256-TSw6ui5nGHRJiT/W+iszKA0rtgUIf73yDJaHkUgqowk=";
subPackages = [ "." ];
pkgs/by-name/mi/mitra/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "mitra";
version = "3.16.0";
version = "3.18.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "silverpill";
repo = "mitra";
rev = "v${version}";
hash = "sha256-jVm1ftFSOxEseNgze6xsF9k8G02UJc3f/CGxzdNzfhw=";
hash = "sha256-PBlAxQvuXS/qoPcze9CKsD18HYzORj9yL+sWC+l1jUk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-QQRl9/Rc0cVs1ug5LXN9OFZI4uTO7Jgu1vQQM/RQsLo=";
cargoHash = "sha256-lTGrj02v0vmWg50GZZzf7Mmb40gM4Iid5invxiB2ue0=";
# require running database
doCheck = false;
pkgs/by-name/py/pytr/package.nix
+7 -5
View File
@@ -8,19 +8,19 @@
python3Packages.buildPythonApplication rec {
pname = "pytr";
version = "0.3.1";
version = "0.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pytr-org";
repo = "pytr";
tag = "v${version}";
hash = "sha256-OFONjJXKkfb6+bQx5fhsadjm9WG62FISznnWL9IEY7I=";
hash = "sha256-uWG8q6H6q54v3Iq5LOkr7zi5rds+y13O0ai9R9QySdI=";
};
build-system = with python3Packages; [
babel
setuptools
hatchling
hatch-babel
];
dependencies = with python3Packages; [
@@ -46,10 +46,12 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
pythonImportsCheck = [ "pytr" ];
meta = {
changelog = "https://github.com/pytr-org/pytr/releases/tag/v${version}";
changelog = "https://github.com/pytr-org/pytr/releases/tag/${src.tag}";
description = "Use TradeRepublic in terminal and mass download all documents";
homepage = "https://github.com/pytr-org/pytr";
license = lib.licenses.mit;
pkgs/by-name/ta/tail-tray/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "tail-tray";
version = "0.2.16";
version = "0.2.17";
src = fetchFromGitHub {
owner = "SneWs";
repo = "tail-tray";
tag = "v${version}";
sha256 = "sha256-AFIQSjmmUP2rQTsBxTIKvADmee/W+jUOyZwGPSINRzk=";
sha256 = "sha256-Mobbh1c7f3aTxn0BEIm2A+DgS2TBSZTYiDlHxyaQEjk=";
};
nativeBuildInputs = with kdePackages; [
pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
+58
View File
@@ -0,0 +1,58 @@
diff --git a/Makefile-integration.am b/Makefile-integration.am
index e2255de..3cea1d8 100644
--- a/Makefile-integration.am
+++ b/Makefile-integration.am
@@ -7,7 +7,6 @@ integration_scripts = \
test/integration/pkcs11-dbup.sh.nosetup \
test/integration/tls-tests.sh \
test/integration/openssl.sh \
- test/integration/pkcs11-javarunner.sh.java \
test/integration/nss-tests.sh \
test/integration/ptool-link.sh.nosetup \
test/integration/python-pkcs11.sh
@@ -110,13 +109,5 @@ test_integration_pkcs_lockout_int_CFLAGS = $(AM_CFLAGS) $(TESTS_CFLAGS)
test_integration_pkcs_lockout_int_LDADD = $(TESTS_LDADD) $(SQLITE3_LIBS)
test_integration_pkcs_lockout_int_SOURCES = test/integration/pkcs-lockout.int.c test/integration/test.c
-#
-# Java Tests
-#
-AM_JAVA_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI) --tsetup-script=$(top_srcdir)/test/integration/scripts/create_pkcs_store.sh
-JAVA_LOG_COMPILER=$(LOG_COMPILER)
-dist_noinst_JAVA = test/integration/PKCS11JavaTests.java
-CLEANFILES += test/integration/PKCS11JavaTests.class
-
endif
# END INTEGRATION
diff --git a/configure.ac b/configure.ac
index 1ec6eb4..7a0a8ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,13 +258,6 @@ AC_ARG_ENABLE(
[build and execute integration tests])],,
[enable_integration=no])
-# Test for Java compiler and interpreter without throwing fatal errors (since
-# these macros are defined using AC_DEFUN they cannot be called conditionally)
-m4_pushdef([AC_MSG_ERROR], [have_javac=no])
-AX_PROG_JAVAC()
-AX_PROG_JAVA()
-m4_popdef([AC_MSG_ERROR])
-
AC_DEFUN([integration_test_checks], [
AC_CHECK_PROG([tpm2_createprimary], [tpm2_createprimary], [yes], [no])
@@ -382,13 +375,6 @@ AC_DEFUN([integration_test_checks], [
[AC_MSG_ERROR([Integration tests enabled but tss2_provision executable not found.])])
])
- AS_IF([test "x$have_javac" = "xno"],
- [AC_MSG_ERROR([Integration tests enabled but no Java compiler was found])])
- AX_CHECK_CLASS([org.junit.Assert], ,
- [AC_MSG_ERROR([Integration tests enabled but JUnit not found, try setting CLASSPATH])])
- AX_CHECK_CLASS([org.hamcrest.SelfDescribing], ,
- [AC_MSG_ERROR([Integration tests enabled but Hamcrest not found, try setting CLASSPATH])])
-
AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])
]) # end function integration_test_checks
pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
-51
View File
@@ -1,51 +0,0 @@
From 2e3e3c0b0f4e0c19e411fd46358930bf158ad3f5 Mon Sep 17 00:00:00 2001
From: Jonathan McDowell <noodles@earth.li>
Date: Wed, 1 Feb 2023 09:29:58 +0000
Subject: [PATCH] Gracefully fail FAPI init when it's not compiled in
Instead of emitting:
WARNING: Getting tokens from fapi backend failed.
errors when FAPI support is not compiled in gracefully fail the FAPI
init and don't log any warnings. We'll still produce a message
indicating this is what's happened in verbose mode, but normal operation
no longer gets an unnecessary message.
Fixes #792
Signed-off-by: Jonathan McDowell <noodles@earth.li>
---
src/lib/backend.c | 4 +++-
src/lib/backend_fapi.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/backend.c b/src/lib/backend.c
index ca5e2ccf..128f58b9 100644
--- a/src/lib/backend.c
+++ b/src/lib/backend.c
@@ -53,7 +53,9 @@ CK_RV backend_init(void) {
LOGE(msg);
return rv;
}
- LOGW(msg);
+ if (rv != CKR_FUNCTION_NOT_SUPPORTED) {
+ LOGW(msg);
+ }
} else {
fapi_init = true;
}
diff --git a/src/lib/backend_fapi.c b/src/lib/backend_fapi.c
index fe594f0e..3a203632 100644
--- a/src/lib/backend_fapi.c
+++ b/src/lib/backend_fapi.c
@@ -977,7 +977,8 @@ CK_RV backend_fapi_token_changeauth(token *tok, bool user, twist toldpin, twist
CK_RV backend_fapi_init(void) {
- return CKR_OK;
+ LOGV("FAPI not enabled, failing init");
+ return CKR_FUNCTION_NOT_SUPPORTED;
}
CK_RV backend_fapi_destroy(void) {
pkgs/by-name/tp/tpm2-pkcs11/package.nix
+162 -59
View File
@@ -1,101 +1,205 @@
{
stdenv,
lib,
fetchFromGitHub,
pkg-config,
autoreconfHook,
autoconf-archive,
makeWrapper,
patchelf,
tpm2-tss,
tpm2-tools,
opensc,
openssl,
sqlite,
python3,
autoreconfHook,
buildEnv,
clangStdenv,
cmocka,
dbus,
expect,
fetchFromGitHub,
glibc,
gnutls,
iproute2,
lib,
libyaml,
abrmdSupport ? true,
tpm2-abrmd ? null,
makeWrapper,
opensc,
openssh,
openssl,
nss,
p11-kit,
patchelf,
pkg-config,
python3,
stdenv,
sqlite,
swtpm,
tpm2-abrmd,
tpm2-openssl,
tpm2-pkcs11, # for passthru abrmd tests
tpm2-tools,
tpm2-tss,
which,
xxd,
abrmdSupport ? false,
fapiSupport ? true,
enableFuzzing ? false,
}:
stdenv.mkDerivation rec {
let
chosenStdenv = if enableFuzzing then clangStdenv else stdenv;
in
chosenStdenv.mkDerivation (finalAttrs: {
pname = "tpm2-pkcs11";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "tpm2-software";
repo = pname;
rev = version;
sha256 = "sha256-SoHtgZRIYNJg4/w1MIocZAM26mkrM+UOQ+RKCh6nwCk=";
repo = "tpm2-pkcs11";
tag = finalAttrs.version;
hash = "sha256-W74ckrpK7ypny1L3Gn7nNbOVh8zbHavIk/TX3b8XbI8=";
};
patches = [
./version.patch
./graceful-fapi-fail.patch
];
# Disable Java‐based tests because of missing dependencies
patches = [ ./disable-java-integration.patch ];
# The preConfigure phase doesn't seem to be working here
# ./bootstrap MUST be executed as the first step, before all
# of the autoreconfHook stuff
postPatch = ''
echo ${version} > VERSION
echo ${lib.escapeShellArg finalAttrs.version} >VERSION
# Don't run git in the bootstrap
substituteInPlace bootstrap --replace-warn "git" "# git"
# Provide configuration file for D-Bus
substituteInPlace Makefile.am --replace-fail \
"dbus-run-session" \
"dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf"
# Disable failing tests
sed -E -i '/\<test\/integration\/(pkcs-crypt\.int|pkcs11-tool\.sh)\>/d' \
Makefile-integration.am
patchShebangs test tools
# The preConfigure phase doesn't seem to be working here
# ./bootstrap MUST be executed as the first step, before all
# of the autoreconfHook stuff
./bootstrap
'';
configureFlags = lib.optionals (!fapiSupport) [
# Note: this will be renamed to with-fapi in next release.
"--enable-fapi=no"
];
configureFlags =
[
(lib.enableFeature finalAttrs.doCheck "unit")
(lib.enableFeature finalAttrs.doCheck "integration")
]
++ lib.optionals enableFuzzing [
"--enable-fuzzing"
"--disable-hardening"
]
++ lib.optional fapiSupport "--with-fapi";
strictDeps = true;
nativeBuildInputs = [
pkg-config
autoreconfHook
autoconf-archive
autoreconfHook
makeWrapper
patchelf
];
buildInputs = [
tpm2-tss
tpm2-tools
opensc
openssl
sqlite
libyaml
pkg-config
(python3.withPackages (
ps: with ps; [
ps:
with ps;
[
packaging
pyyaml
python-pkcs11
cryptography
pyasn1-modules
tpm2-pytss
]
++ cryptography.optional-dependencies.ssh
))
];
buildInputs = [
libyaml
opensc
openssl
sqlite
tpm2-tools
tpm2-tss
];
nativeCheckInputs = [
dbus
expect
gnutls
iproute2
nss.tools
opensc
openssh
openssl
p11-kit
sqlite
swtpm
tpm2-abrmd
tpm2-tools
which
xxd
];
checkInputs = [
cmocka
tpm2-abrmd
];
enableParallelBuilding = true;
hardeningDisable = lib.optional enableFuzzing "all";
outputs = [
"out"
"bin"
"dev"
];
doCheck = true;
dontStrip = true;
dontPatchELF = true;
preCheck =
let
openssl-modules = buildEnv {
name = "openssl-modules";
pathsToLink = [ "/lib/ossl-modules" ];
paths = map lib.getLib [
openssl
tpm2-openssl
];
};
in
''
# Enable tests to load TCTI modules
export LD_LIBRARY_PATH+=":${
lib.makeLibraryPath [
swtpm
tpm2-tools
tpm2-abrmd
]
}"
# Enable tests to load TPM2 OpenSSL module
export OPENSSL_MODULES="${openssl-modules}/lib/ossl-modules"
'';
postInstall = ''
mkdir -p $bin/bin/ $bin/share/tpm2_pkcs11/
mv ./tools/* $bin/share/tpm2_pkcs11/
makeWrapper $bin/share/tpm2_pkcs11/tpm2_ptool.py $bin/bin/tpm2_ptool \
--prefix PATH : ${lib.makeBinPath [ tpm2-tools ]}
'';
# To be able to use the userspace resource manager, the RUNPATH must
# explicitly include the tpm2-abrmd shared libraries.
preFixup =
let
rpath = lib.makeLibraryPath (
(lib.optional abrmdSupport tpm2-abrmd)
++ [
tpm2-tss
sqlite
openssl
[
glibc
libyaml
openssl
sqlite
tpm2-tss
]
++ (lib.optional abrmdSupport tpm2-abrmd)
);
in
''
@@ -106,19 +210,18 @@ stdenv.mkDerivation rec {
$out/lib/libtpm2_pkcs11.so.0.0.0
'';
postInstall = ''
mkdir -p $bin/bin/ $bin/share/tpm2_pkcs11/
mv ./tools/* $bin/share/tpm2_pkcs11/
makeWrapper $bin/share/tpm2_pkcs11/tpm2_ptool.py $bin/bin/tpm2_ptool \
--prefix PATH : ${lib.makeBinPath [ tpm2-tools ]}
'';
passthru = {
tests.tpm2-pkcs11-abrmd = tpm2-pkcs11.override {
abrmdSupport = true;
};
};
meta = with lib; {
meta = {
description = "PKCS#11 interface for TPM2 hardware";
homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ ];
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ numinit ];
mainProgram = "tpm2_ptool";
};
}
})
pkgs/by-name/tp/tpm2-pkcs11/version.patch
-10
View File
@@ -1,10 +0,0 @@
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,6 @@
# Generate a VERSION file that is included in the dist tarball to avoid needed git
# when calling autoreconf in a release tarball.
-git describe --tags --always --dirty > VERSION
# generate list of source files for use in Makefile.am
# if you add new source files, you must run ./bootstrap again
pkgs/desktops/gnome/extensions/valent/default.nix
+13 -8
View File
@@ -1,19 +1,21 @@
{ stdenv
, lib
, fetchFromGitHub
, meson
, ninja
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
gitUpdater,
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-valent";
version = "1.0.0.alpha.46";
version = "1.0.0.alpha.47";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-valent";
rev = "v${version}";
hash = "sha256-OY0fxO6IYg7xukYYuK0QM9YriaEAlM2dH6t8Wv3XKIs=";
tag = "v${version}";
hash = "sha256-KynVbJtpGl4moIAlxzXouM+nxOGImIcCWdevveshbbo=";
};
nativeBuildInputs = [
@@ -24,6 +26,9 @@ stdenv.mkDerivation rec {
passthru = {
extensionUuid = "valent@andyholmes.ca";
extensionPortalSlug = "valent";
updateScript = gitUpdater {
rev-prefix = "v";
};
};
meta = {
pkgs/development/python-modules/hatch-babel/default.nix
+38
View File
@@ -0,0 +1,38 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
hatchling,
babel,
typing-extensions,
}:
buildPythonPackage rec {
pname = "hatch-babel";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "NiklasRosenstein";
repo = "hatch-babel";
tag = version;
hash = "sha256-qAVuT3NuHAh1ELWzBT3/kvrDdSHqdy/YINCfKgpSk8g=";
};
build-system = [ hatchling ];
dependencies = [
babel
typing-extensions
];
pythonImportsCheck = [ "hatch_babel" ];
meta = {
description = "Hatch build-hook to compile Babel *.po files to *.mo files at build time";
homepage = "https://github.com/NiklasRosenstein/hatch-babel";
changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/tools/infisical/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
# the version of infisical
version = "0.34.2";
version = "0.35.0";
# the platform-specific, statically linked binary
src =
pkgs/development/tools/infisical/hashes.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
, "x86_64-linux": "sha256-HRAJhyiXGyewKuqQtjKrJ3HBl80lqgR0ab7vG/64KMQ="
, "x86_64-darwin": "sha256-r6aY1T7zUr1hO6lUKuUQNUY8W85YYe1bJSpKnGEvfG4="
, "aarch64-linux": "sha256-4Xv/HVxDOxp7CW5hwX7L06IJP3RhaQqKl0Cp4iHiyVE="
, "aarch64-darwin": "sha256-ENJyvEQx3MaHAqn67+xOMja3Ce73uxuX7zMAbzQJqYM="
, "x86_64-linux": "sha256-5V4mVm9SEli/hYtMMgTfpFvDC8/OkbruwIoDr8bd0RE="
, "x86_64-darwin": "sha256-RtjM9k1a2bcbnRPfrw4a4+ny4QRbP5llgwjpfuYyFgc="
, "aarch64-linux": "sha256-crCs2puDDaaGwXZ9w81+Bku7IMXz+RTv++fkH3YSboM="
, "aarch64-darwin": "sha256-ypG4tclRBf6s6upkbX4HzxQyTt/q6cKIA0CMUzktpjM="
}
pkgs/top-level/python-packages.nix
+2
View File
@@ -5900,6 +5900,8 @@ self: super: with self; {
hatchling = callPackage ../development/python-modules/hatchling { };
hatch-babel = callPackage ../development/python-modules/hatch-babel { };
hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { };
hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { };