cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-09-07 06:00:59 +00:00 committed by GitHub
commit 2a84cc37bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 232 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/backport.yml vendored
View file

@ -31,5 +31,5 @@ jobs:
pull_description: |-
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
* [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes).
* Even as a non-commiter, if you find that it does not comply, leave a comment.
* [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
* Even as a non-commiter, if you find that it is not acceptable, leave a comment.

18
CONTRIBUTING.md
View file

@ -483,17 +483,17 @@ The oldest supported release (`YYMM`) can be found using
nix-instantiate --eval -A lib.trivial.oldestSupportedRelease
```
The release branches should generally not receive any breaking changes, both for the Nix expressions and derivations.
So these changes are acceptable to backport:
- New packages, modules and functions
- Security fixes
- Package version updates
- Patch versions with fixes
- Minor versions with new functionality, but no breaking changes
The release branches should generally only receive backwards-compatible changes, both for the Nix expressions and derivations.
Here are some examples of backwards-compatible changes that are okay to backport:
- ✔️ New packages, modules and functions
- ✔️ Security fixes
- ✔️ Package version updates
- ✔️ Patch versions with fixes
- ✔️ Minor versions with new functionality, but no breaking changes
In addition, major package version updates with breaking changes are also acceptable for:
- Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord`
- Security critical applications, such as `firefox` and `chromium`
- ✔️ Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord`
- ✔️ Security critical applications, such as `firefox` and `chromium`
### Changes causing mass rebuilds
[mass-rebuild]: #changes-causing-mass-rebuilds

2
nixos/modules/system/boot/systemd/initrd.nix
View file

@ -351,7 +351,7 @@ in {
"autofs4"
# systemd-cryptenroll
] ++ lib.optional cfg.enableTpm2 "tpm-tis"
++ lib.optional (cfg.enableTpm2 && pkgs.stdenv.hostPlatform.system != "riscv64-linux") "tpm-crb";
++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb";
boot.initrd.systemd = {
initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages;

34
pkgs/applications/audio/bespokesynth/default.nix
View file

@ -36,6 +36,7 @@
, CoreServices
, CoreAudioKit
, IOBluetooth
, MetalKit
# It is not allowed to distribute binaries with the VST2 SDK plugin without a license
# (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box.
# Read more in https://github.com/NixOS/nixpkgs/issues/145607
@ -58,20 +59,16 @@ let
in
stdenv.mkDerivation rec {
pname = "bespokesynth";
version = "1.1.0";
version = "unstable-2023-08-17";
src = fetchFromGitHub {
owner = "BespokeSynth";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PN0Q6/gI1PeMaF/8EZFGJdLR8JVHQZfWunAhOIQxkHw=";
rev = "c6b1410afefc8b0b9aeb4aa11ad5c32651879c9f";
hash = "sha256-MLHlHSszD2jEN4/f2jC4vjAidr3gVOSK606qs5bq+Sc=";
fetchSubmodules = true;
};
postPatch = ''
sed '1i#include <memory>' -i Source/TitleBar.h # gcc12
'';
cmakeBuildType = "Release";
cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ];
@ -79,7 +76,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python3 makeWrapper cmake pkg-config ninja ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
# List obtained in https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
# List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
libX11
libXrandr
libXinerama
@ -110,6 +107,7 @@ stdenv.mkDerivation rec {
CoreServices
CoreAudioKit
IOBluetooth
MetalKit
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
@ -133,23 +131,27 @@ stdenv.mkDerivation rec {
--prefix PATH : '${lib.makeBinPath [
gnome.zenity
(python3.withPackages (ps: with ps; [ jedi ]))
]}' \
--prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [
libXrandr
libXinerama
libXcursor
libXScrnSaver
]}'
'';
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath ([
libX11
libXrandr
libXinerama
libXext
libXcursor
libXScrnSaver
])}";
dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath
meta = with lib; {
description =
"Software modular synth with controllers support, scripting and VST";
homepage = "https://github.com/awwbees/BespokeSynth";
homepage = "https://www.bespokesynth.com/";
license = with licenses; [
gpl3Plus
] ++ lib.optional enableVST2 unfree;
maintainers = with maintainers; [ astro tobiasBora OPNA2608 ];
maintainers = with maintainers; [ astro tobiasBora OPNA2608 PowerUser64 ];
mainProgram = "BespokeSynth";
platforms = platforms.all;
};

26
pkgs/applications/audio/ft2-clone/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, nixosTests
, alsa-lib
@ -22,10 +23,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i -e 's@__LINUX_ALSA__@__MACOSX_CORE__@' -e 's@asound@@' CMakeLists.txt
'';
patches = [
# Adapt CMake script to be Darwin-compatible
# https://github.com/8bitbubsy/ft2-clone/pull/30
(fetchpatch {
name = "0001-ft2-clone-Make-CMake-script-macOS-compatible.patch";
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/0033a567abf7ddbdb2bc59c7f730d22f986010aa.patch";
hash = "sha256-fhA+T6RI+Qmhr7mbG9lEA7esWskgK8+DkWzol0J2lUo=";
})
(fetchpatch {
name = "0002-ft2-clone-Fix-__MACOSX_CORE__-typo.patch";
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/fe50aff9233130150a6631875611c7db67a2d705.patch";
hash = "sha256-X4AVuJ0iRlpH1N/YzjdVk5+yv7eiDNoZkk0mhOizgOg=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 ]
@ -38,13 +49,6 @@ stdenv.mkDerivation rec {
Cocoa
];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [
"-framework CoreAudio"
"-framework CoreMIDI"
"-framework CoreServices"
"-framework Cocoa"
];
passthru.tests = {
ft2-clone-starts = nixosTests.ft2-clone;
};

4
pkgs/applications/display-managers/greetd/gtkgreet.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromSourcehut
, wrapGAppsHook
, pkg-config
, cmake
, meson
@ -8,6 +9,7 @@
, gtk3
, gtk-layer-shell
, json_c
, librsvg
, scdoc
}:
@ -27,6 +29,7 @@ stdenv.mkDerivation rec {
meson
ninja
cmake
wrapGAppsHook
];
buildInputs = [
@ -34,6 +37,7 @@ stdenv.mkDerivation rec {
gtk-layer-shell
json_c
scdoc
librsvg
];
mesonFlags = [

31
pkgs/applications/emulators/dolphin-emu/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, wrapQtAppsHook
@ -12,6 +13,7 @@
, enet
, ffmpeg
, fmt_8
, gtest
, hidapi
, libevdev
, libGL
@ -22,6 +24,7 @@
, libXdmcp
, libXext
, libXrandr
, lzo
, mbedtls_2
, mgba
, miniupnpc
@ -29,12 +32,13 @@
, openal
, pugixml
, qtbase
, qtsvg
, sfml
, soundtouch
, udev
, vulkan-loader
, xxHash
, xz
, zlib-ng
# Used in passthru
, common-updater-scripts
@ -55,16 +59,25 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-19368";
version = "5.0-19870";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "dadbeb4bae7e7fa23af2b46e0add4143094dc107";
sha256 = "sha256-XLtFn2liONPizvrKyySZx0mY7qC2fpwhAWaRZLlEzh8=";
rev = "032c77b462a220016f23c5079e71bb23e0ad2adf";
sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff";
sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM=";
})
# Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070
./find-minizip-ng.patch
];
nativeBuildInputs = [
stdenv.cc
cmake
@ -87,22 +100,25 @@ stdenv.mkDerivation rec {
enet
ffmpeg
fmt_8
gtest
hidapi
libiconv
libpulseaudio
libspng
libusb1
libXdmcp
lzo
mbedtls_2
miniupnpc
minizip-ng
openal
pugixml
qtbase
qtsvg
sfml
soundtouch
xxHash
xz
xz # LibLZMA
zlib-ng
] ++ lib.optionals stdenv.isLinux [
alsa-lib
bluez
@ -110,7 +126,7 @@ stdenv.mkDerivation rec {
libGL
libXext
libXrandr
# FIXME: Remove comment on next mgba version
# FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
#mgba # Derivation doesn't support Darwin
udev
vulkan-loader
@ -118,7 +134,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DDISTRIBUTOR=NixOS"
"-DUSE_SHARED_ENET=ON"
"-DDOLPHIN_WC_REVISION=${src.rev}"
"-DDOLPHIN_WC_DESCRIBE=${version}"
"-DDOLPHIN_WC_BRANCH=master"

13
pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee44d04458..2fa6bd8a10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -678,7 +678,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
-dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip)
+dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip)
dolphin_find_optional_system_library(LZO Externals/LZO)

1
pkgs/applications/emulators/dolphin-emu/primehack.nix
View file

@ -134,6 +134,7 @@ stdenv.mkDerivation rec {
mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop
mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png
substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack'
substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack'
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
'';

2
pkgs/applications/misc/gradience/default.nix
View file

@ -6,6 +6,7 @@
, ninja
, pkg-config
, glib
, glib-networking
, desktop-file-utils
, gettext
, librsvg
@ -50,6 +51,7 @@ python3Packages.buildPythonApplication rec {
];
buildInputs = [
glib-networking
libadwaita
libportal
libportal-gtk4

35
pkgs/applications/networking/errbot/default.nix
View file

@ -1,25 +1,26 @@
{ lib
, fetchFromGitHub
, glibcLocales
, python39
, python3
}:
let
python3 = python39;
in python3.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "errbot";
version = "6.1.7";
version = "6.1.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "errbotio";
repo = "errbot";
rev = version;
sha256 = "02h44qd3d91zy657hyqsw3gskgxg31848pw6zpb8dhd1x84z5y77";
hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8=";
};
LC_ALL = "en_US.utf8";
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
buildInputs = [ glibcLocales ];
pythonRelaxDeps = true;
propagatedBuildInputs = with python3.pkgs; [
ansi
@ -28,7 +29,6 @@ in python3.pkgs.buildPythonApplication rec {
deepmerge
dulwich
flask
hypchat
irc
jinja2
markdown
@ -38,9 +38,8 @@ in python3.pkgs.buildPythonApplication rec {
pygments-markdown-lexer
pyopenssl
requests
slackclient
sleekxmpp
telegram
slixmpp
python-telegram-bot
webtest
];
@ -49,18 +48,20 @@ in python3.pkgs.buildPythonApplication rec {
pytestCheckHook
];
# Slack backend test has an import issue
# errbot-backend-slackv3 has not been packaged
pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ];
disabledTests = [
"backup"
"broken_plugin"
"plugin_cycle"
# require networking
"test_backup"
"test_broken_plugin"
"test_plugin_cycle"
];
pythonImportsCheck = [ "errbot" ];
meta = with lib; {
changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst";
description = "Chatbot designed to be simple to extend with plugins written in Python";
homepage = "http://errbot.io/";
maintainers = with maintainers; [ globin ];

69
pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
View file

@ -1,45 +1,74 @@
{ stdenv
, lib
, dpkg
, fetchurl
, autoPatchelfHook
, glib-networking
, openssl
, webkitgtk
{ lib
, fetchFromGitHub
, rustPlatform
, cinny
, copyDesktopItems
, wrapGAppsHook
, pkg-config
, openssl
, dbus
, glib
, glib-networking
, webkitgtk
, makeDesktopItem
}:
stdenv.mkDerivation rec {
rustPlatform.buildRustPackage rec {
pname = "cinny-desktop";
version = "2.2.6";
src = fetchurl {
url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
sha256 = "sha256-Bh7qBlHh2bQ6y2HnI4TtxMU6N3t04tr1Juoul2KMrqs=";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny-desktop";
rev = "v${version}";
hash = "sha256-RW6LeItIAHJk1e7qMa1MLIGb3jHvJ/KM8E9l1qR48w8=";
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-Iab/icQ9hFVh/o6egZVPa2zeKgO5WxzkluhRckcayvw=";
postPatch = ''
substituteInPlace tauri.conf.json \
--replace '"distDir": "../cinny/dist",' '"distDir": "${cinny}",'
'';
postInstall = ''
install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png
install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png
install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png
'';
nativeBuildInputs = [
autoPatchelfHook
dpkg
copyDesktopItems
wrapGAppsHook
pkg-config
];
buildInputs = [
glib-networking
openssl
dbus
glib
glib-networking
webkitgtk
wrapGAppsHook
];
unpackCmd = "dpkg-deb -x $curSrc source";
installPhase = "mv usr $out";
desktopItems = [
(makeDesktopItem {
name = "cinny";
exec = "cinny";
icon = "cinny";
desktopName = "Cinny";
comment = meta.description;
categories = [ "Network" "InstantMessaging" ];
})
];
meta = with lib; {
description = "Yet another matrix client for desktop";
homepage = "https://github.com/cinnyapp/cinny-desktop";
maintainers = [ maintainers.aveltras ];
license = licenses.agpl3Only;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
mainProgram = "cinny";
};

26
pkgs/applications/networking/instant-messengers/cinny/default.nix
View file

@ -1,22 +1,30 @@
{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
{ lib, buildNpmPackage, fetchFromGitHub, writeText, jq, conf ? { } }:
let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
in
buildNpmPackage rec {
pname = "cinny";
version = "2.2.6";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
hash = "sha256-AvYM8++PqKmm7CJN5hmg9GSC72IoHX+rRxuT3GflvjU=";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny";
rev = "v${version}";
hash = "sha256-Da/gbq9piKvkIMiamoafcRrqxF7128GXoswk2C43An8=";
};
npmDepsHash = "sha256-3wgB/dQmLtwxbRsk+OUcyfx98vpCvhvseEOCrJIFohY=";
nativeBuildInputs = [
jq
];
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -R . $out/
${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json"
cp -r dist $out
jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json"
runHook postInstall
'';
@ -25,7 +33,7 @@ in stdenv.mkDerivation rec {
description = "Yet another Matrix client for the web";
homepage = "https://cinny.in/";
maintainers = with maintainers; [ abbe ];
license = licenses.mit;
license = licenses.agpl3Only;
platforms = platforms.all;
};
}

4
pkgs/applications/radio/fldigi/default.nix
View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "fldigi";
version = "4.1.27";
version = "4.2.00";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-siLBJTp+Dvk7GlNYHO8kZlD3St3TvojaW76tkcNNFfA=";
hash = "sha256-F09C6R3mEgYVhS7/MqEBFzfqGKbyrAem5/+QDlwI+9k=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/window-managers/miriway/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "miriway";
version = "unstable-2023-04-25";
version = "unstable-2023-07-27";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "55ef5bd188e2b86dfbd1b9b360d832d4cd454eb7";
hash = "sha256-kooyL5up+SBHmnv/eEnsg0ujJlHBqbE+n/YHqmpXscI=";
rev = "bfa3bdea552a9b36ba5828e667e847d05a7310fc";
hash = "sha256-gMQqiR7zhwUJ/zw61XuBXz1/F7EuQIM1A23ZQ5T38Z8=";
};
strictDeps = true;

6
pkgs/development/beam-modules/elixir-ls/default.nix
View file

@ -4,12 +4,12 @@
let
pname = "elixir-ls";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v${version}";
hash = "sha256-bWR5wKOVE9qPQyFjiaBumsWwG7vv9pFCVvXO4N8a3HA=";
hash = "sha256-tEKwM5o3uXJ0cLY5USnQJ+HOGTSv6NDJvq+F/iqFEWs=";
fetchSubmodules = true;
};
in
@ -21,7 +21,7 @@ mixRelease {
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
hash = "sha256-7AE6RUD7DLo5uTxPMiUDm9MIBYcrNatrIuILK9jinNk=";
hash = "sha256-jpjqMIQ9fS4nkkKWZ80Mx5vULm5bvnNHy52ZQcR0y8c=";
};
# elixir-ls is an umbrella app

2
pkgs/development/libraries/tpm2-tss/default.nix
View file

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory
./no-dynamic-loader-path.patch
(fetchurl {
name = "skip-test-fapi-fix-provisioning-with template-if-no-certificate-available.patch";
name = "skip-test-fapi-fix-provisioning-with-template-if-no-certificate-available.patch";
url = "https://github.com/tpm2-software/tpm2-tss/commit/218c0da8d9f675766b1de502a52e23a3aa52648e.patch";
sha256 = "sha256-dnl9ZAknCdmvix2TdQvF0fHoYeWp+jfCTg8Uc7h0voA=";
})

6
pkgs/development/tools/biome/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "biome";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
hash = "sha256-oX/LyC6JN0NUc/xi4G9lzKgF9yOlooAt69Gw+eLJxbE=";
hash = "sha256-4gfbM+wMK2lF37vso0EccHiIXJ4ZUQ7X6C/6JSx2gkc=";
};
cargoHash = "sha256-4P57fmp5CpGn1wYkQos7PO3YFChup8LrrLExv9S76gs=";
cargoHash = "sha256-Ima10leJd994FtFgZk0TIZy7zGLwwgvSvAQ1PXb4ius=";
nativeBuildInputs = [
pkg-config

6
pkgs/development/tools/gptcommit/default.nix
View file

@ -10,7 +10,7 @@
let
pname = "gptcommit";
version = "0.5.11";
version = "0.5.13";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
owner = "zurawiki";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UUiqIwvZHV+WhzRc05sW/R3V+6ovL8+WoDOzz4chCq0=";
sha256 = "sha256-O0dqLN2wDXRIVcb9whlzK0BJOm/qhTH+nLpCwSUObng=";
};
cargoSha256 = "sha256-YoNC1kaYItpnn9tzRh61Hn58XbA/LPWokqdbPDD3sq4=";
cargoSha256 = "sha256-JwwQaThefWhJVRJ/a0WfdKJqr/NHgll6D6Y2QaeqWsc=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/games/grapejuice/default.nix
View file

@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "7.14.4";
version = "7.20.11";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "v${version}";
hash = "sha256-CWTnofJXx9T/hGXx3rdephXHjpiVRdFEJQ1u2v6n7yo=";
hash = "sha256-sDw67Xseeak1v5x0daznfdeNQahDTj21AVvXmuZlsgg=";
};
nativeBuildInputs = [

6
pkgs/shells/fish/plugins/tide.nix
View file

@ -4,13 +4,13 @@
# Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716
buildFishPlugin rec {
pname = "tide";
version = "5.5.1";
version = "5.6.0";
src = fetchFromGitHub {
owner = "IlanCosman";
repo = "tide";
rev = "v${version}";
sha256 = "sha256-vi4sYoI366FkIonXDlf/eE2Pyjq7E/kOKBrQS+LtE+M=";
hash = "sha256-cCI1FDpvajt1vVPUd/WvsjX/6BJm6X1yFPjqohmo1rI=";
};
#buildFishplugin will only move the .fish files, but tide has a tide configure function
@ -19,7 +19,7 @@ buildFishPlugin rec {
'';
meta = with lib; {
description = "The ultimate Fish prompt.";
description = "The ultimate Fish prompt";
homepage = "https://github.com/IlanCosman/tide";
license = licenses.mit;
maintainers = [ maintainers.jocelynthode ];

2
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file

@ -211,7 +211,7 @@ in rec {
};
bootstrapTools = derivation {
inherit system;
inherit (localSystem) system;
name = "bootstrap-tools";
builder = "${bootstrapFiles.tools}/bin/bash";

10
pkgs/tools/archivers/7zz/default.nix
View file

@ -69,6 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
"-Wno-conversion"
"-Wno-unused-macros"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-declaration-after-statement"
(lib.optionals (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "13") [
"-Wno-reserved-identifier"
"-Wno-unused-but-set-variable"
])
(lib.optionals (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16") [
"-Wno-unsafe-buffer-usage"
"-Wno-cast-function-type-strict"
])
]);
inherit makefile;

9
pkgs/tools/graphics/fgallery/default.nix
View file

@ -10,16 +10,21 @@
stdenv.mkDerivation rec {
pname = "fgallery";
version = "1.8.2";
version = "1.9.1";
src = fetchurl {
url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip";
sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
hash = "sha256-FvF0wkRe3wTPUG9/GEBxkaxvZ1B4wEd9kI9rURHKxn0=";
};
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
postPatch = ''
substituteInPlace Makefile \
--replace "/usr" $out
'';
installPhase = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/fgallery"

2
pkgs/tools/inputmethods/fusuma/Gemfile.lock
View file

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
fusuma (1.3.0)
fusuma (3.1.0)
PLATFORMS
ruby

4
pkgs/tools/inputmethods/fusuma/gemset.nix
View file

@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "150jc8jyqj3w4k13lf1ihqmm2sld1yawp4jwnf43jixnc9rmzx6f";
sha256 = "163an1yv8lasbdmdjsj2a4byq1rljg7vf5z86ip33xpb9l133xmm";
type = "gem";
};
version = "1.3.0";
version = "3.1.0";
};
}

8
pkgs/tools/security/crowdsec/default.nix
View file

@ -23,8 +23,12 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Version=v${version}"
"-X github.com/crowdsecurity/crowdsec/pkg/cwversion.BuildDate=1970-01-01_00:00:00"
"-X github.com/crowdsecurity/go-cs-lib/pkg/version.Version=v${version}"
"-X github.com/crowdsecurity/go-cs-lib/pkg/version.BuildDate=1970-01-01_00:00:00"
"-X github.com/crowdsecurity/go-cs-lib/pkg/version.Tag=${src.rev}"
"-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga"
"-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec"
"-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data"
];
postBuild = "mv $GOPATH/bin/{crowdsec-cli,cscli}";

6
pkgs/tools/system/bfs/default.nix
View file

@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "bfs";
version = "2.6.3";
version = "3.0.1";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "sha256-XsbD5WYa05tldwBylr6CLwARo61/g4IN686pkCpGGM4=";
sha256 = "sha256-/CiQUK6nmu3MtkG5PMQPn05qIO/M0Oy/LdBI/8oFdqA=";
};
buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ];
# Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
preConfigure = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG"
substituteInPlace Makefile --replace "-flto" ""
'';
makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/tools/system/xe/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xe";
version = "0.11";
version = "1.0";
src = fetchFromGitHub {
owner = "chneukirchen";
repo = "xe";
rev = "v${version}";
sha256 = "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x";
sha256 = "sha256-yek6flBhgjSeN3M695BglUfcbnUGp3skzWT2W/BxW8Y=";
};
makeFlags = [ "PREFIX=$(out)" ];

6
pkgs/tools/wayland/gtklock/default.nix
View file

@ -1,12 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, wrapGAppsHook
, pam
, scdoc
, gtk3
, pkg-config
, gtk-layer-shell
, glib
, librsvg
, wayland
, wayland-scanner
}:
@ -22,13 +24,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Jh+BmtKGaLgAcTXc44ydV83dp/W4wzByehUWyeyBoFI=";
};
strictDeps = true;
nativeBuildInputs = [
scdoc
pkg-config
wayland-scanner
glib
wrapGAppsHook
];
buildInputs = [
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
gtk3
pam
gtk-layer-shell
librsvg
];
installFlags = [

10
pkgs/top-level/all-packages.nix
View file

@ -4630,11 +4630,9 @@ with pkgs;
cht-sh = callPackage ../tools/misc/cht.sh { };
cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; };
cinny = callPackage ../applications/networking/instant-messengers/cinny { };
cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop {
openssl = openssl_1_1;
};
cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { };
ckbcomp = callPackage ../tools/X11/ckbcomp { };
@ -30778,8 +30776,8 @@ with pkgs;
berry = callPackage ../applications/window-managers/berry { };
bespokesynth = callPackage ../applications/audio/bespokesynth {
inherit (darwin.apple_sdk.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth;
bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth {
inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit;
};
bespokesynth-with-vst2 = bespokesynth.override {