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

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-12-18 00:13:30 +00:00 committed by GitHub
commit 83f5ace380
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
234 changed files with 6222 additions and 1171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
maintainers/maintainer-list.nix
View file

@ -11248,6 +11248,12 @@
github = "marius851000";
githubId = 22586596;
};
mariuskimmina = {
email = "mar.kimmina@gmail.com";
name = "Marius Kimmina";
github = "mariuskimmina";
githubId = 38843153;
};
markbeep = {
email = "mrkswrn@gmail.com";
github = "markbeep";
@ -11340,6 +11346,12 @@
githubId = 585424;
name = "Massimo Gengarelli";
};
matdibu = {
email = "contact@mateidibu.dev";
github = "matdibu";
githubId = 24750154;
name = "Matei Dibu";
};
matejc = {
email = "cotman.matej@gmail.com";
github = "matejc";
@ -13129,6 +13141,15 @@
githubId = 8214542;
name = "Nicolò Balzarotti";
};
nicolas-goudry = {
email = "goudry.nicolas@gmail.com";
github = "nicolas-goudry";
githubId = 8753998;
name = "Nicolas Goudry";
keys = [{
fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9";
}];
};
nicoo = {
email = "nicoo@debian.org";
github = "nbraud";
@ -20449,6 +20470,15 @@
githubId = 1557253;
name = "Lennart Eichhorn";
};
zedseven = {
name = "Zacchary Dempsey-Plante";
email = "zacc@ztdp.ca";
github = "zedseven";
githubId = 25164338;
keys = [{
fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875";
}];
};
zendo = {
name = "zendo";
email = "linzway@qq.com";

2
maintainers/scripts/luarocks-packages.csv
View file

@ -95,8 +95,8 @@ mediator_lua,,,,,,
middleclass,,,,,,
mpack,,,,,,
moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
nlua,,,,,,teto
nui.nvim,,,,,,mrcjkb
nvim-client,https://github.com/neovim/lua-client.git,,,,,
nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,,
penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,

1 name src ref server version luaversion maintainers
95 middleclass
96 mpack
97 moonscript https://github.com/leafo/moonscript.git dev-1 arobyn
98 nlua teto
99 nui.nvim mrcjkb
nvim-client https://github.com/neovim/lua-client.git
100 nvim-cmp https://github.com/hrsh7th/nvim-cmp
101 penlight https://github.com/lunarmodules/Penlight.git alerque
102 plenary.nvim https://github.com/nvim-lua/plenary.nvim.git 5.1

4
nixos/doc/manual/release-notes/rl-2405.section.md
View file

@ -27,12 +27,16 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).
- [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).
## Backward Incompatibilities {#sec-release-24.05-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
- `k9s` was updated to v0.29. There have been breaking changes in the config file format, check out the [changelog](https://github.com/derailed/k9s/releases/tag/v0.29.0) for details.
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.

22
nixos/modules/config/pulseaudio.nix
View file

@ -8,8 +8,6 @@ let
cfg = config.hardware.pulseaudio;
alsaCfg = config.sound;
systemWide = cfg.enable && cfg.systemWide;
nonSystemWide = cfg.enable && !cfg.systemWide;
hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable;
overriddenPackage = cfg.package.override
@ -217,16 +215,10 @@ in {
};
config = mkMerge [
config = lib.mkIf cfg.enable (mkMerge [
{
environment.etc = {
"pulse/client.conf".source = clientConf;
};
environment.etc."pulse/client.conf".source = clientConf;
hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
}
(mkIf cfg.enable {
environment.systemPackages = [ overriddenPackage ];
sound.enable = true;
@ -242,6 +234,8 @@ in {
"libao.conf".source = writeText "libao.conf" "default_driver=pulse";
};
hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
# Disable flat volumes to enable relative ones
hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no";
@ -255,7 +249,7 @@ in {
# PulseAudio is packaged with udev rules to handle various audio device quirks
services.udev.packages = [ overriddenPackage ];
})
}
(mkIf (cfg.extraModules != []) {
hardware.pulseaudio.daemon.config.dl-search-path = let
@ -277,7 +271,7 @@ in {
services.avahi.publish.userServices = true;
})
(mkIf nonSystemWide {
(mkIf (!cfg.systemWide) {
environment.etc = {
"pulse/default.pa".source = myConfigFile;
};
@ -297,7 +291,7 @@ in {
};
})
(mkIf systemWide {
(mkIf cfg.systemWide {
users.users.pulse = {
# For some reason, PulseAudio wants UID == GID.
uid = assert uid == gid; uid;
@ -328,6 +322,6 @@ in {
environment.variables.PULSE_COOKIE = "${stateDir}/.config/pulse/cookie";
})
];
]);
}

1
nixos/modules/module-list.nix
View file

@ -770,6 +770,7 @@
./services/misc/tautulli.nix
./services/misc/tiddlywiki.nix
./services/misc/tp-auto-kbbl.nix
./services/misc/tuxclocker.nix
./services/misc/tzupdate.nix
./services/misc/uhub.nix
./services/misc/weechat.nix

2
nixos/modules/services/cluster/kubernetes/pki.nix
View file

@ -212,7 +212,7 @@ in
services.certmgr = {
enable = true;
package = pkgs.certmgr-selfsigned;
package = pkgs.certmgr;
svcManager = "command";
specs =
let

182
nixos/modules/services/desktops/pipewire/pipewire.nix
View file

@ -4,6 +4,8 @@
with lib;
let
json = pkgs.formats.json {};
mapToFiles = location: config: concatMapAttrs (name: value: { "pipewire/${location}.conf.d/${name}.conf".source = json.generate "${name}" value;}) config;
cfg = config.services.pipewire;
enable32BitAlsaPlugins = cfg.alsa.support32Bit
&& pkgs.stdenv.isx86_64
@ -72,15 +74,140 @@ in {
https://github.com/PipeWire/pipewire/blob/master/NEWS
'';
};
extraConfig = {
pipewire = mkOption {
type = lib.types.attrsOf json.type;
default = {};
example = {
"10-clock-rate" = {
"context.properties" = {
"default.clock.rate" = 44100;
};
};
"11-no-upmixing" = {
"stream.properties" = {
"channelmix.upmix" = false;
};
};
};
description = lib.mdDoc ''
Additional configuration for the PipeWire server.
Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/pipewire.conf.d`.
See `man pipewire.conf` for details, and [the PipeWire wiki][wiki] for examples.
See also:
- [PipeWire wiki - virtual devices][wiki-virtual-device] for creating virtual devices or remapping channels
- [PipeWire wiki - filter-chain][wiki-filter-chain] for creating more complex processing pipelines
- [PipeWire wiki - network][wiki-network] for streaming audio over a network
[wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PipeWire
[wiki-virtual-device]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Virtual-Devices
[wiki-filter-chain]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Filter-Chain
[wiki-network]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Network
'';
};
client = mkOption {
type = lib.types.attrsOf json.type;
default = {};
example = {
"10-no-resample" = {
"stream.properties" = {
"resample.disable" = true;
};
};
};
description = lib.mdDoc ''
Additional configuration for the PipeWire client library, used by most applications.
Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/client.conf.d`.
See the [PipeWire wiki][wiki] for examples.
[wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client
'';
};
client-rt = mkOption {
type = lib.types.attrsOf json.type;
default = {};
example = {
"10-alsa-linear-volume" = {
"alsa.properties" = {
"alsa.volume-method" = "linear";
};
};
};
description = lib.mdDoc ''
Additional configuration for the PipeWire client library, used by real-time applications and legacy ALSA clients.
Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/client-rt.conf.d`.
See the [PipeWire wiki][wiki] for examples of general configuration, and [PipeWire wiki - ALSA][wiki-alsa] for ALSA clients.
[wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client
[wiki-alsa]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-ALSA
'';
};
jack = mkOption {
type = lib.types.attrsOf json.type;
default = {};
example = {
"20-hide-midi" = {
"jack.properties" = {
"jack.show-midi" = false;
};
};
};
description = lib.mdDoc ''
Additional configuration for the PipeWire JACK server and client library.
Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/jack.conf.d`.
See the [PipeWire wiki][wiki] for examples.
[wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-JACK
'';
};
pipewire-pulse = mkOption {
type = lib.types.attrsOf json.type;
default = {};
example = {
"15-force-s16-info" = {
"pulse.rules" = [{
matches = [
{ "application.process.binary" = "my-broken-app"; }
];
actions = {
quirks = [ "force-s16-info" ];
};
}];
};
};
description = lib.mdDoc ''
Additional configuration for the PipeWire PulseAudio server.
Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/pipewire-pulse.conf.d`.
See `man pipewire-pulse.conf` for details, and [the PipeWire wiki][wiki] for examples.
See also:
- [PipeWire wiki - PulseAudio tricks guide][wiki-tricks] for more examples.
[wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-PulseAudio
[wiki-tricks]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Guide-PulseAudio-Tricks
'';
};
};
};
};
imports = [
(lib.mkRemovedOptionModule ["services" "pipewire" "config"] ''
Overriding default Pipewire configuration through NixOS options never worked correctly and is no longer supported.
Please create drop-in files in /etc/pipewire/pipewire.conf.d/ to make the desired setting changes instead.
Overriding default PipeWire configuration through NixOS options never worked correctly and is no longer supported.
Please create drop-in configuration files via `services.pipewire.extraConfig` instead.
'')
(lib.mkRemovedOptionModule ["services" "pipewire" "media-session"] ''
pipewire-media-session is no longer supported upstream and has been removed.
Please switch to `services.pipewire.wireplumber` instead.
@ -133,26 +260,35 @@ in {
services.udev.packages = [ cfg.package ];
# If any paths are updated here they must also be updated in the package test.
environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable {
text = ''
pcm_type.pipewire {
libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;
${optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"}
}
ctl_type.pipewire {
libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;
${optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"}
}
'';
};
environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable {
source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf";
};
environment.etc."alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable {
source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
};
environment.etc = {
"alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable {
text = ''
pcm_type.pipewire {
libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;
${optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"}
}
ctl_type.pipewire {
libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;
${optionalString enable32BitAlsaPlugins
"libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"}
}
'';
};
"alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable {
source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf";
};
"alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable {
source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
};
}
// mapToFiles "pipewire" cfg.extraConfig.pipewire
// mapToFiles "client" cfg.extraConfig.client
// mapToFiles "client-rt" cfg.extraConfig.client-rt
// mapToFiles "jack" cfg.extraConfig.jack
// mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse;
environment.sessionVariables.LD_LIBRARY_PATH =
lib.mkIf cfg.jack.enable [ "${cfg.package.jack}/lib" ];

6
nixos/modules/services/hardware/keyd.nix
View file

@ -143,7 +143,7 @@ in
RuntimeDirectory = "keyd";
# Hardening
CapabilityBoundingSet = "";
CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
DeviceAllow = [
"char-input rw"
"/dev/uinput rw"
@ -152,7 +152,7 @@ in
PrivateNetwork = true;
ProtectHome = true;
ProtectHostname = true;
PrivateUsers = true;
PrivateUsers = false;
PrivateMounts = true;
PrivateTmp = true;
RestrictNamespaces = true;
@ -165,9 +165,9 @@ in
LockPersonality = true;
ProtectProc = "invisible";
SystemCallFilter = [
"nice"
"@system-service"
"~@privileged"
"~@resources"
];
RestrictAddressFamilies = [ "AF_UNIX" ];
RestrictSUIDSGID = true;

71
nixos/modules/services/misc/tuxclocker.nix Normal file
View file

@ -0,0 +1,71 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.programs.tuxclocker;
in
{
options.programs.tuxclocker = {
enable = mkEnableOption (lib.mdDoc ''
TuxClocker, a hardware control and monitoring program
'');
enableAMD = mkEnableOption (lib.mdDoc ''
AMD GPU controls.
Sets the `amdgpu.ppfeaturemask` kernel parameter to 0xfffd7fff to enable all TuxClocker controls
'');
enabledNVIDIADevices = mkOption {
type = types.listOf types.int;
default = [ ];
example = [ 0 1 ];
description = lib.mdDoc ''
Enable NVIDIA GPU controls for a device by index.
Sets the `Coolbits` Xorg option to enable all TuxClocker controls.
'';
};
useUnfree = mkOption {
type = types.bool;
default = false;
example = true;
description = lib.mdDoc ''
Whether to use components requiring unfree dependencies.
Disabling this allows you to get everything from the binary cache.
'';
};
};
config = let
package = if cfg.useUnfree then pkgs.tuxclocker else pkgs.tuxclocker-without-unfree;
in
mkIf cfg.enable {
environment.systemPackages = [
package
];
services.dbus.packages = [
package
];
# MSR is used for some features
boot.kernelModules = [ "msr" ];
# https://download.nvidia.com/XFree86/Linux-x86_64/430.14/README/xconfigoptions.html#Coolbits
services.xserver.config = let
configSection = (i: ''
Section "Device"
Driver "nvidia"
Option "Coolbits" "31"
Identifier "Device-nvidia[${toString i}]"
EndSection
'');
in
concatStrings (map configSection cfg.enabledNVIDIADevices);
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/include/amd_shared.h#n207
# Enable everything modifiable in TuxClocker
boot.kernelParams = mkIf cfg.enableAMD [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
};
}

2
nixos/tests/nixos-rebuild-specialisations.nix
View file

@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
virtualisation = {
cores = 2;
memorySize = 2048;
memorySize = 4096;
};
};
};

39
pkgs/applications/audio/jack-passthrough/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, libjack2
, meson
, ninja
, fmt_9
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jack-passthrough";
version = "2021-9-25";
# https://github.com/guysherman/jack-passthrough
src = fetchFromGitHub {
owner = "guysherman";
repo = finalAttrs.pname;
rev = "aad03b7c5ccc4a4dcb8fa38c49aa64cb9d628660";
hash = "sha256-9IsNaLW5dYAqiwe+vX0+D3oIKFP2TIfy1q1YaqmS6wE=";
};
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ fmt_9 libjack2 ];
meta = with lib; {
description = "A simple app to help with JACK apps that behave strangely.";
longDescription = ''
Creates a JACK passthrough client with an arbitrary name and number of
ports. Common uses include tricking stubborn applications into creating
more ports than they normally would or to prevent them from
auto-connecting to certain things.
'';
# license unknown: https://github.com/guysherman/jack-passthrough/issues/2
license = licenses.unfree;
maintainers = [ maintainers.PowerUser64 ];
platforms = [ "x86_64-linux" ];
};
})

4
pkgs/applications/audio/monkeys-audio/default.nix
View file

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.28";
version = "10.30";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
sha256 = "sha256-9EFZvD3CicT68hBcc/fS73zonQKDwbV/iNY0CbBmhtE=";
sha256 = "sha256-vTpfHw58WRRjS/h7FVYjYwHSqoXAF08i8Q/i9xI+9Io=";
stripRoot = false;
};
nativeBuildInputs = [

13
pkgs/applications/audio/muse/default.nix
View file

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
, extra-cmake-modules
, pkg-config
, qttools
, wrapQtAppsHook
@ -27,18 +28,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "muse-sequencer";
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "muse-sequencer";
repo = "muse";
rev = finalAttrs.version;
hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY=";
hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
};
sourceRoot = "${finalAttrs.src.name}/src";
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
qttools
wrapQtAppsHook
];
buildInputs = [
alsa-lib

4
pkgs/applications/audio/mympd/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "13.0.0";
version = "13.0.5";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U=";
sha256 = "sha256-9TOQoef5aVHFeDc0y3k6SCHBeKON5ueU7275HAmPw9M=";
};
nativeBuildInputs = [

6
pkgs/applications/audio/ncspot/default.nix
View file

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.13.4";
version = "1.0.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg=";
hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao=";
};
cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw=";
cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU=";
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;

4
pkgs/applications/audio/noson/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "noson";
version = "5.6.0";
version = "5.6.3";
src = fetchFromGitHub {
owner = "janbar";
repo = "noson-app";
rev = finalAttrs.version;
hash = "sha256-ZOAnH7pdhlTbqHOM0kiCWcHYJvnskigWdz3N9WjtM0M=";
hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54=";
};
nativeBuildInputs = [

4
pkgs/applications/blockchains/clightning/default.nix
View file

@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
version = "23.11";
version = "23.11.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "sha256:1q1plg9qhwlrcvljnrv8yd1gaz9a98pxgql7bqxjq37vk3lfggw6";
sha256 = "sha256-PH5vNaQWUP9liKOiNXJnYPWn6LPBw6+XfT4KvcXb4Kk=";
};
# when building on darwin we need dawin.cctools to provide the correct libtool

6
pkgs/applications/blockchains/optimism/geth.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "op-geth";
version = "1.101304.0";
version = "1.101304.2";
src = fetchFromGitHub {
owner = "ethereum-optimism";
repo = "op-geth";
rev = "v${version}";
hash = "sha256-MpLkAAYQmceabVChixF1yqvGSoRm+A9p9mOeKHhqxQE=";
hash = "sha256-cGCgcwP/9xSpVo2UJAArptF5KEflo7SSdfg5WYUMuxY=";
fetchSubmodules = true;
};
@ -33,7 +33,7 @@ buildGoModule rec {
"cmd/utils"
];
vendorHash = "sha256-JIuS2qWFf9g5MIJP6jVTSAkPG15XCDeMHcoYeJQz7Og=";
vendorHash = "sha256-F0OANE4S7WJDYKpJ6mCnR38CPyOov0Hxc0gK1MGHcIg=";
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs =

1
pkgs/applications/editors/neovim/default.nix
View file

@ -43,7 +43,6 @@ let
luabitop
mpack
] ++ lib.optionals doCheck [
nvim-client
luv
coxpcall
busted

4
pkgs/applications/editors/okteta/default.nix
View file

@ -4,11 +4,11 @@
mkDerivation rec {
pname = "okteta";
version = "0.26.13";
version = "0.26.14";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0wlpv0rk4ys4rbcpf8lqpkm0yr5dxkaz60qk2lvm27w1s489ir8l";
sha256 = "sha256-2bvspG3lecKlcN/+YPRmFKQCu/jhckafeSo272iE+9k=";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

4
pkgs/applications/editors/orbiton/default.nix
View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.65.6";
version = "2.65.8";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-HJ1smXLycxcII6FjvXCvxipm7G+2SVweOMPwJ3aJxMg=";
hash = "sha256-1g2D79yUHeFz9jpmz1N5qDmpe1DA8xV82t78ZUVOhBE=";
};
vendorHash = null;

4
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -3557,8 +3557,8 @@ let
mktplcRef = {
name = "uiua-vscode";
publisher = "uiua-lang";
version = "0.0.26";
sha256 = "sha256-EKWThidMgbd+a4Vw4SQo988ggVbCTnCakohvq3/mZQ0=";
version = "0.0.27";
sha256 = "sha256-wEY1FZjgiQJ7VrJGZX0SgZqz/14v//jxgrqdafLjIfM=";
};
meta = {
description = "VSCode language extension for Uiua";

1
pkgs/applications/file-managers/yazi/default.nix
View file

@ -74,5 +74,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/sxyazi/yazi";
license = licenses.mit;
maintainers = with maintainers; [ xyenon matthiasbeyer ];
mainProgram = "yazi";
};
}

42
pkgs/applications/graphics/photoqt/default.nix
View file

@ -7,40 +7,31 @@
, wrapQtAppsHook
, exiv2
, graphicsmagick
, kimageformats
, libarchive
, libraw
, mpv
, poppler
, pugixml
, qtbase
, qtcharts
, qtdeclarative
, qtgraphicaleffects
, qtimageformats
, qtlocation
, qtmultimedia
, qtquickcontrols
, qtquickcontrols2
, qtpositioning
, qtsvg
, qtwayland
}:
stdenv.mkDerivation rec {
pname = "photoqt";
version = "3.4";
version = "4.0.1";
src = fetchurl {
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas=";
hash = "sha256-nmEipzatselwtBR//ayajqgmhaUnAMKW7JBLKdzutHg=";
};
postPatch = ''
# exiv2 0.28.1
substituteInPlace CMakeLists.txt \
--replace "exiv2lib" "exiv2"
''
# error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'?
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace cplusplus/main.cpp \
--replace "std::setlocale" "setlocale"
'';
nativeBuildInputs = [
cmake
extra-cmake-modules
@ -51,18 +42,21 @@ stdenv.mkDerivation rec {
buildInputs = [
exiv2
graphicsmagick
kimageformats
libarchive
libraw
mpv
poppler
pugixml
qtbase
qtcharts
qtdeclarative
qtgraphicaleffects
qtimageformats
qtlocation
qtmultimedia
qtquickcontrols
qtquickcontrols2
qtpositioning
qtsvg
] ++ lib.optionals stdenv.isLinux [
qtwayland
];
cmakeFlags = [
@ -76,6 +70,12 @@ stdenv.mkDerivation rec {
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
'';
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv $out/bin/photoqt.app $out/Applications
makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt
'';
meta = {
description = "Simple, yet powerful and good looking image viewer";
homepage = "https://photoqt.org/";

23
pkgs/applications/misc/clipcat/default.nix
View file

@ -2,42 +2,33 @@
, fetchFromGitHub
, rustPlatform
, protobuf
, xvfb-run
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "clipcat";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "xrelkd";
repo = pname;
rev = "v${version}";
hash = "sha256-Q9uGufIfqRLk3YJjaEEyu29JP8vSwUCe4ch9tf6Vz9g=";
hash = "sha256-NuljH6cqgdtTJDkNv4w44s1UM4/R1gmpVyWpCzCJ3DU=";
};
cargoHash = "sha256-9TPj4W+BSpHlOWkbiV7jNgjiYJjjw9j2c3o8vesrJeI=";
cargoHash = "sha256-5+qa9/QGZyZBaO2kbvpP7Ybs1EXIO1MlPFm0PDTNqCQ=";
nativeBuildInputs = [
protobuf
installShellFiles
];
nativeCheckInputs = [
xvfb-run
checkFlags = [
# Some test cases interact with X11, skip them
"--skip=test_x11_clipboard"
"--skip=test_x11_primary"
];
useNextest = true;
# cargo-nextest help us retry the failed test cases
NEXTEST_RETRIES = 5;
# Some test cases interact with X11, we use xvfb-run here
checkPhase = ''
xvfb-run --auto-servernum cargo nextest run --release --workspace --no-fail-fast --no-capture
'';
postInstall = ''
for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do
installShellCompletion --cmd $cmd \

4
pkgs/applications/misc/gallery-dl/default.nix
View file

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "gallery-dl";
version = "1.26.3";
version = "1.26.4";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "gallery_dl";
sha256 = "sha256-M8EP0YbyJhOUPrghYA2jDQ/CpyD98d27l94uEj4YEpM=";
sha256 = "sha256-qoNWH7fomOQEdOz0+sEXtfhXItPofSMbDvQCmHcOPXo=";
};
propagatedBuildInputs = [

4
pkgs/applications/misc/kaufkauflist/default.nix
View file

@ -21,14 +21,14 @@ let
};
in buildNpmPackage rec {
pname = "kaufkauflist";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "kaufkauflist";
rev = "v${version}";
hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk=";
hash = "sha256-gIwJtfausORMfmZONhSOZ1DRW5CSH+cLDCNy3j+u6d0=";
};
npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM=";

4
pkgs/applications/misc/mainsail/default.nix
View file

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.8.0";
version = "2.9.0";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
hash = "sha256-YNI4WkWLnB1w8I0ETflDsWNkB6QGO5QrASajKpcmGcU=";
hash = "sha256-7GnPdnBoK0lErUgnG3dw644ASb0/1pwGqqvxfn/81T0=";
stripRoot = false;
};

6
pkgs/applications/misc/navi/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "navi";
version = "2.22.1";
version = "2.23.0";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
sha256 = "sha256-dlK7R9T1AezNr3+5Or8XYAMRlnnXejIs9jXAjwTuvd8=";
sha256 = "sha256-pqBTrHBvsuosyQqCnSiI3+pOe2J6XeIQ8dai+kTVFjc=";
};
cargoHash = "sha256-nastb6dsBGM8zIQ/WCfQy3Y50kH3J1dM/vnkOe/q95A=";
cargoHash = "sha256-dx13p+kEyqhyaF8ejJLWsgW3IpEvS9nlIHhjxOpp4d8=";
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/misc/nwg-bar/default.nix
View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "nwg-bar";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kqLQwqZ2RPSKNdw1yzKUfqSe8hQcJe/6/8UzTT/Gz/8=";
sha256 = "sha256-e64qCthZfGeFIe/g4Bu342d/C46qzJRBdxzzP6rM408=";
};
patches = [ ./fix-paths.patch ];
@ -24,7 +24,7 @@ buildGoModule rec {
substituteInPlace tools.go --subst-var out
'';
vendorHash = "sha256-vdDlPsjfHl7w1ufosLYquHAKOvkolNBr04bt+OQBlFE=";
vendorHash = "sha256-YMpq9pgA3KjQMcw7JDwEDbHZ5h3N7ziFVIGvQ+xA3Ds=";
nativeBuildInputs = [ pkg-config wrapGAppsHook ];

4
pkgs/applications/misc/otpclient/default.nix
View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "otpclient";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "paolostivanin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI=";
hash = "sha256-R4vxggZ9bUSPar/QLRc172RGgPXuf9jUwK19kBKpT2w=";
};
nativeBuildInputs = [

0
pkgs/applications/window-managers/sway/contrib.nix → pkgs/applications/misc/sway-contrib/default.nix
View file

28
pkgs/applications/misc/translatelocally/default.nix
View file

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub
, cmake, qt6, libarchive, pcre2, protobuf, gperftools, blas
, runCommand, translatelocally, translatelocally-models
}:
let
rev = "f8a2dba0a63989c6b3a7be36f736ed478cad1dd2";
rev = "a210037760ca3ca9016ca1831c97531318df70fe";
in stdenv.mkDerivation (finalAttrs: {
pname = "translatelocally";
version = "unstable-2023-08-25";
version = "unstable-2023-09-20";
src = fetchFromGitHub {
owner = "XapaJIaMnu";
repo = "translateLocally";
inherit rev;
hash = "sha256-uUdDi0CwCR/FQjw5D2s088d/Tp7NQOI0ia30oOhlGoc=";
hash = "sha256-T7cZdR09yDrPTwYxvDIaKTdV4mrB+gTHYVfch5BQ+PE=";
fetchSubmodules = true;
};
@ -26,6 +27,11 @@ in stdenv.mkDerivation (finalAttrs: {
3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h
'';
# https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330
postConfigure = lib.optionalString stdenv.isAarch64 ''
bash ../cmake/fix_ruy_build.sh .. .
'';
nativeBuildInputs = [
cmake
protobuf
@ -48,6 +54,19 @@ in stdenv.mkDerivation (finalAttrs: {
"-DCBLAS_LIBRARIES=-lcblas"
];
passthru.tests = {
cli-translate = runCommand "${finalAttrs.pname}-test-cli-translate" {
nativeBuildInputs = [
translatelocally
translatelocally-models.fr-en-tiny
];
} ''
export LC_ALL="C.UTF-8"
echo "Bonjour" | translateLocally -m fr-en-tiny > $out
diff "$out" <(echo "Hello")
'';
};
meta = with lib; {
mainProgram = "translateLocally";
homepage = "https://translatelocally.com/";
@ -55,8 +74,5 @@ in stdenv.mkDerivation (finalAttrs: {
license = licenses.mit;
maintainers = with maintainers; [ pacien ];
platforms = platforms.linux;
# https://github.com/XapaJIaMnu/translateLocally/issues/150
broken = stdenv.isAarch64;
};
})

66
pkgs/applications/misc/tuxclocker/default.nix Normal file
View file

@ -0,0 +1,66 @@
{ lib
, stdenv
, boost
, fetchFromGitHub
, git
, makeWrapper
, meson
, ninja
, pkg-config
, python3
, qtbase
, qtcharts
, tuxclocker-plugins
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tuxclocker";
version = "1.4.0";
src = fetchFromGitHub {
owner = "Lurkki14";
repo = "tuxclocker";
fetchSubmodules = true;
rev = "${finalAttrs.version}";
hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA=";
};
# Meson doesn't find boost without these
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
nativeBuildInputs = [
git
makeWrapper
meson
ninja
pkg-config
wrapQtAppsHook
];
buildInputs = [
boost
qtbase
qtcharts
];
postInstall = ''
wrapProgram "$out/bin/tuxclockerd" \
--prefix "TEXTDOMAINDIR" : "${tuxclocker-plugins}/share/locale" \
--prefix "TUXCLOCKER_PLUGIN_PATH" : "${tuxclocker-plugins}/lib/tuxclocker/plugins" \
--prefix "PYTHONPATH" : "${python3.pkgs.hwdata}/${python3.sitePackages}"
'';
mesonFlags = [
"-Dplugins=false"
];
meta = with lib; {
description = "Qt overclocking tool for GNU/Linux";
homepage = "https://github.com/Lurkki14/tuxclocker";
license = licenses.gpl3Only;
maintainers = with maintainers; [ lurkki ];
platforms = platforms.linux;
};
})

6
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.28.2";
version = "0.29.1";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-3ij77aBNufSEP3wf8wtQ/aBehE45fwrgofCmyXxuyPM=";
sha256 = "sha256-agGayZ20RMAcGOx+owwDbUUDsjF3FZajhwDZ5wtE93k=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
tags = [ "netgo" ];
vendorHash = "sha256-kgi5ZfbjkSiJ/uZkfpeMhonSt/4sO3RKARpoww1FsTo=";
vendorHash = "sha256-Wn/9vIyw99BudhhTnoN81Np70VInV6uo7Sru64nhPgk=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

6
pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk=";
hash = "sha256-xDjDBbnYR0PnSrF/vr+HXVGMoba9NmE/uMX/DRm+CVE=";
};
vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0=";
vendorHash = "sha256-NqQGqvvwLi6niey9Mi9hJSRYrRXE4Dj4VWiMu5wUXXw=";
subPackages = [ "cmd/kubectl-cnpg" ];

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-jjYSvY7NT9G/tcsM+9qHnsL81QKItyVMZZWuD2mpln0=";
hash = "sha256-6YMDGvNl1uNMWR1xTPRjYGwaKXC5c4oUy88VRY2Bedw=";
};
vendorHash = "sha256-O48QzyQLkt7T9j+CKQG8TcHlmtS+ykoMoCamsEswPjk=";
vendorHash = "sha256-tXLuOZUoMhVfhhYxnxNw+nYofhEFMKI1b94lVPySd3E=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/applications/networking/cluster/opentofu/default.nix
View file

@ -14,13 +14,13 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.6.0-beta4";
version = "1.6.0-beta5";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
rev = "v${version}";
hash = "sha256-AFy7xg1UwVWlFZjelYhxfkhj4Tk93uVvF1i3PHa2jEM=";
hash = "sha256-RHAhftoqGs9ZoO+NGvZ0AAvT5UWRKzV7cHX1/qVCAMU=";
};
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";

6
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -167,9 +167,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.6.5";
hash = "sha256-TJKs7pWoLFIeov/ERgPqZxPtbjSAHrHI2wrSEXUAS1A=";
vendorHash = "sha256-QHfCGlgOv4v3MzUs4JxIHytcyymUYmnk4Z0smgak1Mg=";
version = "1.6.6";
hash = "sha256-fYFmHypzSbSgut9Wij6Sz8xR97DVOwPLQap6pan7IRA=";
vendorHash = "sha256-fQsxTX1v8HsMDIkofeCVfNitJAaTWHwppC7DniXlvT4=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

4
pkgs/applications/networking/instant-messengers/neosay/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "neosay";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "donuts-are-good";
repo = "neosay";
rev = "v${version}";
hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec=";
hash = "sha256-2tFjvAobDpBh1h0ejdtqxDsC+AqyneN+xNssOJNfEbk=";
};
vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ=";

4
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
View file

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "6.40.0";
version = "6.42.0";
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
hash = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU=";
hash = "sha256-kr8FM+EAtL/7TrgJlI33oDd4CPGMJ+F2PpQCR4OL6j4=";
}

4
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
View file

@ -2,7 +2,7 @@
callPackage ./generic.nix {} rec {
pname = "signal-desktop-beta";
dir = "Signal Beta";
version = "6.40.0-beta.2";
version = "6.43.0-beta.1";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg=";
hash = "sha256-7UlfpOWAalJjZjAJLa2CL3HdR2LFlE1/5sdec5Sj/tg=";
}

1
pkgs/applications/networking/msmtp/default.nix
View file

@ -40,6 +40,7 @@ let
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
mainProgram = "msmtp";
};
binaries = stdenv.mkDerivation {

6
pkgs/applications/networking/mullvad-vpn/default.nix
View file

@ -64,7 +64,7 @@ let
systemd
];
version = "2023.5";
version = "2023.6";
selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -74,8 +74,8 @@ let
};
hash = selectSystem {
x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4=";
aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo=";
x86_64-linux = "sha256-IhE93NXX8iwlvso+ei9wbVyJJLtkjrZf8qB43AZre+4=";
aarch64-linux = "sha256-HRAGDps0Cf7qOWTS7die9uouxMpAaM83t1Ixz7ElF6g=";
};
in

2
pkgs/applications/networking/p2p/tribler/default.nix
View file

@ -95,6 +95,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/applications $out/share/icons
cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
mkdir -p $out/share/copyright/tribler
mv $out/LICENSE $out/share/copyright/tribler
'';
shellHook = ''

5
pkgs/applications/office/espanso/default.nix
View file

@ -117,6 +117,11 @@ rustPlatform.buildRustPackage rec {
--replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"'
'';
env = lib.optionalAttrs stdenv.cc.isClang {
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
# Some tests require networking
doCheck = false;

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

@ -8,11 +8,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "quisk";
version = "4.2.24";
version = "4.2.27";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-myxWcx1/a9sMv+sfa0Gwjx72t0rGoxn5USEfFgfKEro=";
sha256 = "sha256-7pI9K7VOksQREbDFa02w48tcvanehBQ+5d/XYUD/gSo=";
};
buildInputs = [

4
pkgs/applications/science/chemistry/jmol/default.nix
View file

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "16.1.45";
version = "16.1.47";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-rLq0QrY1M0OptmRZ/dKUVssREnH1im9Ti89AbpsiFtg=";
hash = "sha256-3hsH+RkPPoViKp1bc/88GDVSG8jf9hiPKPkUfe9PIkk=";
};
patchPhase = ''

4
pkgs/applications/science/electronics/nvc/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "nickg";
repo = "nvc";
rev = "r${version}";
hash = "sha256-95vIyBQ38SGpI+gnDqK1MRRzOT6uiYjDr1c//folqZ8=";
hash = "sha256-aBH3TtPFuJXtVvGTJcGJev5DYVwqjUAM9cf5PatJq9Y=";
};
nativeBuildInputs = [

13
pkgs/applications/science/electronics/xyce/default.nix
View file

@ -32,21 +32,21 @@
assert withMPI -> trilinos.withMPI;
let
version = "7.6.0";
version = "7.7.0";
# useing fetchurl or fetchFromGitHub doesn't include the manuals
# due to .gitattributes files
xyce_src = fetchgit {
url = "https://github.com/Xyce/Xyce.git";
rev = "Release-${version}";
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
sha256 = "sha256-F0kO86eliD1AfUUjeVllxJ231ZElXkfBfGJ3jhT0s9w=";
};
regression_src = fetchFromGitHub {
owner = "Xyce";
repo = "Xyce_Regression";
rev = "Release-${version}";
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
sha256 = "sha256-iDxm0Vcn3JuuREciCt3/b7q94E8GhXoIUD/BCx0mW6Q=";
};
in
@ -154,8 +154,11 @@ stdenv.mkDerivation rec {
"doc/Reference_Guide/Xyce_RG"
"doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}")
# Release notes refer to an image not in the repo.
sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex
# SANDIA LaTeX class and some organization logos are not publicly available see
# https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ
for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do
sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
done
install -d $doc/share/doc/${pname}-${version}/
for d in ''${docFiles[@]}; do

4
pkgs/applications/science/logic/alt-ergo/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, fetchpatch, lib, ocamlPackages }:
{ darwin, fetchurl, lib, ocamlPackages, stdenv }:
let
pname = "alt-ergo";
@ -28,7 +28,7 @@ ocamlPackages.buildDunePackage {
inherit pname version src;
nativeBuildInputs = [ ocamlPackages.menhir ];
nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ];
buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]);
meta = {

18
pkgs/applications/science/misc/root/default.nix
View file

@ -58,7 +58,7 @@
stdenv.mkDerivation rec {
pname = "root";
version = "6.28.10";
version = "6.30.02";
passthru = {
tests = import ./tests { inherit callPackage; };
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
hash = "sha256-adb962B+ayC9AsdX+mIXAkwLYTLB6bHf9Nhdmiu35R4=";
hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM=";
};
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
@ -110,6 +110,13 @@ stdenv.mkDerivation rec {
patches = [
./sw_vers.patch
# Fix for builtin_llvm=OFF
# https://github.com/root-project/root/pull/14238
(fetchpatch {
url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff";
hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw=";
})
];
preConfigure = ''
@ -121,7 +128,7 @@ stdenv.mkDerivation rec {
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace 'set(lcgpackages ' '#set(lcgpackages '
substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \
substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
--replace 'add_clang_symlink(''${link} clang)' ""
# Don't require textutil on macOS
@ -136,8 +143,8 @@ stdenv.mkDerivation rec {
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
'' + lib.optionalString stdenv.isDarwin ''
# Eliminate impure reference to /System/Library/PrivateFrameworks
substituteInPlace core/CMakeLists.txt \
--replace "-F/System/Library/PrivateFrameworks" ""
substituteInPlace core/macosx/CMakeLists.txt \
--replace "-F/System/Library/PrivateFrameworks " ""
'' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
@ -184,6 +191,7 @@ stdenv.mkDerivation rec {
"-Dsqlite=OFF"
"-Dssl=ON"
"-Dtmva=ON"
"-Dtmva-pymva=OFF"
"-Dvdt=OFF"
"-Dwebgui=ON"
"-Dxml=ON"

13
pkgs/applications/science/misc/root/sw_vers.patch
View file

@ -1,8 +1,8 @@
diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake
@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4)
endif()
@@ -8,17 +8,10 @@
set(ROOT_PLATFORM macosx)
if (CMAKE_SYSTEM_NAME MATCHES Darwin)
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
@ -19,7 +19,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
#TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command
#TODO: more stuff check configure script
@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@@ -37,22 +30,7 @@
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
@ -42,7 +42,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
if (CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common")
@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@@ -96,7 +74,6 @@
endif()
#---Set Linker flags----------------------------------------------------------------------
@ -53,7 +53,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
diff a/config/root-config.in b/config/root-config.in
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -312,12 +312,6 @@ macosxicc)
@@ -307,12 +307,6 @@
;;
macosx64|macosxarm64)
# MacOS X with gcc (GNU cc v4.x) in 64 bit mode
@ -66,7 +66,7 @@ diff a/config/root-config.in b/config/root-config.in
auxcflags="${cxxversionflag} -m64"
auxldflags="-m64"
auxlibs="-lm -ldl"
@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*)
@@ -387,17 +381,11 @@
done
;;
macosx*)
@ -74,7 +74,6 @@ diff a/config/root-config.in b/config/root-config.in
auxcflags="-pthread $auxcflags"
auxlibs="-lpthread $auxlibs"
- else
- auxcflags="-D_REENTRANT $auxcflags"
- auxlibs="-lpthread $auxlibs"
- fi
for f in $features ; do

5
pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
View file

@ -20,6 +20,9 @@ stdenv.mkDerivation {
cp -v ../build/MakePAR Makefile
'';
# https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README
env.NIX_CFLAGS_COMPILE = "-fallow-argument-mismatch";
buildPhase = ''
make dlpoly
'';
@ -33,7 +36,7 @@ stdenv.mkDerivation {
homepage = "https://www.ccp5.ac.uk/DL_POLY_C";
description = "DL_POLY Classic is a general purpose molecular dynamics simulation package";
license = licenses.bsdOriginal;
platforms = [ "x86_64-linux" ];
platforms = platforms.unix;
maintainers = [ maintainers.costrouc ];
};
}

14
pkgs/applications/science/robotics/mujoco/default.nix
View file

@ -22,8 +22,8 @@ let
benchmark = fetchFromGitHub {
owner = "google";
repo = "benchmark";
rev = "344117638c8ff7e239044fd0fa7085839fc03021";
hash = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";
rev = "e45585a4b8e75c28479fa4107182c28172799640";
hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY=";
};
ccd = fetchFromGitHub {
owner = "danfis";
@ -34,8 +34,8 @@ let
eigen3 = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = "e8515f78ac098329ab9f8cab21c87caede090a3f";
hash = "sha256-HXKtFJsKGpug+wNPjYynTuyaG0igo3oG4rFQktveh1g=";
rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3";
hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=";
};
googletest = fetchFromGitHub {
owner = "google";
@ -129,13 +129,15 @@ let
in stdenv.mkDerivation rec {
pname = "mujoco";
version = "3.0.1";
version = "3.1.0";
# Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins!
src = fetchFromGitHub {
owner = "google-deepmind";
repo = pname;
rev = version;
hash = "sha256-UXE+7KDti8RarpoJoo9Ei3TgW/Qdnj3ASRo8uTWhGrU=";
hash = "sha256-a8h30psoAlj9dI4j8IfY3WzWjY4MrRosGbvgt79s1BQ=";
};
patches = [ ./mujoco-system-deps-dont-fetch.patch ];

10
pkgs/applications/version-management/gitkraken/default.nix
View file

@ -10,24 +10,24 @@ with lib;
let
pname = "gitkraken";
version = "9.9.2";
version = "9.10.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-UfzHkgqxEaSsoiDwFLsyIBW2min9AvSBrLPJ2MlKh3U=";
hash = "sha256-JVeJY0VUNyIeR/IQcfoLBN0I1WQNFy7PpCjzk5bPv/Q=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-ble0n+giM8xmuSewBVdj+RuT2093rW0taNzsyQLO92I=";
hash = "sha256-npc+dwHH0tlVKkAZxmGwpoiHXeDn0VHkivqbwoJsI7M=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-QYhYzjqbCO0/pRDK7c5jYifj+/UY7SLpRqQUQ3LBFkE=";
hash = "sha256-fszsGdNKcVgKdv97gBBf+fSODzjKbOBB4MyCvWzm3CA=";
};
};
@ -39,7 +39,7 @@ let
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = builtins.attrNames srcs;
maintainers = with maintainers; [ xnwdd evanjs arkivm ];
maintainers = with maintainers; [ xnwdd evanjs arkivm nicolas-goudry ];
mainProgram = "gitkraken";
};

16
pkgs/applications/video/dvdauthor/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, imagemagick
, autoreconfHook
, libdvdread
, libxml2
, freetype
@ -15,20 +15,18 @@
stdenv.mkDerivation rec {
pname = "dvdauthor";
version = "0.7.1";
version = "0.7.2";
src = fetchurl {
url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc=";
};
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ];
patches = [
./dvdauthor-0.7.1-automake-1.13.patch
./dvdauthor-0.7.1-mga-strndup.patch
./dvdauthor-imagemagick-0.7.0.patch
nativeBuildInputs = [
pkg-config
autoreconfHook
];
meta = with lib; {

10
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch
View file

@ -1,10 +0,0 @@
--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800
+++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800
@@ -1,6 +1,6 @@
AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_AUX_DIR(autotools)
AM_INIT_AUTOMAKE

24
pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch
View file

@ -1,24 +0,0 @@
Index: dvdauthor/src/dvdvml.l
===================================================================
--- dvdauthor/src/dvdvml.l
+++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000
@@ -19,6 +19,7 @@
* USA
*/
+#include "config.h"
#include "compat.h" /* needed for bool */
#include "dvdvm.h"
#include "dvdvmy.h"
Index: dvdauthor/src/dvdvmy.y
===================================================================
--- dvdauthor/src/dvdvmy.y
+++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000
@@ -19,6 +19,7 @@
* USA
*/
+#include "config.h"
#include "compat.h" /* needed for bool */
#include "dvdvm.h"

11
pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch
View file

@ -1,11 +0,0 @@
--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200
+++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200
@@ -31,7 +31,7 @@
usemagick=0
-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
if test -n "$MAGICKCONFIG"; then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"

4
pkgs/applications/video/filebot/default.nix
View file

@ -10,11 +10,11 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "filebot";
version = "5.1.1";
version = "5.1.2";
src = fetchurl {
url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
hash = "sha256-BCsZBRtT2Ka7WZw7WFnagwoJwIO1L3qpFk/6nlGdpmQ=";
hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk=";
};
unpackPhase = "tar xvf $src";

1
pkgs/applications/video/mpv/scripts/buildLua.nix
View file

@ -2,7 +2,6 @@
, stdenvNoCC }:
let
inherit (lib) hasPrefix hasSuffix removeSuffix;
escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'");
fileName = pathStr: lib.last (lib.splitString "/" pathStr);
scriptsDir = "$out/share/mpv/scripts";

4
pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "obs-vertical-canvas";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "Aitum";
repo = "obs-vertical-canvas";
rev = version;
sha256 = "sha256-gDM2S/ygN58iodfO5d34LYUclkzf+nAIBWp+wFeWWik=";
sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4=";
sha256 = "sha256-EaJYuapTWzVD80UyhzjP1q1SCCNmUozf+hUl4wBgC14=";
};
cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ=";
cargoHash = "sha256-Vh5mdxxROVthDUzK+PRhl9AY5jcmvhEXP5UqOeqOm6o=";
# skip test due FHS dependency
doCheck = false;

4
pkgs/applications/virtualization/podman/default.nix
View file

@ -62,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
version = "4.7.2";
version = "4.8.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0=";
hash = "sha256-EDIgipbv8Z7nVV6VQ5IAmvHvvpLyGEDHMDnwhMUm/BQ=";
};
patches = [

6
pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
index 649748947..a981d93bf 100644
index 4e43dd54c..a981d93bf 100644
--- a/pkg/machine/machine_common.go
+++ b/pkg/machine/machine_common.go
@@ -127,14 +127,6 @@ address can't be used by podman. `
@ -7,10 +7,10 @@ index 649748947..a981d93bf 100644
if len(helper) < 1 {
fmt.Print(fmtString)
- } else {
- fmtString += `If you would like to install it run the\nfollowing commands:
- fmtString += `If you would like to install it, run the following commands:
-
- sudo %s install
- podman machine stop%[1]s; podman machine start%[1]s
- podman machine stop%[2]s; podman machine start%[2]s
-
- `
- fmt.Printf(fmtString, helper, suffix)

12
pkgs/build-support/fetchgitlab/default.nix
View file

@ -1,9 +1,11 @@
{ fetchgit, fetchzip, lib }:
{ lib, fetchgit, fetchzip }:
lib.makeOverridable (
# gitlab example
{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false
, fetchSubmodules ? false, leaveDotGit ? false
, deepClone ? false, forceFetchGit ? false
, sparseCheckout ? []
, ... # For hash agility
} @ args:
@ -11,15 +13,15 @@ let
slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);
escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ];
passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "forceFetchGit" "leaveDotGit" "deepClone" ];
useFetchGit = deepClone || fetchSubmodules || leaveDotGit;
useFetchGit = fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != []);
fetcher = if useFetchGit then fetchgit else fetchzip;
gitRepoUrl = "${protocol}://${domain}/${slug}.git";
fetcherArgs = (if useFetchGit then {
inherit rev deepClone fetchSubmodules leaveDotGit;
inherit rev deepClone fetchSubmodules sparseCheckout leaveDotGit;
url = gitRepoUrl;
} else {
url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";

2
pkgs/build-support/fetchzip/default.nix
View file

@ -24,7 +24,7 @@
# the rest are given to fetchurl as is
, ... } @ args:
assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'." true;
assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true;
let
tmpFilename =

32
pkgs/by-name/an/anime4k/package.nix Normal file
View file

@ -0,0 +1,32 @@
{ fetchFromGitHub
, lib
, stdenvNoCC
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "anime4k";
version = "4.0.1";
src = fetchFromGitHub {
owner = "bloc97";
repo = "Anime4k";
rev = "v${finalAttrs.version}";
hash = "sha256-OQWJWcDpwmnJJ/kc4uEReaO74dYFlxNQwf33E5Oagb0=";
};
installPhase = ''
runHook preInstall
install -Dm644 glsl/*/*.glsl -t $out
runHook postInstall
'';
meta = with lib; {
description = "A high-quality real time upscaler for anime";
homepage = "https://github.com/bloc97/Anime4K";
license = licenses.mit;
maintainers = with maintainers; [ surfaceflinger ];
platforms = platforms.all;
};
})

37
pkgs/by-name/as/asn1editor/package.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "asn1editor";
version = "0.8.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Futsch1";
repo = "asn1editor";
rev = "v${version}";
hash = "sha256-mgluhC2DMS4OyS/BoWqBdVf7GcxquOtOKTHZ/hbiHQM=";
};
propagatedBuildInputs = with python3.pkgs; [
asn1tools
coverage
wxPython_4_2
];
pythonImportsCheck = [ "asn1editor" ];
# Tests fail in sandbox, e.g.
# "SystemExit: Unable to access the X Display, is $DISPLAY set properly?"
doCheck = false;
meta = with lib; {
description = "Python based editor for ASN.1 encoded data";
homepage = "https://github.com/Futsch1/asn1editor";
license = licenses.mit;
mainProgram = "asn1editor";
maintainers = with maintainers; [ bjornfor ];
};
}

6
pkgs/by-name/as/ast-grep/package.nix
View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.13.1";
version = "0.14.4";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-Wee+npgL0+7pv9ph3S93fIXr8z/FWp/TBthJhVSx3zI=";
hash = "sha256-TEuQ6Ng9DO2ueIvZkXKIE/gQ/v1wSyzQQRFT2Srxuxo=";
};
cargoHash = "sha256-OFNqBkPAKaSqDQUWisupj6FlDbm3kw0xq5nbvj04H5U=";
cargoHash = "sha256-zg2N8yw9qviHd4EVzGakFpBzkKyzVfM/8FRXu24zL64=";
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
env = lib.optionalAttrs stdenv.cc.isClang {

33
pkgs/by-name/en/endlines/package.nix Normal file
View file

@ -0,0 +1,33 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "endlines";
version = "1.9.2";
src = fetchFromGitHub {
owner = "mdolidon";
repo = "endlines";
rev = finalAttrs.version;
hash = "sha256-M0IyY/WXR8qv9/qx5G0pG3EKqMoZAP3fJTZ6sSSMMyQ=";
};
postPatch = ''
substituteInPlace Makefile --replace "/usr/local" "$out"
'';
preInstall = ''
mkdir -p $out/bin
'';
meta = {
homepage = "https://github.com/mdolidon/endlines";
description = "Easy conversion between new-line conventions";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ zedseven ];
mainProgram = "endlines";
platforms = lib.platforms.unix;
};
})

4
pkgs/by-name/gc/gcli/package.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gcli";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "herrhotzenplotz";
repo = "gcli";
rev = version;
hash = "sha256-ry+T39gFVPfHazAbv97UFpMIH1Dbbw6tZwsn9V4uRec=";
hash = "sha256-JZL0AcbrGYBceQ6ctspgnbzlVD4pg95deg9BWUFQCv8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ];

24
pkgs/by-name/i3/i3-open-next-ws/package.nix Normal file
View file

@ -0,0 +1,24 @@
{
lib,
rustPlatform,
fetchCrate,
}:
rustPlatform.buildRustPackage rec {
pname = "i3-open-next-ws";
version = "0.1.5";
src = fetchCrate {
inherit pname version;
hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY=";
};
cargoHash = "sha256-9U0bYCbkvcZJOCd4jZog4bSJkP1ntmAFjWm7lJDdcuo=";
meta = {
description = "A workspace management utility for i3 and sway, that picks the first unused workspace automagically";
homepage = "https://github.com/JohnDowson/i3-open-next-ws";
license = lib.licenses.mit;
mainProgram = "i3-open-next-ws";
maintainers = with lib.maintainers; [quantenzitrone];
platforms = lib.platforms.linux;
};
}

5
pkgs/by-name/me/memtree/package.nix
View file

@ -18,7 +18,6 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = with python3Packages; [
poetry-core
pytestCheckHook
];
propagatedBuildInputs = with python3Packages; [
@ -27,11 +26,11 @@ python3Packages.buildPythonApplication {
nativeCheckInputs = with python3Packages; [
hypothesis
pytest
pytestCheckHook
];
pytestFlagsArray = [ "-v" ];
pythonImportChecks = [ "memtree" ];
pythonImportsCheck = [ "memtree" ];
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];

4
pkgs/by-name/mo/mommy/package.nix
View file

@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mommy";
version = "1.2.4";
version = "1.2.6";
src = fetchFromGitHub {
owner = "FWDekker";
repo = pname;
rev = "v${version}";
hash = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4=";
hash = "sha256-5mf157hjDE/9YcLsThjadkknuEfPZS8Pp6mtNCWbvEw=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/by-name/ms/msolve/package.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "msolve";
version = "0.6.1";
version = "0.6.3";
src = fetchFromGitHub {
owner = "algebraic-solving";
repo = "msolve";
rev = "v${finalAttrs.version}";
hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE=";
hash = "sha256-hdrNqZjTGhGFrshswJGPVgBjOUfHh93aQUfBKLlk5Es=";
};
postPatch = ''

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

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "mystmd";
version = "1.1.31";
version = "1.1.36";
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mystmd";
rev = "mystmd@${version}";
hash = "sha256-1zjz1HJxa8ww02MnqravCWM51bpuSpnLxn34Kazbt5o=";
hash = "sha256-mmrNfE8d5yhWU7KsSBKuRpP59Ba6Q6pdkCN2AE+PEJE=";
};
npmDepsHash = "sha256-7H3VKJAzbsKLhyFD7MoASsOyJwbt6vERO6LM2mpz/y0=";
npmDepsHash = "sha256-5ns2mVD8YJvVMpMq9VeelAoGU0b9SLNIOdRAHXpnCDM=";
dontNpmInstall = true;

35
pkgs/by-name/na/nautilus-open-in-blackbox/package.nix Normal file
View file

@ -0,0 +1,35 @@
{ python3, fetchFromGitHub, gnome, stdenv, lib }:
stdenv.mkDerivation rec {
pname = "nautilus-open-in-blackbox";
version = "0.1.1";
src = fetchFromGitHub {
owner = "ppvan";
repo = "nautilus-open-in-blackbox";
rev = "refs/tags/${version}";
hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM=";
};
# The Orignal Source code tries to execute `/usr/bin/blackbox` which is not valid in NixOS
# This patch replaces the call with `blackbox`
patches = [ ./paths.patch ];
buildInputs = [
gnome.nautilus-python
python3.pkgs.pygobject3
];
installPhase = ''
runHook preInstall
install -Dm555 ./nautilus-open-in-blackbox.py -t $out/share/nautilus-python/extensions
runHook postInstall
'';
meta = with lib; {
description = "Extension for nautilus, which adds an context-entry for opening in blackbox";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ blankparticle ];
homepage = "https://github.com/ppvan/nautilus-open-in-blackbox";
platforms = platforms.linux;
};
}

23
pkgs/by-name/na/nautilus-open-in-blackbox/paths.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/nautilus-open-in-blackbox.py b/nautilus-open-in-blackbox.py
index 9a43f90..0a5b632 100755
--- a/nautilus-open-in-blackbox.py
+++ b/nautilus-open-in-blackbox.py
@@ -78,17 +78,10 @@ class BlackBoxNautilus(GObject.GObject, Nautilus.MenuProvider):
return item
- def is_native(self):
- return shutil.which("blackbox") == "/usr/bin/blackbox"
-
def _nautilus_run(self, menu, path):
"""'Open with BlackBox 's menu item callback."""
print("Openning:", path)
- args = None
- if self.is_native():
- args = args = ["blackbox", "-w", path]
- else:
- args = ["/usr/bin/flatpak", "run", TERMINAL_NAME, "-w", path]
+ args = ["blackbox", "-w", path]
subprocess.Popen(args, cwd=path)

4
pkgs/by-name/no/noto-fonts/package.nix
View file

@ -18,13 +18,13 @@
stdenvNoCC.mkDerivation rec {
pname = "noto-fonts${suffix}";
version = "23.11.1";
version = "23.12.1";
src = fetchFromGitHub {
owner = "notofonts";
repo = "notofonts.github.io";
rev = "noto-monthly-release-${version}";
hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8=";
hash = "sha256-Hmw6yGFbnxgKMdKjQCQzuVl+pFCVxbJrT3sGntXUPgk=";
};
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;

6
pkgs/by-name/or/orchard/package.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.14.3";
version = "0.15.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-hQP48druIwkVVKeC1TKq+DEGOJOmkendc3Ij9ft+uDQ=";
hash = "sha256-9hxfRiZ3V65wvh8n1SGeTzNdjdoEfRtyFOv4+f/u+O8=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -19,7 +19,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-opPxsCukXcLcrf/sD9AW1iIYOK5BmTLnc/QGUvzVLwg=";
vendorHash = "sha256-LBvd8qah+v0y3dHadSs69/y6pr8TyZ0nDJgHR+8qlEo=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/by-name/pa/passes/package.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "passes";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "pablo-s";
repo = "passes";
rev = "v${finalAttrs.version}";
hash = "sha256-SIJLBVWyW9+Hzb6ebfUnBfUuvNmYBm9ojKrnFOS3BGc=";
hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag=";
};
postPatch = ''

4
pkgs/by-name/pg/pgmoneta/package.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "pgmoneta";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "pgmoneta";
repo = "pgmoneta";
rev = version;
hash = "sha256-F3bQ3UytEunXf0w2Eo1vx3u0Q40usYhbCmCVuL9X9lI=";
hash = "sha256-4jysBL6fwX2ns+N+ldhTCXZ7L/IuXjbAwou18Ur5+JU=";
};
nativeBuildInputs = [

3093
pkgs/by-name/rq/rqbit/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

12
pkgs/by-name/rq/rqbit/package.nix
View file

@ -2,16 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "rqbit";
version = "4.0.1";
version = "5.4.0";
src = fetchFromGitHub {
owner = "ikatson";
repo = "rqbit";
rev = "v${version}";
hash = "sha256-qjjKS5UaBIGemw3lipTYNn+kmDlF7Yr+uwICw1cnxuE=";
hash = "sha256-sZb3DYk2gycANRZGtSQAo3G+fo7dxGF48PwC8kJOfio=";
};
cargoHash = "sha256-LhVzubfiOq/u46tKFYaxzty5WnLHTP4bnObuNOYRt5A=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"network-interface-1.1.1" = "sha256-9fWdR5nr73oFP9FzHhDsbA4ifQf3LkzBygspxI9/ufs=";
};
};
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
@ -23,6 +28,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A bittorrent client in Rust";
homepage = "https://github.com/ikatson/rqbit";
changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
mainProgram = "rqbit";

12
pkgs/tools/audio/soco-cli/default.nix → pkgs/by-name/so/soco-cli/package.nix
View file

@ -5,16 +5,16 @@
python3.pkgs.buildPythonApplication rec {
pname = "soco-cli";
version = "0.4.55";
version = "0.4.73";
format = "setuptools";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub rec {
src = fetchFromGitHub {
owner = "avantrec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E=";
hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -32,11 +32,11 @@ python3.pkgs.buildPythonApplication rec {
"soco_cli"
];
meta = with lib; {
meta = {
description = "Command-line interface to control Sonos sound systems";
homepage = "https://github.com/avantrec/soco-cli";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
license = with lib.licenses; [ asl20 ];
mainProgram = "sonos";
maintainers = with lib.maintainers; [ fab ];
};
}

2
pkgs/applications/window-managers/sway/assign-cgroups.nix → pkgs/by-name/sw/sway-assign-cgroups/package.nix
View file

@ -4,7 +4,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "assign-cgroups";
pname = "sway-assign-cgroups";
version = "0.4.0";
src = fetchFromGitHub {
owner = "alebastr";

0
pkgs/applications/window-managers/sway/fix-paths.patch → pkgs/by-name/sw/sway-unwrapped/fix-paths.patch
View file

0
pkgs/applications/window-managers/sway/load-configuration-from-etc.patch → pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch
View file

5
pkgs/applications/window-managers/sway/default.nix → pkgs/by-name/sw/sway-unwrapped/package.nix
View file

@ -2,7 +2,7 @@
, meson, ninja, pkg-config, wayland-scanner, scdoc
, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, gdk-pixbuf, librsvg
, wlroots, wayland-protocols, libdrm
, wlroots_0_16, wayland-protocols, libdrm
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
@ -11,6 +11,9 @@
, trayEnabled ? systemdSupport
}:
let
wlroots = wlroots_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "sway-unwrapped";
version = "1.8.1";

0
pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch → pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch
View file

0
pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch → pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch
View file

6
pkgs/applications/window-managers/sway/wrapper.nix → pkgs/by-name/sw/sway/package.nix
View file

@ -31,8 +31,10 @@ let
exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@"
fi
'';
in symlinkJoin {
name = "${sway.meta.mainProgram}-${sway.version}";
in symlinkJoin rec {
pname = lib.replaceStrings ["-unwrapped"] [""] sway.pname;
inherit (sway) version;
name = "${pname}-${version}";
paths = (optional withBaseWrapper baseWrapper)
++ [ sway ];

0
pkgs/applications/window-managers/sway/bg.nix → pkgs/by-name/sw/swaybg/package.nix
View file

0
pkgs/applications/window-managers/sway/swaycons.nix → pkgs/by-name/sw/swaycons/package.nix
View file

0
pkgs/applications/window-managers/sway/swayest-workstyle/default.nix → pkgs/by-name/sw/swayest-workstyle/package.nix
View file

25
pkgs/applications/window-managers/sway/fx.nix → pkgs/by-name/sw/swayfx-unwrapped/package.nix
View file

@ -1,7 +1,25 @@
{ fetchFromGitHub, lib, sway-unwrapped }:
{
lib,
fetchFromGitHub,
sway-unwrapped,
stdenv,
systemd,
# Used by the NixOS module:
isNixOS ? false,
enableXWayland ? true,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
trayEnabled ? systemdSupport,
}:
sway-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "swayfx";
(sway-unwrapped.override {
inherit
isNixOS
enableXWayland
systemdSupport
trayEnabled
;
}).overrideAttrs (oldAttrs: rec {
pname = "swayfx-unwrapped";
version = "0.3.2";
src = fetchFromGitHub {
@ -23,7 +41,6 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec {
(patch: !builtins.elem (patch.name or null) removePatches)
(oldAttrs.patches or [ ]);
meta = with lib; {
description = "Sway, but with eye candy!";
homepage = "https://github.com/WillPower3309/swayfx";

26
pkgs/by-name/sw/swayfx/package.nix Normal file
View file

@ -0,0 +1,26 @@
{
lib,
swayfx-unwrapped,
sway,
# Used by the NixOS module:
withBaseWrapper ? true,
extraSessionCommands ? "",
withGtkWrapper ? false,
extraOptions ? [ ], # E.g.: [ "--verbose" ]
isNixOS ? false,
enableXWayland ? true,
dbusSupport ? true,
}:
sway.override {
inherit
withBaseWrapper
extraSessionCommands
withGtkWrapper
extraOptions
isNixOS
enableXWayland
dbusSupport
;
sway-unwrapped = swayfx-unwrapped;
}

0
pkgs/applications/window-managers/sway/idle.nix → pkgs/by-name/sw/swayidle/package.nix
View file

Some files were not shown because too many files have changed in this diff Show more