dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-01 00:16:25 +00:00 committed by GitHub
commit 5dce602f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
105 changed files with 940 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/modules.nix
View File

@ -160,7 +160,10 @@ rec {
type = types.lazyAttrsOf types.raw;
# Only render documentation once at the root of the option tree,
# not for all individual submodules.
internal = prefix != [];
# Allow merging option decls to make this internal regardless.
${if prefix == []
then null # unset => visible
else "internal"} = true;
# TODO: Change the type of this option to a submodule with a
# freeformType, so that individual arguments can be documented
# separately

11
nixos/modules/config/console.nix
View File

@ -149,8 +149,11 @@ in
'');
boot.initrd.systemd.contents = {
"/etc/kbd".source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share";
"/etc/vconsole.conf".source = vconsoleConf;
# Add everything if we want full console setup...
"/etc/kbd" = lib.mkIf cfg.earlySetup { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share"; };
# ...but only the keymaps if we don't
"/etc/kbd/keymaps" = lib.mkIf (!cfg.earlySetup) { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share/keymaps"; };
};
boot.initrd.systemd.storePaths = [
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
@ -180,7 +183,7 @@ in
];
})
(mkIf cfg.earlySetup {
(mkIf (cfg.earlySetup && !config.boot.initrd.systemd.enable) {
boot.initrd.extraUtilsCommands = ''
mkdir -p $out/share/consolefonts
${if substring 0 1 cfg.font == "/" then ''
@ -194,10 +197,6 @@ in
cp -L $font $out/share/consolefonts/font.psf
fi
'';
assertions = [{
assertion = !config.boot.initrd.systemd.enable;
message = "console.earlySetup is implied by systemd stage 1";
}];
})
]))
];

9
nixos/modules/hardware/video/nvidia.nix
View File

@ -361,11 +361,12 @@ in
services.udev.extraRules =
''
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'"
KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'"
KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", PROGRAM="${pkgs.gnugrep}/bin/grep 'Device Minor:' /proc/driver/nvidia/gpus/%b/information", \
RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
'' + optionalString cfg.powerManagement.finegrained ''
# Remove NVIDIA USB xHCI Host Controller devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"

3
nixos/modules/installer/cd-dvd/channel.nix
View File

@ -39,7 +39,8 @@ in
echo "unpacking the NixOS/Nixpkgs sources..."
mkdir -p /nix/var/nix/profiles/per-user/root
${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
-i ${channelSources} --quiet --option build-use-substitutes false
-i ${channelSources} --quiet --option build-use-substitutes false \
${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
mkdir -m 0700 -p /root/.nix-defexpr
ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
mkdir -m 0755 -p /var/lib/nixos

4
nixos/modules/module-list.nix
View File

@ -172,6 +172,7 @@
./programs/java.nix
./programs/k40-whisperer.nix
./programs/kclock.nix
./programs/k3b.nix
./programs/kdeconnect.nix
./programs/kbdlight.nix
./programs/less.nix
@ -1183,13 +1184,14 @@
./system/boot/stage-2.nix
./system/boot/systemd.nix
./system/boot/systemd/coredump.nix
./system/boot/systemd/initrd-secrets.nix
./system/boot/systemd/initrd.nix
./system/boot/systemd/journald.nix
./system/boot/systemd/logind.nix
./system/boot/systemd/nspawn.nix
./system/boot/systemd/shutdown.nix
./system/boot/systemd/tmpfiles.nix
./system/boot/systemd/user.nix
./system/boot/systemd/initrd.nix
./system/boot/timesyncd.nix
./system/boot/tmp.nix
./system/etc/etc-activation.nix

4
nixos/modules/profiles/installation-device.nix
View File

@ -99,6 +99,10 @@ with lib;
stdenvNoCC # for runCommand
busybox
jq # for closureInfo
# For boot.initrd.systemd
makeInitrdNGTool
systemdStage1
systemdStage1Network
];
# Show all debug messages from the kernel but don't log refused packets

4
nixos/modules/profiles/qemu-guest.nix
View File

@ -1,13 +1,13 @@
# Common configuration for virtual machines running under QEMU (using
# virtio).
{ ... }:
{ config, lib, ... }:
{
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
boot.initrd.postDeviceCommands =
boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
''
# Set the system time from the hardware clock to work around a
# bug in qemu-kvm > 1.5.2 (where the VM clock is initialised

52
nixos/modules/programs/k3b.nix Normal file
View File

@ -0,0 +1,52 @@
{ config, pkgs, lib, ... }:
with lib;
{
# interface
options.programs.k3b = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable k3b, the KDE disk burning application.
Additionally to installing <package>k3b</package> enabling this will
add <literal>setuid</literal> wrappers in <literal>/run/wrappers/bin</literal>
for both <package>cdrdao</package> and <package>cdrecord</package>. On first
run you must manually configure the path of <package>cdrdae</package> and
<package>cdrecord</package> to correspond to the appropriate paths under
<literal>/run/wrappers/bin</literal> in the "Setup External Programs" menu.
'';
};
};
# implementation
config = mkIf config.programs.k3b.enable {
environment.systemPackages = with pkgs; [
k3b
dvdplusrwtools
cdrdao
cdrkit
];
security.wrappers = {
cdrdao = {
setuid = true;
owner = "root";
group = "cdrom";
permissions = "u+wrx,g+x";
source = "${pkgs.cdrdao}/bin/cdrdao";
};
cdrecord = {
setuid = true;
owner = "root";
group = "cdrom";
permissions = "u+wrx,g+x";
source = "${pkgs.cdrkit}/bin/cdrecord";
};
};
};
}

1
nixos/modules/system/boot/luksroot.nix
View File

@ -992,6 +992,7 @@ in
];
storePaths = [
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup"
"${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator"
];
};

36
nixos/modules/system/boot/systemd/initrd-secrets.nix Normal file
View File

@ -0,0 +1,36 @@
{ config, pkgs, lib, ... }:
{
config = lib.mkIf (config.boot.initrd.enable && config.boot.initrd.systemd.enable) {
# Copy secrets into the initrd if they cannot be appended
boot.initrd.systemd.contents = lib.mkIf (!config.boot.loader.supportsInitrdSecrets)
(lib.mapAttrs' (dest: source: lib.nameValuePair "/.initrd-secrets/${dest}" { source = if source == null then dest else source; }) config.boot.initrd.secrets);
# Copy secrets to their respective locations
boot.initrd.systemd.services.initrd-nixos-copy-secrets = lib.mkIf (config.boot.initrd.secrets != {}) {
description = "Copy secrets into place";
# Run as early as possible
wantedBy = [ "sysinit.target" ];
before = [ "cryptsetup-pre.target" ];
unitConfig.DefaultDependencies = false;
# We write the secrets to /.initrd-secrets and move them because this allows
# secrets to be written to /run. If we put the secret directly to /run and
# drop this service, we'd mount the /run tmpfs over the secret, making it
# invisible in stage 2.
script = ''
for secret in $(cd /.initrd-secrets; find . -type f); do
mkdir -p "$(dirname "/$secret")"
cp "/.initrd-secrets/$secret" "/$secret"
done
'';
unitConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
};
# The script needs this
boot.initrd.systemd.extraBin.find = "${pkgs.findutils}/bin/find";
};
}

34
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -105,6 +105,9 @@ let
opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs";
in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);
needMakefs = lib.any (fs: fs.autoFormat) fileSystems;
needGrowfs = lib.any (fs: fs.autoResize) fileSystems;
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
firmware = config.hardware.firmware;
@ -360,18 +363,22 @@ in {
storePaths = [
# systemd tooling
"${cfg.package}/lib/systemd/systemd-fsck"
"${cfg.package}/lib/systemd/systemd-growfs"
(lib.mkIf needGrowfs "${cfg.package}/lib/systemd/systemd-growfs")
"${cfg.package}/lib/systemd/systemd-hibernate-resume"
"${cfg.package}/lib/systemd/systemd-journald"
"${cfg.package}/lib/systemd/systemd-makefs"
(lib.mkIf needMakefs "${cfg.package}/lib/systemd/systemd-makefs")
"${cfg.package}/lib/systemd/systemd-modules-load"
"${cfg.package}/lib/systemd/systemd-remount-fs"
"${cfg.package}/lib/systemd/systemd-shutdown"
"${cfg.package}/lib/systemd/systemd-sulogin-shell"
"${cfg.package}/lib/systemd/systemd-sysctl"
# additional systemd directories
"${cfg.package}/lib/systemd/system-generators"
# generators
"${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
"${cfg.package}/lib/systemd/system-generators/systemd-fstab-generator"
"${cfg.package}/lib/systemd/system-generators/systemd-gpt-auto-generator"
"${cfg.package}/lib/systemd/system-generators/systemd-hibernate-resume-generator"
"${cfg.package}/lib/systemd/system-generators/systemd-run-generator"
# utilities needed by systemd
"${cfg.package.util-linux}/bin/mount"
@ -409,8 +416,8 @@ in {
mkdir -p $out/etc/systemd/system
touch $out/etc/systemd/system/systemd-{makefs,growfs}@.service
'')];
services."systemd-makefs@".unitConfig.IgnoreOnIsolate = true;
services."systemd-growfs@".unitConfig.IgnoreOnIsolate = true;
services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; };
services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; };
services.initrd-nixos-activation = {
after = [ "initrd-fs.target" ];
@ -472,6 +479,21 @@ in {
''systemctl --no-block switch-root /sysroot "''${NEW_INIT}"''
];
};
services.panic-on-fail = {
wantedBy = ["emergency.target"];
unitConfig = {
DefaultDependencies = false;
ConditionKernelCommandLine = [
"|boot.panic_on_fail"
"|stage1panic"
];
};
script = ''
echo c > /proc/sysrq-trigger
'';
serviceConfig.Type = "oneshot";
};
};
boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ];

