Skip to content

Commit c06e951

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-next
2 parents 1333b9c + 2c1e21b commit c06e951

66 files changed

Lines changed: 329 additions & 248 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/github-script/commits.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = async ({ github, context, core, dry, cherryPicks }) => {
4646
sha,
4747
commit,
4848
severity: 'warning',
49-
message: `Couldn't locate original commit hash in message of ${sha}.`,
49+
message: `Couldn't locate the cherry-picked commit's hash in the commit message of ${sha}.`,
5050
type: 'no-commit-hash',
5151
}
5252

‎nixos/modules/services/hardware/undervolt.nix‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,37 @@ let
1616
limit != null && window != null
1717
) "Both power limit and window must be set";
1818
"${toString limit} ${toString window}";
19-
cliArgs = lib.cli.toCommandLineGNU { } {
20-
inherit (cfg)
21-
verbose
22-
temp
23-
turbo
24-
;
25-
# `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs:
26-
#
27-
# Core or Cache offsets have no effect. It is not possible to set different offsets for
28-
# CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to
29-
# both CPU and Cache. A warning message will be displayed if you attempt to set different offsets.
30-
core = cfg.coreOffset;
31-
cache = cfg.coreOffset;
32-
gpu = cfg.gpuOffset;
33-
uncore = cfg.uncoreOffset;
34-
analogio = cfg.analogioOffset;
35-
36-
temp-bat = cfg.tempBat;
37-
temp-ac = cfg.tempAc;
38-
39-
power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window;
40-
power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window;
41-
};
19+
cliArgs =
20+
let
21+
optionFormat = optionName: {
22+
option = "--${optionName}";
23+
sep = null;
24+
explicitBool = false;
25+
};
26+
in
27+
lib.cli.toCommandLine optionFormat {
28+
inherit (cfg)
29+
verbose
30+
temp
31+
turbo
32+
;
33+
# `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs:
34+
#
35+
# Core or Cache offsets have no effect. It is not possible to set different offsets for
36+
# CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to
37+
# both CPU and Cache. A warning message will be displayed if you attempt to set different offsets.
38+
core = cfg.coreOffset;
39+
cache = cfg.coreOffset;
40+
gpu = cfg.gpuOffset;
41+
uncore = cfg.uncoreOffset;
42+
analogio = cfg.analogioOffset;
43+
44+
temp-bat = cfg.tempBat;
45+
temp-ac = cfg.tempAc;
46+
47+
power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window;
48+
power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window;
49+
};
4250
in
4351
{
4452
options.services.undervolt = {

‎nixos/modules/services/mail/roundcube.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ in
244244
services.phpfpm.pools.roundcube = {
245245
user = if localDB then user else "nginx";
246246
phpOptions = ''
247-
error_log = 'stderr'
247+
error_log = '/dev/stderr'
248248
log_errors = on
249249
post_max_size = ${cfg.maxAttachmentSize}
250250
upload_max_filesize = ${cfg.maxAttachmentSize}

‎pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
77
mktplcRef = {
88
publisher = "sourcegraph";
99
name = "amp";
10-
version = "0.0.1763851087";
11-
hash = "sha256-x579QIkkFBAa1w6e6mtmx2sHQ3ypDcDWWVge6kCq9wU=";
10+
version = "0.0.1764403772";
11+
hash = "sha256-3R9SMaIop+7gBPVh2cdovbt6FyfaxjMhPIgdDJIPNIE=";
1212
};
1313

1414
meta = {

‎pkgs/applications/networking/cluster/terraform-providers/providers.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -949,13 +949,13 @@
949949
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
950950
},
951951
"newrelic_newrelic": {
952-
"hash": "sha256-iqqjOaop4h7ffAo3Q80ryIcwXZnKH1vmLGAZ/seRqrM=",
952+
"hash": "sha256-mRGLUSHwPu5U2vH8ZCHiiv4a8lrQDts32G5C/shpsc8=",
953953
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
954954
"owner": "newrelic",
955955
"repo": "terraform-provider-newrelic",
956-
"rev": "v3.75.4",
956+
"rev": "v3.76.1",
957957
"spdx": "MPL-2.0",
958-
"vendorHash": "sha256-AfkCBD1qYDhwUsezUZg27fbENMOQN21gH4dT54AMco4="
958+
"vendorHash": "sha256-SUALSNpd/d0chLtrCpzMTJ63Iudpf45DittU30+jark="
959959
},
960960
"ns1-terraform_ns1": {
961961
"hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=",

‎pkgs/by-name/au/autocorrect/package.nix‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
lib,
33
rustPlatform,
44
fetchFromGitHub,
5+
nix-update-script,
56
}:
67

78
rustPlatform.buildRustPackage (finalAttrs: {
89
pname = "autocorrect";
9-
version = "2.14.1";
10+
version = "2.16.2";
1011

1112
src = fetchFromGitHub {
1213
owner = "huacnlee";
1314
repo = "autocorrect";
14-
rev = "5af1bc295d48b0fd04f7dbc35ea99d479f682e78";
15-
hash = "sha256-tbN+48a8NnwirJqUci0LgxsvJI0KzuG/aDvV/Yr8Xu8=";
15+
rev = "v${finalAttrs.version}";
16+
hash = "sha256-IpBEmgZ40CFHMISP4tRzt2c2bE2Di9tn8e+/YJPg9RA=";
1617
};
1718

18-
cargoHash = "sha256-cEiIs7wvfjP5/tkRtYb2XEZfssw09zkbOrqZsOX9ajQ=";
19+
cargoHash = "sha256-sn+72+Qq7qppaiiiMS46RXVhFcm27lCPgXmAIYORKU8=";
1920

2021
cargoBuildFlags = [
2122
"-p"
@@ -26,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
2627
"autocorrect-cli"
2728
];
2829

30+
passthru.updateScript = nix-update-script { };
31+
2932
meta = {
3033
description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)";
3134
mainProgram = "autocorrect";

‎pkgs/by-name/bi/bitrise/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
}:
77
buildGoModule rec {
88
pname = "bitrise";
9-
version = "2.34.7";
9+
version = "2.35.3";
1010

1111
src = fetchFromGitHub {
1212
owner = "bitrise-io";
1313
repo = "bitrise";
1414
rev = "v${version}";
15-
hash = "sha256-5L44yqHk2fvSQ7cPGB2gf2lJfQGfIg8g2sGrqDxiyMY=";
15+
hash = "sha256-RjtOo8+vXKeZbTtnwmUq1t8WwZUJypSUoQSJtr9xd70=";
1616
};
1717

1818
# many tests rely on writable $HOME/.bitrise and require network access

‎pkgs/by-name/co/code-cursor/package.nix‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ let
1616

1717
sources = {
1818
x86_64-linux = fetchurl {
19-
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
20-
hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
19+
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/linux/x64/Cursor-2.1.39-x86_64.AppImage";
20+
hash = "sha256-SsKhW8q/AzOn1HqykhwaVHyTVm+OqTUiFtda7XDiAho=";
2121
};
2222
aarch64-linux = fetchurl {
23-
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
24-
hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
23+
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/linux/arm64/Cursor-2.1.39-aarch64.AppImage";
24+
hash = "sha256-m0QNf/ock6hRkOJXqMACBV6mM6/6ZAD6/yues9hGCfU=";
2525
};
2626
x86_64-darwin = fetchurl {
27-
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
28-
hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
27+
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/darwin/x64/Cursor-darwin-x64.dmg";
28+
hash = "sha256-kFjKAoRMxRJqBC75LCcbEiwqdunaphj/e2afrFD3NaM=";
2929
};
3030
aarch64-darwin = fetchurl {
31-
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
32-
hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
31+
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/darwin/arm64/Cursor-darwin-arm64.dmg";
32+
hash = "sha256-9kP0C7KLLSD0Oak75P/4Qt5sIncTwW6Sldz2/9yi4EE=";
3333
};
3434
};
3535

@@ -39,12 +39,12 @@ in
3939
inherit useVSCodeRipgrep;
4040
commandLineArgs = finalCommandLineArgs;
4141

42-
version = "2.0.64";
42+
version = "2.1.39";
4343
pname = "cursor";
4444

4545
# You can find the current VSCode version in the About dialog:
4646
# workbench.action.showAboutDialog (Help: About)
47-
vscodeVersion = "1.99.3";
47+
vscodeVersion = "1.105.1";
4848

4949
executableName = "cursor";
5050
longName = "Cursor";

‎pkgs/by-name/co/contour/package.nix‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
3737
hash = "sha256-jgasZhdcJ+UF3VIl8HLcxBayvbA/dkaOG8UtANRgeP4=";
3838
};
3939

40-
patches = [ ./dont-fix-app-bundle.diff ];
40+
patches = lib.optionals stdenv.hostPlatform.isDarwin [
41+
./dont-fix-app-bundle.diff
42+
./remove-deep-flag-from-codesign.diff
43+
];
4144

4245
outputs = [
4346
"out"
@@ -82,17 +85,17 @@ stdenv.mkDerivation (finalAttrs: {
8285
mkdir -p $out/nix-support $terminfo/share
8386
''
8487
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
85-
mkdir $out/Applications
88+
mkdir $out/Applications $out/bin
8689
cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
8790
mv $out/contour.app $out/Applications
88-
ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
91+
ln -s $out/Applications/contour.app/Contents/MacOS/contour $out/bin/contour
8992
''
9093
+ lib.optionalString stdenv.hostPlatform.isLinux ''
9194
mv $out/share/terminfo $terminfo/share/
95+
rm -r $out/share/contour
9296
''
9397
+ ''
9498
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
95-
rm -r $out/share/contour
9699
'';
97100

98101
passthru.tests.test = nixosTests.terminal-emulators.contour;

‎pkgs/by-name/co/contour/remove-deep-flag-from-codesign.diff‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/remove-deep-flag-from-codesign.diff b/remove-deep-flag-from-codesign.diff
2+
new file mode 100644
3+
index 0000000000..e69de29bb2
4+
diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt
5+
index 3c7ac83720..55e6830bfc 100644
6+
--- a/src/contour/CMakeLists.txt
7+
+++ b/src/contour/CMakeLists.txt
8+
@@ -510,7 +510,7 @@
9+
# Ensure code signature
10+
execute_process(
11+
WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\"
12+
- COMMAND codesign --force --deep --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}\"
13+
+ COMMAND codesign --force --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}/Contents/MacOS/contour\"
14+
)
15+
")
16+
else()

0 commit comments

Comments
 (0)