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-09-14 06:05:52 +00:00
committed by GitHub
parent 622db1f570 a1e3ec7161
commit bd09088666
23 changed files with 296 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2511.section.md
+6 -1
View File
@@ -244,8 +244,13 @@
### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
- Create the first release note entry in this section!
- `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type
In most cases wrapping `either` with `attrsOf` should be sufficient.
Since types.either was used to bootstrap other types. This also affects the following types:
- `oneOf`
- `number`
- `numbers.*`
### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
lib/tests/modules.sh
+22
View File
@@ -550,6 +550,28 @@ checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freefo
checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix
checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix
# Regression of either, due to freeform not beeing checked previously
checkConfigOutput '^"foo"$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
checkConfigOutput '^"foo"$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
checkConfigOutput '^"foo"$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
checkConfigOutput '^"foo"$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong.nix
checkConfigOutput '^42$' config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.either.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
checkConfigOutput '^42$' config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.eitherBehindNullor.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
checkConfigOutput '^42$' config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.oneOf.int ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
checkConfigOutput '^42$' config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
NIX_ABORT_ON_WARN=1 checkConfigError "One or more definitions did not pass the type-check of the \'either\' type" config.number.str ./freeform-deprecated-malicous.nix ./freeform-deprecated-malicous-wrong2.nix
# Value OK: Fail if a warning is emitted
NIX_ABORT_ON_WARN=1 checkConfigOutput "^42$" config.number.int ./freeform-attrsof-either.nix
## types.anything
# Check that attribute sets are merged recursively
checkConfigOutput '^null$' config.value.foo ./types-anything/nested-attrs.nix
lib/tests/modules/freeform-attrsof-either.nix
+14
View File
@@ -0,0 +1,14 @@
{ lib, ... }:
let
inherit (lib) types mkOption;
in
{
options.number = mkOption {
type = types.submodule ({
freeformType = types.attrsOf (types.either types.int types.int);
});
default = {
int = 42;
}; # should not emit a warning
};
}
lib/tests/modules/freeform-deprecated-malicous-wrong.nix
+18
View File
@@ -0,0 +1,18 @@
# Obviously wrong typed
{
config.either = {
int = "foo";
};
config.eitherBehindNullor = {
int = "foo";
};
config.oneOf = {
int = "foo";
};
config.number = {
str = "foo";
};
}
lib/tests/modules/freeform-deprecated-malicous-wrong2.nix
+19
View File
@@ -0,0 +1,19 @@
# freeeformType should have been (attrsOf either)
# This should also print the warning
{
config.either = {
int = 42;
};
config.eitherBehindNullor = {
int = 42;
};
config.oneOf = {
int = 42;
};
config.number = {
str = 42;
};
}
lib/tests/modules/freeform-deprecated-malicous.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib, ... }:
let
inherit (lib) types mkOption;
in
{
options.either = mkOption {
type = types.submodule ({
freeformType = (types.either types.int types.int);
});
};
options.eitherBehindNullor = mkOption {
type = types.submodule ({
freeformType = types.nullOr (types.either types.int types.int);
});
};
options.oneOf = mkOption {
type = types.submodule ({
freeformType = (
types.oneOf [
types.int
types.int
]
);
});
};
options.number = mkOption {
type = types.submodule ({
freeformType = (types.number); # either int float
});
};
}
lib/types.nix
+6 -1
View File
@@ -1453,7 +1453,12 @@ let
headError = {
message = "The option `${showOption loc}` is neither a value of type `${t1.description}` nor `${t2.description}`, Definition values: ${showDefs defs}";
};
value = abort "(t.merge.v2 defs).value must only be accessed when `.headError == null`. This is a bug in code that consumes a module system type.";
value = lib.warn ''
One or more definitions did not pass the type-check of the 'either' type.
${headError.message}
If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`.
Otherwise consider using the correct type for the option `${showOption loc}`. This will be an error in Nixpkgs 26.06.
'' (mergeOneOption loc defs);
};
in
checkedAndMerged;
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -525,13 +525,13 @@
"vendorHash": "sha256-v0nYsQinopJ9DXtkGFe3bIYXMBMsPDafn71Xfmvi2mo="
},
"google": {
"hash": "sha256-TInKyk82gwn3bGEPM6l9pGDmfMPskrMSSWNL0hDpnws=",
"hash": "sha256-BDMOYw/NPCBb5VuJZGNbACJ/dq2uh+wx/y0w6LGWgwE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v6.49.2",
"rev": "v7.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI="
"vendorHash": "sha256-HavrYEqMGuJnZBQlVwZfZiXTISqALjjOHB8z1EpNkOE="
},
"google-beta": {
"hash": "sha256-l08jmxkWsTrk32cJM28OuwSZgSKIB3EPODaUf7821uY=",
pkgs/by-name/fl/floorp-bin/package.nix
-8
View File
@@ -1,8 +0,0 @@
{
wrapFirefox,
floorp-bin-unwrapped,
}:
wrapFirefox floorp-bin-unwrapped {
pname = "floorp-bin";
}
pkgs/by-name/fr/frigate/ffmpeg.patch
+1 -1
View File
@@ -41,7 +41,7 @@ index 0d3f96da..463bcff4 100644
seconds = int(diff % 60)
ffmpeg_cmd = [
- "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support
+ FfmpegConfig.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support
+ self.config.ffmpeg.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support
"-hide_banner",
"-loglevel",
"warning",
pkgs/by-name/go/godns/package.nix
+4 -4
View File
@@ -10,19 +10,19 @@
buildGoModule rec {
pname = "godns";
version = "3.2.5";
version = "3.3.3";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
tag = "v${version}";
hash = "sha256-pe+A4n2IaiCOoDFc8NVk1NogNBqJ9Z4EnMBhiMbpkMU=";
hash = "sha256-go6LUVr53ioCpzWwShe7Ol2p57HH/cAcsD+g7I0ix2E=";
};
vendorHash = "sha256-ascWufBz1cp74g8QXJjEdF23WLZCwvxY+QUKMmfzhSM=";
vendorHash = "sha256-FHao4E0hhmnM224f8CowcHFAN2fmcR7TN08ldKZ5DUw=";
npmDeps = fetchNpmDeps {
src = "${src}/web";
hash = "sha256-DqNgy/ZrSQPSCqZriKosSUybHq3PbuPOjIFqRW+Nu14=";
hash = "sha256-D0R9CUMlm+oesfD+Gr+Cqi37XETMhQ9n9MSKJOYqe9g=";
};
npmRoot = "web";
pkgs/by-name/li/libdeltachat/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-ZKLdCyg0wypJA16QHLWENiE20hUzr53BPHuwjSIhSOc=";
hash = "sha256-oSTQcR7HE1YaVlNuSknG6JhoiiOjgNwAIaCecmLE7PY=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-swPk+KMOnvKcYznA6aHoQff6TRZ8npqfWmI/4Jr9fkw=";
hash = "sha256-9Dmll7os2cq3mxp30L9Nrx53QK1ZF7loozDg/XTs0UE=";
};
nativeBuildInputs = [
pkgs/by-name/na/nak/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "nak";
version = "0.15.4";
version = "0.16.2";
src = fetchFromGitHub {
owner = "fiatjaf";
repo = "nak";
tag = "v${finalAttrs.version}";
hash = "sha256-9Ap342HKD9byMGjFS8/3Ai14T5QJfsA5eYvUvqM02Gg=";
hash = "sha256-h/L2yIMfVR1Erk9nlDyNrepKL89ttOjdpsR6G1Ztu2g=";
};
vendorHash = "sha256-CoEwwxKyW2bYwVA6mpIdGjzEyN8m7K+1bODnPLajGJo=";
vendorHash = "sha256-w6j4Pd9t8a+xxhi9eYPrMTkg5YRGPaD1IDDSPDgBoaI=";
ldflags = [
"-s"
pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch
+31
View File
@@ -0,0 +1,31 @@
From d4ead86b2184d1fc2748ed2b6fae8c0dceaf76c8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 11 Sep 2025 23:37:28 -0400
Subject: [PATCH ovn 1/2] tests: Expect musl error string for EIO errno.
Musl uses a slightly different string representation for the error,
which makes the test fail on cleanup because an unexpected warning is
observed in the service log.
This patch will ignore both glibc and musl error messages.
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
tests/ovn-controller.at | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index 0b00906ae..bec06e527 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -846,6 +846,7 @@ OVN_CLEANUP([hv1
/Certificate must be configured to use SSL/d
/SSL_read: error/d
/receive error: Input/d
+/receive error: I\/O error/d
/connection dropped/d
])
AT_CLEANUP
--
2.50.1
pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch
+37
View File
@@ -0,0 +1,37 @@
From 44d9d58461e15314edf507d0379bff991d7e9964 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 11 Sep 2025 23:40:51 -0400
Subject: [PATCH ovn 2/2] tests: Use localhost when setting "wrong" ovn-remote.
In some isolated environments (e.g. in nixpkgs build sandbox), the
network namespace doesn't have any routes or interfaces but `lo`. In
this case, an attempt to connect to 192.168.0.10 results in ENETUNREACH,
producing an unexpected "Network unreachable" warning message in service
log file - breaking the test cleanup checks.
Since the test case doesn't seem to care if the address is available, as
long as there is no SB database actually running at the configured
ovn-remote port, use the localhost address instead (which is always
present, even in the most isolated environments).
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
tests/ovn-controller.at | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index bec06e527..a8a9a2da2 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -404,7 +404,7 @@ check_sbdb_connection () {
OVS_WAIT_UNTIL([check_sbdb_connection connected])
-ovs-vsctl set open . external_ids:ovn-remote=tcp:192.168.0.10:6642
+ovs-vsctl set open . external_ids:ovn-remote=tcp:127.0.0.1:12345
OVS_WAIT_UNTIL([check_sbdb_connection 'not connected'])
# reset the remote for clean-up
--
2.50.1
pkgs/by-name/ov/ovn/package.nix
+32 -16
View File
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
autoreconfHook,
gnused,
libbpf,
libcap_ng,
nix-update-script,
@@ -15,19 +14,30 @@
unbound,
xdp-tools,
}:
stdenv.mkDerivation rec {
let
withOpensslConfigureFlag = "--with-openssl=${lib.getLib openssl.dev}";
in
stdenv.mkDerivation (finalAttrs: {
pname = "ovn";
version = "25.09.0";
src = fetchFromGitHub {
owner = "ovn-org";
repo = "ovn";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-DNaf3vWb6tlzViMEI02+3st/0AiMVAomSaiGplcjkIc=";
fetchSubmodules = true;
};
patches = [
# Fix test failure with musl libc.
# https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-1-ihar.hrachyshka@gmail.com/
./0001-tests-Expect-musl-error-string-for-EIO-errno.patch
# Fix sandbox test failure.
# https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-2-ihar.hrachyshka@gmail.com/
./0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch
];
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -49,7 +59,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
pushd ovs
./boot.sh
./configure --with-dbdir=/var/lib/openvswitch
./configure --with-dbdir=/var/lib/openvswitch ${lib.optionalString stdenv.hostPlatform.isStatic withOpensslConfigureFlag}
make -j $NIX_BUILD_CORES
popd
'';
@@ -61,15 +71,14 @@ stdenv.mkDerivation rec {
"--sbindir=$(out)/bin"
"--enable-ssl"
]
++ lib.optional stdenv.hostPlatform.isStatic "--with-openssl=${lib.getLib openssl.dev}";
++ lib.optional stdenv.hostPlatform.isStatic withOpensslConfigureFlag;
enableParallelBuilding = true;
# disable tests due to networking issues and because individual tests can't be skipped easily
doCheck = false;
doCheck = true;
nativeCheckInputs = [
gnused
openssl # used to generate certificates used for test services
procps
];
@@ -93,6 +102,10 @@ stdenv.mkDerivation rec {
sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl
'';
env = {
SKIP_UNSTABLE = "yes";
};
# https://docs.ovn.org/en/latest/topics/testing.html
preCheck = ''
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
@@ -106,15 +119,18 @@ stdenv.mkDerivation rec {
passthru.updateScript = nix-update-script { };
meta = with lib; {
meta = {
description = "Open Virtual Network";
longDescription = ''
OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch.
'';
homepage = "https://github.com/ovn-org/ovn";
changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS";
license = licenses.asl20;
maintainers = with maintainers; [ adamcstephens ];
platforms = platforms.linux;
homepage = "https://www.ovn.org";
changelog = "https://github.com/ovn-org/ovn/blob/refs/tags/${finalAttrs.src.tag}/NEWS";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
adamcstephens
booxter
];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/si/sig/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "sig";
version = "0.1.4";
version = "0.2.1";
src = fetchFromGitHub {
owner = "ynqa";
repo = "sig";
rev = "v${version}";
hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4=";
hash = "sha256-KxLSZ4/idlDrhRKFUsC3Ko0DcpSzwLWjees1jObC5KQ=";
};
cargoHash = "sha256-x4/vCFbC+kxhne4iRjuJy4L6QRpRKrJU3r+TPpDh4Pw=";
cargoHash = "sha256-nlW9pXgfn/8MjFFXs+HeIiBT9Ew8M1ETtuTZg5Qa4AE=";
meta = {
description = "Interactive grep (for streaming)";
pkgs/development/compilers/flutter/versions/3_35/data.json
+44 -44
View File
@@ -1,73 +1,73 @@
{
"version": "3.35.2",
"engineVersion": "a8bfdfc394deaed5c57bd45a64ac4294dc976a72",
"version": "3.35.3",
"engineVersion": "ddf47dd3ff96dbde6d9c614db0d7f019d7c7a2b7",
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY=",
"x86_64-linux": "sha256-igJHgYBcmd7H9wkfe1lD5dAPio+Ivf5yXqV9E3xEtSY="
"aarch64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY=",
"x86_64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY="
},
"x86_64-linux": {
"aarch64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w=",
"x86_64-linux": "sha256-rJSkU4oRGdIgJUbplvMjWzHC1vEAljmbQPHr43hM25w="
"aarch64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ=",
"x86_64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ="
}
},
"dartVersion": "3.9.0",
"dartVersion": "3.9.2",
"dartHash": {
"x86_64-linux": "sha256-25hZuxVDfu5/8PIlfHKoeLXpESBtoGc9F3kSV56E7UA=",
"aarch64-linux": "sha256-EbxZlvvjxDUskxH0Rtxd8KOLakguucFjI7+A5Z28V+w=",
"x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=",
"aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs="
"x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=",
"aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=",
"x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
"aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
},
"flutterHash": "sha256-g9g10WVf7CNoXYN8DVsWRK9N2Gz/2iQufMiQkJC35ZA=",
"flutterHash": "sha256-OXyciVucxYnb+d8IO1Sb0/47hlygnSoA+N8YtJw7ES8=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
"aarch64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY=",
"x86_64-darwin": "sha256-niFZajz1h1MsHxb6aqJuc3uQC269Y1/D9TzS38+wkaA=",
"x86_64-linux": "sha256-BTcZlYd4LtSIlE25m0Lwde36Uhg0j4I9AhB10V6RiFY="
"aarch64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=",
"aarch64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E=",
"x86_64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=",
"x86_64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E="
},
"fuchsia": {
"aarch64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"aarch64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"x86_64-darwin": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo=",
"x86_64-linux": "sha256-e6IrgTD8fCM6+buSkQNl9nXbWKm4cRCFamWqXiFLcLo="
"aarch64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=",
"aarch64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=",
"x86_64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=",
"x86_64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y="
},
"ios": {
"aarch64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"aarch64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"x86_64-darwin": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew=",
"x86_64-linux": "sha256-li5fk3EaAUwoTh65pY6UlqXuPSxmV0BvESHshMKayew="
"aarch64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=",
"aarch64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=",
"x86_64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=",
"x86_64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8="
},
"linux": {
"aarch64-darwin": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
"aarch64-linux": "sha256-8q40JUNVYSdsKBbvdrcB/5OxjR5ZcLheGTHFja/We4U=",
"x86_64-darwin": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI=",
"x86_64-linux": "sha256-B8j4FoHyQXY+/EcV9WHE+Lo6E27+uOnfCmDYggRCFKI="
"aarch64-darwin": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=",
"aarch64-linux": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=",
"x86_64-darwin": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc=",
"x86_64-linux": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc="
},
"macos": {
"aarch64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"aarch64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"x86_64-darwin": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA=",
"x86_64-linux": "sha256-QQ+17TPTB0FTogOkyPRQkII65t03+xVJ3q7CnIhw5vA="
"aarch64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=",
"aarch64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=",
"x86_64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=",
"x86_64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls="
},
"universal": {
"aarch64-darwin": "sha256-Nv36HXVFlpGTmWlobDiMJczVIgUShvoVi8dqAWpbkJM=",
"aarch64-linux": "sha256-SlB09ZiXtz3DJSiv9gTy4ogHpJ9JRVzgy2nmqqmGMYs=",
"x86_64-darwin": "sha256-yZbzy+DNREPxzZ/F6BdjmQoOrUE+5rIw6E4CuUePPWQ=",
"x86_64-linux": "sha256-AdA1xjD5nkBTzp7k1FLe218FD9o1aSJHZx1nOyhneGY="
"aarch64-darwin": "sha256-QB6x399cf7FI5xJS25D3xQsprYMvqdOqs3R2GQwzB0I=",
"aarch64-linux": "sha256-ywTLTRvqZgLqSXSTS/axyGGWsUvMd76KQmz5p/cZhSY=",
"x86_64-darwin": "sha256-mCmTvirTGovEAaYKgYYkK8WJ9ntZMLshDLNrViPxf8U=",
"x86_64-linux": "sha256-hfngQ8yKVEgRDnE1JfBGUPf11u3IKNgag3Yx1/AWfSQ="
},
"web": {
"aarch64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"aarch64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"x86_64-darwin": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ=",
"x86_64-linux": "sha256-kq7rn++V7zp78DszHBQuMUB/qpsbwt2kSscSJPnL1KQ="
"aarch64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=",
"aarch64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=",
"x86_64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=",
"x86_64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk="
},
"windows": {
"x86_64-darwin": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o=",
"x86_64-linux": "sha256-Q6Afxmf3j6SJFhWXRnyVrf4n3+hQ6baWPAoxi4eyY5o="
"x86_64-darwin": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc=",
"x86_64-linux": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc="
}
},
"pubspecLock": {
@@ -346,11 +346,11 @@
"dependency": "direct main",
"description": {
"name": "dwds",
"sha256": "b2f7e3241de2adbd5caa87ae9d05a0f9c59b9cbb8c77aeaeebf6c277821f25d5",
"sha256": "285736451c8e646ea99c50a6c47cde65d0eea55f0e1a995b5474b849d04af3ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "24.4.0+1"
"version": "24.4.0+2"
},
"extension_discovery": {
"dependency": "direct main",
pkgs/development/python-modules/bpython/default.nix
+6 -1
View File
@@ -14,6 +14,7 @@
setuptools,
urwid,
watchdog,
gitUpdater,
}:
buildPythonPackage rec {
@@ -24,7 +25,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bpython";
repo = "bpython";
tag = version;
tag = "${version}-release";
hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w=";
};
@@ -63,6 +64,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "bpython" ];
passthru.updateScript = gitUpdater {
rev-suffix = "-release";
};
meta = with lib; {
changelog = "https://github.com/bpython/bpython/blob/${src.tag}/CHANGELOG.rst";
description = "Fancy curses interface to the Python interactive interpreter";
pkgs/development/python-modules/meshtastic/default.nix
+2 -2
View File
@@ -34,7 +34,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.7.1";
version = "2.7.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "python";
tag = version;
hash = "sha256-gIMn6rDcYloxD3G+rl40ZE+Cpi1UNGPwt10iCfYoqvg=";
hash = "sha256-8dNapcj4SW4fgbW48IxxrawyCuOayI/dxmVHQPshDp0=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/mplhep/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "mplhep";
version = "0.4.0";
version = "0.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "mplhep";
tag = "v${version}";
hash = "sha256-VpdhgFUX1qUiUT5HlA2j3QQv7s3bF671e1I53MsML8w=";
hash = "sha256-Sx/VR573Vhxfv043mVdMpu/v6Ukv/JrVXBlpbILqGsI=";
};
build-system = [
pkgs/os-specific/linux/rtl8852bu/default.nix
+2 -2
View File
@@ -14,8 +14,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "morrownr";
repo = "rtl8852bu-20240418";
rev = "42de963695ffc7929a4905aed5c5d7da7c1c2715";
hash = "sha256-BvOw9MU4eibeMJEOkifKFatCUNGdujNUZav+4D9bYKY=";
rev = "1ef537712a55400aad637f53e45b60ed5ee621d7";
hash = "sha256-8bO82ytorBYgIT0dNKRocOhiCrUhya7DkkMlJ1XM3Hk=";
};
nativeBuildInputs = [
pkgs/top-level/all-packages.nix
+4
View File
@@ -11620,6 +11620,10 @@ with pkgs;
];
};
floorp-bin = wrapFirefox floorp-bin-unwrapped {
pname = "floorp-bin";
};
formiko =
with python3Packages;
callPackage ../applications/editors/formiko {