45
nixos/modules/testing/test-instrumentation.nix
View File

@ -65,33 +65,26 @@ in
};
};
boot.initrd.preDeviceCommands =
''
echo 600 > /proc/sys/kernel/hung_task_timeout_secs
'';
boot.kernel.sysctl = {
"kernel.hung_task_timeout_secs" = 600;
# Panic on out-of-memory conditions rather than letting the
# OOM killer randomly get rid of processes, since this leads
# to failures that are hard to diagnose.
"vm.panic_on_oom" = lib.mkDefault 2;
};
boot.initrd.postDeviceCommands =
''
# Using acpi_pm as a clock source causes the guest clock to
# slow down under high host load. This is usually a bad
# thing, but for VM tests it should provide a bit more
# determinism (e.g. if the VM runs at lower speed, then
# timeouts in the VM should also be delayed).
echo acpi_pm > /sys/devices/system/clocksource/clocksource0/current_clocksource
'';
boot.postBootCommands =
''
# Panic on out-of-memory conditions rather than letting the
# OOM killer randomly get rid of processes, since this leads
# to failures that are hard to diagnose.
echo 2 > /proc/sys/vm/panic_on_oom
'';
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
boot.kernelParams =
[ "console=${qemu-common.qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ];
boot.kernelParams = [
"console=${qemu-common.qemuSerialDevice}"
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
"panic=1" "boot.panic_on_fail"
# Using acpi_pm as a clock source causes the guest clock to
# slow down under high host load. This is usually a bad
# thing, but for VM tests it should provide a bit more
# determinism (e.g. if the VM runs at lower speed, then
# timeouts in the VM should also be delayed).
"clock=acpi_pm"
];
# `xwininfo' is used by the test driver to query open windows.
environment.systemPackages = [ pkgs.xorg.xwininfo ];

11
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -754,13 +754,13 @@ in
);
boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";
boot.initrd.extraUtilsCommands =
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
''
# We need mke2fs in the initrd.
copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs
'';
boot.initrd.postDeviceCommands =
boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
''
# If the disk image appears to be empty, run mke2fs to
# initialise.
@ -770,7 +770,7 @@ in
fi
'';
boot.initrd.postMountCommands =
boot.initrd.postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
''
# Mark this as a NixOS machine.
mkdir -p $targetRoot/etc
@ -789,6 +789,11 @@ in
''}
'';
systemd.tmpfiles.rules = lib.mkIf config.boot.initrd.systemd.enable [
"f /etc/NIXOS 0644 root root -"
"d /boot 0644 root root -"
];
# After booting, register the closure of the paths in
# `virtualisation.additionalPaths' in the Nix database in the VM. This
# allows Nix operations to work in the VM. The path to the

1
nixos/tests/all-tests.nix
View File

@ -235,6 +235,7 @@ in
input-remapper = handleTest ./input-remapper.nix {};
inspircd = handleTest ./inspircd.nix {};
installer = handleTest ./installer.nix {};
installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {};
invoiceplane = handleTest ./invoiceplane.nix {};
iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};

33
nixos/tests/installer-systemd-stage-1.nix Normal file
View File

@ -0,0 +1,33 @@
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../.. { inherit system config; }
}:
{
# Some of these tests don't work with systemd stage 1 yet. Uncomment
# them when fixed.
inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })
# bcache
# btrfsSimple
# btrfsSubvolDefault
# btrfsSubvols
# encryptedFSWithKeyfile
# grub1
# luksroot
# luksroot-format1
# luksroot-format2
# lvm
separateBoot
separateBootFat
simple
simpleLabels
simpleProvided
simpleSpecialised
simpleUefiGrub
simpleUefiGrubSpecialisation
simpleUefiSystemdBoot
# swraid
# zfsroot
;
}

7
nixos/tests/installer.nix
View File

@ -1,6 +1,7 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../.. { inherit system config; }
pkgs ? import ../.. { inherit system config; },
systemdStage1 ? false
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
@ -23,6 +24,8 @@ let
# To ensure that we can rebuild the grub configuration on the nixos-rebuild
system.extraDependencies = with pkgs; [ stdenvNoCC ];
${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"}
${optionalString (bootLoader == "grub") ''
boot.loader.grub.version = ${toString grubVersion};
${optionalString (grubVersion == 1) ''
@ -290,6 +293,8 @@ let
virtualisation.cores = 8;
virtualisation.memorySize = 1536;
boot.initrd.systemd.enable = systemdStage1;
# Use a small /dev/vdb as the root disk for the
# installer. This ensures the target disk (/dev/vda) is
# the same during and after installation.

2
nixos/tests/systemd-initrd-luks-keyfile.nix
View File

@ -32,7 +32,7 @@ in {
};
};
virtualisation.bootDevice = "/dev/mapper/cryptroot";
boot.initrd.systemd.contents."/etc/cryptroot.key".source = keyfile;
boot.initrd.secrets."/etc/cryptroot.key" = keyfile;
};
};

8
pkgs/applications/audio/musikcube/default.nix
View File

