ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 21:32:23 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-25 18:00:59 +00:00 committed by GitHub
commit f6ece27ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 342 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/gpaste.nix
View File

@ -32,5 +32,7 @@ with lib;
systemd.packages = [ pkgs.gnome.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
# gpaste-reloaded applet doesn't work without the typelib
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
};
}

12
pkgs/applications/audio/lsp-plugins/default.nix
View File

@ -5,20 +5,12 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.2.13";
version = "1.2.14";
src = fetchurl {
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo=";
sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po=";
};
patches = [
(fetchpatch {
url = "https://github.com/lsp-plugins/lsp-dsp-lib/commit/58c3f985f009c84347fa91236f164a9e47aafa93.patch";
stripLen = 1;
extraPrefix = "modules/lsp-dsp-lib/";
hash = "sha256-pCLucLijXOgp69xNjSRCRxgVoQziT0YiHLnQGbkefqE=";
})
];
outputs = [ "out" "dev" "doc" ];

10
pkgs/applications/blockchains/bitcoin/default.nix
View File

@ -33,14 +33,14 @@ let
in
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
version = "25.1";
version = "26.0";
src = fetchurl {
urls = [
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
# hash retrieved from signed SHA256SUMS
sha256 = "bec2a598d8dfa8c2365b77f13012a733ec84b8c30386343b7ac1996e901198c9";
sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1";
};
nativeBuildInputs =
@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
++ lib.optionals withGui [ qrencode qtbase qttools ];
postInstall = ''
installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion
installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion
installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion
installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
installShellCompletion --bash contrib/completions/bash/bitcoind.bash
installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
installShellCompletion --fish contrib/completions/fish/bitcoind.fish

4
pkgs/applications/emulators/xemu/default.nix
View File

@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.117";
version = "0.7.118";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
hash = "sha256-R6BPDBMrVhxUkjMWK8Jz9vqEz5P3v62PIyulHp6Q+KM=";
hash = "sha256-IGzPxwNxuqMsZhQ63VUyDzPSBpAgc0U0oUjM/blEd7g=";
fetchSubmodules = true;
};

4
pkgs/applications/networking/cluster/yor/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "yor";
version = "0.1.185";
version = "0.1.187";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-5CBOLbqsEVzYyU67c7QTGTe471XQlEC/826wYCPHzEo=";
hash = "sha256-w82kJhMnupVv4eq3SUDFaWSvkVrxOSPsN+OXl8aIKog=";
};
vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";

4
pkgs/applications/networking/instant-messengers/abaddon/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "abaddon";
version = "0.1.13";
version = "0.1.14";
src = fetchFromGitHub {
owner = "uowuo";
repo = "abaddon";
rev = "v${version}";
hash = "sha256-2iozeRuY/+JDnaHfAYiXNS1VgSrHAxXPuI8BevEEKTc=";
hash = "sha256-Amp6PkQWd4PnwUL29fzGETLuQXVEaARr+jIRlfrxTKc=";
fetchSubmodules = true;
};

