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

4
nixos/modules/services/matrix/appservice-discord.nix
View File

@ -100,9 +100,9 @@ in {
serviceDependencies = mkOption {
type = with types; listOf str;
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
optional config.services.matrix-synapse.enable "matrix-synapse.service"
optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service,

9
nixos/modules/services/matrix/matrix-sliding-sync.nix
View File

@ -80,8 +80,11 @@ in
} ];
};
systemd.services.matrix-sliding-sync = {
after = lib.optional cfg.createDatabase "postgresql.service";
systemd.services.matrix-sliding-sync = rec {
after =
lib.optional cfg.createDatabase "postgresql.service"
++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
wants = after;
wantedBy = [ "multi-user.target" ];
environment = cfg.settings;
serviceConfig = {
@ -90,6 +93,8 @@ in
ExecStart = lib.getExe cfg.package;
StateDirectory = "matrix-sliding-sync";
WorkingDirectory = "%S/matrix-sliding-sync";
Restart = "on-failure";
RestartSec = "1s";
};
};
};

2
nixos/modules/services/matrix/mautrix-facebook.nix
View File

@ -145,7 +145,7 @@ in {
wantedBy = [ "multi-user.target" ];
wants = [
"network-online.target"
] ++ optional config.services.matrix-synapse.enable "matrix-synapse.service"
] ++ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
++ optional cfg.configurePostgresql "postgresql.service";
after = wants;

4
nixos/modules/services/matrix/mautrix-telegram.nix
View File

