Skip to content

Commit 4f1cb3e

Browse files
Merge master into staging-next
2 parents a2789da + 58855d6 commit 4f1cb3e

File tree

32 files changed

+95
-166
lines changed

32 files changed

+95
-166
lines changed

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/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
name = "claude-dev";
99
publisher = "saoudrizwan";
10-
version = "3.9.2";
11-
hash = "sha256-InlftUHtOHEszgtjPl7H6V0PkyHUEZ6MqyZTbFtjA+k=";
10+
version = "3.12.1";
11+
hash = "sha256-N845Ib84q1sjJgsE7deQO1q1P5vZdAsoBYfB7iEY0qU=";
1212
};
1313

1414
meta = {

pkgs/applications/graphics/leocad/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
8080
license = lib.licenses.gpl2Only;
8181
maintainers = with lib.maintainers; [
8282
peterhoeg
83-
hetraeus
8483
];
8584
platforms = lib.platforms.linux;
8685
};

pkgs/by-name/en/ente-web/package.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
5959
changelog = "https://github.com/ente-io/ente/releases";
6060
license = lib.licenses.agpl3Only;
6161
maintainers = with lib.maintainers; [
62-
surfaceflinger
6362
pinpox
6463
];
6564
platforms = lib.platforms.all;

pkgs/by-name/es/espup/package.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
stdenv,
1212
darwin,
1313
testers,
14+
writableTmpDirAsHomeHook,
1415
nix-update-script,
1516
}:
1617

@@ -51,9 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
5152
ZSTD_SYS_USE_PKG_CONFIG = true;
5253
};
5354

54-
preCheck = ''
55-
export HOME=$(mktemp -d)
56-
'';
55+
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
5756

5857
checkFlags = [
5958
# makes network calls

pkgs/by-name/fi/firewalld/package.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
kdePackages,
1616
kmod,
1717
libnotify,
18+
librsvg,
1819
libxml2,
1920
libxslt,
2021
networkmanager,
@@ -108,6 +109,7 @@ stdenv.mkDerivation rec {
108109
++ lib.optionals withGui [
109110
gtk3
110111
libnotify
112+
librsvg
111113
qt6.qtbase
112114
];
113115

pkgs/by-name/gi/github-markdown-toc-go/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
}:
66
buildGoModule rec {
77
pname = "github-markdown-toc-go";
8-
version = "1.4.0";
8+
version = "2.0.0";
99

1010
src = fetchFromGitHub {
1111
owner = "ekalinin";
1212
repo = "github-markdown-toc.go";
1313
rev = "v${version}";
14-
hash = "sha256-tZGAvbC9lrNhtRubCJUkQShRsfCsaAeI6XHhSp4FkS0=";
14+
hash = "sha256-hCkahhnTAF17ctJTL83wZxZiKGDzIKLwWKTTnwYQ3cs=";
1515
};
1616

1717
vendorHash = "sha256-K5yb7bnW6eS5UESK9wgNEUwGjB63eJk6+B0jFFiFero=";

pkgs/by-name/ho/hoarder/package.nix

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
4646
# We need to pass the patched source code, so pnpm sees the patched version
4747
src = stdenv.mkDerivation {
4848
name = "${finalAttrs.pname}-patched-source";
49-
phases = [
50-
"unpackPhase"
51-
"patchPhase"
52-
"installPhase"
53-
];
54-
src = finalAttrs.src;
55-
patches = finalAttrs.patches;
56-
installPhase = "cp -pr --reflink=auto -- . $out";
49+
inherit (finalAttrs) src patches;
50+
installPhase = ''
51+
cp -pr --reflink=auto -- . $out
52+
'';
5753
};
5854

5955
hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA=";
@@ -121,16 +117,12 @@ stdenv.mkDerivation (finalAttrs: {
121117
runHook postInstall
122118
'';
123119

124-
fixupPhase = ''
125-
runHook preFixup
126-
120+
postFixup = ''
127121
# Remove large dependencies that are not necessary during runtime
128122
rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist}
129123
130124
# Remove broken symlinks
131125
find $out -type l ! -exec test -e {} \; -delete
132-
133-
runHook postFixup
134126
'';
135127

136128
meta = {

pkgs/by-name/hy/hyenae/package.nix

Lines changed: 0 additions & 34 deletions
This file was deleted.

pkgs/by-name/ib/ibniz/package.nix

Lines changed: 0 additions & 32 deletions
This file was deleted.

pkgs/by-name/ki/kine/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
buildGoModule rec {
88
pname = "kine";
9-
version = "0.13.11";
9+
version = "0.13.13";
1010

1111
src = fetchFromGitHub {
1212
owner = "k3s-io";
1313
repo = "kine";
1414
rev = "v${version}";
15-
hash = "sha256-Fb73warUgPX/FQT/zDnn3r7SP2tw142Npg2rhK8BEqI=";
15+
hash = "sha256-Gsi7r3l1UoGaARWtaISweISKSGx/Xir8RDLXwfyTa8Y=";
1616
};
1717

18-
vendorHash = "sha256-RyyDtKdEaXhrIHTA4IxtuWhOnuRWbCF2vUCkDr9lhUg=";
18+
vendorHash = "sha256-rNt+3dCILTzUruMpKAnypZAPNrcylLgIw2vtlHNUv50=";
1919

2020
ldflags = [
2121
"-s"

0 commit comments

Comments
 (0)