colin/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:
github-actions[bot] 2023-07-05 12:02:05 +00:00 committed by GitHub
commit 007ab6fb2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 502 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tests/modules.sh
View File

@ -64,9 +64,9 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix
checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix
# types.pathInStore
checkConfigOutput '".*/store/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix
checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathInStore.ok3 ./types.nix
checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix
checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathInStore.ok3 ./types.nix
checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ""' config.pathInStore.bad1 ./types.nix
checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store"' config.pathInStore.bad2 ./types.nix
checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/"' config.pathInStore.bad3 ./types.nix

6
lib/tests/modules/types.nix
View File

@ -12,9 +12,9 @@ in
pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };
};
config = {
pathInStore.ok1 = "${storeDir}/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";
pathInStore.ok2 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";
pathInStore.ok3 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";
pathInStore.ok1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";
pathInStore.ok2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";
pathInStore.ok3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";
pathInStore.bad1 = "";
pathInStore.bad2 = "${storeDir}";
pathInStore.bad3 = "${storeDir}/";

1
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -6,6 +6,7 @@
imports = [ ./installation-cd-graphical-base.nix ];
isoImage.edition = "gnome";
isoImage.graphicalGrub = true;
services.xserver.desktopManager.gnome = {
# Add Firefox and other tools useful for installation to the launcher

12
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -283,7 +283,7 @@ let
cat <<EOF > $out/EFI/boot/grub.cfg
set with_fonts=false
set textmode=false
set textmode=${boolToString !config.isoImage.graphicalGrub}
# If you want to use serial for "terminal_*" commands, you need to set one up:
# Example manual configuration:
# → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
@ -658,6 +658,16 @@ in
'';
};
isoImage.graphicalGrub = mkOption {
default = false;
type = types.bool;
example = true;
description = lib.mdDoc ''
Whether to use textmode or graphical grub.
false means we use textmode grub.
'';
};
};
# store them in lib so we can mkImageMediaOverride the

6
nixos/modules/services/misc/gitea.nix
View File

@ -467,10 +467,8 @@ in
systemd.tmpfiles.rules = [
"d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
"z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
"Z '${cfg.dump.backupDir}' - ${cfg.user} ${cfg.group} - -"
"d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
"z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
"Z '${cfg.repositoryRoot}' - ${cfg.user} ${cfg.group} - -"
"d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
@ -484,7 +482,6 @@ in
"z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
"z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
"z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
"Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
# If we have a folder or symlink with gitea locales, remove it
# And symlink the current gitea locales in place
@ -493,13 +490,12 @@ in
] ++ lib.optionals cfg.lfs.enable [
"d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
"z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
"Z '${cfg.lfs.contentDir}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.gitea = {
description = "gitea";
after = [ "network.target" ] ++ optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
requires = optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
requires = optional (cfg.database.createDatabase && usePostgresql) "postgresql.service" ++ optional (cfg.database.createDatabase && useMysql) "mysql.service";
wantedBy = [ "multi-user.target" ];
path = [ cfg.package pkgs.git pkgs.gnupg ];

9
nixos/modules/services/system/cloud-init.nix
View File

@ -15,6 +15,7 @@ let
]
++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
++ optional cfg.xfs.enable xfsprogs
;
settingsFormat = pkgs.formats.yaml { };
cfgfile = settingsFormat.generate "cloud.cfg" cfg.settings;
@ -57,6 +58,14 @@ in
'';
};
xfs.enable = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Allow the cloud-init service to operate `xfs` filesystem.
'';
};
network.enable = mkOption {
type = types.bool;
default = false;

4
pkgs/applications/audio/monkeys-audio/default.nix
View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
version = "10.14";
version = "10.16";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
sha256 = "sha256-AsWBcEVyHAFzJd9PhbEA866yCGAmgJedvDUP1G7JfUY=";
sha256 = "sha256-gRI2tzcybJx4ju2LCVc21Gb1ppd40qSA1J0TxNEk/Qs=";
stripRoot = false;
};
nativeBuildInputs = [

4
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@ -78,12 +78,12 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "12.5";
version = "12.5.1";
sources = {
x86_64-linux = fetchurl {
url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
hash = "sha256-RTDFi+vMkzRtDFgv9sP1bfIeWzzXR307aoMhNiT6vRs=";
hash = "sha256-yG22oyTDb7i1OnM7L9uOSaMhDytONAxE68Tg5XQSYq4=";
};
};

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -89,7 +89,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.5";
version = "12.5.1";
lang = "ALL";
@ -101,7 +101,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-ois/0ghnQVX6A4OsGybOX2Ph0eKHOHX0+qfR9rnA3v8=";
hash = "sha256-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4=";
};
i686-linux = fetchurl {
@ -111,7 +111,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-Wee3wCVT+Ius9qOJOLTdAEysMh6Z2+swoS9obF28bYo=";
hash = "sha256-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8=";
};
};

6
pkgs/applications/networking/cluster/kubectl-gadget/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-gadget";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
hash = "sha256-dn2iN6eBAX3U20omKfi3cEPpMpg/1MUjrdnSQ6eJYRM=";
hash = "sha256-QB1OX5G0WkV8k84282+haQc2JVMUhsO99cpEMrHR9qY=";
};
vendorHash = "sha256-26VQPKjUNcyKJFeoxfcm9RfozcBpms+6NDozxABnDuc=";
vendorHash = "sha256-5ydul1buJignI5KCn6TMYCjdJ6ni6NgYQrnrGBPADI4=";
CGO_ENABLED = 0;