@ -6,6 +6,7 @@
, fetchFromGitHub
, fetchpatch
, ffmpeg
, gnutls
, lame
, libev
, libmicrohttpd
@ -20,17 +21,17 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "0.96.10";
version = "0.97.0";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
sha256 = "sha256-Aa52pRGq99Pt++aEVZdmVNhhQuBajgfZp39L1AfKvho=";
sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg=";
};
patches = [
# Fix pending upstream inclusion for ncuurses-6.3 support:
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/clangen/musikcube/pull/474
(fetchpatch {
name = "ncurses-6.3.patch";
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
boost
curl
ffmpeg
gnutls
lame
libev
libmicrohttpd

6
pkgs/applications/audio/pyradio/default.nix
View File

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.8.9.16";
version = "0.8.9.17";
propagatedBuildInputs = with python3Packages; [
requests
@ -13,8 +13,8 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = version;
sha256 = "sha256-uerQfyGHWhLbO6UkLSMA1tdfW/8fDQkcm6hYIdwwC7I=";
rev = "refs/tags/${version}";
sha256 = "sha256-lfDSD1+xbA6tAKeHKciq/n6YHWS4JTOvjIqOn+FQ2yA=";
};
checkPhase = ''

4
pkgs/applications/blockchains/btcpayserver/default.nix
View File

@ -3,13 +3,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.4.7";
version = "1.5.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Qz4BNrhK+NPnKBgjXGYl4P2R878LCuMGZxLECawA12E=";
sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

58
pkgs/applications/blockchains/btcpayserver/deps.nix generated
View File

@ -31,18 +31,18 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.All";
version = "1.3.2";
sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z";
version = "1.3.6";
sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Charge";
version = "1.3.1";
sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353";
version = "1.3.2";
sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.CLightning";
version = "1.3.1";
sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2";
version = "1.3.2";
sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
@ -51,23 +51,23 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
version = "1.3.1";
sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844";
version = "1.3.2";
sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Eclair";
version = "1.3.1";
sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c";
version = "1.3.2";
sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LNBank";
version = "1.3.1";
sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d";
version = "1.3.4";
sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LND";
version = "1.3.1";
sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl";
version = "1.3.3";
sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y";
})
(fetchNuGet {
pname = "BuildBundlerMinifier";
@ -89,6 +89,11 @@
version = "15.0.5";
sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma";
})
(fetchNuGet {
pname = "Dapper";
version = "2.0.123";
sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91";
})
(fetchNuGet {
pname = "DigitalRuby.ExchangeSharp";
version = "0.6.3";
@ -374,11 +379,6 @@
version = "3.1.6";
sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Abstractions";
version = "6.0.0";
sha256 = "1aw13qjkpglc1mm3cv7s73s8fschy8lzdnigsp346b7mycpg7v92";
})
(fetchNuGet {
pname = "Microsoft.EntityFrameworkCore.Abstractions";
version = "6.0.1";
@ -831,8 +831,8 @@
})
(fetchNuGet {
pname = "NBitcoin";
version = "6.0.15";
sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";
version = "6.0.18";
sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
})
(fetchNuGet {
pname = "NBitcoin";
@ -856,8 +856,8 @@
})
(fetchNuGet {
pname = "NBXplorer.Client";
version = "4.1.3";
sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251";
version = "4.2.0";
sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims";
})
(fetchNuGet {
pname = "NETStandard.Library";
@ -931,13 +931,13 @@
})
(fetchNuGet {
pname = "Npgsql.EntityFrameworkCore.PostgreSQL";
version = "6.0.1";
sha256 = "108sc62dqdb6ym2ck651kamcv6qf93cmaqzygfblmiglwzi6frnx";
version = "6.0.3";
sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np";
})
(fetchNuGet {
pname = "Npgsql";
version = "6.0.1";
sha256 = "150paiwqxp6zsy5v7vl2a9h3ikzfv3pd04whxifmamq0h1ghw0ld";
version = "6.0.3";
sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
})
(fetchNuGet {
pname = "NSec.Cryptography";
@ -1086,8 +1086,8 @@
})
(fetchNuGet {
pname = "Selenium.WebDriver.ChromeDriver";
version = "98.0.4758.10200";
sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl";
version = "100.0.4896.6000";
sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6";
})
(fetchNuGet {
pname = "Selenium.WebDriver";

4
pkgs/applications/blockchains/lnd/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "lnd";
version = "0.14.2-beta";
version = "0.14.3-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
sha256 = "sha256-JOKitxxWcTlGlxYR1XpySZlI2fT9jgBrOxNUwT/sqdQ=";
sha256 = "sha256-ZTvGFmjhQBIWqMGatMAlX59uVyl1oUKo7L5jiz571Gc";
};
vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I=";

4
pkgs/applications/blockchains/nbxplorer/default.nix
View File

@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.2.20";
version = "2.3.20";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-C3REnfecNwf3dtk6aLYAEsedHRlIrQZAokXtf6KI8U0=";
sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc=";
};
projectFile = "NBXplorer/NBXplorer.csproj";

15
pkgs/applications/blockchains/nbxplorer/deps.nix generated
View File

@ -1,4 +1,9 @@
{ fetchNuGet }: [
(fetchNuGet {
pname = "Dapper";
version = "2.0.123";
sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91";
})
(fetchNuGet {
pname = "DBTrie";
version = "1.0.39";
@ -249,6 +254,11 @@
version = "1.0.0.18";
sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b";
})
(fetchNuGet {
pname = "Npgsql";
version = "6.0.3";
sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
})
(fetchNuGet {
pname = "NuGet.Frameworks";
version = "5.0.0";
@ -754,6 +764,11 @@
version = "4.5.0";
sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43";
})
(fetchNuGet {
pname = "System.Runtime.CompilerServices.Unsafe";
version = "6.0.0";
sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc";
})
(fetchNuGet {
pname = "System.Runtime.Extensions";
version = "4.1.0";

2
pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv
, rtpPath
, vim
, vimCommandCheckHook
, vimGenDocHook
}:
@ -30,6 +31,7 @@ rec {
forceShare= [ "man" "info" ];
nativeBuildInputs = attrs.nativeBuildInputs or []
++ [ vimCommandCheckHook ]
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook;
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;

7
pkgs/applications/editors/vim/plugins/default.nix
View File

@ -3,7 +3,7 @@
let
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook;
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;
inherit (lib) extends;
@ -12,7 +12,10 @@ let
toVimPlugin = drv:
drv.overrideAttrs(oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [
vimGenDocHook
vimCommandCheckHook
];
passthru = (oldAttrs.passthru or {}) // {
vimPlugin = true;
};

7
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -450,11 +450,8 @@ self: super: {
--replace "code-minimap" "${code-minimap}/bin/code-minimap"
'';
doCheck = true;
checkPhase = ''
${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit!
'';
doInstallCheck = true;
vimCommandCheck = "MinimapToggle";
});
ncm2 = super.ncm2.overrideAttrs (old: {

25
pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh Normal file
View File

@ -0,0 +1,25 @@
# Setup hook for checking whether a vim command exists
echo "Sourcing vim-command-check-hook.sh"
vimCommandCheckHook () {
echo "Executing vimCommandCheckHook"
if [ -n "$vimCommandCheck" ]; then
echo "Check whether the following modules can be imported: $vimCommandCheck"
# editorconfig-checker-disable
export HOME="$TMPDIR"
@vimBinary@ -es -n -u NONE -i NONE --clean -V1 --cmd "set rtp+=$out" \
--cmd "runtime! plugin/*.vim" <<-EOF
if exists(":$vimCommandCheck") == 2
cquit 0
else
cquit 1
fi
EOF
fi
}
echo "Using vimCommandCheckHook"
preDistPhases+=" vimCommandCheckHook"

15
pkgs/applications/editors/vim/plugins/vim-utils.nix
View File

@ -521,8 +521,19 @@ rec {
};
} ./vim-gen-doc-hook.sh) {};
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim vimGenDocHook; })
buildVimPlugin buildVimPluginFrom2Nix;
vimCommandCheckHook = callPackage ({ neovim-unwrapped }:
makeSetupHook {
name = "vim-command-check-hook";
deps = [ neovim-unwrapped ];
substitutions = {
vimBinary = "${neovim-unwrapped}/bin/nvim";
inherit rtpPath;
};
} ./vim-command-check-hook.sh) {};
inherit (import ./build-vim-plugin.nix {
inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;
}) buildVimPlugin buildVimPluginFrom2Nix;
# used to figure out which python dependencies etc. neovim needs
requiredPlugins = {

4
pkgs/applications/editors/xedit/default.nix
View File

@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "xedit";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "xorg/app";
repo = "xedit";
rev = "${pname}-${version}";
sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3";
sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg=";
};
nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ];

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

@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.242";
version = "0.243";
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k=";
sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk=";
};
hardeningDisable = [ "fortify" ];

4
pkgs/applications/finance/irpf/default.nix
View File

@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation rec {
pname = "irpf";
version = "2022-1.3";
version = "2022-1.4";
src = let
year = lib.head (lib.splitVersion version);
in fetchzip {
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
sha256 = "sha256-nAmcVPSnMIWuq2zj1xq/657RmzaSmdtxlI9cp9v5P0A=";
sha256 = "sha256-AKBcBkoPDBknUOyndf9hNigzDHjjgi2v0n1Rs+//j/8=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];

5
pkgs/applications/misc/fspy/default.nix
View File

@ -2,7 +2,6 @@
let
pname = "fspy";
version = "1.0.3";
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/stuffmatic/fSpy/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
@ -10,10 +9,10 @@ let
};
in appimageTools.wrapType2 {
inherit name src;
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mv $out/bin/${pname}-v${version} $out/bin/${pname}
'';
meta = with lib; {

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

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.21.1";
version = "1.21.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY=";
sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To=";
};
propagatedBuildInputs = [ requests yt-dlp ];

6
pkgs/applications/misc/hugo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.96.0";
version = "0.98.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3O+ZdOloh5gILPQssztt7s/MwRgDOnpJItwLn7FXnPU=";
sha256 = "sha256-oZzjnuu6C522qBs/A83jKIZ3dUrJRmKJ/C8NRX31yvw=";
};
vendorSha256 = "sha256-TgE/ToHBg2QBgtk0gPZTV/icIbQN14RpVAbL/8b+W0U=";
vendorSha256 = "sha256-HM5IE/rVNWyTfjUtVOlw+69+YoWYlLtU2FOXeH2BAi8=";
doCheck = false;

2
pkgs/applications/misc/phwmon/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
patchPhase = ''
postPatch = ''
substituteInPlace install.sh --replace "/usr/local" "$out"
'';

10
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -162,7 +162,15 @@ let
./patches/widevine-79.patch
];
postPatch = ''
postPatch = optionalString (chromiumVersionAtLeast "102") ''
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
substituteInPlace BUILD.gn \
--replace '"//infra/orchestrator:orchestrator_all",' ""
# Disable build flags that require LLVM 15:
substituteInPlace build/config/compiler/BUILD.gn \
--replace '"-Xclang",' "" \
--replace '"-no-opaque-pointers",' ""
'' + ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
if [ -d "third_party/$lib" ]; then

6
pkgs/applications/networking/browsers/firefox/librewolf/src.json
View File