6
pkgs/applications/networking/wgcf/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "wgcf";
version = "2.2.19";
version = "2.2.20";
src = fetchFromGitHub {
owner = "ViRb3";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M=";
hash = "sha256-k4oOejJiVZk9s4niG/r0mSoI363uuQh3C9OWVweELWc=";
};
subPackages = ".";
vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8=";
vendorHash = "sha256-U1VHbD2l5C5ws7Mt5a7PmtHQkZJ6hzDU1TyiEFqMYEM=";
meta = with lib; {
description = "Cross-platform, unofficial CLI for Cloudflare Warp";

3
pkgs/applications/science/chemistry/gwyddion/default.nix
View File

@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
platforms = with lib.platforms; linux ++ darwin;
maintainers = [ lib.maintainers.cge ];
broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

51
pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, callPackage
, pkg-config
, gcc13Stdenv
, hyprland
}:
let
mkHyprlandPlugin =
args@{ pluginName, ... }:
gcc13Stdenv.mkDerivation (args // {
pname = "${pluginName}";
nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];
buildInputs = [ hyprland ]
++ hyprland.buildInputs
++ (args.buildInputs or [ ]);
meta = args.meta // {
description = (args.meta.description or "");
longDescription = (args.meta.lonqDescription or "") +
"\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options.";
};
});
plugins = {
hy3 = { fetchFromGitHub, cmake, hyprland }:
mkHyprlandPlugin rec {
pluginName = "hy3";
version = "0.32.0";
src = fetchFromGitHub {
owner = "outfoxxed";
repo = "hy3";
rev = "hl${version}";
hash = "sha256-j49bEOLjBa1CH2gTwM+A2Edrw/GspE2m8q1teAn6SuQ=";
};
nativeBuildInputs = [ cmake ];
dontStrip = true;
meta = with lib; {
homepage = "https://github.com/outfoxxed/hy3";
description = "Hyprland plugin for an i3 / sway like manual tiling layout";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.aacebedo ];
};
};
};
in
lib.mapAttrs (name: plugin: callPackage plugin { }) plugins

6
pkgs/by-name/c2/c2fmzq/package.nix
View File

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "c2FmZQ";
version = "0.4.15";
version = "0.4.16";
src = fetchFromGitHub {
owner = "c2FmZQ";
repo = "c2FmZQ";
rev = "v${version}";
hash = "sha256-xQOzuJfGmnmOJqHCm5xUNuLHQO4UVRMu1vABsuUbv60=";
hash = "sha256-DJvcWUPIEu3zCVIVB/mUBqbOzHwUI+01gMQUdYk4qm4=";
};
ldflags = [ "-s" "-w" ];
sourceRoot = "source/c2FmZQ";
vendorHash = "sha256-aG1YPg8jeBJShICujUgrcvgAlb7ySdwjc+x6jEUYHXA=";
vendorHash = "sha256-lnoEh6etfVLx+GYWNCvra40qOYtzTIH3SC28T6mXC2U=";
subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ];

10
pkgs/applications/misc/hugo/default.nix → pkgs/by-name/hu/hugo/package.nix
View File

@ -14,7 +14,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A=";
};
@ -48,10 +48,12 @@ buildGoModule rec {
version = "v${version}";
};
meta = with lib; {
meta = {
changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}";
description = "A fast and modern static website engine";
homepage = "https://gohugo.io";
license = licenses.asl20;
maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ];
license = lib.licenses.asl20;
mainProgram = "hugo";
maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ];
};
}

76
pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch Normal file
View File