6
pkgs/applications/networking/cluster/tfupdate/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tfupdate";
version = "0.6.8";
version = "0.7.1";
src = fetchFromGitHub {
owner = "minamijoyo";
repo = "tfupdate";
rev = "v${version}";
sha256 = "sha256-zL2zUd9wwX6oHeROxgLWNlrFYRQaah/r9k3DePdYikU=";
sha256 = "sha256-A75WxcwXooMfQGlm2PxA0SNdr1hSrPiRGgzDzNjKx9Y=";
};
vendorHash = "sha256-FnrcK990xL2FpFzIdb5ABBeeg5jjP22dBu7dOEeqG9c=";
vendorHash = "sha256-gtAenM1URr2wFfe2/zCIyNvG7echjIxSxG1hX2vq16g=";
# Tests start http servers which need to bind to local addresses:
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted

6
pkgs/applications/networking/diswall/default.nix
View File

@ -5,20 +5,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "diswall";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "dis-works";
repo = "diswall-rs";
rev = "v${version}";
sha256 = "sha256-uT17FJc7T2Q31E7aCjJn2QkUNHUXDqWAVB5v88why9w=";
sha256 = "sha256-uWGpSpT8TyEkF5OI2enZwbcsyoHIemC0Dm1LExi+AC8=";
};
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
cargoHash = "sha256-g6jxe7L4B/e+CStCudkhj0hTR+ZSA8M5EI5fb7d8f5c=";
cargoHash = "sha256-Te2mqrBKHDKbFaO0ZNV2C6AHz07v1jWCMm05YiXg+w0=";
doCheck = false;

249
pkgs/applications/version-management/stgit/0001-fix-use-canonical-Message-ID-spelling.patch Normal file
View File