@ -1,8 +1,8 @@
{
"packageVersion": "99.0.1-3",
"packageVersion": "99.0.1-4",
"source": {
"rev": "99.0.1-3",
"sha256": "0ag4n86hvyp6kx3hp60yn7q45rgjbx7054frj6226ni2ribjx4ln"
"rev": "99.0.1-4",
"sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni"
},
"firefox": {
"version": "99.0.1",

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View File

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.29.4";
sha256 = "110wbz5dyzrzndr937in663cs9hwfs3glgm63f0md9gjj67mz0kk";
manifestsSha256 = "14vrkadv2gsz360s0naqr002sw8n5kvgskc13yx936mcz2vs465y";
version = "0.29.5";
sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";
manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-/8gRyaXTCWe+F4X3z5iT8QhE3LdiNEYKHjtoYKJB/HU=";
vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

55
pkgs/applications/networking/cluster/fluxcd/update.sh
View File

@ -3,36 +3,43 @@
set -x -eu -o pipefail
cd $(dirname "${BASH_SOURCE[0]}")
NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
FLUXCD_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; fluxcd.version or (builtins.parseDrvName fluxcd.name).version" | tr -d '"')"
LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
VERSION=$(echo ${TAG} | sed 's/^v//')
if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz)
SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz)
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/default.nix"
}
SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
setKV version ${LATEST_VERSION}
setKV sha256 ${SHA256}
setKV manifestsSha256 ${SPEC_SHA256}
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
}
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
setKV version ${VERSION}
setKV sha256 ${SHA256}
setKV manifestsSha256 ${SPEC_SHA256}
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
if [ -n "${VENDOR_SHA256:-}" ]; then
setKV vendorSha256 ${VENDOR_SHA256}
else
echo "Update failed. VENDOR_SHA256 is empty."
exit 1
fi
cd ../../../../../
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
cd - > /dev/null
if [ -n "${VENDOR_SHA256:-}" ]; then
setKV vendorSha256 ${VENDOR_SHA256}
# `git` flag here is to be used by local maintainers to speed up the bump process
if [ "$1" = "git" ]; then
git switch -c "package-fluxcd-${LATEST_VERSION}"
git add "$FLUXCD_PATH"/default.nix
git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"
fi
else
echo "Update failed. VENDOR_SHA256 is empty."
exit 1
echo "fluxcd is already up-to-date at $OLD_VERSION"
fi

8
pkgs/applications/networking/cluster/talosctl/default.nix
View File

@ -1,10 +1,10 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
let
# look for GO_LDFLAGS getting set in the Makefile
version = "1.0.3";
sha256 = "sha256-unGr+T2uYg7/4pAXf8vp9Hpi6IrCsLCqGbyBC7QXGX8=";
vendorSha256 = "sha256-9NYr5Ok9oQ1ajYFiTeU9ztmX/55UROBjNawLGjm4HYU=";
pkgsVersion = "v1.0.0-8-g76f8c5b";
version = "1.0.4";
sha256 = "sha256-kO48MRQDQGDUvFfsxAt+CAHn2EGU44NMpSKDWnNwAdk=";
vendorSha256 = "sha256-QcD5MKQO51ZZ/NvVIiAmDsN6wLI2N8YkhA387KB77W8=";
pkgsVersion = "v1.0.0-10-gbf81bd2";
extrasVersion = "v1.0.0-2-gc5d3ab0";
in
buildGoModule rec {

3
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.10.10",
"version": "1.10.11",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -89,6 +89,7 @@
},
"build": {
"appId": "im.riot.app",
"asarUnpack": "**/*.node",
"files": [
"package.json",
{

6
pkgs/applications/networking/instant-messengers/element/pin.json
View File

@ -1,6 +1,6 @@
{
"version": "1.10.10",
"desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=",
"version": "1.10.11",
"desktopSrcHash": "n74KFmHI6ZQWBEJCR55VZHS//myh2RePcJRVOmZ6XHo=",
"desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr",
"webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0"
"webHash": "02m64bhg1ls4a5igmizkkxnqfmbfhs0xy24ycr75vxmn0zmwa3yd"
}

4
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -28,14 +28,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "3.4.1";
version = "3.5";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw=";
sha256 = "sha256-8ZSa2dQPTiChGW00T5OASHmd0C2PatUtTu9Gr4CF4Oc=";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
with lib;
mkDerivation rec {
pname = "qbittorrent";
version = "4.4.1";
version = "4.4.2";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM=";
sha256 = "sha256-xBNN9YYKMDcoL1wvERjlAjV8vb2GVgwwlHtb5y0+f+8=";
};
enableParallelBuilding = true;

18
pkgs/applications/radio/rtl-sdr/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchgit
, fetchFromGitHub
, cmake
, pkg-config
, libusb1
@ -8,12 +8,13 @@
stdenv.mkDerivation rec {
pname = "rtl-sdr";
version = "0.6.0";
version = "0.8.0";
src = fetchgit {
url = "git://git.osmocom.org/rtl-sdr.git";
rev = "refs/tags/${version}";
sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
src = fetchFromGitHub {
owner = "librtlsdr";
repo = "librtlsdr";
rev = "v${version}";
sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk";
};
postPatch = ''
@ -28,7 +29,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 ];
cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON";
cmakeFlags = lib.optional stdenv.isLinux [
"-DINSTALL_UDEV_RULES=ON"
"-DWITH_RPC=ON"
];
meta = with lib; {
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";

4
pkgs/applications/version-management/redmine/Gemfile
View File

@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '>= 2.4.0', '< 2.8.0'
gem 'bundler', '>= 1.12.0'
gem 'rails', '5.2.6.2'
gem 'rails', '5.2.6.3'
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
gem 'rouge', '~> 3.26.0'
@ -24,7 +24,7 @@ gem 'rubyzip', '~> 2.3.0'
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
# TOTP-based 2-factor authentication
gem 'rotp'
gem 'rotp', '>= 5.0.0'
gem 'rqrcode'
# Optional gem for LDAP authentication

98
pkgs/applications/version-management/redmine/Gemfile.lock
View File

@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.6.2)
actionpack (= 5.2.6.2)
actioncable (5.2.6.3)
actionpack (= 5.2.6.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6.2)
actionpack (= 5.2.6.2)
actionview (= 5.2.6.2)
activejob (= 5.2.6.2)
actionmailer (5.2.6.3)
actionpack (= 5.2.6.3)
actionview (= 5.2.6.3)
activejob (= 5.2.6.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.6.2)
actionview (= 5.2.6.2)
activesupport (= 5.2.6.2)
actionpack (5.2.6.3)
actionview (= 5.2.6.3)
activesupport (= 5.2.6.3)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actionview (5.2.6.2)
activesupport (= 5.2.6.2)
actionview (5.2.6.3)
activesupport (= 5.2.6.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.6.2)
activesupport (= 5.2.6.2)
activejob (5.2.6.3)
activesupport (= 5.2.6.3)
globalid (>= 0.3.6)
activemodel (5.2.6.2)
activesupport (= 5.2.6.2)
activerecord (5.2.6.2)
activemodel (= 5.2.6.2)
activesupport (= 5.2.6.2)
activemodel (5.2.6.3)
activesupport (= 5.2.6.3)
activerecord (5.2.6.3)
activemodel (= 5.2.6.3)
activesupport (= 5.2.6.3)
arel (>= 9.0)
activestorage (5.2.6.2)
actionpack (= 5.2.6.2)
activerecord (= 5.2.6.2)
activestorage (5.2.6.3)
actionpack (= 5.2.6.3)
activerecord (= 5.2.6.3)
marcel (~> 1.0.0)
activesupport (5.2.6.2)
activesupport (5.2.6.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -60,7 +60,7 @@ GEM
xpath (~> 3.2)
childprocess (4.1.0)
chunky_png (1.4.0)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
crass (1.0.6)
css_parser (1.11.0)
addressable
@ -72,7 +72,7 @@ GEM
htmlentities (4.3.4)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
loofah (2.14.0)
loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@ -81,21 +81,19 @@ GEM
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.0.3)
mini_portile2 (2.5.3)
minitest (5.15.0)
mocha (1.13.0)
mysql2 (0.5.3)
net-ldap (0.17.0)
nio4r (2.5.8)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.21.0)
parser (3.1.1.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
pg (1.2.3)
public_suffix (4.0.6)
puma (5.6.2)
public_suffix (4.0.7)
puma (5.6.4)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
@ -104,27 +102,27 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6.2)
actioncable (= 5.2.6.2)
actionmailer (= 5.2.6.2)
actionpack (= 5.2.6.2)
actionview (= 5.2.6.2)
activejob (= 5.2.6.2)
activemodel (= 5.2.6.2)
activerecord (= 5.2.6.2)
activestorage (= 5.2.6.2)
activesupport (= 5.2.6.2)
rails (5.2.6.3)
actioncable (= 5.2.6.3)
actionmailer (= 5.2.6.3)
actionpack (= 5.2.6.3)
actionview (= 5.2.6.3)
activejob (= 5.2.6.3)
activemodel (= 5.2.6.3)
activerecord (= 5.2.6.3)
activestorage (= 5.2.6.3)
activesupport (= 5.2.6.3)
bundler (>= 1.3.0)
railties (= 5.2.6.2)
railties (= 5.2.6.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.6.2)
actionpack (= 5.2.6.2)
activesupport (= 5.2.6.2)
railties (5.2.6.3)
actionpack (= 5.2.6.3)
activesupport (= 5.2.6.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@ -160,7 +158,7 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.16.0)
rubocop-ast (1.17.0)
parser (>= 3.1.1.0)
rubocop-performance (1.10.2)
rubocop (>= 0.90.0, < 2.0)
@ -180,7 +178,7 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.3)
sprockets (4.0.2)
sprockets (4.0.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
@ -227,13 +225,13 @@ DEPENDENCIES
pg (~> 1.2.2)
puma
rack-openid
rails (= 5.2.6.2)
rails (= 5.2.6.3)
rails-dom-testing
rbpdf (~> 1.20.0)
redcarpet (~> 3.5.1)
request_store (~> 1.5.0)
roadie-rails (~> 2.2.0)
rotp
rotp (>= 5.0.0)
rouge (~> 3.26.0)
rqrcode
rubocop (~> 1.12.0)
@ -248,7 +246,7 @@ DEPENDENCIES
yard
RUBY VERSION
ruby 2.7.4p191
ruby 2.7.6p219
BUNDLED WITH
2.1.4
2.2.33

8
pkgs/applications/version-management/redmine/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
let
version = "4.2.4";
version = "4.2.5";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@ -15,10 +15,8 @@ in
inherit version;
src = fetchurl {
# https://www.redmine.org/news/134
# > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded."
url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz";
sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d";
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r";
};
nativeBuildInputs = [ makeWrapper ];

88
pkgs/applications/version-management/redmine/gemset.nix
View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67";
sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d";
sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak";
sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x";
sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9";
sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
activemodel = {
dependencies = ["activesupport"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf";
sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14";
sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9";
sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775";
sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
addressable = {
dependencies = ["public_suffix"];
@ -186,10 +186,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
version = "1.1.9";
version = "1.1.10";
};
crass = {
groups = ["default"];
@ -280,10 +280,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
type = "gem";
};
version = "2.14.0";
version = "2.16.0";
};
mail = {
dependencies = ["mini_mime"];
@ -336,16 +336,6 @@
};
version = "1.0.3";
};
mini_portile2 = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
type = "gem";
};
version = "2.5.3";
};
minitest = {
groups = ["default" "test"];
platforms = [];
@ -405,7 +395,7 @@
version = "2.5.8";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
dependencies = ["racc"];
groups = ["default" "test"];
platforms = [];
source = {
@ -420,10 +410,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
version = "1.21.0";
version = "1.22.1";
};
parser = {
dependencies = ["ast"];
@ -431,10 +421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
type = "gem";
};
version = "3.1.1.0";
version = "3.1.2.0";
};
pg = {
groups = ["default"];
@ -459,10 +449,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.6";
version = "4.0.7";
};
puma = {
dependencies = ["nio4r"];
@ -470,10 +460,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
type = "gem";
};
version = "5.6.2";
version = "5.6.4";
};
racc = {
groups = ["default" "test"];
@ -523,10 +513,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0";
sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -556,10 +546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic";
sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy";
type = "gem";
};
version = "5.2.6.2";
version = "5.2.6.3";
};
rainbow = {
groups = ["default" "test"];
@ -723,10 +713,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";
type = "gem";
};
version = "1.16.0";
version = "1.17.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -818,10 +808,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";
sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0";
type = "gem";
};
version = "4.0.2";
version = "4.0.3";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];