@ -0,0 +1,76 @@
From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 23 Dec 2023 23:24:59 +0800
Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login
shell
Users expect their shell profiles to get sourced at startup, which
doesn't happen with wayland sessions.
This commit brings back that feature, by making the cinnamon-session
wrapper script run a login shell.
ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35
---
cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++
cinnamon-session/meson.build | 14 +++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100755 cinnamon-session/cinnamon-session.in
diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in
new file mode 100755
index 0000000..d9d7cb2
--- /dev/null
+++ b/cinnamon-session/cinnamon-session.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
+ [ -n "$SHELL" ] &&
+ grep -q "$SHELL" /etc/shells &&
+ ! (echo "$SHELL" | grep -q "false") &&
+ ! (echo "$SHELL" | grep -q "nologin"); then
+ if [ "$1" != '-l' ]; then
+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
+ else
+ shift
+ fi
+fi
+
+exec @libexecdir@/cinnamon-session-binary "$@"
diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
index 10092ee..3d32fdc 100644
--- a/cinnamon-session/meson.build
+++ b/cinnamon-session/meson.build
@@ -54,7 +54,7 @@ cinnamon_session_sources = [
]
dbus_glib = dependency('dbus-glib-1')
-executable('cinnamon-session',
+executable('cinnamon-session-binary',
cinnamon_session_sources,
dependencies: [
cinnamon_desktop,
@@ -76,6 +76,18 @@ executable('cinnamon-session',
],
include_directories: [ rootInclude ],
install: true,
+ install_dir: get_option('libexecdir'),
+)
+
+script_conf = configuration_data()
+script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir'))
+
+configure_file(
+ input: 'cinnamon-session.in',
+ output: 'cinnamon-session',
+ install: true,
+ install_dir: get_option('bindir'),
+ configuration: script_conf
)
units = [
--
2.42.0

1
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View File

@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
patches = [
./0001-Use-dbus_glib-instead-of-elogind.patch
./0002-Use-login-shell-for-wayland-session.patch
];
buildInputs = [

35
pkgs/desktops/gnome/core/gdm/default.nix
View File

@ -5,7 +5,6 @@
, substituteAll
, meson
, ninja
, rsync
, pkg-config
, glib
, itstool
@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
pkg-config
rsync
gobject-introspection
];
@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: {
'';
preInstall = ''
install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override"
'';
postInstall = ''
# Move stuff from DESTDIR to proper location.
# We use rsync to merge the directories.
rsync --archive "$DESTDIR/etc" "$out"
rm --recursive "$DESTDIR/etc"
for o in $(getAllOutputNames); do
# debug is created later by _separateDebugInfo hook.
if [[ "$o" = "debug" ]]; then continue; fi
rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")"
rm --recursive "$DESTDIR/''${!o}"
mv "$DESTDIR''${!o}" "$(dirname "''${!o}")"
done
# Ensure the DESTDIR is removed.
rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR"
mv "$DESTDIR/etc" "$out"
# Ensure we did not forget to install anything.
rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}"
! test -e "$DESTDIR"
# We are setting DESTDIR so the post-install script does not compile the schemas.
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
# HACK: We want to install configuration files to $out/etc
# but GDM should read them from /etc on a NixOS system.
# With autotools, it was possible to override Make variables
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "${placeholder "out"}/dest";
env = {
# HACK: We want to install configuration files to $out/etc
# but GDM should read them from /etc on a NixOS system.
# With autotools, it was possible to override Make variables
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "dest";
};
separateDebugInfo = true;

6
pkgs/development/embedded/svdtools/default.nix
View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "svdtools";
version = "0.3.6";
version = "0.3.8";
src = fetchCrate {
inherit version pname;
hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI=";
hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw=";
};
cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo=";
cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU=";
meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files";

4
pkgs/development/interpreters/rakudo/zef.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zef";
version = "0.21.1";
version = "0.21.2";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${finalAttrs.version}";
hash = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s=";
hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/amf-headers/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "amf-headers";
version = "1.4.30";
version = "1.4.32";
src = fetchFromGitHub {
owner = "GPUOpen-LibrariesAndSDKs";
repo = "AMF";
rev = "v${version}";
sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs=";
sha256 = "sha256-3CdC/9o6ur2CeVLImz2QfaZAH2+KtDdxs5zRF7W5/oo=";
};
installPhase = ''

39
pkgs/development/libraries/cwiid/default.nix
View File

@ -1,13 +1,22 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, bison
, flex
, bluez
, pkg-config
, gtk2
}:
stdenv.mkDerivation rec {
pname = "cwiid";
version = "unstable-2010-02-21";
src = fetchFromGitHub {
owner = "abstrakraft";
repo = "cwiid";
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
owner = "abstrakraft";
repo = "cwiid";
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h";
};
@ -19,9 +28,21 @@ stdenv.mkDerivation rec {
sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
'';
buildInputs = [ bison flex bluez gtk2 ];
patches = [
./fix-ar.diff
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
bluez
gtk2
];
nativeBuildInputs = [
autoreconfHook
pkg-config
bison
flex
];
NIX_LDFLAGS = "-lbluetooth";
@ -32,9 +53,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Linux Nintendo Wiimote interface";
homepage = "http://cwiid.org";
license = licenses.gpl2Plus;
homepage = "http://cwiid.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ bennofs ];
platforms = platforms.linux;
platforms = platforms.linux;
};
}

26
pkgs/development/libraries/cwiid/fix-ar.diff Normal file
View File

@ -0,0 +1,26 @@
diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in
index 3afbb14..b8df9d9 100644
--- a/common/include/lib.mak.in
+++ b/common/include/lib.mak.in
@@ -22,7 +22,7 @@ static: $(STATIC_LIB)
shared: $(SHARED_LIB)
$(STATIC_LIB): $(OBJECTS)
- ar rcs $(STATIC_LIB) $(OBJECTS)
+ $(AR) rcs $(STATIC_LIB) $(OBJECTS)
$(SHARED_LIB): $(OBJECTS)
$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \
diff --git a/configure.ac b/configure.ac
index 82ca3e1..0a78283 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then
AC_MSG_ERROR([bison not found])
fi
+AC_CHECK_TOOL([AR], [ar], [:])
+
AC_ARG_WITH(
[python],
[AS_HELP_STRING([--without-python],[compile without python support])],

33
pkgs/development/python-modules/django-mdeditor/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, django
}:
let
version = "0.1.20";
in
buildPythonPackage {
pname = "django-mdeditor";
inherit version;
src = fetchFromGitHub {
owner = "pylixm";
repo = "django-mdeditor";
rev = "v${version}";
hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k=";
};
propagatedBuildInputs = [ django ];
# no tests
doCheck = false;
pythonImportsCheck = [ "mdeditor" ];
meta = with lib; {
description = "Markdown Editor plugin application for django based on Editor.md";
homepage = "https://github.com/pylixm/django-mdeditor";
changelog = "https://github.com/pylixm/django-mdeditor/releases";
license = licenses.gpl3;
maintainers = with maintainers; [ augustebaum ];
};
}

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoutbreaksnearme";
version = "2023.10.0";
version = "2023.12.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = "pyoutbreaksnearme";
rev = "refs/tags/${version}";
hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY=";
hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysml";
version = "0.1.1";
version = "0.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mtdcr";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4=";
hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/regenmaschine/default.nix
View File

@ -15,16 +15,16 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "2023.11.0";
version = "2023.12.0";
pyproject = true;
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "bachya";
repo = "regenmaschine";
rev = "refs/tags/${version}";
hash = "sha256-FRfw3B2zHEspKf1LENrB3Ayu6/t3hyS8sjuwoBC5Lfk=";
hash = "sha256-9VBqLmbWJCrfDw9T1qmE9KkdlS+MDnvoG8O9dPCuJDs=";
};
nativeBuildInputs = [

6
pkgs/development/tools/api-linter/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "api-linter";
version = "1.59.2";
version = "1.60.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
rev = "v${version}";
hash = "sha256-tgDrzYaomB0Pj7JQmvp+8G25CBDxGiMYCUnbm8vRkDU=";
hash = "sha256-3uxPHSmIFrkAm82sqQxWKzJwU3cFhTDVsJYp8cENaRg=";
};
vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw=";
@ -23,7 +23,7 @@ buildGoModule rec {
"-w"
];
# reference: https://github.com/googleapis/api-linter/blob/v1.59.2/.github/workflows/release.yaml#L76
# reference: https://github.com/googleapis/api-linter/blob/v1.60.0/.github/workflows/release.yaml#L76
preBuild = ''
cat > cmd/api-linter/version.go <<EOF
package main

6
pkgs/development/tools/azcopy/default.nix
View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.22.0";
version = "10.22.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "refs/tags/v${version}";
hash = "sha256-njDC1KxxWaeCxALF5MRE/6+z6bcEQt/PTjN29hEg4Hw=";
hash = "sha256-WS8h4WRiCTthZOT3NQE8h7BihpaHFfCe39XoGvnDZ1k=";
};
subPackages = [ "." ];
vendorHash = "sha256-vHHUbXpO4Z2VKSyA8itywx5oei9bFuSmvW1d7KENeUM=";
vendorHash = "sha256-afqDnrmbTR6yZHT7NysysORci4b0Oh0sjpftgAXJ5Uk=";
doCheck = false;

