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

Merge branch 'master' into haskell-updates

Browse Source
This commit is contained in:
maralorn
2024-01-02 00:18:48 +01:00
parent f8fc00b94d 2df2bddf07
commit 629cc49c8b
37 changed files with 188 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/security/auditd.nix
+1 -1
View File
@@ -14,7 +14,7 @@ with lib;
description = "Linux Audit daemon";
wantedBy = [ "basic.target" ];
before = [ "shutdown.target" ];
conflicts = [ "shutdown.target "];
conflicts = [ "shutdown.target" ];
unitConfig = {
ConditionVirtualization = "!container";
nixos/modules/services/hardware/sane.nix
+8 -1
View File
@@ -4,7 +4,7 @@ with lib;
let
pkg = pkgs.sane-backends.override {
pkg = config.hardware.sane.backends-package.override {
scanSnapDriversUnfree = config.hardware.sane.drivers.scanSnap.enable;
scanSnapDriversPackage = config.hardware.sane.drivers.scanSnap.package;
};
@@ -57,6 +57,13 @@ in
'';
};
hardware.sane.backends-package = mkOption {
type = types.package;
default = pkgs.sane-backends;
defaultText = literalExpression "pkgs.sane-backends";
description = lib.mdDoc "Backends driver package to use.";
};
hardware.sane.snapshot = mkOption {
type = types.bool;
default = false;
nixos/modules/services/networking/tailscale.nix
+2 -2
View File
@@ -100,8 +100,8 @@ in {
};
systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) {
after = ["tailscale.service"];
wants = ["tailscale.service"];
after = ["tailscaled.service"];
wants = ["tailscaled.service"];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
nixos/modules/services/security/tor.nix
+1 -1
View File
@@ -854,7 +854,7 @@ in
BridgeRelay = true;
ExtORPort.port = mkDefault "auto";
ServerTransportPlugin.transports = mkDefault ["obfs4"];
ServerTransportPlugin.exec = mkDefault "${pkgs.obfs4}/bin/obfs4proxy managed";
ServerTransportPlugin.exec = mkDefault "${lib.getExe pkgs.obfs4} managed";
} // optionalAttrs (cfg.relay.role == "private-bridge") {
ExtraInfoStatistics = false;
PublishServerDescriptor = false;
pkgs/applications/misc/bambu-studio/default.nix
+2
View File
@@ -24,6 +24,7 @@
, gstreamer
, gst-plugins-base
, gst-plugins-bad
, gst-plugins-good
, gtest
, gtk3
, hicolor-icon-theme
@@ -90,6 +91,7 @@ stdenv.mkDerivation rec {
gstreamer
gst-plugins-base
gst-plugins-bad
gst-plugins-good
gtk3
hicolor-icon-theme
ilmbase
pkgs/applications/misc/mainsail/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.9.0";
version = "2.9.1";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
hash = "sha256-7GnPdnBoK0lErUgnG3dw644ASb0/1pwGqqvxfn/81T0=";
hash = "sha256-OrCS+0zfXs72vJbrqjvEaHJWD0ndozfCcHs1N9Gqios=";
stripRoot = false;
};
pkgs/applications/networking/browsers/vivaldi/default.nix
+3 -3
View File
@@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.5.3206.39";
version = "6.5.3206.48";
suffix = {
aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-7f3JRkkBGF+7EFGbzosUcKUUFswmKhpacbcd0AaY8fw=";
x86_64-linux = "sha256-louqE7Icf8qEiegzoVd/1jzA+wLFTrQyN3V8g64uQT8=";
aarch64-linux = "sha256-laerVZWB9kNozy0MxYAPXbTjcfgvr+jL18NMP5u7ST0=";
x86_64-linux = "sha256-3gRvPSSyJapqay6nePlMA1R/tfFI75mHi+mx3f+wfjQ=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
Generated
+6 -6
View File
@@ -57,18 +57,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
[[package]]
name = "proc-macro2"
version = "1.0.70"
version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.33"
version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a"
dependencies = [
"proc-macro2",
]
@@ -95,9 +95,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.41"
version = "2.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
checksum = "92d27c2c202598d05175a6dd3af46824b7f747f8d8e9b14c623f19fa5069735d"
dependencies = [
"proc-macro2",
"quote",
pkgs/by-name/co/cockpit/package.nix
+2 -5
View File
@@ -30,7 +30,6 @@
, pkg-config
, polkit
, python3Packages
, ripgrep
, runtimeShell
, systemd
, udev
@@ -45,13 +44,13 @@ in
stdenv.mkDerivation rec {
pname = "cockpit";
version = "306";
version = "307";
src = fetchFromGitHub {
owner = "cockpit-project";
repo = "cockpit";
rev = "refs/tags/${version}";
hash = "sha256-RB5RpwFTi//XNIIm/86JR4Jo3q5nuoW6ruH05JSfMSk=";
hash = "sha256-6z3IAEc+qzh02g1uTaO6LdLD09eYE/5P8Gg7KW3jlvY=";
fetchSubmodules = true;
};
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
pythonWithGobject.python
python3Packages.setuptools
systemd
ripgrep
xmlto
];
@@ -197,7 +195,6 @@ stdenv.mkDerivation rec {
glib-networking
openssh
python3Packages.pytest
python3Packages.vulture
];
checkPhase = ''
export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules
pkgs/by-name/li/licensure/package.nix
+38
View File
@@ -0,0 +1,38 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, git
, gitls
}:
rustPlatform.buildRustPackage rec {
pname = "licensure";
version = "0.3.2";
src = fetchFromGitHub {
owner = "chasinglogic";
repo = "licensure";
rev = version;
hash = "sha256-rOD2H9TEoZ8JCjlg6feNQiAjvroVGqrlOkDHNZKXDoE=";
};
cargoHash = "sha256-ku0SI14pZmbhzE7RnK5kJY6tSMjRVKEMssC9e0Hq6hc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl git gitls ];
checkFlags = [
# Checking for files in the git repo (git ls-files),
# That obviously does not work with nix
"--skip=test_get_project_files"
];
meta = with lib; {
description = "A FOSS License management tool for your projects";
homepage = "https://github.com/chasinglogic/licensure";
license = licenses.gpl3Plus;
mainProgram = "licensure";
maintainers = [ maintainers.soispha ];
platforms = platforms.linux;
};
}
pkgs/by-name/ne/newsraft/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
, yajl
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "newsraft";
version = "0.22";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
domain = "codeberg.org";
owner = "newsraft";
repo = "newsraft";
rev = "newsraft-${version}";
rev = "newsraft-${finalAttrs.version}";
hash = "sha256-QjIADDk1PSZP89+G7B1Bpu3oTEAykD4RJYghZnMJKho=";
};
@@ -35,4 +35,4 @@ stdenv.mkDerivation rec {
mainProgram = "newsraft";
platforms = platforms.all;
};
}
})
pkgs/by-name/sa/satty/package.nix
+8 -1
View File
@@ -10,6 +10,7 @@
, libadwaita
, pango
, copyDesktopItems
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec {
copyDesktopItems
pkg-config
wrapGAppsHook4
installShellFiles
];
buildInputs = [
@@ -43,6 +45,11 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -Dt $out/share/icons/hicolor/scalable/apps/ assets/satty.svg
installShellCompletion --cmd satty \
--bash completions/satty.bash \
--fish completions/satty.fish \
--zsh completions/_satty
'';
desktopItems = [ "satty.desktop" ];
@@ -51,7 +58,7 @@ rustPlatform.buildRustPackage rec {
description = "A screenshot annotation tool inspired by Swappy and Flameshot";
homepage = "https://github.com/gabm/Satty";
license = licenses.mpl20;
maintainers = with maintainers; [ pinpox ];
maintainers = with maintainers; [ pinpox donovanglover ];
mainProgram = "satty";
platforms = lib.platforms.linux;
};
pkgs/development/interpreters/erlang/24.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "24.3.4.14";
sha256 = "sha256-+OEA7bVomZox/iHhkRQPt91WayyxZQDkDI92B5Ez24Q=";
version = "24.3.4.15";
sha256 = "sha256-1a/5jxTLDWlQHEMfKZoAO3wrg1U0wYBf+xXhyO/EnXA=";
}
pkgs/development/interpreters/erlang/25.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2.7";
sha256 = "sha256-JMHfnnvjAIrJ2YhSzk1qVeS7qGx2HDf2J+8+WFD5Bv8=";
version = "25.3.2.8";
sha256 = "sha256-pS96jO1VBqTGWzaZO4XpXI9V+Whse4PjGnJRunFC98s=";
}
pkgs/development/interpreters/erlang/26.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "26.2";
sha256 = "sha256-mk8vPgWFTMo4oPY/OIdboYMTyxG/22Ow4EYs1b+nHuM=";
version = "26.2.1";
sha256 = "sha256-4aQ4YTeiT32lZ9ZFi7/vV7O4fARYVLbGLtHm5alSDyw=";
}
pkgs/development/python-modules/botocore-stubs/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.8";
version = "1.34.11";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-1smqKxGai3dv6ofisZbGSLdOGYw0DbXAb43De6LWKvc=";
hash = "sha256-wLuHI8jm11bh4yFYTRGP3SGDtdHRnw6RC4ZYwBEPB6Y=";
};
nativeBuildInputs = [
pkgs/development/python-modules/plugwise/default.nix
+17 -7
View File
@@ -14,24 +14,35 @@
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, semver
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "plugwise";
version = "0.35.4";
format = "setuptools";
version = "0.36.2";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = pname;
owner = "plugwise";
repo = "python-plugwise";
rev = "refs/tags/v${version}";
hash = "sha256-5clHLE8QavccxAhBEa6W2yOtWYmQ5oa9ZcctEIKXru4=";
hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "wheel~=0.40.0" "wheel"
'';
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
aiohttp
async-timeout
@@ -40,7 +51,6 @@ buildPythonPackage rec {
munch
pyserial
python-dateutil
pytz
semver
];
pkgs/development/tools/misc/ccache/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ccache";
version = "4.8.3";
version = "4.9";
src = fetchFromGitHub {
owner = "ccache";
repo = "ccache";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-fcstTjwwOh5SAe6+VT5MpBaD+AEFoQtHop99dOMr7/A=";
sha256 = "sha256-/R9ReX1l3okUuVD93IdomoaBTYdKvuIuggyk0sJoYmg=";
};
outputs = [ "out" "man" ];
pkgs/development/tools/misc/fzf-make/default.nix
+4 -6
View File
@@ -10,20 +10,18 @@
rustPlatform.buildRustPackage rec {
pname = "fzf-make";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "kyu08";
repo = "fzf-make";
rev = "v${version}";
hash = "sha256-M7xoHYbBvMVipw19WOQ1f8knqob7+eS4eBNTMvPZhDI=";
hash = "sha256-2Q/rqSJJbjLSN+63oRi9ouW4A7Hb0oyyhOdA/DeCTyE=";
};
cargoHash = "sha256-JKxq4AIezuBsnrIIjqEIywZeq/GzAy1tPbzjlxpvvGQ=";
cargoHash = "sha256-DKxDWar8g71uvAZ9KzN14xRwpvIa1dD7iFACb6nio+8=";
nativeBuildInputs = [
makeBinaryWrapper
];
nativeBuildInputs = [ makeBinaryWrapper ];
postInstall = ''
wrapProgram $out/bin/fzf-make \
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+1
View File
@@ -3,6 +3,7 @@
tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;
tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json;
tree-sitter-bitbake = lib.importJSON ./tree-sitter-bitbake.json;
tree-sitter-c = lib.importJSON ./tree-sitter-c.json;
tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;
tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
+12
View File
@@ -0,0 +1,12 @@
{
"url": "https://github.com/amaanq/tree-sitter-bitbake",
"rev": "ffe6c2f3dbf30224479a28ca5d50df594b2486a9",
"date": "2023-11-08T10:34:03-05:00",
"path": "/nix/store/zzckcglck1cr32cmp14i95r7q0qkgajf-tree-sitter-bitbake",
"sha256": "1g547sq2xsfn7xmdmz1ny4lvk75akwi7k1vrrq6bdfkcg7gzkp1b",
"hash": "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}
pkgs/development/tools/parsing/tree-sitter/update.nix
+4
View File
@@ -84,6 +84,10 @@ let
# If you need a grammar that already exists in the official orga,
# make sure to give it a different name.
otherGrammars = {
"tree-sitter-bitbake" = {
orga = "amaanq";
repo = "tree-sitter-bitbake";
};
"tree-sitter-beancount" = {
orga = "polarmutex";
repo = "tree-sitter-beancount";
pkgs/development/tools/templ/default.nix
+3 -3
View File
@@ -5,7 +5,7 @@
buildGoModule rec {
pname = "templ";
version = "0.2.476";
version = "0.2.501";
subPackages = [ "cmd/templ" ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "a-h";
repo = "templ";
rev = "refs/tags/v${version}";
hash = "sha256-lgeVfe+9kUxN4XXL7ANiFxtmupZwDaiRFABJIAclyd8=";
hash = "sha256-MkSGQZo2Zv6aCVANh2ETXoCXETkp+xk8jWAW4Wj+y2s=";
};
vendorHash = "sha256-hbXKWWwrlv0w3SxMgPtDBpluvrbjDRGiJ/9QnRKlwCE=";
vendorHash = "sha256-buJArvaaKGRg3yS7BdcVY0ydyi4zah57ABeo+CHkZQU=";
meta = with lib; {
description = "A language for writing HTML user interfaces in Go";
pkgs/development/tools/the-way/default.nix
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "the-way";
version = "0.20.1";
version = "0.20.2";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-xOoqMqUFVCTS5gQnX4KEoXoMxVvQX3JRoNgzuA20M6g=";
sha256 = "sha256-jUo46NHjgSFOV7fsqh9Ki0QtTGfoaPjQ87/a66zBz1Q=";
};
cargoHash = "sha256-8eN+O3lygbftXVjIBWCwNfYKAIkmPF/eaUKDa9oVaCA=";
cargoHash = "sha256-nmVsg8LX3di7ZAvvDuPQ3PXlLjs+L6YFTzwXRAkcxig=";
nativeBuildInputs = [ installShellFiles ];
pkgs/servers/audiobookshelf/default.nix
+4 -4
View File
@@ -16,13 +16,13 @@ let
nodejs = nodejs_18;
pname = "audiobookshelf";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "advplyr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bRQ/GbUe+vsgYjSVf3jssoxGzgNeKG4BCDIhNJovAN8=";
sha256 = "sha256-ROxVAevnxCyND/h1yyXfUeK9v5SEULL8gkR3flTmmW8=";
};
client = buildNpmPackage {
@@ -36,7 +36,7 @@ let
NODE_OPTIONS = "--openssl-legacy-provider";
npmBuildScript = "generate";
npmDepsHash = "sha256-2E7Qy3Yew+j+eKKYJMV0SQ/LlJaIfOGm4MpxwP5Dn3Q=";
npmDepsHash = "sha256-2t/+IpmgTZglh3SSuYZNUvT1RZCDZGVT2gS57KU1mqA=";
};
wrapper = import ./wrapper.nix {
@@ -51,7 +51,7 @@ in buildNpmPackage {
dontNpmBuild = true;
npmInstallFlags = [ "--only-production" ];
npmDepsHash = "sha256-BZSRa/27oKm2rJoHFq8TpPzkX2CDO9zk5twtcMeo0cQ=";
npmDepsHash = "sha256-1VVFGc4RPE0FHQX1PeRnvU3cAq9eRYGfJ/0GzMy7Fh4=";
installPhase = ''
mkdir -p $out/opt/client
pkgs/servers/computing/slurm-spank-stunnel/default.nix
+3 -1
View File
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj";
};
patches = [ ./hostlist.patch ];
buildPhase = ''
gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c
gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c
'';
installPhase = ''
pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c
index 81fb4fd..dbe69f6 100644
--- a/slurm-spank-stunnel.c
+++ b/slurm-spank-stunnel.c
@@ -278,7 +278,7 @@ int _stunnel_connect_nodes (char* nodes)
{
char* host;
- hostlist_t hlist;
+ hostlist_t *hlist;
// Connect to the first host in the list
hlist = slurm_hostlist_create(nodes);
pkgs/servers/computing/slurm-spank-x11/default.nix
+3 -1
View File
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
};
patches = [ ./hostlist.patch ];
buildPhase = ''
gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \
-g -o slurm-spank-x11 slurm-spank-x11.c
gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
-g -o x11.so slurm-spank-x11-plug.c
'';
pkgs/servers/computing/slurm-spank-x11/hostlist.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c
index bef6c14..7cb77c4 100644
--- a/slurm-spank-x11-plug.c
+++ b/slurm-spank-x11-plug.c
@@ -608,7 +608,7 @@ int _connect_node (char* node,uint32_t jobid,uint32_t stepid)
int _x11_connect_nodes (char* nodes,uint32_t jobid,uint32_t stepid)
{
char* host;
- hostlist_t hlist;
+ hostlist_t *hlist;
int n=0;
int i;
pkgs/servers/computing/slurm/common-env-echo.patch
+4 -4
View File
@@ -1,13 +1,13 @@
diff --git a/src/common/env.c b/src/common/env.c
index 987846d..73d3b3b 100644
index 4dad18fef1..730f28af96 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode,
@@ -2073,7 +2073,7 @@ char **env_array_user_default(const char *username, int timeout, int mode,
char **env = NULL;
char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX";
char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX";
- char cmdstr[256], *env_loc = NULL;
+ char cmdstr[MAXPATHLEN], *env_loc = NULL;
+ char cmdstr[PATH_MAX], *env_loc = NULL;
char *stepd_path = NULL;
int fd1, fd2, fildes[2], found, fval, len, rc, timeleft;
int fildes[2], found, fval, len, rc, timeleft;
int buf_read, buf_rem, config_timeout;
pkgs/servers/computing/slurm/default.nix
+6 -6
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "23.02.7.1";
version = "23.11.0.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-0u96KnEahx7noA8vQEkC1f+hv4d3NGPmnof9G7bA7Oc=";
hash = "sha256-+8oDNfNg9WGET1iWarhZbQEOdjHjSshIB/otdYvl18c=";
};
outputs = [ "out" "dev" ];
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
configureFlags = with lib;
[ "--with-freeipmi=${freeipmi}"
"--with-http-parser=${http-parser}"
"--with-hwloc=${hwloc.dev}"
"--with-json=${json_c.dev}"
"--with-hwloc=${lib.getDev hwloc}"
"--with-json=${lib.getDev json_c}"
"--with-jwt=${libjwt}"
"--with-lz4=${lz4.dev}"
"--with-lz4=${lib.getDev lz4}"
"--with-munge=${munge}"
"--with-yaml=${libyaml.dev}"
"--with-yaml=${lib.getDev libyaml}"
"--with-ofed=${lib.getDev rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"
pkgs/servers/sql/monetdb/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "monetdb";
version = "11.47.17";
version = "11.49.1";
src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
hash = "sha256-2bMzIlvSShNZMVKzBl5T/T33l0PPcBFH35gJs0qlD4E=";
hash = "sha256-ahZegA9wVWx5TZI23eDvqnGS2Uhnbhoq9Jx8sw9yNko=";
};
nativeBuildInputs = [ bison cmake python3 ];
pkgs/tools/misc/valeronoi/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "valeronoi";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "ccoors";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-4BTBF6h/BEVr0E3E0EvvKOQGHZ4wCtdXgKBWLSfOcOI=";
sha256 = "sha256-7z967y1hWpitZfXNlHHM8qEBdyuBQSFlJElS4ldsAaE=";
};
buildInputs = [
pkgs/tools/networking/arping/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "arping";
version = "2.23";
version = "2.24";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-Yn0EFb23VJvcVluQhwGHg9cdnZ8LKlBEds7cq8Irftc=";
hash = "sha256-rME4IDzwYHOURbyuG7G5gnXvUIVoQH2WIeLWacHyoBA=";
};
nativeBuildInputs = [
pkgs/tools/security/baboossh/default.nix
+3 -9
View File
@@ -1,25 +1,18 @@
{ lib
, python3
, fetchFromGitHub
, fetchpatch
}:
python3.pkgs.buildPythonApplication rec {
pname = "baboossh";
version = "1.2.0";
version = "1.2.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "cybiere";
repo = "baboossh";
rev = "refs/tags/v${version}";
hash = "sha256-dorIqnJuAS/y9W6gyt65QjwGwx4bJHKLmdqRPzY25yA=";
};
patches = fetchpatch {
name = "py3compat-utils.patch";
url = "https://github.com/cybiere/baboossh/commit/f7a75ebeda0c69ab5b119894b9e1488fc0a935a8.patch";
hash = "sha256-gctuu/Qd3nmJIWv2mTyrGwjlQD1U+OhGK6Zh/Un06/E=";
hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -41,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/cybiere/baboossh";
changelog = "https://github.com/cybiere/baboossh/releases/tag/v${version}";
license = licenses.gpl3Only;
mainProgram = "baboossh";
maintainers = with maintainers; [ fab ];
};
}
pkgs/tools/system/stress-ng/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.17.02";
version = "0.17.03";
src = fetchFromGitHub {
owner = "ColinIanKing";
repo = pname;
rev = "V${version}";
hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk=";
hash = "sha256-ecYVcLtpcHlUFKdfwWBq2bwQqCp1g9zJp/maZAeKT+k=";
};
postPatch = ''
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -35411,7 +35411,7 @@ with pkgs;
super-slicer-latest = super-slicer.latest;
bambu-studio = callPackage ../applications/misc/bambu-studio {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good;
glew = glew-egl;