17
pkgs/applications/version-management/redmine/update.sh Executable file
View File

@ -0,0 +1,17 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p cacert bundix
# Do these steps before running this script:
# 1. Copy Gemfile from new Redmine version to this folder
# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious)
pkg_dir="$(dirname "$0")"
cd ${pkg_dir}
for file in "gemset.nix" "Gemfile.lock"; do
if [ -f ${file} ]; then
rm ${file}
fi
done
bundix -l

4
pkgs/applications/virtualization/podman-tui/default.nix
View File

@ -11,13 +11,13 @@
}:
buildGoModule rec {
pname = "podman-tui";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
sha256 = "sha256-1WbDmnKyFosp4Kz9QINr3lOR/wD0UW2QZf7nAAaoClM=";
sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk=";
};
vendorSha256 = null;

8
pkgs/data/themes/flat-remix-gnome/default.nix
View File

@ -7,25 +7,25 @@
let
# make install will use dconf to find desktop background file uri.
# consider adding an args to allow specify pictures manually.
# https://github.com/daniruiz/flat-remix-gnome/blob/20220407/Makefile#L38
# https://github.com/daniruiz/flat-remix-gnome/blob/20220422/Makefile#L38
fake-dconf = writeScriptBin "dconf" "echo -n";
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20220407";
version = "20220422";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-Q54uF49NbvupN6LH80bgRtvyW7Cqm9vqsWXDkQrF4HQ=";
hash = "sha256-W/BNn10SggtBacelNljPh42jVMBfykJFRWBCaj/ar7U=";
};
nativeBuildInputs = [ glib fake-dconf ];
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20220407/Makefile#L56
# https://github.com/daniruiz/flat-remix-gnome/blob/20220422/Makefile#L56
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
'';

4
pkgs/data/themes/flat-remix-gtk/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "flat-remix-gtk";
version = "20220330";
version = "20220412";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
sha256 = "sha256-TRBjttAYpx3M/Qza6N9dJy50vQtUOJGmdLNdobnAt2Y=";
sha256 = "sha256-LIGYPsOoPN3KIe0XrjCIf7yV3p3Gfzx8zci57+HzW18=";
};
dontBuild = true;

6
pkgs/desktops/gnome/apps/gnome-todo/default.nix
View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gnome-todo";
version = "unstable-2022-03-13";
version = "unstable-2022-04-07";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-todo";
rev = "68787718eabf164f9087367113689996cd06fefd";
sha256 = "srfu22s8nVVJYw8c97T1ubT6nQqbA1Sav5Ckemdcn30=";
rev = "ebc683746c705faa7c080aa96eecb83e523a8c15";
sha256 = "YMRol1XSQUuwdlpOKNgjUnTZthbMvV/l4dqtBoBnjSU=";
};
patches = [

20
pkgs/desktops/gnome/extensions/collisions.json
View File

@ -87,6 +87,10 @@
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"
@ -129,6 +133,10 @@
"fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"
@ -140,6 +148,10 @@
"wireguard-indicator": [
"wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es"
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski"
]
},
"42": {
@ -155,9 +167,17 @@
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"fullscreen-hot-corner": [
"fullscreen-hot-corner@sorrow.about.alice.pm.me",
"fullscreen-hot-corner@richardblaha.cz"
],
"wireguard-indicator": [
"wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es"
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski"
]
}
}

9
pkgs/desktops/gnome/extensions/extensionRenames.nix
View File

@ -9,9 +9,15 @@
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
"fullscreen-hot-corner@sorrow.about.alice.pm.me" = "fullscreen-hot-corner";
"fullscreen-hot-corner@richardblaha.cz" = "fullscreen-hot-corner-2";
"lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2";
"volume_scroller@trflynn89.pm.me" = "volume-scroller";
"volume_scroller@noskoski" = "volume-scroller-2";
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
"wireguard-indicator@atareao.es" = "wireguard-indicator";
@ -57,9 +63,6 @@
"extension-list@tu.berry" = "extension-list";
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
"volume_scroller@trflynn89.pm.me" = "volume-scroller";
"volume_scroller@noskoski" = "volume-scroller-2";
# ####### GNOME 3.38 #######
"bottompanel@tmoer93" = "bottompanel";

185
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

2
pkgs/desktops/gnome/extensions/update-extensions.py
View File

@ -239,7 +239,7 @@ def scrape_extensions_index() -> List[Dict[str, Any]]:
# If our page isn't "full", it must have been the last one
if response_length < 25:
logging.debug(
f"\tThis page only has {responseLength} entries, so it must be the last one."
f"\tThis page only has {response_length} entries, so it must be the last one."
)
break
except urllib.error.HTTPError as e:

4
pkgs/development/beam-modules/erlang-ls/default.nix
View File

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
version = "0.29.0";
version = "0.30.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "sha256-BWI7H5HU5ZgXrMWFOZ7WpTfS6syrFpEVRInZW6hC5iE=";
sha256 = "sha256-Dqkp0d6U8U5HbyBq6q0WmKODVIQx3DVE8yofD0JhAHM=";
rev = version;
};
releaseType = "escript";

1
pkgs/development/embedded/openocd/default.nix
View File