6
pkgs/development/tools/bearer/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "bearer";
version = "1.33.0";
version = "1.33.1";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-sdtZOj3jksXDVVYi+Uy/zXgZoqlhGlPKjokXNErBe9k=";
hash = "sha256-cdD4LYQZwkS5dRhmvyHkio7TXPDgfDo7kutVAGJCitc=";
};
vendorHash = "sha256-u3pqG74o8xRxxepS5u3lTo4rPgbFABDC/dLWD1JAyxA=";
vendorHash = "sha256-nh2hkwscb4EYEfumBXPFrLgxIxRlkVqBCnQZ4eMZbgg=";
subPackages = [
"cmd/bearer"

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

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "changie";
version = "1.16.1";
version = "1.17.0";
src = fetchFromGitHub {
owner = "miniscruff";
repo = "changie";
rev = "v${version}";
hash = "sha256-NN/ohZPwgvl1ZUqFI06vKfUYs4KG9dtBKSz76+FR6pM=";
hash = "sha256-IS4KKvAi4VutJADSpst56ZdeqoqVkSMQ1TyQR12pqNg=";
};
vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40=";

4
pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "woodpecker-plugin-git";
version = "2.2.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "plugin-git";
rev = "refs/tags/${version}";
hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A=";
hash = "sha256-9aK6c2uUBhTzBni6S4XwevdVRxswiMYGJKwmKOGHIbg=";
};
vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU=";