@ -122,9 +122,9 @@ in {
serviceDependencies = mkOption {
type = with types; listOf str;
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
optional config.services.matrix-synapse.enable "matrix-synapse.service"
optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.

4
nixos/modules/services/matrix/mautrix-whatsapp.nix
View File

@ -100,9 +100,9 @@ in {
serviceDependencies = lib.mkOption {
type = with lib.types; listOf str;
default = lib.optional config.services.matrix-synapse.enable "matrix-synapse.service";
default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = lib.literalExpression ''
optional config.services.matrix-synapse.enable "matrix-synapse.service"
optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnits
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.

4
nixos/modules/services/matrix/mx-puppet-discord.nix
View File

@ -66,9 +66,9 @@ in {
};
serviceDependencies = mkOption {
type = with types; listOf str;
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
optional config.services.matrix-synapse.enable "matrix-synapse.service"
optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.

13
nixos/modules/services/matrix/synapse.nix
View File

@ -296,6 +296,18 @@ in {
services.matrix-synapse = {
enable = mkEnableOption (lib.mdDoc "matrix.org synapse");
serviceUnit = lib.mkOption {
type = lib.types.str;
readOnly = true;
description = lib.mdDoc ''
The systemd unit (a service or a target) for other services to depend on if they
need to be started after matrix-synapse.
This option is useful as the actual parent unit for all matrix-synapse processes
changes when configuring workers.
'';
};
configFile = mkOption {
type = types.path;
readOnly = true;
@ -1021,6 +1033,7 @@ in {
port = 9093;
});
services.matrix-synapse.serviceUnit = if hasWorkers then "matrix-synapse.target" else "matrix-synapse.service";
services.matrix-synapse.configFile = configFile;
services.matrix-synapse.package = wrapped;

9
nixos/modules/virtualisation/oci-containers.nix
View File

@ -214,6 +214,13 @@ let
'';
};
hostname = mkOption {
type = with types; nullOr str;
default = null;
description = lib.mdDoc "The hostname of the container.";
example = "hello-world";
};
extraOptions = mkOption {
type = with types; listOf str;
default = [];
@ -280,6 +287,8 @@ let
"--log-driver=${container.log-driver}"
] ++ optional (container.entrypoint != null)
"--entrypoint=${escapeShellArg container.entrypoint}"
++ optional (container.hostname != null)
"--hostname=${escapeShellArg container.hostname}"
++ lib.optionals (cfg.backend == "podman") [
"--cidfile=/run/podman-${escapedName}.ctr-id"
"--cgroups=no-conmon"

4
nixos/tests/prometheus-exporters.nix
View File

@ -471,7 +471,7 @@ let
services.knot = {
enable = true;
extraArgs = [ "-v" ];
extraConfig = ''
settingsFile = pkgs.writeText "knot.conf" ''
server:
listen: 127.0.0.1@53
@ -969,7 +969,7 @@ let
pgbouncer = {
exporterConfig = {
enable = true;
connectionString = "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable";
connectionStringFile = pkgs.writeText "connection.conf" "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable";
};
metricProvider = {

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -57,6 +57,8 @@ in
inherit (pkgs) python3 git go gopls pyright;
};
lspce = callPackage ./manual-packages/lspce { };
matrix-client = callPackage ./manual-packages/matrix-client {
_map = self.map;
};

72
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix Normal file
View File

@ -0,0 +1,72 @@
{ lib
, emacs
, f
, fetchFromGitHub
, markdown-mode
, rustPlatform
, trivialBuild
, yasnippet
}:
let
version = "unstable-2023-10-30";
src = fetchFromGitHub {
owner = "zbelial";
repo = "lspce";
rev = "34c59787bcdbf414c92d9b3bf0a0f5306cb98d64";
hash = "sha256-kUHGdeJo2zXA410FqXGclgXmgWrll30Zv8fSprcmnIo=";
};
meta = {
homepage = "https://github.com/zbelial/lspce";
description = "LSP Client for Emacs implemented as a module using rust";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.marsam ];
inherit (emacs.meta) platforms;
};
lspce-module = rustPlatform.buildRustPackage {
inherit version src meta;
pname = "lspce-module";
cargoHash = "sha256-eqSromwJrFhtJWedDVJivfbKpAtSFEtuCP098qOxFgI=";
checkFlags = [
# flaky test
"--skip=msg::tests::serialize_request_with_null_params"
];
postFixup = ''
for f in $out/lib/*; do
mv $f $out/lib/lspce-module.''${f##*.}
done
'';
};
in
trivialBuild rec {
inherit version src meta;
pname = "lspce";
preBuild = ''
ln -s ${lspce-module}/lib/lspce-module* .
# Fix byte-compilation
substituteInPlace lspce-util.el \
--replace "(require 'yasnippet)" "(require 'yasnippet)(require 'url-util)"
substituteInPlace lspce-calltree.el \
--replace "(require 'compile)" "(require 'compile)(require 'cl-lib)"
'';
buildInputs = propagatedUserEnvPkgs;
propagatedUserEnvPkgs = [
f
markdown-mode
yasnippet
];
postInstall = ''
install lspce-module* $LISPDIR
'';
}

14
pkgs/applications/emulators/yuzu/sources.nix
View File

@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2023-10-20
# Last updated: 2023-11-05
{
compatList = {
rev = "9d17cbd71408476c6a28cbf0fa8177155c511681";
rev = "e9c4e5da6e5e88e889c87582dfd826d204ca8782";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
};
mainline = {
version = "1595";
hash = "sha256:09b0w6z4w9z4ms2pvik2vrmklfcx25jxcgs61bff3nflilnw9m97";
version = "1611";
hash = "sha256:18rrw63j2zjwakbn99wbzprb1rpmlznl6gb09ay9sq8brxy7zjsv";
};
ea = {
version = "3940";
distHash = "sha256:0g0vv274sh3iy56n7s324km87g302005ahi9zh2qhwkiirbnc811";
fullHash = "sha256:0ywppc4z5d4b1zl1cr8yfnba58hgi0z2szficwpinapai7q0pyid";
version = "3966";
distHash = "sha256:1p60455s0h3dwigxm2lxdfgxgv4l2ibwybisja1khcy4i8lgss03";
fullHash = "sha256:1jq2bfbv9a6i3dlqsdgmi87rccvks45iyybxwf8p6rxdjqh4bvl2";
};
}

12
pkgs/applications/graphics/xpano/default.nix
View File

@ -15,21 +15,16 @@
stdenv.mkDerivation rec {
pname = "xpano";
version = "0.16.1";
version = "0.17.0";
src = fetchFromGitHub {
owner = "krupkat";
repo = pname;
rev = "v${version}";
sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj";
sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo=";
fetchSubmodules = true;
};
patches = [
# force install desktop + icon files
./skip_prefix_check.patch
];
nativeBuildInputs = [
cmake
ninja
@ -42,7 +37,7 @@ stdenv.mkDerivation rec {
SDL2
gtk3
spdlog
# exiv2 # TODO: enable when 0.28.0 is available
exiv2
];
checkInputs = [
@ -53,6 +48,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_TESTING=ON"
"-DXPANO_INSTALL_DESKTOP_FILES=ON"
];
meta = with lib; {

18
pkgs/applications/graphics/xpano/skip_prefix_check.patch
View File

@ -1,18 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,6 @@ install(FILES
TYPE BIN
)
-if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
install(FILES
"misc/build/linux/xpano.desktop"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications"
@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
"misc/build/linux/cz.krupkat.Xpano.metainfo.xml"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo"
)
-endif()
install(DIRECTORY
"${CMAKE_SOURCE_DIR}/misc/assets"

12
pkgs/applications/networking/cluster/kubectl-klock/default.nix
View File

@ -2,21 +2,21 @@
buildGo121Module rec {
pname = "kubectl-klock";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "jillejr";
owner = "applejag";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A=";
sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s=";
};
vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0=";
vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso=";
meta = with lib; {
description = "A kubectl plugin to render watch output in a more readable fashion";
homepage = "https://github.com/jillejr/kubectl-klock";
changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}";
homepage = "https://github.com/applejag/kubectl-klock";
changelog = "https://github.com/applejag/kubectl-klock/releases/tag/v${version}";
license = licenses.gpl3Plus;
maintainers = [ maintainers.scm2342 ];
};

6
pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
View File

@ -19,18 +19,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
version = "1.3.14";
version = "1.3.18";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
hash = "sha256-2H7j8e2wPMd4cHXDKxSmyC2Ng/B3jb3/tGVTpUOU3XM=";
hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-zB6H14VAf13pAHQmsWC51d/qqyfRmAEbltyLD5ucG4Y=";
hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0=";
};
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];

4
pkgs/applications/science/chemistry/nwchem/default.nix
View File

@ -54,13 +54,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nwchem";
version = "7.2.1";
version = "7.2.2";
src = fetchFromGitHub {
owner = "nwchemgit";
repo = "nwchem";
rev = "v${version}-release";
hash = "sha256-nnNTZ+c7VVGAqwOBMkBlW3rImNjs08Ne35XRkI3ssGo=";
hash = "sha256-BcYRqPaPR24OTRY0MJgBxi46HvUG4uFaY0unZmu5b9k=";
};
nativeBuildInputs = [

4
pkgs/applications/video/kodi/addons/pvr-hts/default.nix
View File

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
version = "20.6.3";
version = "20.6.4";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
sha256 = "sha256-lfFCcmLvdvlY3NvHmF+JDcnA6zGsIKvX8BUg9GwYPs4=";
sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg=";
};
meta = with lib; {

6
pkgs/by-name/my/mystmd/package.nix
View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "mystmd";
version = "1.1.23";
version = "1.1.26";
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mystmd";
rev = "mystmd@${version}";
hash = "sha256-+zgAm3v7XcNhhVOFueRqJijteQqMCZmE33hDyR4d5bA=";
hash = "sha256-hDXqUjJXQqEpaGCdfxGuAnUraB5/RjZB4MmomAG4aPM=";
};
npmDepsHash = "sha256-8brgDSV0BBggYUnizV+24RQMXxPd6HUBDYrw9fJtL+M=";
npmDepsHash = "sha256-uq3HbmkeJl3A46/rfm29v+oXFnZOwp2SFArm6Wtv+wo=";
dontNpmInstall = true;

13
pkgs/by-name/ux/uxn/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uxn";
version = "unstable-2023-09-29";
version = "unstable-2023-10-23";
src = fetchFromSourcehut {
owner = "~rabbits";
repo = "uxn";
rev = "c71842aa8472f26c0ea7fbf92624659313c038ba";
hash = "sha256-Lo1AkK81Hv8A0jBfpR4lxlBJcWkh9LttURiXVoibKSs=";
rev = "798ebafdc8c27529217f159f8ff53edb0a8a328f";
hash = "sha256-OVCnJEdc/DdJJCks6c2jP9wK31VSNP1NBOsJZ2SFY+0=";
};
outputs = [ "out" "projects" ];
@ -31,8 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs build.sh
substituteInPlace build.sh \
--replace "-L/usr/local/lib " "" \
--replace "\$(brew --prefix)/lib/libSDL2.a " ""
--replace "-L/usr/local/lib " ""
'';
buildPhase = ''
@ -65,9 +64,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ AndersonTorres ];
mainProgram = "uxnemu";
inherit (SDL2.meta) platforms;
# ofborg complains about an error trying to link inexistent SDL2 library
# For full logs, run:
# 'nix log /nix/store/bmyhh0lpifl9swvkpflqldv43vcrgci1-uxn-unstable-2023-08-10.drv'.
broken = stdenv.isDarwin;
};
})

5
pkgs/development/compilers/crystal/default.nix
View File

@ -148,6 +148,11 @@ let
# See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277
substituteInPlace spec/compiler/loader/unix_spec.cr \
--replace 'it "parses file paths"' 'pending "parses file paths"'
'' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
# Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
# libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
substituteInPlace src/llvm/lib_llvm.cr \
--replace '@[Link("stdc++")]' '@[Link("c++", "-l${stdenv.cc.libcxx.cxxabi.libName}")]'
'';
# Defaults are 4

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgpiod";
version = "2.0.2";
version = "2.1";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
hash = "sha256-NTLh26/9wsWWWnYaB1DyaR7kmq0nPdu9k6z2pyextlw=";
hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w=";
};
nativeBuildInputs = [

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

@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nng";
rev = "8e1836f57e8bcdb228dd5baadc71dfbf30b544e0";
sha256 = "sha256-Q08/Oxv9DLCHp7Hf3NqNa0sHq7qwM6TfGT8gNyiwin8=";
rev = "a54820ff0e1b74554c7f649e8386ee8c4ecd98f5";
sha256 = "sha256-4Vj8nf3c45Y8LJ79YUOrNAAGMmfygdPtAJrs+JuFiUM=";
};
nativeBuildInputs = [ cmake ninja ]

6
pkgs/development/ocaml-modules/camlimages/default.nix
View File

@ -6,8 +6,6 @@ buildDunePackage rec {
pname = "camlimages";
version = "5.0.4";
duneVersion = "3";
minimalOCamlVersion = "4.07";
src = fetchFromGitLab {
@ -17,6 +15,10 @@ buildDunePackage rec {
sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4";
};
postPatch = ''
substituteInPlace core/{images,units}.ml --replace String.lowercase String.lowercase_ascii
'';
nativeBuildInputs = [ cppo ];
buildInputs = [ dune-configurator findlib graphics lablgtk stdio ];

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

@ -11,6 +11,10 @@ buildDunePackage rec {
sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ=";
};
postPatch = ''
substituteInPlace src/dune --replace bytes ""
'';
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-cry";
description = "OCaml client for the various icecast & shoutcast source protocols";

6
pkgs/development/ocaml-modules/dum/default.nix
View File

@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
};
postPatch = ''
substituteInPlace "dum.ml" \
--replace "Lazy.lazy_is_val" "Lazy.is_val" \
--replace "Obj.final_tag" "Obj.custom_tag"
'';
nativeBuildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ easy-format ];

3
pkgs/development/ocaml-modules/piqi/default.nix
View File

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex, easy-format, xmlm, base64 }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"piqi is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
version = "0.6.16";
pname = "piqi";

3
pkgs/development/ocaml-modules/sodium/default.nix
View File

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"sodium is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-sodium";
version = "0.6.0";

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

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "django-cacheops";
version = "7.0.1";
version = "7.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA=";
hash = "sha256-d6N8c9f6z8cpk2XtZqEr56SH3XRd2GwdM8ouv9OzKHg=";
};
nativeBuildInputs = [

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

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "django-configurations";
version = "2.4.1";
version = "2.5";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-psJcFDg05nsg00dRUS0IsykGhPJQmO4hKx7jaASlkIU=";
hash = "sha256-Y/olLEDciOoXuLkPX0oxonJuWGrLH/Dtx0wijGHxnl0=";
};
buildInputs = [

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

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "wand";
version = "0.6.11";
version = "0.6.13";
src = fetchPypi {
pname = "Wand";
inherit version;
hash = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU=";
hash = "sha256-9QE0hOr3og6yLRghqu/mC1DMMpciNytfhWXUbUqq/Mo=";
};
postPatch = ''

2
pkgs/development/tools/rust/cargo-outdated/default.nix
View File

@ -6,6 +6,7 @@
, stdenv
, curl
, CoreFoundation
, CoreServices
, Security
, SystemConfiguration
}:
@ -26,6 +27,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
curl
CoreFoundation
CoreServices
Security
SystemConfiguration
];

4
pkgs/development/tools/smlfmt/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smlfmt";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "shwestrick";
repo = pname;
rev = "v${version}";
hash = "sha256-7CTfMiEvuOena5SOE0qKpFPq6ARxmkE6d+loznZNbC0=";
hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE=";
};
nativeBuildInputs = [ mlton ];

1
pkgs/games/heroic/fhsenv.nix
View File

@ -96,6 +96,7 @@ buildFHSEnv {
libsoup
libtheora
libtiff
libunwind
libusb1
libv4l
libva

1
pkgs/games/steam/fhsenv.nix
View File

@ -169,6 +169,7 @@ in buildFHSEnv rec {
libcaca
libcanberra
libgcrypt
libunwind
libvpx
librsvg
xorg.libXft

5
pkgs/misc/ghostscript/default.nix
View File

@ -122,7 +122,10 @@ stdenv.mkDerivation rec {
doCheck = false;
# don't build/install statically linked bin/gs
buildFlags = [ "so" ];
buildFlags = [ "so" ]
# without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0)
# error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
++ lib.optional (x11Support && stdenv.isDarwin) "LDFLAGS=-headerpad_max_install_names";
installTargets = [ "soinstall" ];
postInstall = ''

11
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -8,6 +8,7 @@
, gobject-introspection
, gettext
, libgudev
, libdrm
, polkit
, libxmlb
, glib
@ -18,14 +19,12 @@
, curl
, libjcat
, elfutils
, libsmbios
, efivar
, valgrind
, meson
, libuuid
, colord
, ninja
, gcab
, gnutls
, protobufc
, python3
@ -124,7 +123,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.9.6";
version = "1.9.7";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU=";
hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM=";
};
patches = [
@ -169,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
gettext
shared-mime-info
valgrind
gcab
gnutls
protobufc # for protoc
python
@ -183,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
gusb
sqlite
libarchive
libdrm
curl
elfutils
libgudev
@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: {
libcbor
libqmi
xz # for liblzma
] ++ lib.optionals haveDell [
libsmbios
] ++ lib.optionals haveFlashrom [
flashrom
];

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.1.60";
hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM=";
version = "6.1.61";
hash = "sha256-15dAzCcFUekBlkBfcHWiZ3gourimLp6GlUKeWAddDqo=";
variant = "lts";
};
mainVariant = {
version = "6.5.9";
hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA=";
version = "6.5.10";
hash = "sha256-t99LKAmNApcjFVna3ChNZp4O6ag9t2kQVrg8yRsTANg=";
variant = "main";
};

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.87.0";
version = "0.88.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
hash = "sha256-AfjCGxoXKXVfDnPkLqx2W3dGBFY9aiBPgltFMg1xKZI=";
hash = "sha256-Tflva3qo9tgdTAR+Ibr8KgpXU419rg5cX9Y1P6yTl0c=";
};
# there is a nested go.mod
sourceRoot = "${src.name}/cmd/otelcorecol";
vendorHash = "sha256-OTeZL/mBYLKq47pJE26J+vbQkTZlgz0eVC1jwRmqw88=";
vendorHash = "sha256-VqZsYI/aA/db7fpZhlxUQzfFESjOBi4Hp9nytm+mFVY=";
# upstream strongly recommends disabling CGO
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream

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

@ -17079,7 +17079,7 @@ with pkgs;
cargo-lock = callPackage ../development/tools/rust/cargo-lock { };
cargo-machete = callPackage ../development/tools/rust/cargo-machete { };
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
};
cargo-pgx_0_6_1 = callPackage ../development/tools/rust/cargo-pgx/0_6_1.nix {
inherit (darwin.apple_sdk.frameworks) Security;