alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-05-10 00:11:58 +00:00 committed by GitHub
parent 9d30031014 af7e39841a
commit 5b55bccfe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
238 changed files with 13146 additions and 10444 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/systems/default.nix
View file

@ -145,6 +145,7 @@ rec {
else if final.isS390 && !final.isS390x then null
else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386"
else if final.isMips64 then "mips64${lib.optionalString final.isLittleEndian "el"}"
else final.uname.processor;
# Name used by UEFI for architectures.

30
maintainers/maintainer-list.nix
View file

@ -579,6 +579,12 @@
githubId = 20405311;
name = "Aksh Gupta";
};
alanpearce = {
email = "alan@alanpearce.eu";
github = "alanpearce";
githubId = 850317;
name = "Alan Pearce";
};
alapshin = {
email = "alapshin@fastmail.com";
github = "alapshin";
@ -6786,6 +6792,15 @@
githubId = 54999;
name = "Ariel Nunez";
};
Intuinewin = {
email = "antoinelabarussias@gmail.com";
github = "Intuinewin";
githubId = 13691729;
name = "Antoine Labarussias";
keys = [{
fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E";
}];
};
ionutnechita = {
email = "ionut_n2001@yahoo.com";
github = "ionutnechita";
@ -7899,6 +7914,12 @@
githubId = 2469618;
name = "Junji Hashimoto";
};
jurraca = {
email = "julienu@pm.me";
github = "jurraca";
githubId = 5124422;
name = "Julien Urraca";
};
justinas = {
email = "justinas@justinas.org";
github = "justinas";
@ -15573,6 +15594,15 @@
githubId = 57180880;
name = "Ansh Tyagi";
};
therealr5 = {
email = "rouven@rfive.de";
github = "therealr5";
githubId = 72568063;
name = "Rouven Seifert";
keys = [{
fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09";
}];
};
therishidesai = {
email = "desai.rishi1@gmail.com";
github = "therishidesai";

23
maintainers/scripts/copy-tarballs.pl
View file

@ -50,19 +50,22 @@ while (@ARGV) {
}
}
my $bucket;
# S3 setup.
my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n";
my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n";
if (not defined $ENV{DEBUG}) {
# S3 setup.
my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n";
my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n";
my $s3 = Net::Amazon::S3->new(
{ aws_access_key_id => $aws_access_key_id,
aws_secret_access_key => $aws_secret_access_key,
retry => 1,
host => "s3-eu-west-1.amazonaws.com",
});
my $s3 = Net::Amazon::S3->new(
{ aws_access_key_id => $aws_access_key_id,
aws_secret_access_key => $aws_secret_access_key,
retry => 1,
host => "s3-eu-west-1.amazonaws.com",
});
my $bucket = $s3->bucket("nixpkgs-tarballs") or die;
$bucket = $s3->bucket("nixpkgs-tarballs") or die;
}
my $doWrite = 0;
my $cacheFile = ($ENV{"HOME"} or die "\$HOME is not set") . "/.cache/nix/copy-tarballs";

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

@ -290,6 +290,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`.
- The `pict-rs` package was updated from an 0.3 alpha release to 0.3 stable, and related environment variables now require two underscores instead of one.
## Other Notable Changes {#sec-release-23.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -343,6 +345,8 @@ In addition to numerous new and upgraded packages, this release has the followin
`services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
end of life.
- `kube3d` has now been renamed to `k3d` since the 3d editor that originally took that name has been dropped from nixpkgs. `kube3d` will continue to work as an alias for now.
- The `dokuwiki` service is now configured via `services.dokuwiki.sites.<name>.settings` attribute set; `extraConfig` has been removed.
The `{aclUse,superUser,disableActions}` attributes have been renamed accordingly. `pluginsConfig` now only accepts an attribute set of booleans.
Passing plain PHP is no longer possible.

26
nixos/lib/test-driver/test_driver/machine.py
View file

@ -7,6 +7,7 @@ import io
import os
import queue
import re
import select
import shlex
import shutil
import socket
@ -99,7 +100,7 @@ def _perform_ocr_on_screenshot(
+ "-blur 1x65535"
)
tess_args = f"-c debug_file=/dev/null --psm 11"
tess_args = "-c debug_file=/dev/null --psm 11"
cmd = f"convert {magick_args} '{screenshot_path}' 'tiff:{screenshot_path}.tiff'"
ret = subprocess.run(cmd, shell=True, capture_output=True)
@ -154,6 +155,7 @@ class StartCommand:
# qemu options
qemu_opts = (
" -device virtio-serial"
# Note: virtconsole will map to /dev/hvc0 in Linux guests
" -device virtconsole,chardev=shell"
" -device virtio-rng-pci"
" -serial stdio"
@ -524,8 +526,10 @@ class Machine:
if timeout is not None:
timeout_str = f"timeout {timeout}"
# While sh is bash on NixOS, this is not the case for every distro.
# We explicitely call bash here to allow for the driver to boot other distros as well.
out_command = (
f"{timeout_str} sh -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
)
assert self.shell
@ -719,6 +723,15 @@ class Machine:
self.wait_for_unit(jobname)
def connect(self) -> None:
def shell_ready(timeout_secs: int) -> bool:
"""We sent some data from the backdoor service running on the guest
to indicate that the backdoor shell is ready.
As soon as we read some data from the socket here, we assume that
our root shell is operational.
"""
(ready, _, _) = select.select([self.shell], [], [], timeout_secs)
return bool(ready)
if self.connected:
return
@ -728,8 +741,11 @@ class Machine:
assert self.shell
tic = time.time()
self.shell.recv(1024)
# TODO: Timeout
# TODO: do we want to bail after a set number of attempts?
while not shell_ready(timeout_secs=30):
self.log("Guest root shell did not produce any data yet...")
self.log(self.shell.recv(1024).decode())
toc = time.time()
self.log("connected to guest root shell")
@ -950,7 +966,7 @@ class Machine:
Prepares the machine to be reconnected which is useful if the
machine was started with `allow_reboot = True`
"""
self.send_key(f"ctrl-alt-delete")
self.send_key("ctrl-alt-delete")
self.connected = False
def wait_for_x(self) -> None:

2
nixos/modules/config/no-x-libs.nix
View file

@ -47,7 +47,7 @@ with lib;
libva = super.libva-minimal;
limesuite = super.limesuite.override { withGui = false; };
mc = super.mc.override { x11Support = false; };
mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; };
mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; waylandSupport = false; };
msmtp = super.msmtp.override { withKeyring = false; };
neofetch = super.neofetch.override { x11Support = false; };
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };

1
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -483,6 +483,7 @@ in
Compression settings to use for the squashfs nix store.
'';
example = "zstd -Xcompression-level 6";
type = types.str;
};
isoImage.edition = mkOption {

15
nixos/modules/installer/netboot/netboot.nix
View file

@ -8,6 +8,20 @@ with lib;
{
options = {
netboot.squashfsCompression = mkOption {
default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% "
+ lib.optionalString isx86 "-Xbcj x86"
# Untested but should also reduce size for these platforms
+ lib.optionalString isAarch "-Xbcj arm"
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+ lib.optionalString (isSparc) "-Xbcj sparc";
description = lib.mdDoc ''
Compression settings to use for the squashfs nix store.
'';
example = "zstd -Xcompression-level 6";
type = types.str;
};
netboot.storeContents = mkOption {
example = literalExpression "[ pkgs.stdenv ]";
description = lib.mdDoc ''
@ -77,6 +91,7 @@ with lib;
# Create the squashfs image that contains the Nix store.
system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix {
storeContents = config.netboot.storeContents;
comp = config.netboot.squashfsCompression;
};

2
nixos/modules/programs/fzf.nix
View file

@ -26,7 +26,7 @@ in
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
'');
programs.zsh.ohMyZsh.plugins = optional (cfg.keybindings || cfg.fuzzyCompletion) [ "fzf" ];
programs.zsh.ohMyZsh.plugins = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) [ "fzf" ];
};
meta.maintainers = with maintainers; [ laalsaas ];
}

2
nixos/modules/programs/shadow.nix
View file

@ -41,6 +41,8 @@ let
# This should be made configurable.
#CHFN_RESTRICT frwh
# The default crypt() method, keep in sync with the PAM default
ENCRYPT_METHOD YESCRYPT
'';
mkSetuidRoot = source:

2
nixos/modules/security/apparmor/includes.nix
View file

@ -22,7 +22,7 @@ in
# some may even be completely useless.
config.security.apparmor.includes = {
# This one is included by <tunables/global>
# which is usualy included before any profile.
# which is usually included before any profile.
"abstractions/tunables/alias" = ''
alias /bin -> /run/current-system/sw/bin,
alias /lib/modules -> /run/current-system/kernel/lib/modules,

2
nixos/modules/security/tpm2.nix
View file

@ -3,7 +3,7 @@ let
cfg = config.security.tpm2;
# This snippet is taken from tpm2-tss/dist/tpm-udev.rules, but modified to allow custom user/groups
# The idea is that the tssUser is allowed to acess the TPM and kernel TPM resource manager, while
# The idea is that the tssUser is allowed to access the TPM and kernel TPM resource manager, while
# the tssGroup is only allowed to access the kernel resource manager
# Therefore, if either of the two are null, the respective part isn't generated
udevRules = tssUser: tssGroup: ''

2
nixos/modules/services/games/asf.nix
View file

@ -245,7 +245,7 @@ in
rm -f www
${optionalString cfg.web-ui.enable ''
ln -s ${cfg.web-ui.package}/lib/dist www
ln -s ${cfg.web-ui.package}/ www
''}
'';
};

24
nixos/modules/services/monitoring/prometheus/alertmanager.nix
View file

@ -6,10 +6,12 @@ let
cfg = config.services.prometheus.alertmanager;
mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration);
checkedConfig = file: pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out
amtool check-config $out
'';
checkedConfig = file:
if cfg.checkConfig then
pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out
amtool check-config $out
'' else file;
alertmanagerYml = let
yml = if cfg.configText != null then
@ -70,6 +72,20 @@ in {
'';
};
checkConfig = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
Check configuration with `amtool check-config`. The call to `amtool` is
subject to sandboxing by Nix.
If you use credentials stored in external files
(`environmentFile`, etc),
they will not be visible to `amtool`
and it will report errors, despite a correct configuration.
'';
};
logFormat = mkOption {
type = types.nullOr types.str;
default = null;

2
nixos/modules/services/monitoring/prometheus/exporters.md
View file

@ -76,7 +76,7 @@ example:
directory, which will be called postfix.nix and contains all exporter
specific options and configuration:
```
# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
# nixpkgs/nixos/modules/services/prometheus/exporters/postfix.nix
{ config, lib, pkgs, options }:
with lib;

2
nixos/modules/services/torrent/deluge.nix
View file

@ -93,7 +93,7 @@ in {
`true`.
It does NOT apply to the daemon port nor the web UI port. To access those
ports secuerly check the documentation
ports securely check the documentation
<https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient#CreateSSHTunnel>
or use a VPN or configure certificates for deluge.
'';

2
nixos/modules/services/web-apps/matomo.md
View file

@ -3,7 +3,7 @@
Matomo is a real-time web analytics application. This module configures
php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
An automatic setup is not suported by Matomo, so you need to configure Matomo
An automatic setup is not supported by Matomo, so you need to configure Matomo
itself in the browser-based Matomo setup.
## Database Setup {#module-services-matomo-database-setup}

8
nixos/modules/services/web-apps/peertube.nix
View file

@ -429,7 +429,7 @@ in {
environment = env;
path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];
path = with pkgs; [ bashInteractive ffmpeg nodejs_18 openssl yarn python3 ];
script = ''
#!/bin/sh
@ -490,7 +490,7 @@ in {
services.nginx = lib.mkIf cfg.configureNginx {
enable = true;
virtualHosts."${cfg.localDomain}" = {
root = "/var/lib/peertube";
root = "/var/lib/peertube/www";
# Application
locations."/" = {
@ -593,7 +593,7 @@ in {
# Bypass PeerTube for performance reasons.
locations."~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$" = {
tryFiles = "/www/client-overrides/$1 /www/client/$1 $1";
tryFiles = "/client-overrides/$1 /client/$1 $1";
priority = 1310;
};
@ -859,7 +859,7 @@ in {
home = cfg.package;
};
})
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_18 pkgs.yarn ])
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
];

4
nixos/modules/services/web-apps/pict-rs.nix
View file

@ -34,8 +34,8 @@ in
config = lib.mkIf cfg.enable {
systemd.services.pict-rs = {
environment = {
PICTRS_PATH = cfg.dataDir;
PICTRS_ADDR = "${cfg.address}:${toString cfg.port}";
PICTRS__PATH = cfg.dataDir;
PICTRS__ADDR = "${cfg.address}:${toString cfg.port}";
};
wantedBy = [ "multi-user.target" ];
serviceConfig = {

2
nixos/modules/system/boot/networkd.nix
View file

@ -2848,7 +2848,7 @@ let
''
+ optionalString (def.tokenBucketFilterConfig != { }) ''
[TokenBucketFilter]
${attrsToSection def.tockenBucketFilterConfig}
${attrsToSection def.tokenBucketFilterConfig}
''
+ optionalString (def.pieConfig != { }) ''
[PIE]

39
nixos/modules/system/boot/systemd/repart.nix
View file

@ -72,11 +72,6 @@ in
};
config = lib.mkIf (cfg.enable || initrdCfg.enable) {
# Always link the definitions into /etc so that they are also included in
# the /nix/store of the sysroot during early userspace (i.e. while in the
# initrd).
environment.etc."repart.d".source = definitionsDirectory;
boot.initrd.systemd = lib.mkIf initrdCfg.enable {
additionalUpstreamUnits = [
"systemd-repart.service"
@ -86,38 +81,44 @@ in
"${config.boot.initrd.systemd.package}/bin/systemd-repart"
];
contents."/etc/repart.d".source = definitionsDirectory;
# Override defaults in upstream unit.
services.systemd-repart = {
# Unset the conditions as they cannot be met before activation because
# the definition files are not stored in the expected locations.
unitConfig.ConditionDirectoryNotEmpty = [
" " # required to unset the previous value.
];
# systemd-repart tries to create directories in /var/tmp by default to
# store large temporary files that benefit from persistence on disk. In
# the initrd, however, /var/tmp does not provide more persistence than
# /tmp, so we re-use it here.
environment."TMPDIR" = "/tmp";
serviceConfig = {
# systemd-repart runs before the activation script. Thus we cannot
# rely on them being linked in /etc already. Instead we have to
# explicitly pass their location in the sysroot to the binary.
ExecStart = [
" " # required to unset the previous value.
# When running in the initrd, systemd-repart by default searches
# for definition files in /sysroot or /sysusr. We tell it to look
# in the initrd itself.
''${config.boot.initrd.systemd.package}/bin/systemd-repart \
--definitions=/sysroot${definitionsDirectory} \
--definitions=/etc/repart.d \
--dry-run=no
''
];
};
# Because the initrd does not have the `initrd-usr-fs.target` the
# upestream unit runs too early in the boot process, before the sysroot
# is available. However, systemd-repart needs access to the sysroot to
# find the definition files.
# systemd-repart needs to run after /sysroot (or /sysuser, but we don't
# have it) has been mounted because otherwise it cannot determine the
# device (i.e disk) to operate on. If you want to run systemd-repart
# without /sysroot, you have to explicitly tell it which device to
# operate on.
after = [ "sysroot.mount" ];
};
};
environment.etc = lib.mkIf cfg.enable {
"repart.d".source = definitionsDirectory;
};
systemd = lib.mkIf cfg.enable {
additionalUpstreamSystemUnits = [
"systemd-repart.service"
];
};
};
}

12
nixos/modules/testing/test-instrumentation.nix
View file

@ -36,8 +36,16 @@ in
while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done
echo "connecting to host..." >&2
stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
echo
PS1= exec /bin/sh
# The following line is essential since it signals to
# the test driver that the shell is ready.
# See: the connect method in the Machine class.
echo "Spawning backdoor root shell..."
# Passing the terminal device makes bash run non-interactively.
# Otherwise we get errors on the terminal because bash tries to
# setup things like job control.
# Note: calling bash explicitely here instead of sh makes sure that
# we can also run non-NixOS guests during tests.
PS1= exec /usr/bin/env bash --norc /dev/hvc0
'';
serviceConfig.KillSignal = "SIGHUP";
};

2
nixos/tests/gitea.nix
View file

@ -30,7 +30,7 @@ let
nodes = {
server = { config, pkgs, ... }: {
virtualisation.memorySize = 2048;
virtualisation.memorySize = 2047;
services.gitea = {
enable = true;
database = { inherit type; };

1
nixos/tests/mosquitto.nix
View file

@ -66,6 +66,7 @@ in {
in {
server = { pkgs, ... }: {
networking.firewall.allowedTCPPorts = [ port tlsPort anonPort ];
networking.useNetworkd = true;
services.mosquitto = {
enable = true;
settings = {

2
nixos/tests/mysql/mysql.nix
View file

@ -15,7 +15,7 @@ let
name ? mkTestName package,
useSocketAuth ? true,
hasMroonga ? true,
hasRocksDB ? true
hasRocksDB ? pkgs.stdenv.hostPlatform.is64bit
}: makeTest {
inherit name;
meta = with lib.maintainers; {

2
nixos/tests/wiki-js.nix
View file

@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
};
nodes.machine = { pkgs, ... }: {
virtualisation.memorySize = 2048;
virtualisation.memorySize = 2047;
services.wiki-js = {
enable = true;
settings.db.host = "/run/postgresql";

47
pkgs/applications/audio/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch Normal file
View file

@ -0,0 +1,47 @@
From 42eda1afc1cfb0506b02baae894fb32f7e21755d Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Fri, 10 Mar 2023 04:39:38 +0200
Subject: [PATCH] Avoid using vendored dependencies we have in nixpkgs
---
CMakeLists.txt | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 136e7b0..5416da1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,8 +246,6 @@ qt6_add_resources(RESOURCES_OBJ resources/qml.qrc)
qt6_add_big_resources(RESOURCES_OBJ resources/other.qrc)
set_property(SOURCE "${RESOURCES_OBJ}" PROPERTY SKIP_AUTOMOC ON)
-set(ARMADILLO_INCLUDE_DIR external/armadillo/include)
-set(TOMLPP_INCLUDE_DIR external/tomlplusplus/include)
### SEARCH AUDIO MODULES
@@ -334,17 +332,15 @@ target_include_directories(in-formant SYSTEM PRIVATE ${ARMADILLO_INCLUDE_DIR} ${
target_link_libraries(in-formant PRIVATE Eigen3::Eigen ${FFTW_LIBRARIES} Qt6::Charts Qt6::Quick Qt6::QuickControls2 Qt6::QuickTemplates2 Qt6::Qml Qt6::Widgets Qt6::OpenGL Qt6::Gui Qt6::Core)
target_link_directories(in-formant PRIVATE ${FFTW_LIBRARY_DIRS})
-set(BUILD_SHARED_LIBS TRUE)
-add_subdirectory(external/freetype EXCLUDE_FROM_ALL)
+find_package(Freetype)
target_link_libraries(in-formant PRIVATE freetype)
-set(BUILD_SHARED_LIBS)
add_subdirectory(external/rpmalloc EXCLUDE_FROM_ALL)
target_link_libraries(in-formant PRIVATE rpcxx_only)
-add_subdirectory(external/libsamplerate)
-target_link_libraries(in-formant PRIVATE lsr)
-target_include_directories(in-formant PRIVATE external/libsamplerate/src)
+
+find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0 samplerate-0)
+target_link_libraries(in-formant PRIVATE ${LIBSAMPLERATE_LIBRARY})
target_compile_definitions(in-formant PRIVATE
-DINFORMANT_VERSION=${CUR_VERSION} -DARMA_DONT_USE_WRAPPER
--
2.39.0

51
pkgs/applications/audio/in-formant/default.nix
View file

@ -1,33 +1,56 @@
{ stdenv, cmake, lib, fetchFromGitHub, qt5, fftw, libtorch-bin, portaudio, eigen
, xorg, pkg-config, autoPatchelfHook, soxr
{ stdenv
, cmake
, lib
, fetchFromGitHub
, wrapQtAppsHook
, qtbase
, qtcharts
, fftw
, libtorch-bin
, portaudio
, eigen
, xorg
, pkg-config
, autoPatchelfHook
, soxr
, freetype
, libsamplerate
, armadillo
, tomlplusplus
}:
stdenv.mkDerivation rec {
pname = "in-formant";
version = "2021-06-30";
version = "unstable-2022-09-15";
# no Qt6 yet, so we're stuck in the last Qt5-supporting commit: https://github.com/NixOS/nixpkgs/issues/108008
src = fetchFromGitHub {
owner = "in-formant";
repo = "in-formant";
rev = "e28e628cf5ff0949a7b046d220cc884f6035f31a";
sha256 = "sha256-YvtV0wGUNmI/+GGxrIfTk/l8tqUsWgc/LAI17X+AWGI=";
rev = "e0606feecff70f0fd4226ff8f116e46817dd7462";
hash = "sha256-/4eKny9M2e8Lb9LOiKBj9QLE00CAaD+2ZAwn48lnvKQ=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook autoPatchelfHook ];
patches = [
# Ignore the freetype sources bundled as a submodule:
# /nix/store/…-harfbuzz-7.0.0/lib/libharfbuzz.so.0: undefined reference to `FT_Get_Transform'
./0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
];
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook autoPatchelfHook ];
buildInputs = [
qt5.qtbase
qt5.qtquickcontrols
qt5.qtquickcontrols2
qt5.qtcharts
qtbase
qtcharts
fftw
libtorch-bin
portaudio
eigen
xorg.libxcb
soxr
libsamplerate
armadillo
tomlplusplus
];
installPhase = ''
@ -35,14 +58,12 @@ stdenv.mkDerivation rec {
cp in-formant $out/bin
'';
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
meta = with lib; {
description = "A real-time pitch and formant tracking software";
homepage = "https://github.com/in-formant/in-formant";
license = licenses.asl20;
platforms = platforms.linux;
# currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ckie ];
};
}

20
pkgs/applications/audio/ledfx/default.nix
View file

@ -1,35 +1,22 @@
{ lib
, fetchpatch
, python3
}:
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.64";
version = "2.0.67";
format = "setuptools";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4=";
hash = "sha256-lFxAMjglQZXCySr83PtvStU6hw2ucQu+rSjIHo1yZBk=";
};
patches = [
# replace tcp-latency which is not packaged with icmplib
(fetchpatch {
url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch";
excludes = [
# only used in win.spec file which is windows specific
"hiddenimports.py"
];
hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace '"openrgb-python~=0.2.10",' "" \
--replace '"pyupdater>=3.1.0",' "" \
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
--replace '"sentry-sdk==1.14.0",' "" \
--replace "~=" ">="
'';
@ -49,6 +36,7 @@ python3.pkgs.buildPythonPackage rec {
psutil
pyserial
pystray
python-rtmidi
# rpi-ws281x # not packaged
requests
sacn

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

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.11.24";
version = "3.11.25";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-3NM2jw3XvzMxLpDQAR3LZzCJXwSnQXSDoN7IK4nr4wM=";
sha256 = "sha256-B14xM4/E6TQZGLZifvIFA4JxLPo0hNah9PIyquS9TzI=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.3.09";
version = "6.3.10";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-oidYxG3A0yZGAJzjf5WvspEIbh1d/SXNHJsxKsSRifI=";
sha256 = "sha256-wnw8GKMukiraZgMMzd3S2NldC/cnRSILNo+D1Rqhr4k=";
};
configurePhase = ''

24
pkgs/applications/audio/spotifywm/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
{ lib, stdenv, fetchFromGitHub, spotify, xorg, makeWrapper }:
stdenv.mkDerivation {
pname = "spotifywm-unstable";
version = "2022-10-26";
@ -10,15 +10,23 @@ stdenv.mkDerivation {
sha256 = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [ spotify ];
installPhase = ''
echo "#!${runtimeShell}" > spotifywm
echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm
install -Dm644 spotifywm.so $out/lib/spotifywm.so
install -Dm755 spotifywm $out/bin/spotifywm
runHook preInstall
mkdir -p $out/{bin,lib}
install -Dm644 spotifywm.so $out/lib/
ln -sf ${spotify}/bin/spotify $out/bin/spotify
# wrap spotify to use spotifywm.so
wrapProgram $out/bin/spotify --set LD_PRELOAD "$out/lib/spotifywm.so"
# backwards compatibility for people who are using the "spotifywm" binary
ln -sf $out/bin/spotify $out/bin/spotifywm
runHook postInstall
'';
meta = with lib; {
@ -26,6 +34,6 @@ stdenv.mkDerivation {
description = "Wrapper around Spotify that correctly sets class name before opening the window";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ jqueiroz ];
maintainers = with maintainers; [ jqueiroz the-argus ];
};
}

2
pkgs/applications/audio/vocal/default.nix
View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The podcast client for the modern free desktop";
longDescription = ''
Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that independent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
'';
homepage = "https://github.com/needle-and-thread/vocal";
license = licenses.gpl3Plus;

1975
pkgs/applications/editors/neovim/gnvim/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

37
pkgs/applications/editors/neovim/gnvim/default.nix
View file

@ -1,42 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
{ lib, rustPlatform, fetchFromGitHub, pkg-config, glib, gtk4 }:
rustPlatform.buildRustPackage rec {
pname = "gnvim-unwrapped";
version = "0.1.6";
version = "0.3.1";
src = fetchFromGitHub {
owner = "vhakulinen";
repo = "gnvim";
rev = "v${version}";
sha256 = "1cc3yk04v9icdjr5cn58mqc3ba1wqmlzhf9ly7biy9m8yk30w9y0";
hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nvim-rs-0.1.1-alpha.0" = "sha256-wn68Lix3zZULrg/G4hP+OSj1GbEZMsA/+PaOlG9WLtc=";
};
};
cargoLock.lockFile = ./Cargo.lock;
buildInputs = [ gtk webkitgtk ];
nativeBuildInputs = [
pkg-config
# for the `glib-compile-resources` command
glib
];
buildInputs = [ glib gtk4 ];
# The default build script tries to get the version through Git, so we
# replace it
postPatch = ''
cat << EOF > build.rs
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::Path;
fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("gnvim_version.rs");
let mut f = File::create(&dest_path).unwrap();
f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
}
EOF
# Install the binary ourselves, since the Makefile doesn't have the path
# containing the target architecture
sed -e "/target\/release/d" -i Makefile
@ -46,6 +32,9 @@ rustPlatform.buildRustPackage rec {
make install PREFIX="${placeholder "out"}"
'';
# GTK fails to initialize
doCheck = false;
meta = with lib; {
description = "GUI for neovim, without any web bloat";
homepage = "https://github.com/vhakulinen/gnvim";

14
pkgs/applications/editors/neovim/gnvim/wrapper.nix
View file

@ -1,21 +1,13 @@
{ stdenv, gnvim-unwrapped, neovim, makeWrapper }:
{ lib, stdenv, gnvim-unwrapped, neovim, makeWrapper }:
stdenv.mkDerivation {
pname = "gnvim";
version = gnvim-unwrapped.version;
buildCommand = if stdenv.isDarwin then ''
mkdir -p $out/Applications
cp -r ${gnvim-unwrapped}/bin/gnvim.app $out/Applications
chmod -R a+w "$out/Applications/gnvim.app/Contents/MacOS"
wrapProgram "$out/Applications/gnvim.app/Contents/MacOS/gnvim" \
--prefix PATH : "${neovim}/bin" \
--set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
'' else ''
buildCommand = ''
makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
--prefix PATH : "${neovim}/bin" \
--set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
'' + lib.optionalString (!stdenv.isDarwin) ''
mkdir -p "$out/share"
ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"

27
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View file

@ -1,10 +1,8 @@
{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }:
{ lib, fetchFromGitHub, buildNpmPackage, nodePackages, ArchiSteamFarm }:
let
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
buildNpmPackage {
pname = "asf-ui";
inherit (ArchiSteamFarm) version;
src = fetchFromGitHub {
owner = "JustArchiNET";
@ -15,20 +13,15 @@ let
sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
};
in
nodePackages.package.override {
inherit src;
npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU=";
# upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time)
version = ArchiSteamFarm.version;
installPhase = ''
runHook preInstall
nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ];
mkdir $out
cp -rv dist/* $out/
postInstall = ''
patchShebangs node_modules/
npm run build
cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist
rm -rf $out/lib/node_modules/
runHook postInstall
'';
meta = with lib; {

17
pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix
View file

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

7428
pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/misc/jetbrains-toolbox/default.nix
View file

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "1.28.0.15158";
version = "1.28.1.15219";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-IHs3tQtFXGS9xa5lKwSEWvp8aNffrCjNcoVE4tGX9ak=";
sha256 = "sha256-4P73MC5Go8wLACBtjh1y3Ao0czE/3hsSI4728mNjKxA=";
stripRoot = false;
};

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
keyboard between two or more computers.
Without the need for any external hardware, Synergy2 uses the TCP-IP
protocol to share the resources, even between machines with diferent
protocol to share the resources, even between machines with different
operating systems, such as Mac OS, Linux and Windows.
Remember to open port 24800 (used by synergys program) if you want to

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "slweb";
version = "0.5";
version = "0.5.4";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GoDumiysqIkWj2HTPQv2gheYsf4fWjtCNPFS/1R0tzc=";
sha256 = "sha256-Wj9ZCs8nRBpIkX5jzTqBdo83zUBMamykk1vbBCIWyoQ=";
};
nativeBuildInputs = [ redo-apenwarr ];

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
version = "4.5.6";
version = "4.5.10";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-h7k/zAYqpCAGn2dW+a3gOF/BN5ywjy/2Yx6THK9zk6k=";
hash = "sha256-2CELRY6V7/6PcC5s4XjOqadxXc5SbS0vstqLEej3xnI=";
};
vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";

2
pkgs/applications/networking/browsers/polypane/default.nix
View file

@ -27,7 +27,7 @@ in appimageTools.wrapType2 {
'';
meta = with lib; {
description = "Browser with unified devtools targeting responsability and acessibility";
description = "Browser with unified devtools targeting responsability and accessibility";
longDescription = ''
The stand-alone browser for ambitious developers that want to build responsive,
accessible and performant websites in a fraction of the time it takes with other browsers.

9
pkgs/applications/networking/cluster/kube3d/default.nix → pkgs/applications/networking/cluster/k3d/default.nix
View file

@ -14,7 +14,7 @@ let
false;
in
buildGoModule rec {
pname = "kube3d";
pname = "k3d";
version = "5.4.4";
src = fetchFromGitHub {
@ -30,10 +30,10 @@ buildGoModule rec {
excludedPackages = [ "tools" "docgen" ];
ldflags =
let t = "github.com/k3d-io/k3d/v5/version"; in
let t = "github.com/k3d-io/k3d/v${lib.versions.major version}/version"; in
[ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];
preCheck = ''
preCheck = ''
# skip test that uses networking
substituteInPlace version/version_test.go \
--replace "TestGetK3sVersion" "SkipGetK3sVersion"
@ -57,7 +57,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://github.com/k3d-io/k3d/";
changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
longDescription = ''
k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@ -67,6 +67,5 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "k3d";
};
}

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-gadget";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
hash = "sha256:1gn09kpkw8q2lxc8nic7hd1lhp0z4vscs8yvvxjzp1i9mw8s35xh";
hash = "sha256:0ijqnlh234pqkx6yzz2kxdnj8hnqarp2scq7gfsp8wpq7s42ivg8";
};
vendorHash = "sha256-Y76Y3KR80dCx8+f6M0h5J6glGQGhXYE2KQM4jdJcDEM=";
vendorHash = "sha256-IbqE0aI7utYuu1XpQijEFVu/IpUDK6CQLu7g8GUR4e8=";
CGO_ENABLED = 0;

18
pkgs/applications/networking/cluster/terraform-backend-git/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
@ -16,7 +17,22 @@ buildGoModule rec {
vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [
installShellFiles
];
ldflags = [
"-s"
"-w"
"-X=github.com/plumber-cd/terraform-backend-git/cmd.Version=${version}"
];
postInstall = ''
installShellCompletion --cmd terraform-backend-git \
--bash <($out/bin/terraform-backend-git completion bash) \
--fish <($out/bin/terraform-backend-git completion fish) \
--zsh <($out/bin/terraform-backend-git completion zsh)
'';
meta = with lib; {
description = "Terraform HTTP Backend implementation that uses Git repository as storage";

22
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -437,24 +437,24 @@
"vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ="
},
"google": {
"hash": "sha256-8uRIvFZsuPyisJMRmqL5zNxea6h1VwxZS+lmmvZslfo=",
"hash": "sha256-0spzfAsinmWsdarpoxIfrQFIPGEV47H50IVw5Kfyqxs=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.63.1",
"rev": "v4.64.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
"vendorHash": "sha256-rjLvmKymUiuAIwiZRpgivbYbP88MLVSBlrirlJxZpcw="
},
"google-beta": {
"hash": "sha256-avE1EnjCItz1NcF0KzsSgUnQABr2D0IC7kLGgIj+j6g=",
"hash": "sha256-VMJdTj9LUhoj0Qvmt9lUYh00sOJQctgEggem4ZRVsVw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.63.1",
"rev": "v4.64.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
"vendorHash": "sha256-rjLvmKymUiuAIwiZRpgivbYbP88MLVSBlrirlJxZpcw="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -728,11 +728,11 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"minio": {
"hash": "sha256-LL3jOuNNCd5isNPyt+I35j5BdxAbnWRQ2o2RBLSOc/E=",
"hash": "sha256-1VO0ofT+6JU8pMSfrSfgEJlTb5GM64AVYQ1hvbWPzCw=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
"rev": "v1.15.0",
"rev": "v1.15.1",
"spdx": "Apache-2.0",
"vendorHash": "sha256-Xz6WxAxzvLfgJTD2oDgZoeHffcdA7dyfgwY1g6lFkbk="
},
@ -764,13 +764,13 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-+awQtvyJBLSm+WYH2gp+VM2uNbWeEfIbwqw7VsikQEA=",
"hash": "sha256-YD7RpzhFgX9BwXzZ4OO3XdPPGLurTvEA6Y0iXnVxTPg=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.21.3",
"rev": "v3.22.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-fqO3hlDUPY8/9SSMpNVD81pyaQE12zwNKDLSI54UF3M="
"vendorHash": "sha256-LWIqCc4hn4ExG4LkFKD5NLM6djWpKgYQdqZM7atTez8="
},
"nomad": {
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",

27
pkgs/applications/networking/cluster/tfupdate/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "tfupdate";
version = "0.6.7";
src = fetchFromGitHub {
owner = "minamijoyo";
repo = "tfupdate";
rev = "v${version}";
sha256 = "sha256-zDrmzubk5ScqZapp58U8NsyKl9yZ48VtWafamDdlWK0=";
};
vendorHash = "sha256-nhAeN/UXLR0QBb7PT9hdtNSz1whfXxt6SYejpLJbDbk=";
# Tests start http servers which need to bind to local addresses:
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Update version constraints in your Terraform configurations";
homepage = "https://github.com/minamijoyo/tfupdate";
changelog = "https://github.com/minamijoyo/tfupdate/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Intuinewin ];
};
}

64
pkgs/applications/networking/gabutdm/default.nix Normal file
View file

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, pkg-config
, cmake
, ninja
, vala
, wrapGAppsHook4
, desktop-file-utils
, sqlite
, libcanberra
, libsoup_3
, libgee
, json-glib
, qrencode
, curl
}:
stdenv.mkDerivation rec {
pname = "gabutdm";
version = "2.1.5";
src = fetchFromGitHub {
owner = "gabutakut";
repo = pname;
rev = version;
hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4=";
};
nativeBuildInputs = [
meson
pkg-config
cmake
ninja
vala
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
sqlite
libcanberra
libsoup_3
libgee
json-glib
qrencode
curl
];
postPatch = ''
substituteInPlace meson/post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
meta = with lib; {
description = "Simple and faster download manager";
homepage = "https://github.com/gabutakut/gabutdm";
license = licenses.lgpl21Plus;
mainProgram = "com.github.gabutakut.gabutdm";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.unix;
};
}

25
pkgs/applications/networking/instant-messengers/quaternion/default.nix
View file

@ -1,37 +1,40 @@
{ mkDerivation
, stdenv
{ stdenv
, lib
, fetchFromGitHub
, cmake
, qtquickcontrols
, wrapQtAppsHook
, qtbase
, qtquickcontrols2
, qtkeychain
, qtmultimedia
, qttools
, libquotient
, libsecret
, olm
}:
mkDerivation rec {
stdenv.mkDerivation {
pname = "quaternion";
version = "0.0.95.1";
version = "0.0.95.81";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "Quaternion";
rev = version;
sha256 = "sha256-6FLj/hVY13WO7sMgHCHV57eMJu39cwQHXQX7m0lmv4I=";
rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b";
hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w=";
};
buildInputs = [
qtmultimedia
qtquickcontrols2
qtkeychain
libquotient
libsecret
olm
qtbase
qtkeychain
qtmultimedia
qtquickcontrols2
];
nativeBuildInputs = [ cmake qttools ];
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
postInstall =
if stdenv.isDarwin then ''

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

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230429";
version = "20230508-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-uOZfEZ5Wf+4lz5FxPqsockAIA/um61OZ6mvjj51BGkg=";
hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc=";
};
postPatch = ''

12
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.14.5.17687";
versions.x86_64-darwin = "5.14.5.17687";
versions.x86_64-linux = "5.14.5.2430";
versions.aarch64-darwin = "5.14.7.18149";
versions.x86_64-darwin = "5.14.7.18149";
versions.x86_64-linux = "5.14.7.2928";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-cklNvp6q/4yGWpLhDbruGiBHgaQrY5wHwhtsVapRxx4=";
hash = "sha256-8Yu/1oDjTOpL5KbS/PJlGIHTRevBxkZ7/1Rp/dgpnOw=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-1w41TGBqUl8lnl08PglQImSV7JM71khlshacxh1oTJo=";
hash = "sha256-un4tV7fitm097ES9J2Ght3U2NUJSNiyouwwKrsNXL/w=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-sf7w9P6Gajm8/D7DHo/u5d4kZwjxeJjAE96BUW/e4KE=";
hash = "sha256-xvJeVjzBKD1qxpr/t4sEhIWcqz3aQ4jllXoHX4pjrTU=";
};
};

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -138,9 +138,7 @@ stdenv.mkDerivation {
'' else
lib.optionalString withQt ''
pwd
install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop
install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg
mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap}
cp config.h $dev/include/wireshark/

5
pkgs/applications/radio/qdmr/default.nix
View file

@ -52,7 +52,10 @@ stdenv.mkDerivation rec {
--replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
'';
cmakeFlags = [ "-DBUILD_MAN=ON" ];
cmakeFlags = [
"-DBUILD_MAN=ON"
"-DINSTALL_UDEV_RULES=OFF"
];
postInstall = ''
installManPage doc/dmrconf.1 doc/qdmr.1

2
pkgs/applications/science/chemistry/siesta/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false; # Started making trouble with gcc-11
# Must do manualy becuase siesta does not do the regular
# Must do manually because siesta does not do the regular
# ./configure; make; make install
configurePhase = ''
cd Obj

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

@ -122,6 +122,12 @@ stdenv.mkDerivation rec {
patches = [
./sw_vers.patch
] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [
# Fix build against Python 3.11
(fetchpatch {
url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch";
hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s=";
})
];
# Fix build against vanilla LLVM 9

2
pkgs/applications/video/mpv/default.nix
View file

@ -69,7 +69,7 @@
, speexSupport ? true, speex
, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift
, theoraSupport ? true, libtheora
, vaapiSupport ? stdenv.isLinux, libva
, vaapiSupport ? x11Support || waylandSupport, libva
, vapoursynthSupport ? false, vapoursynth
, vdpauSupport ? true, libvdpau
, xineramaSupport ? stdenv.isLinux, libXinerama

4
pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "advanced-scene-switcher";
version = "1.20.5";
version = "1.21.1";
src = fetchFromGitHub {
owner = "WarmUpTill";
repo = "SceneSwitcher";
rev = version;
sha256 = "04k7f7v756vdsan95g73cc29lrs61jis738v37a3ihi3ivps3ma3";
sha256 = "1p6fl1fy39hrm7yasjhv6z79bnjk2ib3yg9dvf1ahwzkd9bpyfyl";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
View file

@ -41,6 +41,10 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
# lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
# https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249
auditable = false;
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [

2
pkgs/applications/window-managers/tinywm/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib;{
description = "A tiny window manger for X11";
description = "A tiny window manager for X11";
longDescription = ''
TinyWM is a tiny window manager that I created as an exercise in

13
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View file

@ -76,6 +76,19 @@ let
# XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share
# Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".
# In nix, it is commonly set without containing these values, so we add them as fallback.
#
# [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>
case ":$XDG_DATA_DIRS:" in
*:/usr/local/share:*) ;;
*) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;
esac
case ":$XDG_DATA_DIRS:" in
*:/usr/share:*) ;;
*) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;;
esac
# Force compilers and other tools to look in default search paths
unset NIX_ENFORCE_PURITY
export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

13
pkgs/build-support/build-fhsenv-chroot/env.nix
View file

@ -63,6 +63,19 @@ let
# XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share
# Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share".
# In nix, it is commonly set without containing these values, so we add them as fallback.
#
# [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>
case ":$XDG_DATA_DIRS:" in
*:/usr/local/share:*) ;;
*) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;;
esac
case ":$XDG_DATA_DIRS:" in
*:/usr/share:*) ;;
*) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;;
esac
# Force compilers and other tools to look in default search paths
unset NIX_ENFORCE_PURITY
export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

6
pkgs/build-support/cc-wrapper/default.nix
View file

@ -364,9 +364,9 @@ stdenv.mkDerivation {
''
# this ensures that when clang passes -lgcc_s to lld (as it does
# when building e.g. firefox), lld is able to find libgcc_s.so
+ lib.optionalString (gccForLibs?libgcc) ''
echo "-L${gccForLibs.libgcc}/lib" >> $out/nix-support/cc-ldflags
'')
+ concatMapStrings (libgcc: ''
echo "-L${libgcc}/lib" >> $out/nix-support/cc-ldflags
'') (lib.toList (gccForLibs.libgcc or [])))
##
## General libc support

2
pkgs/data/fonts/d2coding/default.nix
View file

@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
D2Coding is a monospace font developed by a Korean IT Company called Naver.
Font is good for displaying both Korean characters and latin characters,
as sometimes these two languages could share some similar strokes.
Since verion 1.3, D2Coding font is officially supported by the font
Since version 1.3, D2Coding font is officially supported by the font
creator, with symbols for Powerline.
'';
homepage = "https://github.com/naver/d2codingfont";

4
pkgs/data/fonts/sarasa-gothic/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.40.6";
version = "0.40.7";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-AHslDiYBQXcxo8XVh1GMZDR8LJXvzJHl4hrisfhltEM=";
hash = "sha256-muxmoTfAZWLhPp4rx91PDnYogBGHuD4esYjE2kZiOAY=";
};
sourceRoot = ".";

39
pkgs/data/icons/dracula-icon-theme/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib, stdenvNoCC, fetchFromGitHub, jdupes }:
stdenvNoCC.mkDerivation {
pname = "dracula-icon-theme";
version = "unstable-2021-07-21";
src = fetchFromGitHub {
owner = "m4thewz";
repo = "dracula-icons";
rev = "2d3c83caa8664e93d956cfa67a0f21418b5cdad8";
hash = "sha256-GY+XxTM22jyNq8kaB81zNfHRhfXujArFcyzDa8kjxCQ=";
};
nativeBuildInputs = [
jdupes
];
dontDropIconThemeCache = true;
dontPatchELF = true;
dontRewriteSymlinks = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/Dracula
cp -a * $out/share/icons/Dracula/
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';
meta = with lib; {
description = "Dracula Icon theme";
homepage = "https://github.com/m4thewz/dracula-icons";
platforms = platforms.linux;
license = licenses.gpl3Only;
maintainers = with maintainers; [ therealr5 ];
};
}

22
pkgs/desktops/deepin/go-package/dde-daemon/0005-fix-custom-wallpapers-path.diff Normal file
View file

@ -0,0 +1,22 @@
diff --git a/bin/dde-system-daemon/wallpaper.go b/bin/dde-system-daemon/wallpaper.go
index d4af13da..1ff36f84 100644
--- a/bin/dde-system-daemon/wallpaper.go
+++ b/bin/dde-system-daemon/wallpaper.go
@@ -24,7 +24,7 @@ import (
const maxCount = 5
const maxSize = 32 * 1024 * 1024
-const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/"
+const wallPaperDir = "/var/lib/dde-daemon/wallpapers/custom-wallpapers/"
func GetUserDir(username string) (string, error) {
dir := filepath.Join(wallPaperDir, username)
@@ -136,7 +136,7 @@ func (d *Daemon) SaveCustomWallPaper(sender dbus.Sender, username string, file s
"-u",
username,
"--",
- "head",
+ "@coreutils@/bin/head",
"-c",
"0",
file,

15
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
View file

@ -32,6 +32,9 @@
, xdotool
, getconf
, dbus
, coreutils
, util-linux
, dde-session-ui
}:
buildGoPackage rec {
@ -55,6 +58,10 @@ buildGoPackage rec {
src = ./0004-aviod-use-hardcode-path.patch;
inherit dbus;
})
(substituteAll {
src = ./0005-fix-custom-wallpapers-path.diff;
inherit coreutils;
})
];
postPatch = ''
@ -70,7 +77,7 @@ buildGoPackage rec {
substituteInPlace system/uadp/crypto.go \
--replace "/usr/share/uadp" "/var/lib/dde-daemon/uadp"
substituteInPlace appearance/background/{background.go,custom_wallpapers.go} accounts/user.go bin/dde-system-daemon/wallpaper.go \
substituteInPlace appearance/background/{background.go,custom_wallpapers.go} accounts/user.go \
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
substituteInPlace appearance/manager.go timedate/zoneinfo/zone.go \
@ -138,6 +145,12 @@ buildGoPackage rec {
runHook postInstall
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ util-linux dde-session-ui ]}"
)
'';
postFixup = ''
for f in "$out"/lib/deepin-daemon/*; do
echo "Wrapping $f"

12
pkgs/development/compilers/llvm/multi.nix
View file

@ -28,7 +28,9 @@ let
# includes
ln -s ${glibc_multi.dev}/include $out/
mkdir -p $out/include
ln -s ${glibc_multi.dev}/include/* $out/include
ln -s ${gcc64.cc}/include/c++ $out/include/c++
# dynamic linkers
mkdir -p $out/lib/32
@ -46,7 +48,13 @@ let
libc = gcc_multi_sysroot;
};
gccForLibs = gcc_multi_sysroot;
gccForLibs = gcc_multi_sysroot // {
inherit (glibc_multi) libgcc;
langCC =
assert (gcc64.cc.langCC != gcc32.cc.langCC)
-> throw "(gcc64.cc.langCC=${gcc64.cc.langCC}) != (gcc32.cc.langCC=${gcc32.cc.langCC})";
gcc64.cc.langCC;
};
};
in clangMulti

4
pkgs/development/compilers/yosys/default.nix
View file

@ -71,13 +71,13 @@ let
in stdenv.mkDerivation rec {
pname = "yosys";
version = "0.27";
version = "0.28";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "${pname}-${version}";
hash = "sha256-u6SeVlmQVCF3xCGajxsv0ZAgMKg6aa6WdN3DLKTPNYo=";
hash = "sha256-z550IAyo4Rbq9/S2Vwgec3sy7KH2n95PH0k8vo/pBSE=";
};
enableParallelBuilding = true;

6
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
View file

@ -65,7 +65,7 @@ def _get_values(attribute, text):
:returns: List of matches.
"""
regex = '{}\s+=\s+"(.*)";'.format(re.escape(attribute))
regex = fr'{re.escape(attribute)}\s+=\s+"(.*)";'
regex = re.compile(regex)
values = regex.findall(text)
return values
@ -430,7 +430,7 @@ def _update_package(path, target):
if fetcher == 'fetchFromGitHub':
# in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
# in which no string value is meant to be substituted. However, we can just overwrite the previous value.
regex = '(rev\s+=\s+[^;]*;)'
regex = r'(rev\s+=\s+[^;]*;)'
regex = re.compile(regex)
matches = regex.findall(text)
n = len(matches)
@ -519,7 +519,7 @@ environment variables:
if len(packages) > 1:
global BULK_UPDATE
BULK_UPDATE = true
BULK_UPDATE = True
logging.info("Updating packages...")

5
pkgs/development/libraries/ada/gnatcoll/bindings.nix
View file

@ -14,6 +14,7 @@
, zlib
, python3
, ncurses
, darwin
}:
let
@ -48,6 +49,10 @@ stdenv.mkDerivation rec {
python3
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
];
# propagate since gprbuild needs to find referenced .gpr files
# and all dependency C libraries when statically linking a
# downstream executable.

2
pkgs/development/libraries/alkimia/default.nix
View file

@ -27,7 +27,7 @@ mkDerivation rec {
logic that will be used by all financial applications in KDE.
The target is to share financial related information over
application bounderies.
application boundaries.
'';
license = lib.licenses.lgpl21Plus;
platforms = qtbase.meta.platforms;

5
pkgs/development/libraries/gdal/default.nix
View file

@ -52,6 +52,7 @@
, libspatialite
, sqlite
, libtiff
, useTiledb ? !(stdenv.isDarwin && stdenv.isx86_64)
, tiledb
, libwebp
, xercesc
@ -91,6 +92,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
] ++ lib.optionals (!useTiledb) [
"-DGDAL_USE_TILEDB=OFF"
];
buildInputs = [
@ -135,7 +138,9 @@ stdenv.mkDerivation rec {
libspatialite
sqlite
libtiff
] ++ lib.optionals useTiledb [
tiledb
] ++ [
libwebp
zlib
zstd

13
pkgs/development/libraries/glibc/multi.nix
View file

@ -1,4 +1,5 @@
{ runCommand, glibc, glibc32
{ lib
, runCommand, glibc, glibc32
}:
let
@ -7,7 +8,15 @@ let
in
runCommand "${nameVersion.name}-multi-${nameVersion.version}"
# out as the first output is an exception exclusive to glibc
{ outputs = [ "out" "bin" "dev" ]; } # TODO: no static version here (yet)
{
outputs = [ "out" "bin" "dev" ]; # TODO: no static version here (yet)
passthru = {
libgcc = lib.lists.filter (x: x!=null) [
(glibc64.libgcc or null)
(glibc32.libgcc or null)
];
};
}
''
mkdir -p "$out/lib"
ln -s '${glibc64.out}'/lib/* "$out/lib"

9
pkgs/development/libraries/gsl-lite/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, ninja
, installCompatHeader ? false
@ -18,6 +19,14 @@ stdenv.mkDerivation rec {
hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio=";
};
patches = [
(fetchpatch {
name = "type-limits-cast-fix.patch";
url = "https://github.com/gsl-lite/gsl-lite/commit/13475be0e5bf5f464c398f4a07ef5c7684bc57c5.patch";
hash = "sha256-rSz7OBmgQ3KcQ971tS3Z3QNC+U4XmrPjgmuOyG7J6Bo=";
})
];
nativeBuildInputs = [ cmake ninja ];
cmakeFlags = lib.mapAttrsToList

2
pkgs/development/libraries/libhwy/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
dontUseCmakeBuildDir = true;
cmakeFlags = let
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
libExt = stdenv.hostPlatform.extensions.library;
in [
"-GNinja"
"-DCMAKE_INSTALL_LIBDIR=lib"

39
pkgs/development/libraries/libosmo-abis/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
, libosmocore, ortp, bctoolbox
}:
stdenv.mkDerivation rec {
pname = "libosmo-abis";
version = "1.4.0";
src = fetchgit {
url = "https://gitea.osmocom.org/osmocom/libosmo-abis";
rev = version;
sha256 = "sha256-RKJis0Ur3Y0LximNQl+hm6GENg8t2E1S++2c+63D2pQ=";
};
postPatch = ''
echo "${version}" > .tarball-version
'';
configureFlags = [ "--disable-dahdi" ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
libosmocore
ortp
bctoolbox
];
meta = with lib; {
description = "GSM A-bis interface library";
homepage = "https://osmocom.org/projects/libosmo-abis";
maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux;
license = licenses.agpl3Only;
};
}

37
pkgs/development/libraries/libosmo-netif/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
, libosmocore, lksctp-tools
}:
stdenv.mkDerivation rec {
pname = "libosmo-netif";
version = "1.3.0";
src = fetchgit {
url = "https://gitea.osmocom.org/osmocom/libosmo-netif";
rev = version;
sha256 = "sha256-PhGi/6JVO8tXxzfGwEKUB/GdrgCJkqROo26TPU+O9Sg=";
};
postPatch = ''
echo "${version}" > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
libosmocore
lksctp-tools
];
meta = with lib; {
description = "Higher-layer GSM cellular communications protocol implementation";
homepage = "https://gitea.osmocom.org/osmocom/libosmo-netif";
maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux;
license = licenses.agpl3Only;
};
}

38
pkgs/development/libraries/libosmo-sccp/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
, libosmocore, libosmo-netif, lksctp-tools
}:
stdenv.mkDerivation rec {
pname = "libosmo-sccp";
version = "1.7.0";
src = fetchgit {
url = "https://gitea.osmocom.org/osmocom/libosmo-sccp";
rev = version;
sha256 = "sha256-ScJZke9iNmFc9XXqtRjb24ZzKfa5EYws5PDNhcZFb7U=";
};
postPatch = ''
echo "${version}" > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
libosmocore
libosmo-netif
lksctp-tools
];
meta = with lib; {
description = "Implementation of telecom signaling protocols and OsmoSTP";
homepage = "https://osmocom.org/projects/osmo-stp/wiki";
maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux;
license = licenses.agpl3Only;
};
}

12
pkgs/development/libraries/libquotient/default.nix
View file

@ -1,17 +1,17 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, olm, openssl, qtmultimedia, qtkeychain }:
{ stdenv, lib, fetchFromGitHub, cmake, olm, openssl, qtbase, qtmultimedia, qtkeychain }:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "libquotient";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
hash = "sha256-3xnv1dcyeX3Kl5EH2Tlf6nXobLG1zXsFmYstnvmSAXA=";
hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk=";
};
buildInputs = [ olm openssl qtmultimedia qtkeychain ];
buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];
nativeBuildInputs = [ cmake ];
@ -26,6 +26,8 @@ mkDerivation rec {
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
'';
dontWrapQtApps = true;
meta = with lib; {
description = "A Qt5/Qt6 library to write cross-platform clients for Matrix";
homepage = "https://matrix.org/docs/projects/sdk/quotient";

19
pkgs/development/libraries/libressl/default.nix
View file

@ -107,22 +107,13 @@ in {
];
};
libressl_3_5 = generic {
version = "3.5.4";
hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
};
libressl_3_6 = generic {
version = "3.6.2";
hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
};
libressl_3_7 = generic {
version = "3.7.2";
hash = "sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc=";
};
}

4
pkgs/development/libraries/opencv/tests.nix
View file

@ -57,7 +57,7 @@ let
(map (test: "${testRunner}${opencv4.package_tests}/opencv_test_${test} --test_threads=$NIX_BUILD_CORES --gtest_filter=$GTEST_FILTER" ) testNames)
}
'';
perfomanceTests = lib.optionalString runPerformanceTests ''
performanceTests = lib.optionalString runPerformanceTests ''
${ builtins.concatStringsSep "\n"
(map (test: "${testRunner}${opencv4.package_tests}/opencv_perf_${test} --perf_impl=plain --perf_min_samples=10 --perf_force_samples=10 --perf_verify_sanity --skip_unstable=1 --gtest_filter=$GTEST_FILTER") perfTestNames)
}
@ -67,4 +67,4 @@ runCommand "opencv4-tests"
{
nativeBuildInputs = lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]);
}
(testsPreparation + accuracyTests + perfomanceTests)
(testsPreparation + accuracyTests + performanceTests)

4
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -149,7 +149,9 @@ let
qt3d = callPackage ../modules/qt3d.nix {};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth;
};
qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};

3
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
View file

@ -1,8 +1,9 @@
{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez, IOBluetooth }:
qtModule {
pname = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = lib.optional stdenv.isLinux bluez;
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ];
outputs = [ "out" "dev" "bin" ];
}

37
pkgs/development/libraries/qtkeychain/default.nix
View file

@ -1,11 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools
, CoreFoundation, Security
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, qtbase
, qttools
, CoreFoundation
, Security
, libsecret
}:
stdenv.mkDerivation rec {
pname = "qtkeychain";
version = "0.12.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
version = "0.12.0";
src = fetchFromGitHub {
owner = "frankosterfeld";
@ -18,7 +25,10 @@ stdenv.mkDerivation rec {
patches = [ ./0002-Fix-install-name-Darwin.patch ];
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
cmakeFlags = [
"-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
"-DQT_TRANSLATIONS_DIR=share/qt/translations"
];
nativeBuildInputs = [ cmake ]
++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
@ -27,9 +37,22 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
++ [ qtbase qttools ]
++ lib.optionals stdenv.isDarwin [
CoreFoundation Security
]
;
CoreFoundation
Security
];
doInstallCheck = true;
# we previously had a note in here saying to run this check manually, so we might as
# well do it automatically. It seems like a perfectly valid sanity check, but I
# have no idea *why* we might need it
installCheckPhase = ''
runHook preInstallCheck
grep --quiet -R 'set(PACKAGE_VERSION "${version}"' .
runHook postInstallCheck
'';
meta = {
description = "Platform-independent Qt API for storing passwords securely";

2
pkgs/development/libraries/spice-gtk/default.nix
View file

@ -40,7 +40,7 @@
}:
# If this package is built with polkit support (withPolkit=true),
# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
# usb redirection requires spice-client-glib-usb-acl-helper to run setuid root.
# The helper confirms via polkit that the user has an active session,
# then adds a device acl entry for that user.
# Example NixOS config to create a setuid wrapper for the helper:

2
pkgs/development/libraries/zlib/default.nix
View file

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
export CHOST=${stdenv.hostPlatform.config}
'';
# For zlib's ./configure (as of verion 1.2.11), the order
# For zlib's ./configure (as of version 1.2.11), the order
# of --static/--shared flags matters!
# `--shared --static` builds only static libs, while
# `--static --shared` builds both.

2
pkgs/development/node-packages/overrides.nix
View file

@ -1,4 +1,4 @@
# Do not use overrides in this file to add `meta.mainProgram` to packges. Use `./main-programs.nix`
# Do not use overrides in this file to add `meta.mainProgram` to packages. Use `./main-programs.nix`
# instead.
{ pkgs, nodejs }:

12
pkgs/development/ocaml-modules/lambdasoup/default.nix
View file

@ -1,21 +1,21 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, camlp-streams, markup, ounit2 }:
buildDunePackage rec {
pname = "lambdasoup";
version = "0.7.3";
version = "1.0.0";
minimalOCamlVersion = "4.02";
minimalOCamlVersion = "4.03";
useDune2 = true;
duneVersion = "3";
src = fetchFromGitHub {
owner = "aantron";
repo = pname;
rev = version;
sha256 = "sha256:1wclkn1pl0d150dw0xswb29jc7y1q9mhipff1pnsc1hli3pyvvb7";
hash = "sha256-PZkhN5vkkLu8A3gYrh5O+nq9wFtig0Q4qD8zLGUGTRI=";
};
propagatedBuildInputs = [ markup ];
propagatedBuildInputs = [ camlp-streams markup ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
checkInputs = [ ounit2 ];

20
pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix Normal file
View file

@ -0,0 +1,20 @@
{ buildDunePackage, qcheck-core
, qcheck, ppxlib, ppx_deriving }:
buildDunePackage {
pname = "ppx_deriving_qcheck";
inherit (qcheck-core) version src patches;
duneVersion = "3";
propagatedBuildInputs = [
qcheck
ppxlib
ppx_deriving
];
meta = qcheck-core.meta // {
description = "PPX Deriver for QCheck";
};
}

1
pkgs/development/python-modules/afdko/default.nix
View file

@ -107,6 +107,7 @@ buildPythonPackage rec {
# https://github.com/adobe-type-tools/afdko/issues/1425
"test_spec"
] ++ lib.optionals (stdenv.hostPlatform.isi686) [
"test_dump_option"
"test_type1mm_inputs"
];

4
pkgs/development/python-modules/ailment/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.48";
version = "9.2.49";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-abUxA2ndkOlLMWdPspKKTgWGuoGYyypAq43MrgaW+AY=";
hash = "sha256-pKQNaPRdsjS8RHPAsZCHEm9eiCOuAxQymDowvpeg7W0=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/angr/default.nix
View file

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.48";
version = "9.2.49";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-KHeLi4b54gvWcCsbdIbJ2n1sRcowio7ng4eEqkGacTU=";
hash = "sha256-6SHg1topRXQlZ2kDCcOyPbNpGl7Na9vcOgOthQ44tCs=";
};
propagatedBuildInputs = [

53
pkgs/development/python-modules/anthropic/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, httpx
, importlib-metadata
, requests
, tokenizers
, aiohttp
, pythonOlder
}:
buildPythonPackage rec {
pname = "anthropic";
version = "0.2.7";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-2v3WF8eRIruXvFNjRRno3LoXt+dlpaI3LHf243RBJ+U=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
httpx
requests
tokenizers
aiohttp
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# try downloading tokenizer in tests
# relates https://github.com/anthropics/anthropic-sdk-python/issues/24
doCheck = false;
pythonImportsCheck = [
"anthropic"
];
meta = with lib; {
description = "Anthropic's safety-first language model APIs";
homepage = "https://github.com/anthropics/anthropic-sdk-python";
changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
};
}

4
pkgs/development/python-modules/archinfo/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.48";
version = "9.2.49";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-WQkIw/tuT/KwRBVQ2+u2NXioAzisV0hCvTN8tfN+lRY=";
hash = "sha256-FbI2XX5/gc3bTW28alT8qEEQ46UEkQf5cO37jJcFVBs=";
};
nativeBuildInputs = [

15
pkgs/development/python-modules/avion/default.nix
View file

@ -4,18 +4,28 @@
, csrmesh
, fetchPypi
, pycryptodome
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "avion";
version = "0.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0zgv45086b97ngyqxdp41wxb7hpn9g7alygc21j9y3dib700vzdz";
hash = "sha256-v/0NwFmxDZ9kEOx5qs5L9sKzOg/kto79syctg0Ah+30=";
};
postPatch = ''
# https://github.com/mjg59/python-avion/pull/16
substituteInPlace setup.py \
--replace "bluepy>==1.1.4" "bluepy>=1.1.4"
'';
propagatedBuildInputs = [
bluepy
csrmesh
@ -23,8 +33,9 @@ buildPythonPackage rec {
requests
];
# Project has no test
# Module has no test
doCheck = false;
# bluepy/uuids.json is not found
# pythonImportsCheck = [ "avion" ];

2
pkgs/development/python-modules/betterproto/default.nix
View file

@ -53,7 +53,7 @@ buildPythonPackage rec {
] ++ passthru.optional-dependencies.compiler;
# The tests require the generation of code before execution. This requires
# the protoc-gen-python_betterproto script from the packge to be on PATH.
# the protoc-gen-python_betterproto script from the package to be on PATH.
preCheck = ''
export PATH=$PATH:$out/bin
${python.interpreter} -m tests.generate

4
pkgs/development/python-modules/bluetooth-adapters/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "bluetooth-adapters";
version = "0.15.3";
version = "0.15.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sh5wOx/4J1AEzR5zrd77v7Cbq6Mt9vOjCSREKHRN4aQ=";
hash = "sha256-H8QkOs+QPN9jB/g4f3OaGlX/F2SO2hIDptoPB47ogqA=";
};
postPatch = ''

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