6
pkgs/development/tools/just/default.nix
View File

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "1.17.0";
version = "1.18.1";
outputs = [ "out" "man" "doc" ];
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-tT8WNenYTLL5dGrRbhfASRMEcyuoHS7RNXpMX/GG+wE=";
hash = "sha256-jmTSTx2WSLOtxy0gPCTonjcoy4o9FKA5aiQW3+wPrZQ=";
};
cargoHash = "sha256-1R2kl5E5OU3U38LfcBzlvth4bBpVVnbXiet2N5LNNZk=";
cargoHash = "sha256-4kbvtmXkU5bhuC079K5NOGKVdqYvTileVNXSNLIV0ok=";
nativeBuildInputs = [ installShellFiles mdbook ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

6
pkgs/development/tools/rust/cargo-mutants/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-mutants";
version = "23.12.0";
version = "23.12.2";
src = fetchFromGitHub {
owner = "sourcefrog";
repo = "cargo-mutants";
rev = "v${version}";
hash = "sha256-6p+ri6An0rQTPSFUSE4MBNP5dFiVFsS0UDXUoWJoY20=";
hash = "sha256-TFVk8uq+wBfCmwU5klqapxp6IeJNnvoH6pDKC8NJuao=";
};
cargoHash = "sha256-4ej0Pl8n1Z001IdiM1u+/Z7ZTi9hwuoJLA4gHheQOsA=";
cargoHash = "sha256-cN7mgyKzuYZT+g8j04Ncqb4s2mwyTsNib5RssrEa2F8=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration

6
pkgs/development/tools/rust/cargo-run-bin/default.nix
View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-run-bin";
version = "1.6.0";
version = "1.6.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-PB44m39TDH1z8N3DrxAlZ/FKOdZmpe+U84tbmBBP9VQ=";
hash = "sha256-B4tkP2QuL3MFQn3iAPg4TMJfFbn1D8w/C1OX+TbpgSE=";
};
cargoHash = "sha256-FMlirUr3c8QhnTmTHvfNPff7PYlWSl83vCGLOLbyaR4=";
cargoHash = "sha256-tn+NqugSK5R/lIQVF1URWoDbdsSCvi5tjdjOlT293tg=";
# multiple impurities in tests
doCheck = false;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vendir";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-vendir";
rev = "v${version}";
sha256 = "sha256-AxHVr6XryTXqm+iL54eqxIRE2MfxLbwFz7+aCauP0x8=";
sha256 = "sha256-H5SeDZzl2KdVp3KsRpsmp6/ZOxLq+3y9Coe1NIEi5YQ=";
};
vendorHash = null;