@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
];
configureFlags = [
"--disable-werror"
"--enable-jtag_vpi"
"--enable-usb_blaster_libftdi"
(lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel")

6
pkgs/development/libraries/ffmpegthumbnailer/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ffmpegthumbnailer";
version = "unstable-2021-09-02";
version = "unstable-2022-02-18";
src = fetchFromGitHub {
owner = "dirkvdb";
repo = "ffmpegthumbnailer";
rev = "d92e191dd793b12cee0a0f685f5a8d8252988399";
sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q";
rev = "3db9fe895b2fa656bb40ddb7a62e27604a688171";
sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc";
};
nativeBuildInputs = [ cmake pkg-config ];

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "imath";
version = "3.1.4";
version = "3.1.5";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "imath";
rev = "v${version}";
sha256 = "sha256-FZXIIzAxhd0QlJAV0q7spEa1pNFXutI0WFZbT3izN4M=";
sha256 = "sha256-pniIhpq2eXAZemq8LavXXv6+tGrBkqZ09Kjvi4aZdu8=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View File

@ -1,7 +1,7 @@
{ ffmpeg_4, ffmpeg-full, fetchFromGitHub, lib }:
(ffmpeg-full.override { ffmpeg = ffmpeg_4; }).overrideAttrs (old: rec {
name = "jellyfin-ffmpeg";
pname = "jellyfin-ffmpeg";
version = "4.4.1-4";
src = fetchFromGitHub {

12
pkgs/development/libraries/libcef/default.nix
View File

@ -70,17 +70,17 @@ let
projectArch = "x86_64";
};
};
platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa";
platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama";
platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3";
platforms."aarch64-linux".sha256 = "0gmnmr0zn2ffn7xbhmfh6rhmwmxy5zzlj0s3lyp99knjn47lg2fg";
platforms."i686-linux".sha256 = "1lp2z9db89qk2wh900c2dzlhflwmcbmp4m7xnlj04pq4q2kgfm9p";
platforms."x86_64-linux".sha256 = "1ljrp0iky7rrj04sbqicrg1jr938xnid6jlirbf7gwlmzliz3wfs";
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
in
stdenv.mkDerivation rec {
pname = "cef-binary";
version = "98.1.21";
gitRevision = "9782362";
chromiumVersion = "98.0.4758.102";
version = "100.0.24";
gitRevision = "0783cf8";
chromiumVersion = "100.0.4896.127";
src = fetchurl {
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";

22
pkgs/development/libraries/openal-soft/default.nix
View File

@ -1,40 +1,46 @@
{ lib, stdenv, fetchFromGitHub, cmake
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, alsaSupport ? !stdenv.isDarwin, alsa-lib
, dbusSupport ? !stdenv.isDarwin, dbus
, pipewireSupport ? !stdenv.isDarwin, pipewire
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, CoreServices, AudioUnit, AudioToolbox
}:
stdenv.mkDerivation rec {
pname = "openal-soft";
version = "1.21.1";
version = "1.22.0";
src = fetchFromGitHub {
owner = "kcat";
repo = "openal-soft";
rev = version;
sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg=";
sha256 = "sha256-Y2KhPkwtG6tBzUhSqwV2DVnOjZwxPihidLKahjaIvyU=";
};
# this will make it find its own data files (e.g. HRTF profiles)
# without any other configuration
patches = [ ./search-out.patch ];
postPatch = ''
substituteInPlace alc/helpers.cpp \
substituteInPlace core/helpers.cpp \
--replace "@OUT@" $out
'';
strictDeps = true;
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc
++ lib.optional alsaSupport alsa-lib
++ lib.optional dbusSupport dbus
++ lib.optional pipewireSupport pipewire
++ lib.optional pulseSupport libpulseaudio
++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
NIX_LDFLAGS = toString (
lib.optional alsaSupport "-lasound"
++ lib.optional pulseSupport "-lpulse");
cmakeFlags = [
# Automatically links dependencies without having to rely on dlopen, thus
# removes the need for NIX_LDFLAGS.
"-DALSOFT_DLOPEN=OFF"
];
meta = with lib; {
description = "OpenAL alternative";

4
pkgs/development/libraries/openal-soft/search-out.patch
View File

@ -1,7 +1,7 @@
diff --git a/alc/helpers.cpp b/alc/helpers.cpp
index 8c1c856..19bbc0f 100644
--- a/alc/helpers.cpp
+++ b/alc/helpers.cpp
--- a/core/helpers.cpp
+++ b/core/helpers.cpp
@@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir)
DirectorySearch(path.c_str(), ext, &results);

4
pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gnome";
version = "42.0.1";
version = "42.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "3+i1JFDzKDj5+eiY6Vqo36JwXOEtQ4MFVXwSi5zg4uY=";
sha256 = "doW2aVzZi+gjgXECDByXE8RkfSaAAGyYzo5N+FgxLNI=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
version = "1.12.0";
version = "1.14.0";
src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk=";
sha256 = "I9xQgiE3lNb2vRodO5R1y40lqoOKzALskrVePidant4=";
};
nativeBuildInputs = [

30
pkgs/development/libraries/xdg-desktop-portal/default.nix
View File

@ -5,7 +5,8 @@
, fetchFromGitHub
, fetchpatch
, flatpak
, fuse
, fuse3
, systemdMinimal
, geoclue2
, glib
, gsettings-desktop-schemas
@ -14,6 +15,9 @@
, libxml2
, nixosTests
, pipewire
, gdk-pixbuf
, librsvg
, python3
, pkg-config
, stdenv
, substituteAll
@ -23,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.12.1";
version = "1.14.3";
outputs = [ "out" "installedTests" ];
@ -31,17 +35,9 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE=";
sha256 = "CDqTQQ8dOatOxDKR+HiVQgSJKxH6ZstskKdR84U/870=";
};
patches = [
# Hardcode paths used by x-d-p itself.
(substituteAll {
src = ./fix-paths.patch;
inherit flatpak;
})
];
nativeBuildInputs = [
autoreconfHook
libxml2
@ -53,12 +49,22 @@ stdenv.mkDerivation rec {
acl
dbus
flatpak
fuse
fuse3
systemdMinimal # libsystemd
glib
gsettings-desktop-schemas
json-glib
libportal
pipewire
# For icon validator
gdk-pixbuf
librsvg
# For document-fuse installed test.
(python3.withPackages (pp: with pp; [
pygobject3
]))
] ++ lib.optionals enableGeoLocation [
geoclue2
];

13
pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/notification.c b/src/notification.c
index 5412609..4243e98 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -366,7 +366,7 @@
int status;
g_autofree char *err = NULL;
g_autoptr(GError) error = NULL;
- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon";
+ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon";
const char *args[6];
if (G_IS_THEMED_ICON (icon))

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

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "0.9.8.2";
version = "0.9.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-EDKa77sU09HOBp4NVsHNwp6S4UbHyqX8T8rFGOnV8kA=";
hash = "sha256-24OYAjbnzer0KyTRx7Kty8HVsHdon+l4UazcWMIm428=";
};
nativeBuildInputs = [

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

@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.14.2";
version = "0.14.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1fkq8q54s9apqiamdd8vgrhk5p02w5w281q93dfnrd37xv7ysk6h";
sha256 = "sha256-dg5bsegECH92JXa5uVY9Y7R9UhsWUpiOKMPLXmS2GZA=";
};
postPatch = ''

2
pkgs/development/python-modules/can/default.nix
View File

@ -73,7 +73,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "CAN support for Python";
homepage = "python-can.readthedocs.io";
homepage = "https://python-can.readthedocs.io";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab sorki ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.16.0";
version = "1.16.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
sha256 = "sha256-fPojcHuz2d3Im2Ri6iCu79KLuRNucIG/IwWrUo0uYH8=";
sha256 = "sha256-7URIk76iQ1u59RM1VeqO5qqTg+0kCPtsP+2Y5CxCZ3I=";
};
propagatedBuildInputs = [

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

@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
version = "1.11";
version = "1.12";
pname = "Flask-Compress";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw=";
sha256 = "sha256-4hWUmfOdYYpNVroEhOe1i1eVa5osbTUQ8JX1uxS3r8U=";
};
nativeBuildInputs = [

56
pkgs/development/python-modules/flask-testing/default.nix
View File

@ -1,32 +1,58 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }:
{ lib
, stdenv
, blinker
, pytestCheckHook
, buildPythonPackage
, fetchPypi
, flask
, pythonOlder
}:
buildPythonPackage rec {
pname = "Flask-Testing";
pname = "flask-testing";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01";
pname = "Flask-Testing";
inherit version;
hash = "sha256-CnNNe2jmOpQQtBPNex+WRW+ahYvQmmIi1GVlDMeC6wE=";
};
postPatch = ''
substituteInPlace setup.py --replace "twill==0.9.1" "twill"
'';
propagatedBuildInputs = [
flask
];
propagatedBuildInputs = [ flask ];
checkInputs = [
blinker
pytestCheckHook
];
checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ];
# Some of the tests use localhost networking on darwin
doCheck = !stdenv.isDarwin;
# twill integration is outdated in Python 2, hence it the tests fails.
# Some of the tests use localhost networking on darwin.
doCheck = isPy3k && !stdenv.isDarwin;
disabledTests = [
# RuntimeError and NotImplementedError
"test_assert_redirects"
"test_server_listening"
"test_server_process_is_spawned"
];
pythonImportsCheck = [ "flask_testing" ];
disabledTestPaths = [
# twill is only used by Python 2 according setup.py
"tests/test_twill.py"
];
pythonImportsCheck = [
"flask_testing"
];
meta = with lib; {
description = "Flask unittest integration.";
description = "Extension provides unit testing utilities for Flask";
homepage = "https://pythonhosted.org/Flask-Testing/";
license = licenses.bsd3;
maintainers = [ maintainers.mic92 ];
maintainers = with maintainers; [ mic92 ];
};
}

71
pkgs/development/python-modules/ihatemoney/default.nix
View File

@ -1,6 +1,6 @@
{ buildPythonPackage
, lib
, isPy27
{ lib
, buildPythonPackage
, pythonOlder
, nixosTests
, fetchPypi
, alembic
@ -29,7 +29,6 @@
, python-dateutil
, pytz
, requests
, six
, sqlalchemy
, sqlalchemy-utils
, sqlalchemy-continuum
@ -37,83 +36,85 @@
, werkzeug
, wtforms
, psycopg2 # optional, for postgresql support
, flask_testing
, flask-testing
, pytestCheckHook
, fetchpatch
}:
buildPythonPackage rec {
pname = "ihatemoney";
version = "5.1.1";
version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0gsqba9qbs1dpmfys8qpiahy4pbn4khcc6mgmdnhssmkjsb94sx6";
sha256 = "sha256-uQgZBbpqqbZYHpR+GwHWX0c7di2rVvEz0jPRY6+BkkQ=";
};
disabled = isPy27;
propagatedBuildInputs = [
aniso8601
Babel
blinker
cachetools
click
debts
dnspython
email_validator
flask
flask-babel
flask-cors
flask_mail
flask_migrate
flask_wtf
flask-babel
flask-cors
flask-restful
flask-talisman
flask_wtf
idna
itsdangerous
jinja2
Mako
markupsafe
psycopg2
python-dateutil
pytz
requests
six
sqlalchemy
sqlalchemy-continuum
werkzeug
wtforms
psycopg2
debts
];
patches = [
# fix build with wtforms 3. remove with next release
(fetchpatch {
url = "https://github.com/spiral-project/ihatemoney/commit/40ce32d9fa58a60d26a4d0df547b8deb709c330d.patch";
sha256 = "sha256-2ewOu21qhq/AOZaE9qrF5J6HH0h6ohFgjDb+BYjJnuQ=";
excludes = [ "setup.cfg" ];
})
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "cachetools>=4.1,<5" "cachetools>=4.1" \
--replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \
--replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \
--replace "WTForms>=2.3.1,<2.4" "WTForms" \
--replace "Flask-Talisman>=0.8,<1" "Flask-Talisman>=0.8,<2" # https://github.com/spiral-project/ihatemoney/pull/1006
--replace "WTForms>=2.3.1,<3.1" "WTForms"
'';
checkInputs = [
flask_testing
flask-testing
pytestCheckHook
];
pythonImportsCheck = [ "ihatemoney" ];
pythonImportsCheck = [
"ihatemoney"
];
disabledTests = [
"test_notifications" # requires running service.
"test_invite" # requires running service.
"test_invitation_email_failure" # requires dns resolution
# Requires running service
"test_notifications"
"test_invite"
"test_access_other_projects"
"test_authentication"
"test_manage_bills"
"test_member_delete_method"
"test_membership"
"test_bill_add_remove_add"
"test_clear_ip_records"
"test_disable_clear_no_new_records"
"test_logs_for_common_actions"
# Requires DNS resolution
"test_invitation_email_failure"
];
passthru.tests = {
@ -121,9 +122,9 @@ buildPythonPackage rec {
};
meta = with lib; {
description = "Shared budget manager web application";
homepage = "https://ihatemoney.org";
description = "A simple shared budget manager web application";
license = licenses.beerware;
maintainers = [ maintainers.symphorien ];
maintainers = with maintainers; [ symphorien ];
};
}

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.0.20";
version = "0.0.21";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-h/WQzkDoEuE4grnb0YeuWhHDPWIqVHgjWgMq02XLahs=";
hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";
};
postPatch = ''

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.82";
version = "2.1.84";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-VwbpcKPtPH/43E+lfzUken8JvX8QtTa6o0H0S2RXbYk=";
hash = "sha256-tjPjLzNOO/PUU6EItLYyQw+KPekIwboTBn98T8wHpHw=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/pyvo/default.nix
View File

@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Astropy affiliated package for accessing Virtual Observatory data and services";
homepage = "github.com/astropy/pyvo";
homepage = "https://github.com/astropy/pyvo";
license = licenses.bsd3;
maintainers = with maintainers; [ smaret ];
};

51
pkgs/development/python-modules/swspotify/default.nix
View File

@ -1,40 +1,57 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27
, poetry-core }:
{ lib
, stdenv
, buildPythonPackage
, dbus-python
, fetchFromGitHub
, flask
, flask-cors
, poetry-core
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "SwSpotify";
pname = "swspotify";
version = "1.2.3";
disabled = isPy27;
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SwagLyrics";
repo = "SwSpotify";
rev = "v${version}";
sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [ requests flask flask-cors ]
++ lib.optionals stdenv.isLinux [ dbus-python ];
propagatedBuildInputs = [
dbus-python
flask
flask-cors
requests
];
doCheck = !stdenv.isDarwin;
checkPhase = ''
pytest tests/test_spotify.py::${if stdenv.isDarwin then "DarwinTests" else "LinuxTests"}
postPatch = ''
# Detection of the platform doesn't always works with 1.2.3
substituteInPlace pyproject.toml \
--replace 'dbus-python = {version = "^1.2.16", platform = "linux"}' ""
'';
checkInputs = [ pytestCheckHook mock ];
# Tests want to use Dbus
doCheck = false;
pythonImportsCheck = [ "SwSpotify" ];
pythonImportsCheck = [
"SwSpotify"
];
meta = with lib; {
homepage = "https://github.com/SwagLyrics/SwSpotify";
description = "Library to get the currently playing song and artist from Spotify";
homepage = "https://github.com/SwagLyrics/SwSpotify";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.unix;
};
}

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-decorator";
version = "5.1.6";
version = "5.1.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-OZ+qczvJMstRtQ08odfpV7KuAvPE1xGcdpYxKCo4aKY=";
sha256 = "sha256-srf0f9AcoY+JyMAmSDnZLl95oezAes5Hu5AO/XzQL1k=";
};
# Modules doesn't have tests

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "types-paramiko";
version = "2.8.19";
version = "2.8.20";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UhkthDZk73wfh7n+Bpe7u1qPgS5DAWlEz+q+x93spCM=";
sha256 = "sha256-tsK0nbyjv6hlONLinKRAgckjECEIqrGsK0f1OL5h5S4=";
};
pythonImportsCheck = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
version = "1.26.13";
version = "1.26.14";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-QPj7XozX1X6K797j/dXpMKoaG7QXnNrdVSJs6liK95A=";
hash = "sha256-KiV45LNjQczSQLAPzNqYJpiP8FiaRLpKZku9ae80jSc=";
};
# Module doesn't have tests

7
pkgs/development/tools/altair-graphql-client/default.nix
View File

@ -3,24 +3,23 @@
let
pname = "altair";
version = "4.1.0";
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-YuG7H+7FXYGbNNhM5vxps72dqltcj3bA325e7ZbW8aI=";
};
appimageContents = appimageTools.extract { inherit name src; };
appimageContents = appimageTools.extract { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit src name;
inherit src pname version;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \

6
pkgs/development/tools/database/pg_activity/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "pg_activity";
version = "2.3.0";
version = "2.3.1";
disabled = python3Packages.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "dalibo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O5ACTWsHoIty+QLTGaSuk985qduH7xBjviiH4yCrY2o=";
rev = "refs/tags/v${version}";
sha256 = "sha256-oStoZVFf0g1Dj2m+T+8caiKS0o1CnhtQNe/GbnlVUCM=";
};
propagatedBuildInputs = with python3Packages; [

10
pkgs/development/tools/misc/binutils/default.nix
View File

@ -21,7 +21,7 @@ in
, enableGold ? execFormatIsELF stdenv.targetPlatform
, enableShared ? !stdenv.hostPlatform.isStatic
# WARN: Enabling all targets increases output size to a multiple.
, withAllTargets ? false, libbfd, libopcodes
, withAllTargets ? false
}:
# WARN: configure silently disables ld.gold if it's unsupported, so we need to
@ -183,11 +183,9 @@ stdenv.mkDerivation {
# Fails
doCheck = false;
postFixup = lib.optionalString (enableShared && withAllTargets) ''
rm "$out"/lib/lib{bfd,opcodes}-${version}.so
ln -s '${lib.getLib libbfd}/lib/libbfd-${version}.so' "$out/lib/"
ln -s '${lib.getLib libopcodes}/lib/libopcodes-${version}.so' "$out/lib/"
'';
# Remove on next bump. It's a vestige of past conditional. Stays here to avoid
# mass rebuild.
postFixup = "";
# INFO: Otherwise it fails with:
# `./sanity.sh: line 36: $out/bin/size: not found`

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

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KmFNe22XltSrxlINOH/3w79P1CGHwPkxKVyKMD5OcCc=";
sha256 = "sha256-qrIaHDjPiOzQ8Gi7aPT0BM9oIgWr1IdcT7vvYmsea7k=";
};
buildInputs = [ zlib openssl ];

6
pkgs/development/web/deno/default.nix
View File

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Sv9Keb+6vc6Lr+H/gAi9/4bmBO18gv9bqAjBIpOrtnk=";
sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4=";
};
cargoSha256 = "sha256-EykIg8rU2VBag+3834SwMYkz9ZR6brOo/0NXXvrGqsU=";
cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

3
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@ -131,6 +131,9 @@ let
patches = [ ./fix-stonesense.patch ];
# gcc 11 fix
NIX_CFLAGS_COMPILE = "-fpermissive";
# As of
# https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4,
# dfhack gets its goodies from the directory above the Dwarf_Fortress

35
pkgs/games/tintin/default.nix
View File

@ -1,35 +0,0 @@
{ stdenv, fetchurl, lib, zlib, pcre
, memorymappingHook, memstreamHook
, tlsSupport ? true, gnutls ? null
# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB
}:
assert tlsSupport -> gnutls != null;
stdenv.mkDerivation rec {
pname = "tintin";
version = "2.02.12";
src = fetchurl {
url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
sha256 = "sha256-tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA=";
};
nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
buildInputs = [ zlib pcre ]
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
++ lib.optional tlsSupport gnutls;
preConfigure = ''
cd src
'';
meta = with lib; {
description = "A free MUD client for macOS, Linux and Windows";
homepage = "http://tintin.sourceforge.net";
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
mainProgram = "tt++";
platforms = platforms.unix;
};
}

8
pkgs/os-specific/linux/sasutils/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, fetchFromGitHub, sg3_utils }:
{ lib, python3Packages, fetchFromGitHub, installShellFiles, sg3_utils }:
python3Packages.buildPythonApplication rec {
pname = "sasutils";
@ -11,8 +11,14 @@ python3Packages.buildPythonApplication rec {
sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl";
};
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [ sg3_utils ];
postInstall = ''
installManPage doc/man/man1/*.1
'';
meta = with lib; {
homepage = "https://github.com/stanford-rc/sasutils";
description = "A set of command-line tools to ease the administration of Serial Attached SCSI (SAS) fabrics";

4
pkgs/os-specific/linux/sgx/ssl/default.nix
View File

@ -14,12 +14,12 @@ let
in
stdenv.mkDerivation rec {
pname = "sgx-ssl" + lib.optionalString debug "-debug";
version = "lin_${sgxVersion}_${opensslVersion}";
version = "${sgxVersion}_${opensslVersion}";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-sgx-ssl";
rev = version;
rev = "lin_${sgxVersion}_${opensslVersion}";
hash = "sha256-ibPXs90ni2fkxJ09fNO6wWVpfCFdko6MjBFkEsyIih8=";
};

16
pkgs/servers/sabnzbd/default.nix
View File

@ -10,7 +10,21 @@
}:
let
pythonEnv = python3.withPackages(ps: with ps; [
python = python3.override {
packageOverrides = final: prev: {
sabyenc3 = prev.sabyenc3.overridePythonAttrs (oldAttrs: rec {
version = "4.0.0";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-PwwQ2jChKIqh7jJ6E2hkqPquTDSN4MklghfJ+MkM0n0=";
};
});
};
self = python;
};
pythonEnv = python.withPackages(ps: with ps; [
chardet
cheetah3
cherrypy

4
pkgs/shells/fish/plugins/fzf-fish.nix
View File

@ -2,13 +2,13 @@
buildFishPlugin rec {
pname = "fzf.fish";
version = "8.2";
version = "8.3";
src = fetchFromGitHub {
owner = "PatrickF1";
repo = "fzf.fish";
rev = "v${version}";
sha256 = "sha256-WRrPd/GuXHJ9uYvhwjwp9AEtvbfMlpV0xdgNyfx43ok=";
sha256 = "sha256-eSNUqvKXTxcuvICxo8BmVWL1ESXQuU7VhOl7aONrhwM=";
};
checkInputs = [ fzf fd util-linux ];

6
pkgs/tools/admin/eksctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.94.0";
version = "0.95.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-6I/rzdSJ0iwoazt7EHsQ3gEynGfzBoLR7ekPNUo/YQs=";
sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU=";
};
vendorSha256 = "sha256-cWZvMP19xTq68kKJ50d2RYXHu9AfiEE+zQL2IsQ4eiY=";
vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM=";
doCheck = false;

9
pkgs/tools/admin/lxd/default.nix
View File

@ -11,13 +11,13 @@
buildGo118Package rec {
pname = "lxd";
version = "5.0.0";
version = "5.1";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "sha256-qZt+37UsgZWy3kmIhE0y1zvmQm9s/yhAglBReyOP3vk=";
sha256 = "sha256-MZ9Ok1BuIUTtqigLAYX7N8Q3TPfXRopeXIwbZ4GJJQo=";
};
postPatch = ''
@ -25,6 +25,8 @@ buildGo118Package rec {
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
'';
excludedPackages = [ "test" "lxd/db/generate" ];
preBuild = ''
# required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
@ -33,9 +35,6 @@ buildGo118Package rec {
'';
postInstall = ''
# test binaries, code generation
rm $out/bin/{deps,macaroon-identity,generate}
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
[ iptables ]
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ]

12
pkgs/tools/misc/mutagen/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip }:
{ lib, buildGo118Module, fetchFromGitHub, fetchzip }:
buildGoModule rec {
buildGo118Module rec {
pname = "mutagen";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WFEbiPyE029q9+ZXYioESXLm9fmpwihaNwgLcPYQYFE=";
sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE=";
};
vendorSha256 = "sha256-kMX0E3yCg+wRaVMRWNSkeW+dN8b/EG04C0P77x9TQC0=";
vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc=";
agents = fetchzip {
name = "mutagen-agents-${version}";
@ -21,7 +21,7 @@ buildGoModule rec {
extraPostFetch = ''
rm $out/mutagen # Keep only mutagen-agents.tar.gz.
'';
sha256 = "sha256-QwPOt2pK9fRPrfvpc6qqr/uBZ/XK8CMlYNSLb7eWzg4=";
sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8=";
};
doCheck = false;

38
pkgs/tools/misc/swaglyrics/default.nix
View File

@ -1,18 +1,38 @@
{ lib, python3, fetchFromGitHub, ncurses }:
{ lib
, python3
, fetchFromGitHub
, ncurses
}:
python3.pkgs.buildPythonApplication rec {
pname = "swaglyrics";
version = "unstable-2021-06-17";
format = "setuptools";
src = fetchFromGitHub {
owner = "SwagLyrics";
repo = "SwagLyrics-For-Spotify";
rev = "99fe764a9e45cac6cb9fcdf724c7d2f8cb4524fb";
sha256 = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0=";
hash = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0=";
};
propagatedBuildInputs = with python3.pkgs; [
unidecode colorama beautifulsoup4 flask requests swspotify
beautifulsoup4
colorama
flask
requests
swspotify
unidecode
];
checkInputs = with python3.pkgs; [
blinker
flask
flask-testing
mock
pytestCheckHook
] ++ [
ncurses
];
preConfigure = ''
@ -22,10 +42,12 @@ python3.pkgs.buildPythonApplication rec {
--replace 'flask==2.0.1' 'flask>=2.0.1'
'';
preBuild = "export HOME=$NIX_BUILD_TOP";
preBuild = ''
export HOME=$(mktemp -d)
'';
# disable tests which touch network
disabledTests = [
# Disable tests which touch network
"test_database_for_unsupported_song"
"test_that_lyrics_works_for_unsupported_songs"
"test_that_get_lyrics_works"
@ -33,9 +55,9 @@ python3.pkgs.buildPythonApplication rec {
"test_songchanged_can_raise_songplaying"
];
checkInputs = with python3.pkgs;
[ blinker swspotify pytestCheckHook flask mock flask_testing ]
++ [ ncurses ];
pythonImportsCheck = [
"swaglyrics"
];
meta = with lib; {
description = "Lyrics fetcher for currently playing Spotify song";

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