@ -0,0 +1,249 @@
From c500ebe5a51da4eecba0c88d9a335e7a659e7ecb Mon Sep 17 00:00:00 2001
From: Peter Grayson <pete@jpgrayson.net>
Date: Sun, 18 Jun 2023 15:00:19 -0400
Subject: fix: use canonical Message-ID spelling
This change aligns with a change in git 2.41.0 to consistently spell
"Message-ID" instead of "Message-Id".
The test suite is updated to accommodate both spellings, since such headers
are case insensitive.
---
Documentation/stg.txt | 2 +-
completion/stgit.zsh | 2 +-
src/cmd/email/format.rs | 2 +-
src/cmd/email/send.rs | 2 +-
src/cmd/import.rs | 6 +++---
t/t1800-import.sh | 2 +-
t/t1801-import-email.sh | 32 ++++++++++++++++----------------
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/stg.txt b/Documentation/stg.txt
index fb4c08fb..20b75ce2 100644
--- a/Documentation/stg.txt
+++ b/Documentation/stg.txt
@@ -302,7 +302,7 @@ N.B. Set 'commit.gpgsign' to determine whether patch commits themselves are GPG
See linkgit:git-config[1] for more information about 'commit.gpgsign'.
stgit.import.message-id::
- When set to 'true', create 'Message-Id:' trailer in the patch description of patches
+ When set to 'true', create 'Message-ID:' trailer in the patch description of patches
imported from email using linkstg:import[].
stgit.keepoptimized::
diff --git a/completion/stgit.zsh b/completion/stgit.zsh
index 797d9044..de818242 100644
--- a/completion/stgit.zsh
+++ b/completion/stgit.zsh
@@ -717,7 +717,7 @@ _stg-import() {
'--replace[replace unapplied patches in series]'
'--reject[leave rejected hunks in .rej files]'
'--keep-cr[do not remove CR from email lines ending with CRLF]'
- '--message-id[create Message-Id trailer from email header]'
+ '--message-id[create Message-ID trailer from email header]'
'(-d --showdiff)'{-d,--showdiff}'[show patch content in editor buffer]'
':file:_files'
+ '(source)'
diff --git a/src/cmd/email/format.rs b/src/cmd/email/format.rs
index f385b48a..b30af9c0 100644
--- a/src/cmd/email/format.rs
+++ b/src/cmd/email/format.rs
@@ -323,7 +323,7 @@ fn message_options() -> Vec<Arg> {
.long_help(
"Controls addition of `In-Reply-To` and `References` headers to make \
the second and subsequent mails appear as replies to the first. Also \
- controls generation of the `Message-Id` header to reference.\n\
+ controls generation of the `Message-ID` header to reference.\n\
\n\
The optional <style> argument can be either `shallow` or `deep`. \
`shallow` threading makes every mail a reply to the head of the \
diff --git a/src/cmd/email/send.rs b/src/cmd/email/send.rs
index 6904956f..af75f4b3 100644
--- a/src/cmd/email/send.rs
+++ b/src/cmd/email/send.rs
@@ -194,7 +194,7 @@ fn compose_options() -> Vec<Arg> {
.help("Specify the \"In-Reply-To:\" identifier")
.long_help(
"Make the first mail (or all the mails with '--no-thread') appear as a \
- reply to the given Message-Id, which avoids breaking threads to \
+ reply to the given Message-ID, which avoids breaking threads to \
provide a new patch series. The second and subsequent emails will be \
sent as replies according to the '--[no-]chain-reply-to' setting.\n\
\n\
diff --git a/src/cmd/import.rs b/src/cmd/import.rs
index d5477df7..2835aefa 100644
--- a/src/cmd/import.rs
+++ b/src/cmd/import.rs
@@ -210,9 +210,9 @@ fn make() -> clap::Command {
.arg(
Arg::new("message-id")
.long("message-id")
- .help("Create Message-Id trailer from Message-ID header")
+ .help("Create Message-ID trailer from Message-ID header")
.long_help(
- "Create Message-Id trailer in patch description based on the \
+ "Create Message-ID trailer in patch description based on the \
Message-ID email header. This option is applicable when importing \
with '--mail' or '--mbox'. This behavior may also be enabled via \
the \"stgit.import.message-id\" configuration option.",
@@ -500,7 +500,7 @@ fn import_file<'repo>(
if message.len() > 1 && &message[message.len() - 2..] != b"\n\n" {
message.push(b'\n');
}
- message.push_str("Message-Id: ");
+ message.push_str("Message-ID: ");
message.push_str(message_id);
message.push(b'\n');
}
diff --git a/t/t1800-import.sh b/t/t1800-import.sh
index ecf0020c..229269bf 100755
--- a/t/t1800-import.sh
+++ b/t/t1800-import.sh
@@ -43,7 +43,7 @@ test_expect_success 'Import patch with email headers' '
cat >expected <<-\EOF &&
body
- Message-Id: abc123
+ Message-ID: abc123
EOF
test_cmp expected body &&
diff --git a/t/t1801-import-email.sh b/t/t1801-import-email.sh
index dbd3f7da..0559e076 100755
--- a/t/t1801-import-email.sh
+++ b/t/t1801-import-email.sh
@@ -17,7 +17,7 @@ test_expect_success 'Apply a patch from an 8bit-encoded e-mail' '
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 1 ] &&
stg delete ..
'
@@ -28,7 +28,7 @@ test_expect_success !MINGW,STG_IMPORT_URL 'Apply a patch from an 8bit-encoded e-
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -40,7 +40,7 @@ test_expect_success 'Apply a patch from an 8bit-encoded e-mail with CRLF endings
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -56,7 +56,7 @@ test_expect_success 'Apply e-mail with CRLF endings and --keep-cr' '
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -68,7 +68,7 @@ test_expect_success 'Apply a patch from latin1-encoded email specifying utf-8 ch
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -79,7 +79,7 @@ test_expect_success 'Apply a patch from email with quoted "From" header' '
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -90,7 +90,7 @@ test_expect_success 'Apply a patch from a QP-encoded e-mail' '
[ $(git cat-file -p $(stg id) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id) \
- | grep -c "Message-Id: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111105814.23209.46952.stgit@localhost>") = 0 ] &&
stg delete ..
'
@@ -102,19 +102,19 @@ test_expect_success 'Apply several patches from an mbox file' '
[ $(git cat-file -p $(stg id change-1) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
- | grep -c "Message-Id: <20061111114527.31778.12942.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.12942.stgit@localhost>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
- | grep -c "Message-Id: <20061111114527.31778.92851.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.92851.stgit@localhost>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
- | grep -c "Message-Id: <20061111114527.31778.45876.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.45876.stgit@localhost>") = 1 ] &&
stg delete ..
'
@@ -126,19 +126,19 @@ test_expect_success !MINGW,STG_IMPORT_URL 'Apply several patches from an mbox ur
[ $(git cat-file -p $(stg id change-1) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
- | grep -c "Message-Id: <20061111114527.31778.12942.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.12942.stgit@localhost>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
- | grep -c "Message-Id: <20061111114527.31778.92851.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.92851.stgit@localhost>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
- | grep -c "Message-Id: <20061111114527.31778.45876.stgit@localhost>") = 1 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.45876.stgit@localhost>") = 1 ] &&
stg delete ..
'
@@ -156,19 +156,19 @@ test_expect_success 'Apply several patches from an mbox file from stdin' '
[ $(git cat-file -p $(stg id change-1) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
- | grep -c "Message-Id: <20061111114527.31778.12942.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.12942.stgit@localhost>") = 0 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
- | grep -c "Message-Id: <20061111114527.31778.92851.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.92851.stgit@localhost>") = 0 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
| grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3-colon) \
- | grep -c "Message-Id: <20061111114527.31778.45876.stgit@localhost>") = 0 ] &&
+ | grep -c "Message-I[Dd]: <20061111114527.31778.45876.stgit@localhost>") = 0 ] &&
stg delete ..
'
--
2.40.1

55
pkgs/applications/version-management/stgit/default.nix
View File

@ -1,32 +1,48 @@
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, installShellFiles
, python3Packages
, makeWrapper
, asciidoc
, docbook_xsl
, docbook_xml_dtd_45
, xmlto
, curl
, git
, perl
, xmlto
, darwin
}:
python3Packages.buildPythonApplication rec {
rustPlatform.buildRustPackage rec {
pname = "stgit";
version = "1.5";
version = "2.3.0";
src = fetchFromGitHub {
owner = "stacked-git";
repo = "stgit";
rev = "v${version}";
sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw=";
sha256 = "sha256-pGGLY/Hu62dT3KP9GH9YmPg6hePDoPdijJtmap5gpEA=";
};
cargoHash = "sha256-f0MQvCkFYR7ErbBDJ3n0r9ZetKfcWg9twhc4r4EpPS4=";
nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 python3Packages.setuptools ];
nativeBuildInputs = [
pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl
docbook_xml_dtd_45 perl
];
buildInputs = [ curl ];
format = "other";
nativeCheckInputs = [
git perl
] ++ lib.optionals stdenv.isDarwin [
darwin.system_cmds darwin.libiconv
];
nativeCheckInputs = [ git perl ];
patches = [
# Fixes tests, can be removed when stgit 2.3.1 is released
./0001-fix-use-canonical-Message-ID-spelling.patch
];
postPatch = ''
for f in Documentation/*.xsl; do
@ -40,25 +56,28 @@ python3Packages.buildPythonApplication rec {
substituteInPlace Documentation/texi.xsl \
--replace http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd \
${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd
cat > stgit/_version.py <<EOF
__version__ = "${version}"
EOF
'';
makeFlags = [
makeFlags = lib.strings.concatStringsSep " " [
"prefix=${placeholder "out"}"
"MAN_BASE_URL=${placeholder "out"}/share/man"
"XMLTO_EXTRA=--skip-validation"
"PERL_PATH=${perl}/bin/perl"
];
buildFlags = [ "all" "doc" ];
buildPhase = ''
make all ${makeFlags}
'';
checkTarget = "test";
checkFlags = [ "PERL_PATH=${perl}/bin/perl" ];
checkPhase = ''
make test ${makeFlags}
'';
installPhase = ''
make install install-man install-html ${makeFlags}
wrapProgram $out/bin/stg --prefix PATH : ${lib.makeBinPath [ git ]}
installTargets = [ "install" "install-doc" "install-html" ];
postInstall = ''
installShellCompletion --cmd stg \
--fish completion/stg.fish \
--bash completion/stgit.bash \

4
pkgs/applications/video/flowblade/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "flowblade";
version = "2.10.0.2";
version = "2.10.0.3";
src = fetchFromGitHub {
owner = "jliljebl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lXMVtWsTyMaGIpEglHvnUgDSaFlnWtB3lSyg6ljNIdQ=";
sha256 = "sha256-WsSW0DZS1tkUkwUPLgZJUXlztRQXwYau2UMKKRqXfJ0=";
};
buildInputs = [

4
pkgs/applications/video/media-downloader/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "media-downloader";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = version;
hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg=";
hash = "sha256-+wLVF0UKspVll+dYZGSk5dUbPBc/2Y0cqTuaeepxw+k=";
};
nativeBuildInputs = [

4
pkgs/data/misc/ddccontrol-db/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20230424";
version = "20230627";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = pname;
rev = version;
sha256 = "sha256-qi6dDh6Zk1GpHBpQ+aatAmG9lCdesnJRhK3jVjKYKcQ=";
sha256 = "sha256-gRkYoDDD3QCsfZcpIqNAZBAb/si975vyd0NnlWNHob8=";
};
nativeBuildInputs = [ autoreconfHook intltool ];

4
pkgs/desktops/xfce/core/xfce4-settings/default.nix
View File

@ -16,9 +16,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
version = "4.18.2";
version = "4.18.3";
sha256 = "sha256-u8xto4tP9fsaPaY6dzv4Bj/C6qvltT5wXJlV+TzP5uE=";
sha256 = "sha256-QGh5th790qkvqchUfi+kOAJ9A1M+zEIzMxOM5eCGPEk=";
postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do

6
pkgs/development/libraries/agda/cubical/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "cubical";
version = "unstable-2023-02-09";
version = "0.5";
src = fetchFromGitHub {
repo = pname;
owner = "agda";
rev = "6b1ce0b67fd94693c1a3e340c8e8765380de0edc";
hash = "sha256-XRCaW94oAgy2GOnFiI9c5A8mEx7AzlbT4pFd+PMmc9o=";
rev = "v${version}";
hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k=";
};
# The cubical library has several `Everything.agda` files, which are

4
pkgs/development/libraries/faudio/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "23.06";
version = "23.07";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-V5t9YliyXxoWNnKwp3TTOCyCIzpcyg1X4DaI0WFlfeQ=";
sha256 = "sha256-HGW28mM/rg8VALRoo4iFNHogBkPaVpU80eJh3NmxBqw=";
};
nativeBuildInputs = [cmake];

4
pkgs/development/libraries/libfabric/default.nix
View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
version = "1.18.0";
version = "1.18.1";
enableParallelBuilding = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-30ADIUbpzwyxMJtPyLDwXYGJF4c1ZiSJH2mBBtgfE18=";
sha256 = "sha256-3iQsFfpXSyMFkBeByGJmKSTUXuLsWA0l8t1cCDkNRos=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

1
pkgs/development/libraries/minizip-ng/default.nix
View File

@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DMZ_OPENSSL=ON"
"-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DMZ_LIB_SUFFIX='-ng'"
] ++ lib.optionals stdenv.isDarwin [
# missing header file
"-DMZ_LIBCOMP=OFF"

6
pkgs/development/libraries/opencolorio/default.nix
View File

@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch";
sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM=";
})
(fetchpatch {
name = "minizip-ng-4.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch";
hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew=";
})
];
postPatch = lib.optionalString stdenv.isDarwin ''
@ -78,6 +83,7 @@ stdenv.mkDerivation rec {
"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
# GPU test fails with: freeglut (GPU tests): failed to open display ''
"-DOCIO_BUILD_GPU_TESTS=OFF"
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include"
] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";

4
pkgs/development/libraries/partio/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "partio";
version = "1.14.6";
version = "1.17.0";
src = fetchFromGitHub {
owner = "wdas";
repo = "partio";
rev = "refs/tags/v${version}";
hash = "sha256-S8U5I3dllFzDSocU1mJ8FYCCmBpsOR4n174oiX5hvAM=";
hash = "sha256-QKGZ9oR5M39LS7insiRfXtp/+kQtFL+zM2X73JCX5Ms=";
};
outputs = [ "dev" "out" "lib" ];

4
pkgs/development/ocaml-modules/gen_js_api/default.nix
View File

@ -1,4 +1,5 @@
{ buildDunePackage
, ocaml
, lib
, ppxlib
, fetchFromGitHub
@ -10,7 +11,6 @@
buildDunePackage rec {
pname = "gen_js_api";
version = "1.1.1";
duneVersion = "3";
src = fetchFromGitHub {
owner = "LexiFi";
@ -23,7 +23,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ojs ppxlib ];
nativeCheckInputs = [ js_of_ocaml-compiler nodejs ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.13";
meta = {
homepage = "https://github.com/LexiFi/gen_js_api";

4
pkgs/development/python-modules/aiounifi/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "48";
version = "49";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HxZoHul8Nef52st/e10jjtRUvI9NGXuX6/pFYoFI/80=";
hash = "sha256-GZ++R8NUhpUQbeNhavWnIhk1AuPnEAAHRq9ZYdeHFDc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/awswrangler/default.nix
View File

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "awswrangler";
version = "3.0.0";
version = "3.2.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "aws";
repo = "aws-sdk-pandas";
rev = "refs/tags/${version}";
hash = "sha256-uuY6+GCMBtqcj4pLbns0ESRDA8I/0kzJ6Cc4eqsyQ44=";
hash = "sha256-mpKvg3CM8kMK+RI9XdHHGfy6qlMye+T/B77M4XeTqw0=";
};
nativeBuildInputs = [ poetry-core ];

4
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -65,6 +65,10 @@ buildPythonPackage rec {
requests-toolbelt
];
preCheck = ''
export CI=true
'';
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"

4
pkgs/development/python-modules/dvc-data/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "2.3.1";
version = "2.3.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-LuCKQkiQodBDDO3TJ6wWqJG7kDHZyMz9dBpVooGeW3g=";
hash = "sha256-xRfe1k5i67aAI2bbZq85pGwn+KOY8P8bkvWLW7f/L+o=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/glyphslib/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "glyphslib";
version = "6.2.2";
version = "6.2.3";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "googlefonts";
repo = "glyphsLib";
rev = "refs/tags/v${version}";
hash = "sha256-JY1Gs2RTjp7eCwyK9ZI2OpqExxYR8unt4DcjarXWiZk=";
hash = "sha256-AL8dkN3qTriiyGp/359uKy5aOMr9XPSSBw388VvUXYI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

5
pkgs/development/python-modules/jug/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "jug";
version = "2.2.3";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Jug";
inherit version;
hash = "sha256-DNJsmWCSzqyNVjsrFDE9tJhMA9oGM7dBr9h/nZfa+Fk=";
hash = "sha256-JWE0eSCAaAJ2vyiKGksYUzS3enCIJYCaT3tVV7fP1BA=";
};
propagatedBuildInputs = [
@ -40,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A Task-Based Parallelization Framework";
homepage = "https://jug.readthedocs.io/";
changelog = "https://github.com/luispedro/jug/blob/v${version}/ChangeLog";
license = licenses.mit;
maintainers = with maintainers; [ luispedro ];
};

4
pkgs/development/python-modules/nvidia-ml-py/default.nix
View File

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "nvidia-ml-py";
version = "11.525.112";
version = "11.525.131";
format = "setuptools";
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
hash = "sha256-xk5HOVO2XsDMx2zzYBwxMKCsgGC7yuqRLMAPqOTJho0=";
hash = "sha256-K39NrSXEv0mrnQqaPW4lq9FouRtd6OK23uRwN1bBuuU=";
};
patches = [

55
pkgs/development/python-modules/opower/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, aiohttp
, arrow
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, setuptools
}:
buildPythonPackage rec {
pname = "opower";
version = "0.0.12";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
hash = "sha256-XrzcWKW1dRoVdRdo4ghmI13jVpWIOwZgzOl1nSUES30=";
};
pythonRemoveDeps = [
# https://github.com/tronikos/opower/pull/4
"asyncio"
];
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
];
propagatedBuildInputs = [
aiohttp
arrow
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"opower"
];
meta = with lib; {
description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com";
homepage = "https://github.com/tronikos/opower";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/pyezviz/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyezviz";
version = "0.2.1.7";
version = "0.2.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "baqs";
repo = "pyEzviz";
rev = "refs/tags/${version}";
hash = "sha256-bixcjSFuvZfcTJ5eAv9NUEhoqTq45tF6mQSNxwFQzCA=";
hash = "sha256-o+hGPLptqzBHtQNquM/jP88QFQ1tiZqI/NXColHrcAM=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/pytest-freezer/default.nix
View File

@ -1,8 +1,8 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, freezegun
, hatchling
, pytest
, pytestCheckHook
, pythonOlder
@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pytest-freezer";
version = "0.4.6";
version = "0.4.8";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,11 +19,11 @@ buildPythonPackage rec {
owner = "pytest-dev";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-0JZv6MavRceAV+ZOetCVxJEyttd5W3PCts6Fz2KQsh0=";
hash = "sha256-Eak6LNoyu2wvZbPaBBUO0UkyB9vni8YbsADGK0as7Cg=";
};
nativeBuildInputs = [
hatchling
flit-core
];
buildInputs = [

4
pkgs/development/python-modules/pywemo/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pywemo";
version = "1.0.0";
version = "1.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Ffq291AXRQTp8GpkmpEqj0qh4spNWza5Cqc7wsqQbD0=";
hash = "sha256-OROS5mLMDXxygzWvURZtt5MD+gey5GxfsvpkbshOzR0=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/zeroconf/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.68.0";
version = "0.70.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-xhWl0OUzTz+msZ5UgLrb/wqQTKuuFnpgpk7SPGyyI7Q=";
hash = "sha256-AXzPx6T82TYQhoHFkOeNDawD6xnsIBDk35Jlp+Jt5ZQ=";
};
nativeBuildInputs = [

4
pkgs/development/tools/database/liquibase/default.nix
View File

@ -24,11 +24,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "4.17.2";
version = "4.23.0";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0h5gqxgarzjb3c46ig6yxbs12czz3dha81b8gpywrg8602411sc5";
sha256 = "sha256-mIuHNNo/L5h2RvpTN0jZt6ri+Il0H9aSL4auOjIepjU=";
};
nativeBuildInputs = [ makeWrapper ];

10
pkgs/development/tools/gauge/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "gauge";
version = "1.4.3";
excludedPackages = [ "build" "man" ];
version = "1.5.1";
src = fetchFromGitHub {
owner = "getgauge";
repo = "gauge";
rev = "v${version}";
sha256 = "sha256-TszZAREk6Hs2jULjftQAhHRIVKaZ8fw0NLJkBdr0FPw=";
hash = "sha256-67MHWJc4sOhOVe0n1RJLSez7SeUb79gGxjDqMrTuqFU=";
};
vendorSha256 = "1wp19m5n85c7lsv8rvcbfz1bv4zhhb7dj1frkdh14cqx70s33q8r";
vendorHash = "sha256-qrRb8LRRmY5sZSSqsh0oSUq9MGYy7M8bgtBH8JPYQmc=";
excludedPackages = [ "build" "man" ];
meta = with lib; {
description = "Light weight cross-platform test automation";

26
pkgs/development/tools/misc/blackfire/php-probe.nix
View File

@ -12,42 +12,42 @@
let
phpMajor = lib.versions.majorMinor php.version;
version = "1.87.2";
version = "1.88.1";
hashes = {
"x86_64-linux" = {
system = "amd64";
hash = {
"8.1" = "sha256-FEb0NBJpwoYaNdEHEn4TkSQR7VShGpHptaDIRKwrmkQ=";
"8.2" = "sha256-itB0Zm1Mog18F8vIHn9AZMYMzafLQR0v5zcOgqy1ouI=";
"8.1" = "sha256-8t/9+USw4cun8kIsCkcFl/672rtgEBy6SgRMEzl47VU=";
"8.2" = "sha256-/sVDxfhJXMQZb1CdRh+qBjCt3gdYci65BN23K9Kfcys=";
};
};
"i686-linux" = {
system = "i386";
hash = {
"8.1" = "sha256-0bX2frll0ne6H6o7HNH4TRV2D+NDe11mVvqwhvSDg9E=";
"8.2" = "sha256-U6zmbEkRr3+9yVwUgQ1+SBNK0zWD92S2KBOHJ1gMmjM=";
"8.1" = "sha256-ASZKa40D6dpNyzQhqci0+fEUoduyuyoJbWvY2UjVmxA=";
"8.2" = "sha256-CWSTPXPr0ZCcGnkDNIh8HhDf53gNy663IWLqIRObv28=";
};
};
"aarch64-linux" = {
system = "arm64";
hash = {
"8.1" = "sha256-agLQVI3u7ENcWLDRx7YSEBZobRnwEaKAmFpIU5AXhqo=";
"8.2" = "sha256-Y2bUYaymoZ/Ct5a7K+5U+zNh9ZKUaq0Oal/v04nzuaU=";
"8.1" = "sha256-HST8U3DJ1s+ricPQ7Q4bY/eZE+mSnGaJuLKwFpLb0JI=";
"8.2" = "sha256-uPCIlYw9i0MFPbca+GWyzpK4oHOOmTUxR46yEBB48mg=";
};
};
"aarch64-darwin" = {
system = "arm64";
hash = {
"8.1" = "sha256-ovTtwXPut9jCvxVyd5mQzrfJPCy+rQvUi4c74NrBzY4=";
"8.2" = "sha256-8hybE62l8vSwbqpcrnj/lI2Wjy8R3wuO04zwofLi9EY=";
"8.1" = "sha256-4JJ7m4/ybVzu/yBtfpSwuSIKor7s80Xlt7FH3K8PwTU=";
"8.2" = "sha256-BW6c/qKWeOkJUBYf8TFGz7aYKPUb9kKzyfNGSv1XOhE=";
};
};
"x86_64-darwin" = {
system = "amd64";
hash = {
"8.1" = "sha256-WsHH/XJboHeRhxpYY0WtXEJwOsGNFtfexBShC/J7GaQ=";
"8.2" = "sha256-w3Vu7CTFebn59i1FYVCYHiOadTIPlPCkQ1QHEfvHWig=";
"8.1" = "sha256-O6gZwHNIFCXuC2r4yPMuk/wg1LbsMu6aRJmwbRR3B8s=";
"8.2" = "sha256-l4wTdt5fGIbGPqCT3/EiRTNovyGQOV1ZRzPjYvlHQIg=";
};
};
};
@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
fi
for source in ${lib.concatStringsSep " " (builtins.attrNames finalAttrs.passthru.updateables)}; do
update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "0" "${lib.fakeSha256}"
update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "0" "sha256-${lib.fakeSha256}"
update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION"
done
'';
@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
createUpdateable = path: _value:
lib.nameValuePair
(createName path)
(finalAttrs.self.overrideAttrs (attrs: {
(finalAttrs.finalPackage.overrideAttrs (attrs: {
src = makeSource (createSourceParams path);
}));

10
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -1,24 +1,22 @@
{ lib, fetchurl, buildDunePackage
, cmdliner, yojson, ppxlib, findlib
, menhir, menhirLib
, menhir, menhirLib, sedlex
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "4.1.0";
duneVersion = "3";
version = "5.3.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "sha256-kXk/KaWvPeq6P301zqsR5znP4KXMMFVvYgFGGm1CNu8=";
hash = "sha256-vp497rmOXSjxvLLZhHwE0ohfwH7VjM2LCKpLZijNZNI=";
};
nativeBuildInputs = [ menhir ];
buildInputs = [ cmdliner ppxlib ];
configurePlatforms = [];
propagatedBuildInputs = [ menhirLib yojson findlib ];
propagatedBuildInputs = [ menhirLib yojson findlib sedlex ];
meta = {
description = "Compiler from OCaml bytecode to Javascript";

1
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -6,7 +6,6 @@ buildDunePackage {
pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src;
duneVersion = "3";
buildInputs = [ ppxlib ];

1
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View File

@ -6,7 +6,6 @@ buildDunePackage {
pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src;
duneVersion = "3";
buildInputs = [ js_of_ocaml-ppx ];

1
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View File

@ -7,7 +7,6 @@ buildDunePackage {
pname = "js_of_ocaml-ppx";
inherit (js_of_ocaml-compiler) version src;
duneVersion = "3";
buildInputs = [ js_of_ocaml ];
propagatedBuildInputs = [ ppxlib ];

1
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@ -6,7 +6,6 @@ buildDunePackage {
pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src;
duneVersion = "3";
propagatedBuildInputs = [ js_of_ocaml ppxlib ];

1
pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix
View File

@ -1,7 +1,6 @@
{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }:
buildDunePackage {
duneVersion = "3";
pname = "js_of_ocaml-toplevel";
inherit (js_of_ocaml-compiler) src version;
buildInputs = [ ppxlib ];

1
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View File

@ -7,7 +7,6 @@ buildDunePackage {
pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src;
duneVersion = "3";
buildInputs = [ js_of_ocaml-ppx ];

4
pkgs/misc/lilypond/unstable.nix
View File

@ -1,10 +1,10 @@
{ lib, fetchurl, lilypond }:
lilypond.overrideAttrs (oldAttrs: rec {
version = "2.25.5";
version = "2.25.6";
src = fetchurl {
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
sha256 = "sha256-QgFGiNKqfC7Q7E0/yhsXFwKZoj+/07c0GwTPWiDz/u4=";
sha256 = "sha256-auDkASJQgq4+Yc6jFvJ8rUvVRMn6ndr2Cd6yzK75irk=";
};
passthru.updateScript = {

8
pkgs/servers/lidarr/default.nix
View File

@ -8,13 +8,13 @@ let
x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-JGv4SXONVncRdWqtqvKnBWJXnp16AWLyFvULTWPmAgc=";
arm64-linux_hash = "sha256-irZLQfeGAkM6mb6EXC2tuslyw7QYBZg/aRb0Lx7CJFA=";
x64-osx_hash = "sha256-UcPZXf0BzoqlTmOSn1gDEvSZHijyB2nAb6HBj9R1D9Q=";
x64-linux_hash = "sha256-fYfqkv3o9aly2bgY5iiZETs4LZfrbJGWd7XeRP4nTu0=";
arm64-linux_hash = "sha256-ENdQQnjxNFyVYnTdxZuaSO4oJ7sd4Oa9TLs8xu93p5g=";
x64-osx_hash = "sha256-LwzwMsqq8RDBiQbKtBVKJPhh4woQTpVr+T0K8ii6kG8=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "lidarr";
version = "1.1.4.3027";
version = "1.2.6.3313";
src = fetchurl {
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz";

6
pkgs/servers/mediamtx/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mediamtx";
version = "0.23.6";
version = "0.23.7";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
hash = "sha256-7Afer0lzI264qK9iWfGMxgUuKBmDDdR+fTapt3SIGYY=";
hash = "sha256-kkB4OuBBz9kdymUmXSkr3alE62O1T0woK5BNAwRBN4o=";
};
vendorHash = "sha256-wgTMobmIu6nJdyFOoFVhyKvWQEuZTDSEzJGQLUYS6o4=";
vendorHash = "sha256-LCdMSyCbndus+VviT4Zp3mZ4ZzpF0F+ONroJsayb5lo=";
# Tests need docker
doCheck = false;

4
pkgs/servers/metabase/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.46.5";
version = "0.46.6";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-5F8BQ42hun+qUk6/X1dSTlhRGXBEPq9h0IfJHA77OOw=";
hash = "sha256-hREGkZDlTQjN012/iTM8IDHrW722N+4gVGtsVH6R5ko=";
};
nativeBuildInputs = [ makeWrapper ];

8
pkgs/servers/radarr/default.nix
View File

@ -9,14 +9,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-BJKEl75VNr2dN/P1NeYuOYmrDJEIc8pGS2rszibVGbQ=";
arm64-linux_hash = "sha256-1qGx3rM8sjLhzCNnyUjTWs+EGLzmm12h/o08QmvXxts=";
x64-osx_hash = "sha256-+afi+BQGrJb+i91IDKZEqRS6xAMvU1C5XmZs6H5rgoI=";
x64-linux_hash = "sha256-EDaccNDSKAkGGT4wSgPUp373M9WXwB5U6KpJS5GO24Y=";
arm64-linux_hash = "sha256-xUhWdmQ5RMXxrYge3Qz3XEC6wa2d660hgirS39E62fk=";
x64-osx_hash = "sha256-UdJd7xrL9aoIziaN4db4orEs48udXTqqongxsCt5L1Y=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "4.5.2.7388";
version = "4.6.4.7568";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

4
pkgs/servers/roundcube/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.6.1";
version = "1.6.2";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "sha256-RsL2ujS8t+V+R8sDS/M45fx9zO3dqSEqLvO9MUbZe+0=";
sha256 = "sha256-yJgwfZXMSEGM+VUX71K1sAiMUAFPZ6bvgVdjQoqAQ/A=";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

4
pkgs/servers/sql/dolt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dolt";
version = "1.7.0";
version = "1.7.2";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-k6Q6Tu8drMFkQFpSRJaLk9Wejo5ciSoA0cjv4+3TuPE=";
sha256 = "sha256-oMfph6hNo3TD4LNAPH1LJT6ectmi7fF+J2uASrIfL+0=";
};
modRoot = "./go";

4
pkgs/servers/unifi/default.nix
View File

@ -66,7 +66,7 @@ in rec {
};
unifi7 = generic {
version = "7.3.83";
sha256 = "sha256-mDbF9vfoWjvABxcOIRngStji7xBllgZfUhVA9kF6ERU=";
version = "7.4.156";
sha256 = "sha256-UJjzSC2qKi2ABwH5p0s/5fXfB3NVfYBb3wBfE/8NlK4=";
};
}

4
pkgs/tools/admin/awscli2/default.nix
View File

@ -18,14 +18,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.12.5"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.12.6"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-KrNVVmH0sfk2WaHlAcc2ElO23vyxG4u777twvFKBAD4=";
hash = "sha256-pvgIXQzL3v4a9Nw+qyXTdVwJxIk2qWw5nVsxu7gGwEg=";
};
postPatch = ''

4
pkgs/tools/backup/dar/default.nix
View File

@ -29,12 +29,12 @@ let
in
stdenv.mkDerivation rec {
version = "2.7.9";
version = "2.7.10";
pname = "dar";
src = fetchzip {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
sha256 = "sha256-q5ZfX0bybyvJ0NjrJQ2/+o0n7dBLGxdIDevls3xOQMg=";
sha256 = "sha256-cvEeV4e19gVgz5vctQUgA4Atj37dgFg3iH789DWtVZU=";
};
outputs = [ "out" "dev" ];

6
pkgs/tools/misc/goose/default.nix
View File

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "goose";
version = "3.11.2";
version = "3.13.0";
src = fetchFromGitHub {
owner = "pressly";
repo = pname;
rev = "v${version}";
hash = "sha256-D/mWzDsGNftl0ldNpWt/98b2o5fWk4Jxb5zEIAqTPs0=";
hash = "sha256-F8VfyxcacNSrjjBScrEk1QC5CQGifum0ZHgb4gYRmpY=";
};
proxyVendor = true;
vendorHash = "sha256-6KqYafXtTLmiYrKabuPaszzkN5P3uZDl4LWo1tat/Bk=";
vendorHash = "sha256-eE21EU09X6E2EDai3R7l916A3DDVj3bDAvB2VXagv48=";
# end-to-end tests require a docker daemon
postPatch = ''

6
pkgs/tools/misc/infracost/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.22";
version = "0.10.24";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-i3YGTD0Hj0iFG5WvPcSsnWaECSytpxVkn0avyeMiRPQ=";
sha256 = "sha256-PsxQzEU2rB/+B7kk6QMssUgH9Bj/kyla6O2MzgrZzUM=";
};
vendorHash = "sha256-o6vRNBqq7Lcr7Yyj+dRT7YfSEwfpU35byEocP/KQOfI=";
vendorHash = "sha256-rDsHIwYfsu1kTtZhd2WMNnV9kNZUSjy6lkyUKPGSPsA=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];

4
pkgs/tools/misc/lnav/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "lnav";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "tstack";
repo = "lnav";
rev = "v${version}";
sha256 = "sha256-W0NXmdbrarSmLOLpl9bt9kYjjDBtejGgh0QYeGFVMNQ=";
sha256 = "sha256-OuxxcXpdpSxrDdiUqRbEaXvCZBAcWvE4YwaMtLKSqCM=";
};
patches = [ ./0001-Forcefully-disable-docs-build.patch ];

4
pkgs/tools/misc/mmctl/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "mmctl";
version = "7.10.2";
version = "7.10.3";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mmctl";
rev = "v${version}";
sha256 = "sha256-cD2RwawWhemhIf14NFEDmREmoaOSKyIxveSy75O7fcU=";
sha256 = "sha256-ANoisFJnTEUgL0xKGaS19jqAHX3MT9RR4BO7hz/vm6E=";
};
vendorHash = null;

6
pkgs/tools/misc/mutagen-compose/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mutagen-compose";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
hash = "sha256-B1UpN9lNMmWe4FtKos2RAGb0ef3xODeGrjD2MwkAYAI=";
hash = "sha256-FEUVRDGVYYpgNSOSSR9hyUyz9mP8B8qWy3MnTtuE3fQ=";
};
vendorHash = "sha256-uILyJV6Lc4zZeqSl9JMlcUYAs0jDblsIPQKwgg2WOX8=";
vendorHash = "sha256-u4vRQjqBSsugEcBzteV7yOTizbXGpCH+M/zAvdWusK0=";
doCheck = false;

2
pkgs/top-level/python-packages.nix
View File

@ -7296,6 +7296,8 @@ self: super: with self; {
openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { };
opower = callPackage ../development/python-modules/opower { };
opsdroid_get_image_size = callPackage ../development/python-modules/opsdroid_get_image_size { };
opt-einsum = callPackage ../development/python-modules/opt-einsum { };