6
pkgs/development/tools/web-ext/default.nix
View File

@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "web-ext";
version = "7.6.2";
version = "7.9.0";
src = fetchFromGitHub {
owner = "mozilla";
repo = "web-ext";
rev = version;
hash = "sha256-tFMngcoHFA3QmR0AK68elUVpli37PsVlcL978o7DQCs=";
hash = "sha256-7fBUWQFUsIGQnyNhZISvdtAQMAMZ38mbzGuC+6Cwu1Y=";
};
npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU=";
npmDepsHash = "sha256-3Dq4sNPZm9fDxPxOZL+rDxFA/FEs2/+zdz8sF3JFJ3s=";
npmBuildFlags = [ "--production" ];

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

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }:
stdenv.mkDerivation rec {
version = "0.5.1";
version = "0.5.3";
pname = "wiiload";
nativeBuildInputs = [ autoconf automake ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "devkitPro";
repo = "wiiload";
rev = "v${version}";
sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3";
sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo=";
};
preConfigure = "./autogen.sh";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ytt";
version = "0.46.2";
version = "0.46.3";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-ytt";
rev = "v${version}";
sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI=";
sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0=";
};
vendorHash = null;

2
pkgs/development/web/flyctl/default.nix
View File

@ -57,7 +57,7 @@ buildGoModule rec {
downloadPage = "https://github.com/superfly/flyctl";
homepage = "https://fly.io/";
license = licenses.asl20;
maintainers = with maintainers; [ aaronjanse adtya jsierles techknowlogick viraptor ];
maintainers = with maintainers; [ adtya jsierles techknowlogick viraptor ];
mainProgram = "flyctl";
};
}

32
pkgs/os-specific/linux/upower/default.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitLab
, makeWrapper
, pkg-config
, rsync
, libxslt
, meson
, ninja
@ -69,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
libxslt
makeWrapper
pkg-config
rsync
glib
] ++ lib.optionals withIntrospection [
gobject-introspection
@ -138,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: {
# Our gobject-introspection patches make the shared library paths absolute
# in the GIR files. When running tests, the library is not yet installed,
# though, so we need to replace the absolute path with a local one during build.
# We are using a symlink that will be overwitten during installation.
mkdir -p "$out/lib"
ln -s "$PWD/libupower-glib/libupower-glib.so" "$out/lib/libupower-glib.so.3"
'';
@ -159,21 +156,28 @@ stdenv.mkDerivation (finalAttrs: {
# meson rebuild during install and it is not used at runtime anyway.
sed -Ei 's~#!.+/bin/python3~#!/usr/bin/python3~' \
../src/linux/integration-test.py
# Undo preCheck installation since DESTDIR hack expects outputs to not exist.
rm "$out/lib/libupower-glib.so.3"
rmdir "$out/lib" "$out"
'';
postInstall = ''
# Move stuff from DESTDIR to proper location.
# We use rsync to merge the directories.
for dir in etc var; do
rsync --archive "$DESTDIR/$dir" "$out"
rm --recursive "$DESTDIR/$dir"
for o in $(getAllOutputNames); do
# devdoc is created later by _multioutDocs hook.
if [[ "$o" = "devdoc" ]]; then continue; fi
mv "$DESTDIR''${!o}" "$(dirname "''${!o}")"
done
for o in out dev installedTests; do
rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")"
rm --recursive "$DESTDIR/''${!o}"
done
# Ensure the DESTDIR is removed.
rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR"
mv "$DESTDIR/var" "$out"
# The /etc already exist so we need to merge it.
cp --recursive "$DESTDIR/etc" "$out"
rm --recursive "$DESTDIR/etc"
# Ensure we did not forget to install anything.
rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}"
! test -e "$DESTDIR"
'';
postFixup = ''
@ -194,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "${placeholder "out"}/dest";
DESTDIR = "dest";
};
passthru = {

6
pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
View File

@ -4,7 +4,7 @@
}:
buildGoModule rec {
pname = "buildkite-agent-metrics";
version = "5.9.2";
version = "5.9.3";
outputs = [ "out" "lambda" ];
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "buildkite";
repo = "buildkite-agent-metrics";
rev = "v${version}";
hash = "sha256-JYpsQUIKTlQz1VUmPfTzvgh++0p3NAoa105mvGoqgt8=";
hash = "sha256-DepIptvR4i0+/45stCMErJtDeAFIDiNbhioitQ8gYBs=";
};
vendorHash = "sha256-2EbZLLaddR7oWXb9H9E35foevp6gMbWfoymDf2lQuto=";
vendorHash = "sha256-YEvVGtfhe/RBeuD87C2BNOFEeK40JDidX4loSLdBwhs=";
postInstall = ''
mkdir -p $lambda/bin

4
pkgs/tools/filesystems/ceph-csi/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "ceph-csi";
version = "3.10.0";
version = "3.10.1";
nativeBuildInputs = [ go ];
buildInputs = [ ceph ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "ceph";
repo = "ceph-csi";
rev = "v${version}";
sha256 = "sha256-k7eipiBcr/a2V62tEtiQrduk5Cj8KGxbmiVo4x6BVwE=";
sha256 = "sha256-S5jv9l/Oozv0NrEEf+Bik0jnaK4AYIChFm2pU2/DQow=";
};
preConfigure = ''

6
pkgs/tools/misc/mcfly/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
version = "0.8.1";
version = "0.8.4";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
hash = "sha256-9muBKJXsXiSxSmLRygGATEbwpiz6B8oTFQIkVMJMWAk=";
hash = "sha256-beoXLTy3XikdZBS0Lh3cugHflNJ51PbqsCE3xtCHpj0=";
};
postPatch = ''
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
'';
cargoHash = "sha256-LhIAJ3JI7cp+vzEH5vthefgExPORF6Xnjj3cQkIkhSA=";
cargoHash = "sha256-wWYpDU6oXT+sDCzX8VWJ6GfNPOi7T02LK0JKcWHFGi8=";
meta = with lib; {
homepage = "https://github.com/cantino/mcfly";

4
pkgs/tools/security/aws-iam-authenticator/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
version = "0.6.14";
version = "0.6.16";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-NWYTOHqeCxIgKvslezHAZT1GastWcbavWdfmY6KlbXc=";
hash = "sha256-E/DkCDtnzI6yBEYemlLqxc1r8ZEuX+6jDefaZTRFRek=";
};
vendorHash = "sha256-TDsY05jnutNIKx0z6/8vGvsgYCIKBkTxh9mXqk4IR38=";

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

@ -5748,6 +5748,8 @@ with pkgs;
hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { });
hysteria = callPackage ../tools/networking/hysteria { };
hyx = callPackage ../tools/text/hyx { };
@ -32507,8 +32509,6 @@ with pkgs;
huggle = libsForQt5.callPackage ../applications/misc/huggle { };
hugo = callPackage ../applications/misc/hugo { };
ghosttohugo = callPackage ../applications/misc/ghosttohugo {};
gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };

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

@ -3098,6 +3098,8 @@ self: super: with self; {
django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { };
django-mdeditor = callPackage ../development/python-modules/django-mdeditor { };
django-mptt = callPackage ../development/python-modules/django-mptt { };
django-mysql = callPackage ../development/python-modules/django-mysql { };