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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-08 06:06:14 +00:00
committed by GitHub
parent e84ec1a23c 8cc42b1d45
commit 8a22392a75
30 changed files with 474 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/kafka/base.nix
+1
View File
@@ -131,5 +131,6 @@ with pkgs;
mode = "zookeeper";
};
kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; };
kafka_4_1 = makeKafkaTest "kafka_4_1" { kafkaPackage = apacheKafka_4_1; };
kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };
}
pkgs/by-name/ac/acct/package.nix
+8
View File
@@ -2,6 +2,7 @@
fetchurl,
lib,
stdenv,
fetchpatch2,
}:
stdenv.mkDerivation rec {
@@ -15,6 +16,13 @@ stdenv.mkDerivation rec {
doCheck = true;
patches = [
(fetchpatch2 {
url = "https://src.fedoraproject.org/rpms/psacct/raw/rawhide/f/psacct-6.6.4-sprintf-buffer-overflow.patch";
hash = "sha256-l74tLIuhpXj+dIA7uAY9L0qMjQ2SbDdc+vjHMyVouFc=";
})
];
meta = {
description = "GNU Accounting Utilities, login and process accounting utilities";
pkgs/by-name/an/anytype-heart/package.nix
+3 -3
View File
@@ -13,12 +13,12 @@ let
pname = "anytype-heart";
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
version = "0.40.21";
version = "0.43.0-rc02";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${version}";
hash = "sha256-53LSaETzxwhKkI9is6N6G1+f5Cnf7KStvHA9qeaWUNo=";
hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
};
arch =
@@ -36,7 +36,7 @@ in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-WsYRkAIYDkKWkQpq843dD7Rqc993eHSgee2IX6PomcU=";
vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
subPackages = [ "cmd/grpcserver" ];
tags = [
pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch
-25
View File
@@ -1,25 +0,0 @@
From 0622b4b5497d8bd923eb0d6dd3f917dfcbda9d53 Mon Sep 17 00:00:00 2001
From: Axel Karjalainen <axel@axka.fi>
Date: Thu, 22 May 2025 22:38:14 +0300
Subject: [PATCH] fix: single instance detection when not packaged
---
electron.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electron.js b/electron.js
index d70f20f..158bb93 100644
--- a/electron.js
+++ b/electron.js
@@ -76,7 +76,7 @@ if (is.development && !port) {
return;
};
-if (app.isPackaged && !app.requestSingleInstanceLock()) {
+if (!is.development && !app.requestSingleInstanceLock()) {
Api.exit(mainWindow, '' ,false);
return;
};
--
2.49.0
pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/electron.js b/electron.js
index c5d6760882..17afc05e26 100644
--- a/electron.js
+++ b/electron.js
@@ -15,7 +15,6 @@ const store = new Store({ name: [ 'localStorage', suffix ].join('-') });
// gRPC DevTools extension ID
const GRPC_DEVTOOLS_ID = 'fohdnlaeecihjiendkfhifhlgldpeopm';
-const { installExtension } = require('@tomjs/electron-devtools-installer');
// Fix notifications app name
if (is.windows) {
pkgs/by-name/an/anytype/package.nix
+8 -6
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
fetchFromGitHub,
buildNpmPackage,
pkg-config,
@@ -13,27 +14,27 @@
let
pname = "anytype";
version = "0.46.5";
version = "0.49.2";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${version}";
hash = "sha256-gDlxyHxBLWVBLnaI6rFclfjwqkw9gneBEC7ssmWDKYU=";
hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU=";
};
description = "P2P note-taking tool";
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "1d7ca0073bdd02d0145b8da3b1b956ca0652a108";
hash = "sha256-aL79DOIFH3CocbcLW0SJ472mYPZJXrPJyRKy8zXiF4o=";
rev = "873b42df7320ebbbc80d7e2477914dac70363ef7";
hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg=";
};
in
buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-WEw3RCi7dWs2eMYxLH7DcmWBrN4T8T6beIyplcXgJAA=";
npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -52,7 +53,7 @@ buildNpmPackage {
patches = [
./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
./0001-fix-single-instance-detection-when-not-packaged.patch
./0002-remove-grpc-devtools.patch
];
buildPhase = ''
@@ -132,5 +133,6 @@ buildNpmPackage {
"x86_64-darwin"
"aarch64-darwin"
];
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/ba/basedpyright/package.nix
+3 -3
View File
@@ -16,16 +16,16 @@
buildNpmPackage rec {
pname = "basedpyright";
version = "1.31.3";
version = "1.31.4";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
tag = "v${version}";
hash = "sha256-sk/jqTVWLnE0qP7iSZFTegOkfz8s0TenUlctDmAEVW4=";
hash = "sha256-Lv2wNqS32482jFThJ5dIqlyv/m8QzEHDdlCYs6wd9nY=";
};
npmDepsHash = "sha256-O7OypjSMxMEajJZOHOt1AJXChQQbGZ4u63g8agU95Qw=";
npmDepsHash = "sha256-D1/6H+7GXWeL3dWeXB4Ho5mzCCVzCQPVIPMJ+btF0k4=";
npmWorkspace = "packages/pyright";
preBuild = ''
pkgs/by-name/bu/buf/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "buf";
version = "1.56.0";
version = "1.57.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "buf";
tag = "v${finalAttrs.version}";
hash = "sha256-a2yU8KgMRNEz5fgFx/e0U6Hrtw53neeO5PWsTU8AV14=";
hash = "sha256-D1/VMlvaaYNKyd8Uh5BZot/NABYzEvdjxtVFeKF4+6o=";
};
vendorHash = "sha256-lWcqXMkOpa+bh40zH8LQ86mIbTAqB2mk8naN1oY7Xuc=";
vendorHash = "sha256-6DRuSHZnQZTDiVvPNKgAnEaG4Zb70EPdNr2N13BVJQ0=";
patches = [
# Skip a test that requires networking to be available to work.
pkgs/by-name/cu/cursor-cli/package.nix
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-046NAHLckWOvIG5WJ8p3SNiUTbelEw2eTZ+/1DvTpNY=";
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-Y1ynrrHfhbmMKkbZ1C3Xl+uZy3AWnmAXwTC+OkMcquc=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-Ft/7AivBm3VWsgtYAE0a9SqDLzuiFnGUTdEjsBZjUDA=";
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-EeeHCWFDCayFGpSKkeHxZe2JSHsQ+hJYAwepTm6i8Bo=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-lgn7gaiItLzvhh7ePtUcDCqPuZFUWE3WDSzn5TY3Taw=";
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-yzu0Ea5/X38RGyaFx0VR1O2aXzWs/XHopDyQzouFXP8=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-+zC4rTzTCj1MSCYA///6Br82SffTRdICHuhnhaXsAWg=";
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-C2av4foh8XcXi+CYzFEz6jeFIR7sTjZFi1fk2s0I46I=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2025-08-27";
version = "0-unstable-2025-09-04";
src = sources.${hostPlatform.system};
pkgs/by-name/fi/filebeat8/package.nix
+3 -3
View File
@@ -8,18 +8,18 @@
buildGoModule rec {
pname = "filebeat";
version = "8.19.2";
version = "8.19.3";
src = fetchFromGitHub {
owner = "elastic";
repo = "beats";
tag = "v${version}";
hash = "sha256-3SW4SHUbEhdsKh3zd9VlVC8ZAxaR52Mfm1K/btjtB/4=";
hash = "sha256-bw/qWsNT4tG+hUjeb+DXaTxDY6HEL/A9iANFLdbyi5E=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-y8oAeH6RBD45+NEhl9EF4tPL1Ox4qHlLi+jSetjgKRE=";
vendorHash = "sha256-t+rCXm2eIG2a5xW1E8SjRAb/w9OuFKC/PyCGpJP8Szc=";
subPackages = [ "filebeat" ];
pkgs/by-name/mi/mirrord/manifest.json
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.159.0",
"version": "3.161.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_x86_64",
"hash": "sha256-QwoilxsUmUDaYbIJLOhERbRgrrCN/M1sp4BvJsMWtOQ="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_linux_x86_64",
"hash": "sha256-Oqk1ITUcFqs2hM3Ph/2MjWmAeyU3jzfoDzZUHRXOyHQ="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_aarch64",
"hash": "sha256-/4VACn2xOwDBjKca8gO2syuw6foDQNyqZCECiPNeT2M="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_linux_aarch64",
"hash": "sha256-9BWLLkUGc65nMfaJ3GUXN3/9hI+RVA5lVcDTT+ZMCMw="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal",
"hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_mac_universal",
"hash": "sha256-ak2DrNudwZWxy8RoPxc9+lLuU4LqCPa86/7DQrndVdk="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal",
"hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_mac_universal",
"hash": "sha256-ak2DrNudwZWxy8RoPxc9+lLuU4LqCPa86/7DQrndVdk="
}
}
}
pkgs/by-name/s7/s7/package.nix
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.5-unstable-2025-08-26";
version = "11.5-unstable-2025-09-06";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "f2abd58b4311e3f873619a6da1e65c5ad3d81943";
hash = "sha256-4si8ObGNeM+grMR83pXppm50HZrw01tayQLePhwNRhk=";
rev = "cc2781b08764f820a3b9dc7dfbbc40505a3131db";
hash = "sha256-8hwCzoELeDsnIz+XvfHHyRov4KajqCe1icI8uobrbDk=";
};
buildInputs =
pkgs/by-name/st/starlark/package.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
buildGoModule {
pname = "starlark";
version = "0-unstable-2025-08-04";
version = "0-unstable-2025-09-06";
src = fetchFromGitHub {
owner = "google";
repo = "starlark-go";
rev = "3c9dc17c5f2e062f7d7b8b4237e571810e9c6445";
hash = "sha256-hNP2kt6X46WpyQ4eDFU+mGP4x5H6sD3PC+BRD3AUgbo=";
rev = "bf296ed553ea1715656054a7f64ac6a6dd161360";
hash = "sha256-ijZvmR9oFsIvpindO1RSi01USr2bhBATvVEQtYlgP/A=";
};
vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
+316 -173
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ta/tantivy-go/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "tantivy-go";
version = "1.0.1";
version = "1.0.4";
src = fetchFromGitHub {
owner = "anyproto";
repo = "tantivy-go";
tag = "v${version}";
hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU=";
hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
};
cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY=";
cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260=";
cargoPatches = [
./add-Cargo.lock.patch
pkgs/by-name/tx/txtpbfmt/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule {
pname = "txtpbfmt";
version = "0-unstable-2025-06-27";
version = "0-unstable-2025-09-03";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "txtpbfmt";
rev = "f293424e46b51a8dc295a0edf0fe7217ebda2660";
hash = "sha256-0fFQbzj4CZ78P7A3iTwNA6LHUDM0nwYM/mPwDOlV2Zo=";
rev = "cf07efcaeff78f7d945f844d506daf4cad5a9229";
hash = "sha256-A/rmMtYLaTEkP02DLaYu/1nwaQ7EWacvcl0ri5Zx5zs=";
};
vendorHash = "sha256-iWY0b6PAw9BhA8WrTEECnVAKWTGXuIiGvOi9uhJO4PI=";
pkgs/development/compilers/ghc/9.2.4-binary.nix
+1 -2
View File
@@ -211,8 +211,6 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -497,5 +495,6 @@ stdenv.mkDerivation {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
teams = [ lib.teams.haskell ];
broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
};
}
pkgs/development/compilers/ghc/9.6.3-binary.nix
+1 -2
View File
@@ -210,8 +210,6 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -471,5 +469,6 @@ stdenv.mkDerivation {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
teams = [ lib.teams.haskell ];
broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
};
}
pkgs/development/compilers/ghc/9.8.4-binary.nix
+1 -2
View File
@@ -224,8 +224,6 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -486,5 +484,6 @@ stdenv.mkDerivation {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
maintainers = lib.teams.haskell.members;
broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
};
}
pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
+2
View File
@@ -32,6 +32,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-algebra.version ]
[
(case (range "8.20" "9.1") (isGe "2.4") "1.2.7")
(case (range "8.20" "9.1") (isGe "2.4") "1.2.6")
(case (range "8.20" "9.1") (isGe "2.4") "1.2.5")
(case (range "8.16" "9.0") (isGe "2.0") "1.2.4")
@@ -48,6 +49,7 @@ mkCoqDerivation {
release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q=";
release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA=";
release."1.2.6".sha256 = "sha256-D7EEiLeCJMgxsYvlAFyL7QZyx/KJAKesVE+vyfzqzkU=";
release."1.2.7".sha256 = "sha256-pCal3BPZ85SMAsEFAXRWWV7nuriHGWtyfNocJqsEmLk=";
propagatedBuildInputs = [
mathcomp-ssreflect
pkgs/development/python-modules/pyqt/6.x.nix
+1
View File
@@ -118,6 +118,7 @@ buildPythonPackage rec {
qtquicktimeline
]
# ++ lib.optional withConnectivity qtconnectivity
++ lib.optional withMultimedia qtmultimedia
++ lib.optional withWebSockets qtwebsockets
++ lib.optional withLocation qtlocation
++ lib.optional withSerialPort qtserialport;
pkgs/development/python-modules/weaviate-client/default.nix
+2 -2
View File
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "weaviate-client";
version = "4.16.5";
version = "4.16.9";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "weaviate";
repo = "weaviate-python-client";
tag = "v${version}";
hash = "sha256-AjZZ9kmVxePlomX6bXUohZZXl2IXMbrjG00qNlGdjRc=";
hash = "sha256-vnBBZUUTv8GVPxjkxqKgTYA9/UaJ7VPr9QoRBIBVek8=";
};
pythonRelaxDeps = [
pkgs/development/rocq-modules/rocq-elpi/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@ let
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "3.0.1")
(case (range "9.0" "9.1") "3.3.0")
(case (range "9.0" "9.1") "2.0.7")
] { };
elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; };
@@ -36,7 +36,7 @@ let
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "3.0.0")
(case (range "9.0" "9.1") "3.1.0")
(case (range "9.0" "9.1") "2.6.0")
(case ("9.0") "2.5.2")
] null;
pkgs/games/dwarf-fortress/df.lock.json
+33 -13
View File
@@ -1,28 +1,48 @@
{
"game": {
"latest": {
"linux": "51.11",
"linux": "52.04",
"darwin": "0.47.05"
},
"versions": {
"51.11": {
"52.04": {
"df": {
"version": "51.11",
"version": "52.04",
"urls": {
"linux": {
"url": "https://www.bay12games.com/dwarves/df_51_11_linux.tar.bz2",
"outputHash": "sha256-51cwIFMm5cwSaXjjhpz4pS3D8B5/Mt5+k1ALu1F+JWc="
"url": "https://www.bay12games.com/dwarves/df_52_04_linux.tar.bz2",
"outputHash": "sha256-x/v4yWuojnbea0N7KUAINBdhPBjl0DoWy8Pi/eDCpec="
}
}
},
"hack": {
"version": "51.11-r1.2",
"version": "52.04-r1",
"git": {
"url": "https://github.com/DFHack/dfhack.git",
"revision": "51.11-r1.2",
"outputHash": "sha256-x8zY8IGDhnyoeNz24Mt00o+2XLzSHZG165MXQHXW+YA="
"revision": "52.04-r1",
"outputHash": "sha256-DPW+fvurUYnwfGrEqV3JEN1TfllOJPHqGIlNJ3Wha90="
},
"xmlRev": "6502bdefd1796315365a7bb58e30e0ce34359bea"
"xmlRev": "7b691d256f9427036e7ff24fa795a0f9334739e7"
}
},
"51.13": {
"df": {
"version": "51.13",
"urls": {
"linux": {
"url": "https://www.bay12games.com/dwarves/df_51_13_linux.tar.bz2",
"outputHash": "sha256-Fdb3QS+P0xL4/U0z6nZyMh78KVHDiu9TI3fF6saAw3I="
}
}
},
"hack": {
"version": "51.13-r1",
"git": {
"url": "https://github.com/DFHack/dfhack.git",
"revision": "51.13-r1",
"outputHash": "sha256-Z6ZmXl4BmSg9jRwPpYKMIw3fW6DYxBJEv8oboh+PbZQ="
},
"xmlRev": "ae7424d3f40bf60b3906b5b9b472cb9a7209a3a8"
}
},
"50.15": {
@@ -96,12 +116,12 @@
}
},
"therapist": {
"version": "42.1.13",
"maxDfVersion": "51.11",
"version": "42.1.18",
"maxDfVersion": "52.03",
"git": {
"url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git",
"revision": "v42.1.13",
"outputHash": "sha256-y/kUur/BTArznrEzw54FZBrxnD2KXHcwfrHE4WvoemA="
"revision": "v42.1.18",
"outputHash": "sha256-RdBUpVkjvsNjTowHpQ2FQUCtJiwfqls4dnoUIwKoXGg="
}
}
}
pkgs/games/dwarf-fortress/dfhack/default.nix
+6 -13
View File
@@ -120,23 +120,16 @@ stdenv.mkDerivation {
name = "rename-lerp.patch";
url = "https://github.com/DFHack/dfhack/commit/389dcf5cfcdb8bfb8deeb05fa5756c9f4f5709d1.patch";
hash = "sha256-QuDtGURhP+nM+x+8GIKO5LrMcmBkl9JSHHIeqzqGIPQ=";
});
})
# Newer versions use SDL_GetBasePath and SDL_GetPrefPath with a Windows-esque directory
# that mismatches where we have historically stored data in nixpkgs:
# https://github.com/libsdl-org/SDL/blob/release-2.24.x/src/filesystem/unix/SDL_sysfilesystem.c#L136
# Use SDL_GetPrefPath since this takes XDG_DATA_HOME into account (which is correct).
++ optional (versionAtLeast version "52.02-r2") ./use-df-linux-dir.patch;
# gcc 11 fix
CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";
# As of
# https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4,
# dfhack gets its goodies from the directory above the Dwarf_Fortress
# executable, which leads to stock Dwarf Fortress and not the built
# environment where all the dfhack resources are symlinked to (typically
# ~/.local/share/df_linux). This causes errors like `tweak is not a
# recognized command` to be reported and dfhack to lose some of its
# functionality.
postPatch = ''
sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp
'';
nativeBuildInputs = [
cmake
ninja
pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch
+25
View File
@@ -0,0 +1,25 @@
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 7a6b09a50..d5827f016 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -232,17 +232,10 @@ std::filesystem::path Filesystem::canonicalize(std::filesystem::path p) noexcept
std::filesystem::path Filesystem::getInstallDir() noexcept
{
- return std::filesystem::path{ DFSDL::DFSDL_GetBasePath() };
+ return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") };
}
std::filesystem::path Filesystem::getBaseDir() noexcept
{
- auto getsavebase = []() {
- // assume portable mode is _on_ if init is missing
- if (!df::global::init || df::global::init->media.flag.is_set(df::enums::init_media_flags::PORTABLE_MODE))
- return DFSDL::DFSDL_GetBasePath();
- else
- return DFSDL::DFSDL_GetPrefPath("Bay 12 Games", "Dwarf Fortress");
- };
- return std::filesystem::path{ getsavebase() };
+ return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") };
}
pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+3 -2
View File
@@ -74,9 +74,10 @@ stdenv.mkDerivation {
local orig_md5="$2"
local patched_md5="$3"
echo "It doesn't support DF $dfVersion out of the box, so we're doing it the hard way."
export NIXPKGS_DF_HOME="$(mktemp -dt dfhack.XXXXXX)"
export HOME="$(mktemp -dt dfhack.XXXXXX)"
export XDG_DATA_HOME="$HOME/.local/share"
expect ${dfHackExpectScript}
local ini="$NIXPKGS_DF_HOME/therapist.ini"
local ini="$XDG_DATA_HOME/df_linux/therapist.ini"
if [ -f "$ini" ]; then
if grep -q "$patched_md5" "$ini"; then
cp -v "$ini" "$output"
pkgs/games/dwarf-fortress/update.rb
+1 -1
View File
@@ -571,7 +571,7 @@ class DFLock < Struct.new(:game, :therapist, keyword_init: true)
# Returns an array containing all versions.
def all_versions
self.game.versions.keys.map {"DF #{_1}"}.to_a + ["DT #{self.therapist.version}"]
[self.game.versions.keys.lazy.map {"DF #{_1}"}.first] + ["DT #{self.therapist.version}"]
end
# Loads this DFLock.
pkgs/servers/apache-kafka/default.nix
+7
View File
@@ -14,6 +14,13 @@
let
versionMap = {
"4_1" = {
kafkaVersion = "4.1.0";
scalaVersion = "2.13";
sha256 = "sha256-hbRThHDR3LmNAnMoa/q4cXBlUi5Zfs//zU24OjAhdY4=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.base.kafka_4_1;
};
"4_0" = {
kafkaVersion = "4.0.0";
scalaVersion = "2.13";
pkgs/top-level/all-packages.nix
+2 -1
View File
@@ -6435,9 +6435,10 @@ with pkgs;
apacheKafka_3_8
apacheKafka_3_9
apacheKafka_4_0
apacheKafka_4_1
;
apacheKafka = apacheKafka_4_0;
apacheKafka = apacheKafka_4_1;
asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { };