ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-11 07:15:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-27 00:12:11 +00:00 committed by GitHub
commit 7f599f6511
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
488 changed files with 11332 additions and 6963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/check-by-name.yml vendored
View File

@ -1,11 +1,9 @@
# Checks pkgs/by-name (see pkgs/by-name/README.md)
# using the nixpkgs-check-by-name tool (see pkgs/test/nixpkgs-check-by-name)
# using the nixpkgs-check-by-name tool (see https://github.com/NixOS/nixpkgs-check-by-name)
#
# When you make changes to this workflow, also update pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh adequately
# When you make changes to this workflow, also update pkgs/test/check-by-name/run-local.sh adequately
name: Check pkgs/by-name
# The tool is pinned to a pre-built version on Hydra,
# see pkgs/test/nixpkgs-check-by-name/scripts/README.md
on:
# Using pull_request_target instead of pull_request avoids having to approve first time contributors
pull_request_target:
@ -24,8 +22,7 @@ permissions:
jobs:
check:
# This is x86_64-linux, for which the tool is always prebuilt on the nixos-* channels,
# as specified in nixos/release-combined.nix
# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases
runs-on: ubuntu-latest
# This should take 1 minute at most, but let's be generous.
# The default of 6 hours is definitely too long
@ -100,11 +97,14 @@ jobs:
echo "base=$base" >> "$GITHUB_ENV"
- uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
- name: Fetching the pinned tool
# Update the pinned version using pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh
# Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh
run: |
# Get the direct /nix/store path from the pin to avoid having to evaluate Nixpkgs
toolPath=$(jq -r '."ci-path"' pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json)
# This asks the substituter for the path, which should be there because Hydra will have pre-built and pushed it
# The pinned version of the tooling to use
toolVersion=$(<pkgs/test/check-by-name/pinned-version.txt)
# Fetch the x86_64-linux-specific release artifact containing the Gzipped NAR of the pre-built tool
toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-check-by-name/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
| gzip -cd | nix-store --import | tail -1)
# Adds a result symlink as a GC root
nix-store --realise "$toolPath" --add-root result
- name: Running nixpkgs-check-by-name
run: |

21
maintainers/maintainer-list.nix
View File

@ -4838,6 +4838,12 @@
githubId = 4708206;
name = "Daniel Fox Franke";
};
dghubble = {
email = "dghubble@gmail.com";
github = "dghubble";
githubId = 2253428;
name = "Dalton Hubble";
};
dgliwka = {
email = "dawid.gliwka@gmail.com";
github = "dgliwka";
@ -16188,6 +16194,15 @@
githubId = 104558;
name = "Benjamin Saunders";
};
ramblurr = {
name = "Casey Link";
email = "nix@caseylink.com";
github = "Ramblurr";
githubId = 14830;
keys = [{
fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA";
}];
};
ramkromberg = {
email = "ramkromberg@mail.com";
github = "RamKromberg";
@ -19077,6 +19092,12 @@
githubId = 321799;
name = "Paul Colomiets";
};
takac = {
email = "cammann.tom@gmail.com";
github = "takac";
githubId = 1015381;
name = "Tom Cammann";
};
takagiy = {
email = "takagiy.4dev@gmail.com";
github = "takagiy";

2
maintainers/scripts/README.md
View File

@ -11,7 +11,7 @@ What follows is a (very incomplete) overview of available scripts.
### `check-by-name.sh`
An alias for `pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh`, see [documentation](../../pkgs/test/nixpkgs-check-by-name/scripts/README.md).
An alias for `pkgs/test/check-by-name/run-local.sh`, see [documentation](../../pkgs/test/check-by-name/README.md).
### `get-maintainer.sh`

2
maintainers/scripts/check-by-name.sh
View File

@ -1 +1 @@
../../pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh
../../pkgs/test/check-by-name/run-local.sh

2
maintainers/scripts/kde/generate-sources.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ])
#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ])"
import base64
import binascii
import json

10
nixos/doc/manual/configuration/x-windows.chapter.md
View File

@ -146,14 +146,12 @@ default because it's not free software. You can enable it as follows:
services.xserver.videoDrivers = [ "nvidia" ];
```
Or if you have an older card, you may have to use one of the legacy
drivers:
If you have an older card, you may have to use one of the legacy drivers:
```nix
services.xserver.videoDrivers = [ "nvidiaLegacy470" ];
services.xserver.videoDrivers = [ "nvidiaLegacy390" ];
services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_340;
```
You may need to reboot after enabling this driver to prevent a clash

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -111,6 +111,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix]($opt-services-pretix.enable).
- [microsocks](https://github.com/rofl0r/microsocks), a tiny, portable SOCKS5 server with very moderate resource usage. Available as [services.microsocks]($opt-services-microsocks.enable).
- [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).
- [fritz-exporter](https://github.com/pdreker/fritz_exporter), a Prometheus exporter for extracting metrics from [FRITZ!](https://avm.de/produkte/) devices. Available as [services.prometheus.exporters.fritz](#opt-services.prometheus.exporters.fritz.enable).

36
nixos/modules/config/users-groups.nix
View File

@ -496,6 +496,7 @@ let
in
filter types.shellPackage.check shells;
lingeringUsers = map (u: u.name) (attrValues (flip filterAttrs cfg.users (n: u: u.linger)));
in {
imports = [
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
@ -695,24 +696,31 @@ in {
'';
} else ""; # keep around for backwards compatibility
system.activationScripts.update-lingering = let
lingerDir = "/var/lib/systemd/linger";
lingeringUsers = map (u: u.name) (attrValues (flip filterAttrs cfg.users (n: u: u.linger)));
lingeringUsersFile = builtins.toFile "lingering-users"
(concatStrings (map (s: "${s}\n")
(sort (a: b: a < b) lingeringUsers))); # this sorting is important for `comm` to work correctly
in stringAfter [ "users" ] ''
if [ -e ${lingerDir} ] ; then
systemd.services.linger-users = lib.mkIf ((builtins.length lingeringUsers) > 0) {
wantedBy = ["multi-user.target"];
after = ["systemd-logind.service"];
requires = ["systemd-logind.service"];
script = let
lingerDir = "/var/lib/systemd/linger";
lingeringUsersFile = builtins.toFile "lingering-users"
(concatStrings (map (s: "${s}\n")
(sort (a: b: a < b) lingeringUsers))); # this sorting is important for `comm` to work correctly
in ''
mkdir -vp ${lingerDir}
cd ${lingerDir}
for user in ${lingerDir}/*; do
if ! id "$user" >/dev/null 2>&1; then
for user in $(ls); do
if ! id "$user" >/dev/null; then
echo "Removing linger for missing user $user"
rm --force -- "$user"
fi
done
ls ${lingerDir} | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger
ls ${lingerDir} | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger
fi
'';
ls | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger
ls | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger
'';
serviceConfig.Type = "oneshot";
};
# Warn about user accounts with deprecated password hashing schemes
# This does not work when the users and groups are created by

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

@ -396,6 +396,9 @@ in {
modules = [nvidia_x11.bin];
display = !offloadCfg.enable;
deviceSection =
''
Option "SidebandSocketPath" "/run/nvidia-xdriver/"
'' +
lib.optionalString primeEnabled
''
BusID "${pCfg.nvidiaBusId}"
@ -533,8 +536,14 @@ in {
hardware.firmware = lib.optional cfg.open nvidia_x11.firmware;
systemd.tmpfiles.rules =
lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
systemd.tmpfiles.rules = [
# Remove the following log message:
# (WW) NVIDIA: Failed to bind sideband socket to
# (WW) NVIDIA: '/var/run/nvidia-xdriver-b4f69129' Permission denied
#
# https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115
"d /run/nvidia-xdriver 0770 root users"
] ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
boot = {

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -257,7 +257,7 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") {
# Add bcache module, if needed.
my @bcacheDevices = glob("/dev/bcache*");
@bcacheDevices = grep(!qr#dev/bcachefs.*#, @bcacheDevices);
@bcacheDevices = grep(!m#dev/bcachefs.*#, @bcacheDevices);
if (scalar @bcacheDevices > 0) {
push @initrdAvailableKernelModules, "bcache";
}

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

@ -1020,6 +1020,7 @@
./services/networking/lxd-image-server.nix
./services/networking/magic-wormhole-mailbox-server.nix
./services/networking/matterbridge.nix
./services/networking/microsocks.nix
./services/networking/mihomo.nix
./services/networking/minidlna.nix
./services/networking/miniupnpd.nix

4
nixos/modules/programs/steam.nix
View File

@ -45,6 +45,8 @@ in {
apply = steam: steam.override (prev: {
extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages;
}) // (optionalAttrs cfg.extest.enable {
LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
}) // (prev.extraEnv or {});
extraLibraries = pkgs: let
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
@ -59,8 +61,6 @@ in {
# use the setuid wrapped bubblewrap
bubblewrap = "${config.security.wrapperDir}/..";
};
} // optionalAttrs cfg.extest.enable {
extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
});
description = lib.mdDoc ''
The Steam package to use. Additional libraries are added from the system

16
nixos/modules/services/misc/paperless.nix
View File

@ -27,6 +27,8 @@ let
name = "paperless_ngx_nltk_data";
paths = pkg.nltkData;
};
} // optionalAttrs (cfg.openMPThreadingWorkaround) {
OMP_NUM_THREADS = "1";
} // (lib.mapAttrs (_: s:
if (lib.isAttrs s || lib.isList s) then builtins.toJSON s
else if lib.isBool s then lib.boolToString s
@ -199,6 +201,20 @@ in
};
package = mkPackageOption pkgs "paperless-ngx" { };
openMPThreadingWorkaround = mkEnableOption ''
a workaround for document classifier timeouts.
Paperless uses OpenBLAS via scikit-learn for document classification.
The default is to use threading for OpenMP but this would cause the
document classifier to spin on one core seemingly indefinitely if there
are large amounts of classes per classification; causing it to
effectively never complete due to running into timeouts.
This sets `OMP_NUM_THREADS` to `1` in order to mitigate the issue. See
https://github.com/NixOS/nixpkgs/issues/240591 for more information.
'' // mkOption { default = true; };
};
config = mkIf cfg.enable {

146
nixos/modules/services/networking/microsocks.nix Normal file
View File

@ -0,0 +1,146 @@
{ config,
lib,
pkgs,
...
}:
let
cfg = config.services.microsocks;
cmd =
if cfg.execWrapper != null
then "${cfg.execWrapper} ${cfg.package}/bin/microsocks"
else "${cfg.package}/bin/microsocks";
args =
[ "-i" cfg.ip "-p" (toString cfg.port) ]
++ lib.optionals (cfg.authOnce) [ "-1" ]
++ lib.optionals (cfg.disableLogging) [ "-q" ]
++ lib.optionals (cfg.outgoingBindIp != null) [ "-b" cfg.outgoingBindIp ]
++ lib.optionals (cfg.authUsername != null) [ "-u" cfg.authUsername ];
in {
options.services.microsocks = {
enable = lib.mkEnableOption (lib.mdDoc "Tiny, portable SOCKS5 server with very moderate resource usage");
user = lib.mkOption {
default = "microsocks";
description = lib.mdDoc "User microsocks runs as.";
type = lib.types.str;
};
group = lib.mkOption {
default = "microsocks";
description = lib.mdDoc "Group microsocks runs as.";
type = lib.types.str;
};
package = lib.mkPackageOption pkgs "microsocks" {};
ip = lib.mkOption {
type = lib.types.str;
default = "127.0.0.1";
description = lib.mdDoc ''
IP on which microsocks should listen. Defaults to 127.0.0.1 for
security reasons.
'';
};
port = lib.mkOption {
type = lib.types.port;
default = 1080;
description = lib.mdDoc "Port on which microsocks should listen.";
};
disableLogging = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc "If true, microsocks will not log any messages to stdout/stderr.";
};
authOnce = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
If true, once a specific ip address authed successfully with user/pass,
it is added to a whitelist and may use the proxy without auth.
'';
};
outgoingBindIp = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc "Specifies which ip outgoing connections are bound to";
};
authUsername = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = "alice";
description = lib.mdDoc "Optional username to use for authentication.";
};
authPasswordFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/secrets/microsocks-password";
description = lib.mdDoc "Path to a file containing the password for authentication.";
};
execWrapper = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = ''
''${pkgs.mullvad-vpn}/bin/mullvad-exclude
'';
description = lib.mdDoc ''
An optional command to prepend to the microsocks command (such as proxychains, or a VPN exclude command).
'';
};
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = (cfg.authUsername != null) == (cfg.authPasswordFile != null);
message = "Need to set both authUsername and authPasswordFile for microsocks";
}
];
users = {
users = lib.mkIf (cfg.user == "microsocks") {
microsocks = {
group = cfg.group;
isSystemUser = true;
};
};
groups = lib.mkIf (cfg.group == "microsocks") {
microsocks = {};
};
};
systemd.services.microsocks = {
enable = true;
description = "a tiny socks server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = cfg.user;
Group = cfg.group;
Restart = "on-failure";
RestartSec = 10;
LoadCredential = lib.optionalString (cfg.authPasswordFile != null) "MICROSOCKS_PASSWORD_FILE:${cfg.authPasswordFile}";
MemoryDenyWriteExecute = true;
SystemCallArchitectures = "native";
PrivateTmp = true;
NoNewPrivileges = true;
ProtectSystem = "strict";
ProtectHome = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
PrivateDevices = true;
RestrictSUIDSGID = true;
RestrictNamespaces = [
"cgroup"
"ipc"
"pid"
"user"
"uts"
];
};
script =
if cfg.authPasswordFile != null
then ''
PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/MICROSOCKS_PASSWORD_FILE")
${cmd} ${lib.escapeShellArgs args} -P "$PASSWORD"
''
else ''
${cmd} ${lib.escapeShellArgs args}
'';
};
};
}

2
nixos/modules/services/x11/xserver.nix
View File

@ -303,7 +303,7 @@ in
type = types.listOf types.str;
default = [ "modesetting" "fbdev" ];
example = [
"nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"
"nvidia"
"amdgpu-pro"
];
# TODO(@oxij): think how to easily add the rest, like those nvidia things

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

@ -392,7 +392,10 @@ in {
boot.kernelParams = [
"root=${config.boot.initrd.systemd.root}"
] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}";
] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
# `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
# For NixOS activation to succeed, we need to have root writable in initrd.
++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
boot.initrd.systemd = {
initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package];

5
nixos/release-combined.nix
View File

@ -169,11 +169,6 @@ in rec {
(onFullSupported "nixpkgs.jdk")
(onSystems ["x86_64-linux"] "nixpkgs.mesa_i686") # i686 sanity check + useful
["nixpkgs.tarball"]
# Ensure that nixpkgs-check-by-name is available in nixos-unstable,
# so that a pre-built version can be used in CI for PR's
# See ../pkgs/test/nixpkgs-check-by-name/README.md
(onSystems ["x86_64-linux"] "nixpkgs.tests.nixpkgs-check-by-name")
];
};
}

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

@ -902,6 +902,7 @@ in {
systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
systemd-timesyncd-nscd-dnssec = handleTest ./systemd-timesyncd-nscd-dnssec.nix {};
systemd-user-linger = handleTest ./systemd-user-linger.nix {};
systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {};
systemd-misc = handleTest ./systemd-misc.nix {};
systemd-userdbd = handleTest ./systemd-userdbd.nix {};

8
nixos/tests/goss.nix
View File

@ -28,10 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
group.root.exists = true;
kernel-param."kernel.ostype".value = "Linux";
service.goss = {
enabled = true;
running = true;
};
user.root.exists = true;
};
};
@ -46,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
with subtest("returns health status"):
result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz"))
assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}"
assert len(result["results"]) == 8, f".results should be an array of 10 items, was {result['results']!r}"
assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}"
assert result["summary"]["test-count"] == 10, f".summary.test-count should be 10, was {result['summary']['test-count']}"
assert result["summary"]["test-count"] == 8, f".summary.test-count should be 10, was {result['summary']['test-count']}"
'';
})

39
nixos/tests/systemd-user-linger.nix Normal file
View File

@ -0,0 +1,39 @@
import ./make-test-python.nix (
{ lib, ... }:
{
name = "systemd-user-linger";
nodes.machine =
{ ... }:
{
users.users = {
alice = {
isNormalUser = true;
linger = true;
uid = 1000;
};
bob = {
isNormalUser = true;
linger = false;
uid = 10001;
};
};
};
testScript =
{ ... }:
''
machine.wait_for_file("/var/lib/systemd/linger/alice")
machine.succeed("systemctl status user-1000.slice")
machine.fail("test -e /var/lib/systemd/linger/bob")
machine.fail("systemctl status user-1001.slice")
with subtest("missing users have linger purged"):
machine.succeed("touch /var/lib/systemd/linger/missing")
machine.systemctl("restart linger-users")
machine.succeed("test ! -e /var/lib/systemd/linger/missing")
'';
}
)

10
pkgs/applications/audio/mamba/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, xxd
@ -14,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "mamba";
version = "2.3";
version = "2.6";
src = fetchFromGitHub {
owner = "brummer10";
repo = "Mamba";
rev = "v${version}";
sha256 = "sha256-Dj8yPmuEtDVgu6Gm6aEY+dgJ0dtwB8RPg9EuaVAsiIs=";
hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY=";
fetchSubmodules = true;
};
@ -37,8 +38,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd0;
maintainers = with maintainers; [ magnetophon orivej ];
platforms = platforms.linux;
# 2023-08-19, `-Werror=format-security` fails for xputty
# reported as https://github.com/brummer10/libxputty/issues/12
broken = true;
};
}

17
pkgs/applications/audio/termusic/default.nix
View File

@ -22,16 +22,26 @@
rustPlatform.buildRustPackage rec {
pname = "termusic";
version = "0.7.11";
version = "0.9.0";
src = fetchFromGitHub {
owner = "tramhao";
repo = "termusic";
rev = "v${version}";
hash = "sha256-ykOBXM/WF+zasAt+6mgY2aSFCpGaYcqk+YI7YLM3MWs=";
hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q=";
};
cargoHash = "sha256-BrOpU0RFdlRXQIMjfHfs/XYIdBCYKFSA+5by/rGzC8Y=";
postPatch = ''
pushd $cargoDepsCopy/stream-download
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \
--replace-warn '#![doc = include_str!("../README.md")]' ""
substituteInPlace .cargo-checksum.json \
--replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
popd
'';
cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM=";
nativeBuildInputs = [
pkg-config
@ -62,5 +72,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/tramhao/termusic";
license = with lib.licenses; [ gpl3Only ];
maintainers = with lib.maintainers; [ devhell ];
mainProgram = "termusic";
};
}

8
pkgs/applications/editors/android-studio/default.nix
View File

@ -14,12 +14,12 @@ let
sha256Hash = "sha256-ACZCdXKEnJy7DJTW+XGOoIvDRdzP47NytUEAqV//mbU=";
};
betaVersion = {
version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1"
sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
version = "2023.3.1.14"; # "Android Studio Jellyfish | 2023.3.1.1 Beta 1"
sha256Hash = "sha256-2p/WwH6yPAMwUSJ5NrWvJBZG395eS9UgApFr/CB1fUo=";
};
latestVersion = {
version = "2023.3.2.1"; # "Android Studio Jellyfish | 2023.3.2 Canary 1"
sha256Hash = "sha256-99EWGh3+3HV8yO29ANg1pwoo/1ktI2aCwKrdIqlcgVs=";
version = "2023.3.2.2"; # "Android Studio Koala | 2023.3.2 Canary 2"
sha256Hash = "sha256-KrCNkKFyOUE2q2b1wjvmn3E5IedAp1kFKII+70i1Wwk=";
};
in {
# Attributes are named by their corresponding release channels

25
pkgs/applications/editors/emacs/sources.nix
View File

@ -4,8 +4,8 @@
}:
let
mkArgs = { pname, version, variant, rev, hash }: {
inherit pname version variant;
mkArgs = { pname, version, variant, patches ? _: [ ], rev, hash }: {
inherit pname version variant patches;
src = {
"mainline" = (fetchFromSavannah {
@ -73,6 +73,27 @@ in
variant = "mainline";
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
patches = fetchpatch: [
# CVE-2022-45939
(fetchpatch {
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51";
hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs=";
})
# https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html
(fetchpatch {
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs=";
})
(fetchpatch {
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA=";
})
(fetchpatch {
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek=";
})
];
});
emacs29 = import ./make-emacs.nix (mkArgs {

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

@ -15,14 +15,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "retext";
version = "8.0.1";
version = "8.0.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "retext-project";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7zNEmFf0FZCzaNq9EMfGCje66/v5T/QvI5DTftLhi7g=";
hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
};
toolbarIcons = fetchzip {

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -17033,5 +17033,17 @@ final: prev:
meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/";
};
jupytext-nvim = buildVimPlugin {
pname = "jupytest-nvim";
version = "2024-01-24";
src = fetchFromGitHub {
owner = "GCBallesteros";
repo = "jupytext.nvim";
rev = "68fddf28119dbaddfaea6b71f3d6aa1e081afb93";
sha256 = "sha256-x5emW+qfUTUDR72B9QdDgVdrb8wGH9D7AdtRrQm80sI=";
};
meta.homepage = "https://github.com/GCBallesteros/jupytext.nvim/";
};
}

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

@ -744,6 +744,10 @@
dependencies = with self; [ lush-nvim ];
};
jupytext-nvim = super.jupytext-nvim.overrideAttrs {
passthru.python3Dependencies = ps: [ ps.jupytext ];
};
LanguageClient-neovim =
let
version = "0.1.161";
@ -1189,12 +1193,12 @@
sniprun =
let
version = "1.3.11";
version = "1.3.12";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "refs/tags/v${version}";
hash = "sha256-f/EifFvlHr41wP0FfkwSGVdXLyz739st/XtnsSbzNT4=";
hash = "sha256-siM0MBugee2OVaD1alr2hKn9ngoaV3Iy9No/F3wryJs=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
@ -1204,7 +1208,7 @@
darwin.apple_sdk.frameworks.Security
];
cargoHash = "sha256-SmhfjOnw89n/ATGvmyvd5clQSucIh7ky3v9JsSjtyfI=";
cargoHash = "sha256-Gnpv0vAU3kTtCKsV2XGlSbzYuHEqR7iDFeKj9Vhq1UQ=";
nativeBuildInputs = [ makeWrapper ];

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -419,6 +419,7 @@ https://github.com/HiPhish/jinja.vim/,HEAD,
https://github.com/vito-c/jq.vim/,,
https://github.com/neoclide/jsonc.vim/,,
https://github.com/JuliaEditorSupport/julia-vim/,,
https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
https://github.com/rebelot/kanagawa.nvim/,,
https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
https://github.com/kmonad/kmonad-vim/,,

6
pkgs/applications/graphics/gscreenshot/default.nix
View File

@ -18,13 +18,13 @@
python3Packages.buildPythonApplication rec {
pname = "gscreenshot";
version = "3.4.2";
version = "3.5.0";
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "${pname}";
rev = "v${version}";
sha256 = "sha256-Ha9PTvr6XNGhe4I0ZUwrdbsNHWhz+Ubw2gp+ctLTO64=";
rev = "refs/tags/v${version}";
sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM=";
};
# needed for wrapGAppsHook to function

43
pkgs/applications/graphics/monado/default.nix
View File

@ -2,28 +2,22 @@
, stdenv
, fetchFromGitLab
, writeText
, cmake
, cjson
, doxygen
, glslang
, pkg-config
, python3
, SDL2
, bluez
, cjson
, cmake
, dbus
, doxygen
, eigen
, elfutils
, ffmpeg
, glslang
, gst-plugins-base
, gstreamer
, hidapi
, libGL
, libXau
, libXdmcp
, libXrandr
, libXext
, libbsd
, libdrm
, libffi
, libGL
, libjpeg
, librealsense
, libsurvive
@ -32,13 +26,20 @@
, libuv
, libuvc
, libv4l
, libXau
, libxcb
, libXdmcp
, libXext
, libXrandr
, onnxruntime
, opencv4
, openhmd
, openvr
, orc
, pcre2
, pkg-config
, python3
, SDL2
, shaderc
, udev
, vulkan-headers
@ -46,7 +47,6 @@
, wayland
, wayland-protocols
, wayland-scanner
, libdrm
, zlib
, zstd
, nixosTests
@ -83,7 +83,6 @@ stdenv.mkDerivation {
];
buildInputs = [
SDL2
bluez
cjson
dbus
@ -93,13 +92,11 @@ stdenv.mkDerivation {
gst-plugins-base
gstreamer
hidapi
libGL
libXau
libXdmcp
libXrandr
libbsd
libjpeg
libdrm
libffi
libGL
libjpeg
librealsense
libsurvive
libunwind
@ -107,21 +104,25 @@ stdenv.mkDerivation {
libuv
libuvc
libv4l
libXau
libxcb
libXdmcp
libXext
libXrandr
onnxruntime
opencv4
openhmd
openvr
orc
pcre2
SDL2
shaderc
udev
vulkan-headers
vulkan-loader
wayland
wayland-scanner
wayland-protocols
libdrm
wayland-scanner
zlib
zstd
];

4
pkgs/applications/misc/keymapp/default.nix
View File

@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keymapp";
version = "1.0.8";
version = "1.1.1";
src = fetchurl {
url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
hash = "sha256-adFQCuHkorXixn/dId/vrCcnjQ2VDDQM049UrodjFgA=";
hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/organicmaps/default.nix
View File

@ -29,13 +29,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "organicmaps";
version = "2024.03.05-4";
version = "2024.03.18-5";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
hash = "sha256-vPpf7pZOkVjRlFcGULcxGy4eBLZRmqcINSFiNh8DUHI=";
hash = "sha256-KoQlS2dW0tTZSDnGKF2F0+JeqMb0Fm0brz1gVCC8xY4=";
fetchSubmodules = true;
};

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

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "overmind";
version = "2.4.0";
version = "2.5.0";
nativeBuildInputs = [ makeWrapper ];
@ -14,10 +14,10 @@ buildGoModule rec {
owner = "DarthSim";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE=";
sha256 = "sha256-/reRiSeYf8tnSUJICMDp7K7XZCYvTDFInPJ1xFuAqRs=";
};
vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4=";
vendorHash = "sha256-6/S5Sf2vvCp2RpRqcJPVc9mvMuPVn4Kj9QpSIlu6YFU=";
meta = with lib; {
homepage = "https://github.com/DarthSim/overmind";

2
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -121,7 +121,7 @@ in
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, mlsAPISupport ? geolocationSupport
, webrtcSupport ? !privacySupport && !stdenv.hostPlatform.isRiscV
, webrtcSupport ? !privacySupport
# digital rights managemewnt

6
pkgs/applications/networking/cluster/linkerd/edge.nix
View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "24.2.4";
sha256 = "0hh2sfjvqz085hl2dpsa9zgr3dwpyc85gcbx0c7lzpjg411bxmim";
vendorHash = "sha256-g1e1uY43fUC2srKK9erVFlJDSwWrEvq4ni0PgeCFaOg=";
version = "24.3.4";
sha256 = "0v9yjcy5wlkg3z9gl25s75j2irvn9jkgc542cz5w1gbc88i4b69v";
vendorHash = "sha256-TmH3OhiSmUaKv2QPzMuzTq6wRTMu8LejE1y4Vy/tVRg=";
}

9
pkgs/applications/networking/gabutdm/default.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitHub
, meson
, pkg-config
, cmake
, ninja
, vala
, wrapGAppsHook4
@ -15,6 +14,7 @@
, json-glib
, qrencode
, curl
, aria2
}:
stdenv.mkDerivation rec {
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
pkg-config
cmake
ninja
vala
wrapGAppsHook4
@ -53,6 +52,12 @@ stdenv.mkDerivation rec {
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ aria2 ]}
)
'';
meta = with lib; {
description = "Simple and fast download manager";
homepage = "https://github.com/gabutakut/gabutdm";

4
pkgs/applications/networking/ids/suricata/default.nix
View File

@ -33,11 +33,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "7.0.3";
version = "7.0.4";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
hash = "sha256-6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8=";
hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20240319";
version = "20240320";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-aDf7HId0A4GBiG3AJZLAtVEq54RywV/gx4Sa3c/KLg0=";
hash = "sha256-2H+VGVPnSHdsx62hPygWc5uz5vH6DS7AfmYSlBZuB4A=";
};
postPatch = ''

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

@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
pname = "qbittorrent"
+ lib.optionalString (guiSupport && qtVersion == "5") "-qt5"
+ lib.optionalString (!guiSupport) "-nox";
version = "4.6.3";
version = "4.6.4";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
hash = "sha256-4RVJ7xQY9zcB8+RUr80P9xKUXGxt0ATSzYmRDfZIowU=";
hash = "sha256-98iE+VM32eq56eB4B0KNrj8+DbmRSsyAb7eMlprSsjs=";
};
nativeBuildInputs = [

4
pkgs/applications/office/portfolio/default.nix
View File

@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.68.2";
version = "0.68.3";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-h/WCfF3jK/pkN911vxPe2xzGUfVY2Xy+3yJwoqBQ5mA=";
hash = "sha256-7EQ/gKFflElga5LDwAkjPcqNl6HNtnAzno1ZGPBybJY=";
};
nativeBuildInputs = [

4
pkgs/applications/science/math/gfan/default.nix
View File

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
for f in $(find -name "*.h" -or -name "*.cpp"); do
substituteInPlace "$f" --replace-quiet "log2" "_log2"
done
'';
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ];

2
pkgs/applications/science/math/sage/sage-env.nix
View File

@ -39,7 +39,6 @@
, ecm
, lcalc
, rubiks
, flintqs
, blas
, lapack
, flint3
@ -93,7 +92,6 @@ let
ecm
lcalc
rubiks
flintqs
jdk # only needed for `jmol` which may be replaced in the future
less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
]

2
pkgs/applications/science/math/sage/sage-with-env.nix
View File

@ -13,7 +13,6 @@
, gmp
, gfan
, python3
, flintqs
, eclib
, ntl
, ecm
@ -40,7 +39,6 @@ let
gfan
maxima
eclib
flintqs
ntl
ecm
];

9
pkgs/applications/science/math/singular/default.nix
View File

@ -13,12 +13,9 @@
, doxygen
, graphviz
, latex2html
# upstream generates docs with texinfo 4. later versions of texinfo
# use letters instead of numbers for post-appendix chapters, and we
# want it to match the upstream format because sage depends on it.
, texinfo4
, texinfo
, texliveSmall
, enableDocs ? true
, enableDocs ? !stdenv.isDarwin
, enableGfanlib ? true
}:
@ -85,7 +82,7 @@ stdenv.mkDerivation rec {
doxygen
graphviz
latex2html
texinfo4
texinfo
texliveSmall
] ++ lib.optionals stdenv.isDarwin [ getconf ];
depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/applications/system/glances/default.nix
View File

@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.4.0.3";
version = "3.4.0.5";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "refs/tags/v${version}";
hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg=";
hash = "sha256-Ho4vcmTEVja7rkgLSfNkXvnpopYupRxPL1UVlnmdGCg=";
};
# On Darwin this package segfaults due to mismatch of pure and impure

4
pkgs/applications/version-management/meld/default.nix
View File

@ -18,13 +18,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "meld";
version = "3.22.1";
version = "3.22.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-bdO9MtvUNBq6djD7lTd393x3aB7qIjazZB1iKo+QaDY=";
sha256 = "sha256-RqCnE/vNGxU7N3oeB1fIziVcmCJGdljqz72JsekjFu8=";
};
nativeBuildInputs = [

6
pkgs/applications/video/mpv/scripts/reload.nix
View File

@ -6,12 +6,12 @@
buildLua rec {
pname = "mpv-reload";
version = "unstable-2023-12-19";
version = "unstable-2024-03-22";
src = fetchFromGitHub {
owner = "4e6";
repo = pname;
rev = "133d596f6d369f320b4595bbed1f4a157b7b9ee5";
hash = "sha256-B+4TCmf1T7MuwtbL+hGZoN1ktI31hnO5yayMG1zW8Ng=";
rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938";
hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0=";
};
passthru.updateScript = unstableGitUpdater {};

4
pkgs/applications/virtualization/ecs-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.82.0";
version = "1.82.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-joI2jNfH4++mpReVGO9V3Yc7cRpykc3F166WEGZ09HA=";
hash = "sha256-WXxuFJnqWUm+XgFNdtf0WBBGa7fP8Qv7hRd4xfGeVeg=";
};
vendorHash = null;

8
pkgs/applications/virtualization/gvisor/default.nix
View File

@ -10,7 +10,7 @@
buildGoModule {
pname = "gvisor";
version = "20231113.0";
version = "20240311.0-unstable-2024-03-25";
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
# that can be used to build gvisor without bazel.
@ -19,11 +19,11 @@ buildGoModule {
src = fetchFromGitHub {
owner = "google";
repo = "gvisor";
rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24";
hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI=";
rev = "b1e227737fd6e3bb3b11a403a1a5013bc89b3b60";
hash = "sha256-EfXzXkoEgtEerNMacRhbITCRig+t23WlIRya0BlJZcE=";
};
vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs=";
vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4=";
nativeBuildInputs = [ makeWrapper ];

10
pkgs/applications/virtualization/lima/bin.nix
View File

@ -9,31 +9,31 @@
}:
let
version = "0.20.2";
version = "0.21.0";
dist = {
aarch64-darwin = rec {
archSuffix = "Darwin-arm64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "f250bed8a20b705f913e382b545641082f278f44687409f4b897d6430df4d735";
sha256 = "97a0517ff5d72feb30ff413f5f0ef75e4c07982651bb2f7326fe5faadb0232d9";
};
x86_64-darwin = rec {
archSuffix = "Darwin-x86_64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "bec9933254ed80827a6fd38eabe1234b538bdb783f4656a94e120bcaa5689d37";
sha256 = "f4a3a01d0ca13bd1bddf14766f39569bc3e074c7744b54d33e9336b1b55e77c9";
};
aarch64-linux = rec {
archSuffix = "Linux-aarch64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "0b839459aa3adde059577f7d9c3ed1bb4720dbdad798e4ffe00af5d86afa556e";
sha256 = "6d3f1fe0ef561e1513579a1bf85b04f1bebe73b4c1f03d8683551ece34fecc6a";
};
x86_64-linux = rec {
archSuffix = "Linux-x86_64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "f9af6bd42e48a803fc1aeb5214bdf511582a56701a1c058ce4e66d871db65dd8";
sha256 = "9a75c8700a988b35986ed6f761f398fdb31d56394a8e2b6801566a86e59b346c";
};
};
in

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "open-vm-tools";
version = "12.3.5";
version = "12.4.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${finalAttrs.version}";
hash = "sha256-OuESPenXVDKLckIZ3sQCtQXZXCL6xSLZOxZWVEX2XMk=";
hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8=";
};
sourceRoot = "${finalAttrs.src.name}/open-vm-tools";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "podman-tui";
version = "0.18.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
hash = "sha256-T2hiCRoZqdbcB36Tpy597j7Hc1yeR2MijQbuheENfuA=";
hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw=";
};
vendorHash = null;
@ -24,11 +24,11 @@ buildGoModule rec {
let
skippedTests = [
"TestDialogs"
"TestVoldialogs"
];
in
''
export USER=$(whoami)
export HOME=/home/$USER
export HOME="$(mktemp -d)"
# Disable flaky tests
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
@ -36,7 +36,7 @@ buildGoModule rec {
passthru.tests.version = testers.testVersion {
package = podman-tui;
command = "podman-tui version";
command = "HOME=$(mktemp -d) podman-tui version";
version = "v${version}";
};

4
pkgs/applications/window-managers/tabbed/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tabbed";
version = "0.7";
version = "0.8";
src = fetchgit {
url = "https://git.suckless.org/tabbed";
rev = finalAttrs.version;
hash = "sha256-Y1MgPwqMUoa2Rr4HmqjtPaQegUmQJWYkcbyFcJHAOBI=";
hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU=";
};
inherit patches;

6
pkgs/by-name/README.md
View File

@ -108,13 +108,13 @@ There's some limitations as to which packages can be defined using this structur
## Validation
CI performs [certain checks](../test/nixpkgs-check-by-name/README.md#validity-checks) on the `pkgs/by-name` structure.
This is done using the [`nixpkgs-check-by-name` tool](../test/nixpkgs-check-by-name).
CI performs [certain checks](https://github.com/NixOS/nixpkgs-check-by-name?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure.
This is done using the [`nixpkgs-check-by-name` tool](https://github.com/NixOS/nixpkgs-check-by-name).
You can locally emulate the CI check using
```
$ ./pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh master
$ ./maintainers/scripts/check-by-name.sh master
```
See [here](../../.github/workflows/check-by-name.yml) for more info.

5174
pkgs/by-name/at/attic-client/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

66
pkgs/by-name/at/attic-client/package.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, rustPlatform
, fetchFromGitHub
, nix
, boost
, pkg-config
, stdenv
, installShellFiles
, darwin
, crates ? [ "attic-client" ]
}:
rustPlatform.buildRustPackage {
pname = "attic";
version = "0.1.0";
src = fetchFromGitHub {
owner = "zhaofengli";
repo = "attic";
rev = "6eabc3f02fae3683bffab483e614bebfcd476b21";
hash = "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=";
};
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [
nix
boost
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
SystemConfiguration
]);
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nix-base32-0.1.2-alpha.0" = "sha256-wtPWGOamy3+ViEzCxMSwBcoR4HMMD0t8eyLwXfCDFdo=";
};
};
cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
ATTIC_DISTRIBUTOR = "attic";
# Attic interacts with Nix directly and its tests require trusted-user access
# to nix-daemon to import NARs, which is not possible in the build sandbox.
doCheck = false;
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
if [[ -f $out/bin/attic ]]; then
installShellCompletion --cmd attic \
--bash <($out/bin/attic gen-completions bash) \
--zsh <($out/bin/attic gen-completions zsh) \
--fish <($out/bin/attic gen-completions fish)
fi
'';
meta = with lib; {
description = "Multi-tenant Nix Binary Cache";
homepage = "https://github.com/zhaofengli/attic";
license = licenses.asl20;
maintainers = with maintainers; [ zhaofengli aciceri ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "attic";
};
}

7
pkgs/by-name/at/attic-server/package.nix Normal file
View File

@ -0,0 +1,7 @@
{ attic-client
}:
(attic-client.override {
crates = [ "attic-server" ];
}).overrideAttrs {
meta.mainProgram = "atticd";
}

51
pkgs/applications/networking/remote/aws-workspaces/default.nix → pkgs/by-name/aw/aws-workspaces/package.nix
View File

@ -1,19 +1,39 @@
{ stdenv, lib
, makeWrapper, dpkg, fetchurl, autoPatchelfHook
, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis, xcbutil
{ stdenv
, lib
, makeWrapper
, dpkg
, fetchurl
, autoPatchelfHook
, curl
, libkrb5
, lttng-ust
, libpulseaudio
, gtk3
, openssl_1_1
, icu70
, webkitgtk
, librsvg
, gdk-pixbuf
, libsoup
, glib-networking
, graphicsmagick_q16
, libva
, libusb1
, hiredis
, xcbutil
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "aws-workspaces";
version = "4.6.0.4187";
version = "4.7.0.4312";
src = fetchurl {
# ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages
# Check new version at https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages
urls = [
"https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb"
"https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb"
"https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb"
"https://archive.org/download/workspacesclient_${finalAttrs.version}_amd64/workspacesclient_${finalAttrs.version}_amd64.deb"
];
sha256 = "sha256-A+b79ewh4hBIf8jgK0INILFktTqRRpOgXRH0FGziV6c=";
hash = "sha256-G0o5uFnEkiUWmkTMUHlVcidw+2x8e/KmMfVBE7oLXV8=";
};
nativeBuildInputs = [
@ -57,24 +77,29 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/lib
mv $out/opt/workspacesclient/* $out/lib
rm -rf $out/opt
wrapProgram $out/lib/workspacesclient \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
--set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"
mv $out/lib/workspacesclient $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution";
homepage = "https://clients.amazonworkspaces.com";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ]; # TODO Mac support
mainProgram = "workspacesclient";
maintainers = with maintainers; [ mausch dylanmtaylor ];
platforms = [ "x86_64-linux" ]; # TODO Mac support
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}
})

118
pkgs/by-name/co/codefresh/package.json Normal file
View File

@ -0,0 +1,118 @@
{
"name": "codefresh",
"version": "0.87.3",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
"scripts": {
"generate-completion": "node ./lib/interface/cli/completion/generate",
"test": "jest .spec.js --coverage",
"e2e": "bash e2e/e2e.spec.sh",
"eslint": "eslint --fix lib/logic/**",
"pkg": "pkg . -t node16-alpine-x64,node16-macos-x64,node16-linux-x64,node16-win-x64,node16-linux-arm64 --out-path ./dist",
"serve-docs": "yarn build-local-docs && cd temp && hugo server -D",
"serve-docs-beta": "ALLOW_BETA_COMMANDS=true yarn build-local-docs && cd temp && hugo server -D",
"build-local-docs": "node ./docs/index.js",
"build-public-docs": "node ./docs/index.js && cd temp && hugo",
"postinstall": "node run-check-version.js"
},
"bin": {
"codefresh": "lib/interface/cli/codefresh"
},
"repository": "git+https://github.com/codefresh-io/cli.git",
"keywords": [
"command line"
],
"pkg": {
"scripts": [
"lib/**/*.js",
"node_modules/codefresh-sdk/lib/**/*.js",
"node_modules/kubernetes-client/**/*.js"
],
"assets": "lib/**/*.hbs"
},
"resolutions": {
"websocket-extensions": "^0.1.4",
"lodash": "^4.17.21",
"json-schema": "^0.4.0",
"ajv": "^6.12.6",
"normalize-url": "^4.5.1",
"ansi-regex": "^5.0.1",
"y18n": "^4.0.1",
"shelljs": "^0.8.5",
"codefresh-sdk/swagger-client/qs": "6.9.7",
"kubernetes-client/qs": "6.9.7",
"**/request/qs": "6.5.3"
},
"dependencies": {
"@codefresh-io/docker-reference": "^0.0.5",
"adm-zip": "^0.5.5",
"ajv": "^6.12.6",
"bluebird": "^3.5.1",
"cf-errors": "^0.1.16",
"chalk": "^4.1.0",
"cli-progress": "3.10.0",
"codefresh-sdk": "^1.12.0",
"colors": "1.4.0",
"columnify": "^1.6.0",
"compare-versions": "^3.4.0",
"copy-dir": "^0.3.0",
"debug": "^3.1.0",
"diff": "^3.5.0",
"dockerode": "^2.5.7",
"draftlog": "^1.0.12",
"figlet": "^1.4.0",
"filesize": "^3.5.11",
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
"flat": "^4.1.1",
"inquirer": "^7.1.0",
"js-yaml": "^3.10.0",
"kefir": "^3.8.1",
"kubernetes-client": "^9.0.0",
"lodash": "^4.17.21",
"mkdirp": "^0.5.1",
"moment": "^2.29.4",
"mongodb": "^4.17.2",
"node-forge": "^1.3.0",
"ora": "^5.4.1",
"prettyjson": "^1.2.5",
"promise-retry": "^2.0.1",
"recursive-readdir": "^2.2.3",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"requestretry": "^7.0.2",
"rimraf": "^2.6.2",
"semver": "^7.5.4",
"tar-stream": "^2.2.0",
"uuid": "^3.1.0",
"yaml": "^1.10.0",
"yargs": "^15.4.1",
"yargs-parser": "^13.0.0",
"zip": "^1.2.0"
},
"devDependencies": {
"@types/node-forge": "^1.0.1",
"eslint": "^7.32.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^27.6.3",
"hugo-cli": "^0.5.4",
"jest": "^29.7.0",
"pkg": "5.5.2"
},
"bugs": {
"url": "https://github.com/codefresh-io/cli/issues"
},
"homepage": "https://github.com/codefresh-io/cli#readme",
"author": "Codefresh",
"license": "ISC",
"engines": {
"node": ">=14.0.0"
},
"jest": {
"testEnvironment": "node",
"setupFiles": [
"./test-setup.js"
]
}
}

36
pkgs/by-name/co/codefresh/package.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, mkYarnPackage, fetchFromGitHub, fetchYarnDeps, testers, codefresh }:
mkYarnPackage rec {
pname = "codefresh";
version = "0.87.3";
src = fetchFromGitHub {
owner = "codefresh-io";
repo = "cli";
rev = "v${version}";
hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY=";
};
packageJSON = ./package.json;
doDist = false;
passthru.tests.version = testers.testVersion {
package = codefresh;
# codefresh needs to read a config file, this is faked out with a subshell
command = "codefresh --cfconfig <(echo 'contexts:') version";
};
meta = {
changelog = "https://github.com/codefresh-io/cli/releases/tag/v${version}";
description = "Codefresh CLI tool to interact with Codefresh services.";
homepage = "https://github.com/codefresh-io/cli";
license = lib.licenses.mit;
mainProgram = "codefresh";
maintainers = [ lib.maintainers.takac ];
};
}

12
pkgs/by-name/cs/csvlens/package.nix
View File

@ -1,20 +1,26 @@
{ lib
, stdenv
, darwin
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "csvlens";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "YS-L";
repo = "csvlens";
rev = "refs/tags/v${version}";
hash = "sha256-b8SuXx1uN9lBrCoEDLeudZwylHu+f2i/PQkfHA56YlE=";
hash = "sha256-4lKiqojBF8mqAp56eTDfJcK276IzEDLA3pORKIZpC94=";
};
cargoHash = "sha256-SPUEK+8rLXBR8cdxN3qUajvN6PxbAZX2i7vYcyMzqyw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
];
cargoHash = "sha256-EzM7qGor/B17N4KDTsQzgiV4pgXE2D47RZcrmKVkPu8=";
meta = with lib; {
description = "Command line csv viewer";

4
pkgs/tools/misc/dgoss/default.nix → pkgs/by-name/dg/dgoss/package.nix
View File

@ -9,13 +9,13 @@
resholve.mkDerivation rec {
pname = "dgoss";
version = "0.4.2";
version = "0.4.6";
src = fetchFromGitHub {
owner = "goss-org";
repo = "goss";
rev = "refs/tags/v${version}";
hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM=";
hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
};
dontConfigure = true;

58
pkgs/by-name/do/docker-credential-gcr/package.nix Normal file
View File

@ -0,0 +1,58 @@
{
buildGoModule,
docker-credential-gcr,
fetchFromGitHub,
lib,
nix-update-script,
testers,
}:
buildGoModule rec {
pname = "docker-credential-gcr";
version = "2.1.22";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "refs/tags/v${version}";
sha256 = "sha256-vGX6Jhh91dUqZ+y+h1SlPiFE3dL0UO3iJyyzvQVoUsQ=";
};
postPatch = ''
rm -rf ./test
'';
vendorHash = "sha256-VsJ5OI8D1u9qZqtirYf682+z0wLJr/vAxRLHAEGwKSY=";
CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-X github.com/GoogleCloudPlatform/docker-credential-gcr/v2/config.Version=${version}"
];
passthru = {
tests.version = testers.testVersion {
package = docker-credential-gcr;
command = "docker-credential-gcr version";
};
updateScript = nix-update-script { };
};
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "A Docker credential helper for GCR (https://gcr.io) users";
longDescription = ''
docker-credential-gcr is Google Container Registry's Docker credential
helper. It allows for Docker clients v1.11+ to easily make
authenticated requests to GCR's repositories (gcr.io, eu.gcr.io, etc.).
'';
homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr";
changelog = "https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ suvash anthonyroussel ];
mainProgram = "docker-credential-gcr";
};
}

30
pkgs/tools/admin/elasticsearch-curator/default.nix → pkgs/by-name/el/elasticsearch-curator/package.nix
View File

@ -1,34 +1,28 @@
{ lib
, elasticsearch-curator
, fetchFromGitHub
, nix-update-script
, python3
, testers
}:
python3.pkgs.buildPythonApplication rec {
pname = "elasticsearch-curator";
version = "8.0.10";
version = "8.0.12";
format = "pyproject";
src = fetchFromGitHub {
owner = "elastic";
repo = "curator";
rev = "refs/tags/v${version}";
hash = "sha256-hGG7lyrVviZSKTUo+AOPIutn/mxtDo+ewFxCRdj/jts=";
hash = "sha256-CU/8l5607eKodcdpMKu0Wdlg+K6YnFX6uoDju12NDR0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "elasticsearch8==" "elasticsearch8>=" \
--replace "es_client==" "es_client>=" \
--replace "ecs-logging==" "ecs-logging>=" \
--replace "click==" "click>="\
--replace "pyyaml==" "pyyaml>="
'';
nativeBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
hatchling
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
certifi
click
ecs-logging
@ -40,7 +34,6 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
mock
requests
pytestCheckHook
];
@ -76,6 +69,14 @@ python3.pkgs.buildPythonApplication rec {
"test_api_key_set"
];
passthru = {
tests.version = testers.testVersion {
package = elasticsearch-curator;
command = "${lib.getExe elasticsearch-curator} --version";
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Curate, or manage, your Elasticsearch indices and snapshots";
homepage = "https://github.com/elastic/curator";
@ -93,6 +94,7 @@ python3.pkgs.buildPythonApplication rec {
* Perform various actions on the items which remain in the actionable list.
'';
mainProgram = "curator";
maintainers = with maintainers; [ basvandijk ];
};
}

17
pkgs/tools/misc/goss/default.nix → pkgs/by-name/go/goss/package.nix
View File

@ -16,30 +16,27 @@ buildGoModule rec {
pname = "goss";
# Don't forget to update dgoss to the same version.
version = "0.4.4";
version = "0.4.6";
src = fetchFromGitHub {
owner = "goss-org";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dH052t30unWmrFTZK5niXNvbg1nngzWY7mwuZr4ULbM=";
hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
};
vendorHash = "sha256-4fEEz/c/xIeWxIzyyjwgSn2/2FWLA2tIedK65jGgYhY=";
vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs=";
CGO_ENABLED = 0;
ldflags = [
"-s" "-w" "-X main.version=v${version}"
"-s"
"-w"
"-X main.version=v${version}"
];
nativeBuildInputs = [ makeWrapper ];
checkFlags = [
# Prometheus tests are skipped upstream
# See https://github.com/goss-org/goss/blob/master/ci/go-test.sh
"-skip" "^TestPrometheus"
];
postInstall = let
runtimeDependencies = [ bash getent ]
++ lib.optionals stdenv.isLinux [ systemd ];

39
pkgs/by-name/gr/graphite-cli/package-lock.json generated
View File

@ -1,21 +1,26 @@
{
"name": "@withgraphite/graphite-cli",
"version": "1.2.3",
"version": "1.2.8",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@withgraphite/graphite-cli",
"version": "1.2.3",
"version": "1.2.8",
"hasInstallScript": true,
"license": "None",
"dependencies": {
"chalk": "^4.1.2",
"semver": "^7.5.4",
"ws": "^8.6.0",
"yargs": "^17.5.1"
},
"bin": {
"graphite": "graphite.js",
"gt": "graphite.js"
},
"engines": {
"node": ">=16"
}
},
"node_modules/ansi-regex": {
@ -121,6 +126,17 @@
"node": ">=8"
}
},
"node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=10"
}
},
"node_modules/require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@ -129,6 +145,20 @@
"node": ">=0.10.0"
}
},
"node_modules/semver": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
"dependencies": {
"lru-cache": "^6.0.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@ -208,6 +238,11 @@
"node": ">=10"
}
},
"node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/yargs": {
"version": "17.7.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",

6
pkgs/by-name/gr/graphite-cli/package.nix
View File

@ -7,14 +7,14 @@
buildNpmPackage rec {
pname = "graphite-cli";
version = "1.2.3";
version = "1.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
hash = "sha256-T18D4JkH9B0BcJt5rgfKJsiTRhgNBBu70l6MDtPMoHQ=";
hash = "sha256-fDnCQVHsdP5xXfMrbndha3sl96W4F3Z4gEGq7g9p9w0=";
};
npmDepsHash = "sha256-AouEmq4wCzDxk34cjRv2vL+Me+LgeSH8S/sAAvw0Fks=";
npmDepsHash = "sha256-qzU+wG2ESkDxok55RE37LtbsnPZWEwJcTGnkOkRdRS0=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json

2
pkgs/by-name/gr/graphite-cli/update.sh
View File

@ -22,7 +22,7 @@ sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
rm -f package-lock.json package.json *.tgz
wget "$url"
tar xf "$tarball" --strip-components=1 package/package.json
npm i --package-lock-only
npm i --package-lock-only --ignore-scripts
npm_hash=$(prefetch-npm-deps package-lock.json)
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
rm -f package.json *.tgz

27
pkgs/by-name/ha/hacompanion/package.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib,
fetchFromGitHub,
buildGoModule
}:
buildGoModule rec {
pname = "hacompanion";
version = "1.0.11";
src = fetchFromGitHub {
owner = "tobias-kuendig";
repo = "hacompanion";
rev = "v${version}";
hash = "sha256-gTsA5XBjLlm/cITwQwYNudPK9SbSEaiAIjjdvRS3+8Q=";
};
vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ=";
meta = {
changelog = "https://github.com/tobias-kuendig/hacompanion/releases/tag/v${version}";
description = "Daemon that sends local hardware information to Home Assistant";
homepage = "https://github.com/tobias-kuendig/hacompanion";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ramblurr ];
};
}

6
pkgs/by-name/he/hermitcli/package.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "hermit";
version = "0.38.2";
version = "0.39.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-cBVTIpY85lrKJ1bX1mIlUW1oWEHgg8wjdUh+0FHUp80=";
hash = "sha256-BXh9HWCFeAs/S5z1ru+31mndsvt1DVh1Q7SeGzB4Rzk=";
};
vendorHash = "sha256-W8n7WA1gHx73jHF69apoKnDCIKlbWkj5f1wVITt7F+M=";
vendorHash = "sha256-1QMZvxy6cCJVoIP8mG7s4V0nBAGhrHoPbiKKyYDDL2g=";
subPackages = [ "cmd/hermit" ];

6
pkgs/by-name/ho/home-manager/package.nix
View File

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "unstable-2024-03-19";
version = "unstable-2024-03-22";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "022464438a85450abb23d93b91aa82e0addd71fb";
hash = "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=";
rev = "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb";
hash = "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=";
};
nativeBuildInputs = [

4
pkgs/by-name/ic/icewm/package.nix
View File

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.4.6";
version = "3.4.7";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-j4o4/Q+WWuVPZM/rij2miC7ApWrBNhzve2TAPEXIU20=";
hash = "sha256-p7qbmR8NcE8mgmlTtkHxVRo4DDUHPMiAUhdF3zm9IEc=";
};
nativeBuildInputs = [

6
pkgs/by-name/ig/igir/package.nix
View File

@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "igir";
version = "2.5.2";
version = "2.6.0";
src = fetchFromGitHub {
owner = "emmercm";
repo = "igir";
rev = "v${version}";
hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
hash = "sha256-yW2lInIUfexFvIeiadM2A9qXmWOVClh1pVXS93pbH8I=";
};
npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
npmDepsHash = "sha256-5Xp3vRW0tZXEN0n1IqrnPXYnMM+25diSKrG1ba/ZWns=";
# I have no clue why I have to do this
postPatch = ''

37
pkgs/by-name/in/integresql/package.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "integresql";
version = "1.1.0";
src = fetchFromGitHub {
owner = "allaboutapps";
repo = "integresql";
rev = "v${version}";
hash = "sha256-heRa1H4ZSCZzSMCejhakBpJfnEnGQLmNFERKqMxbC04=";
};
vendorHash = "sha256-8qI7mLgQB0GK2QV6tZmWU8hJX+Ax1YhEPisQbjGoJRc=";
ldflags = [
"-s"
"-w"
"-X github.com/allaboutapps/integresql/internal/config.Commit=${src.rev}"
"-X github.com/allaboutapps/integresql/internal/config.ModuleName=github.com/allaboutapps/integresql"
];
postInstall = ''
mv $out/bin/server $out/bin/integresql
'';
doCheck = false;
meta = with lib; {
description = "IntegreSQL manages isolated PostgreSQL databases for your integration tests";
homepage = "https://github.com/allaboutapps/integresql";
changelog = "https://github.com/allaboutapps/integresql/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
mainProgram = "integresql";
};
}

10
pkgs/development/tools/java/jextract/default.nix → pkgs/by-name/je/jextract-21/package.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, emptyDirectory
, writeText
, makeWrapper
, makeBinaryWrapper
, gradle
, jdk21
, llvmPackages
@ -49,7 +49,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
gradle
makeWrapper
makeBinaryWrapper
];
env = {
@ -79,18 +79,16 @@ stdenv.mkDerivation {
mkdir -p $out/opt/
cp -r ./build/jextract $out/opt/jextract
makeBinaryWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract"
runHook postInstall
'';
postFixup = ''
makeWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract"
'';
meta = with lib; {
description = "A tool which mechanically generates Java bindings from a native library headers";
mainProgram = "jextract";
homepage = "https://github.com/openjdk/jextract";
platforms = jdk21.meta.platforms;
license = licenses.gpl2Only;
maintainers = with maintainers; [ sharzy ];
};

95
pkgs/by-name/je/jextract/package.nix Normal file
View File

@ -0,0 +1,95 @@
{ lib
, stdenv
, fetchFromGitHub
, emptyDirectory
, writeText
, makeBinaryWrapper
, gradle
, jdk22
, llvmPackages
}:
let
gradleInit = writeText "init.gradle" ''
logger.lifecycle 'Replacing Maven repositories with empty directory...'
gradle.projectsLoaded {
rootProject.allprojects {
buildscript {
repositories {
clear()
maven { url '${emptyDirectory}' }
}
}
repositories {
clear()
maven { url '${emptyDirectory}' }
}
}
}
settingsEvaluated { settings ->
settings.pluginManagement {
repositories {
maven { url '${emptyDirectory}' }
}
}
}
'';
in
stdenv.mkDerivation {
pname = "jextract";
version = "unstable-2024-03-13";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jextract";
rev = "b9ec8879cff052b463237fdd76382b3a5cd8ff2b";
hash = "sha256-+4AM8pzXPIO/CS3+Rd/jJf2xDvAo7K7FRyNE8rXvk5U=";
};
nativeBuildInputs = [
gradle
makeBinaryWrapper
];
env = {
ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib;
ORG_GRADLE_PROJECT_jdk22_home = jdk22;
};
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
gradle --console plain --init-script "${gradleInit}" assemble
runHook postBuild
'';
doCheck = true;
checkPhase = ''
runHook preCheck
gradle --console plain --init-script "${gradleInit}" verify
runHook postCheck
'';
installPhase = ''
runHook preInstall
mkdir -p $out/opt/
cp -r ./build/jextract $out/opt/jextract
makeBinaryWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract"
runHook postInstall
'';
meta = with lib; {
description = "A tool which mechanically generates Java bindings from a native library headers";
mainProgram = "jextract";
homepage = "https://github.com/openjdk/jextract";
platforms = jdk22.meta.platforms;
license = licenses.gpl2Only;
maintainers = with maintainers; [ jlesquembre sharzy ];
};
}

74
pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix Normal file
View File

@ -0,0 +1,74 @@
{ stdenv
, config
, pkgs
, lib
, fetchFromGitHub
, cmake
, eigen
, onnxruntime
, opencv
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
}@inputs:
let
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;
cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities;
# E.g. [ "80" "86" "90" ]
cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities);
cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures;
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "fastdeploy-ppocr";
version = "0-unstable-2023-10-09";
src = fetchFromGitHub {
owner = "Cryolitia";
repo = "FastDeploy";
# follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
rev = "2e68908141f6950bc5d22ba84f514e893cc238ea";
hash = "sha256-BWO4lKZhwNG6mbkC70hPgMNjabTnEV5XMo0bLV/gvQs=";
};
outputs = [ "out" "cmake" ];
nativeBuildInputs = [
cmake
eigen
] ++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
];
buildInputs = [
onnxruntime
opencv
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_cccl # cub/cub.cuh
libcublas # cublas_v2.h
libcurand # curand.h
libcusparse # cusparse.h
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
]);
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
] ++ lib.optionals cudaSupport [
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
];
postInstall = ''
mkdir $cmake
install -Dm644 ${finalAttrs.src}/cmake/Findonnxruntime.cmake $cmake/
'';
meta = with lib; {
description = "MaaAssistantArknights stripped-down version of FastDeploy";
homepage = "https://github.com/MaaAssistantArknights/FastDeploy";
platforms = platforms.linux;
license = licenses.apsl20;
broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux";
};
})

99
pkgs/by-name/ma/maa-assistant-arknights/package.nix Normal file
View File

@ -0,0 +1,99 @@
{ lib
, config
, callPackage
, stdenv
, fetchFromGitHub
, asio
, cmake
, eigen
, libcpr
, onnxruntime
, opencv
, isBeta ? false
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
}:
let
fastdeploy = callPackage ./fastdeploy-ppocr.nix { };
sources = lib.importJSON ./pin.json;
in
stdenv.mkDerivation (finalAttr: {
pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
version = if isBeta then sources.beta.version else sources.stable.version;
src = fetchFromGitHub {
owner = "MaaAssistantArknights";
repo = "MaaAssistantArknights";
rev = "v${finalAttr.version}";
hash = if isBeta then sources.beta.hash else sources.stable.hash;
};
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=maa-assistant-arknights
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'RUNTIME DESTINATION .' ' ' \
--replace-fail 'LIBRARY DESTINATION .' ' ' \
--replace-fail 'PUBLIC_HEADER DESTINATION .' ' '
substituteInPlace CMakeLists.txt \
--replace-fail 'find_package(asio ' '# find_package(asio ' \
--replace-fail 'asio::asio' ' '
shopt -s globstar nullglob
substituteInPlace src/MaaCore/**/{*.h,*.cpp,*.hpp,*.cc} \
--replace 'onnxruntime/core/session/' ""
substituteInPlace CMakeLists.txt \
--replace-fail 'ONNXRuntime' 'onnxruntime'
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
'';
nativeBuildInputs = [
asio
cmake
fastdeploy.cmake
] ++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
];
buildInputs = [
fastdeploy
libcpr
onnxruntime
opencv
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_cccl # cub/cub.cuh
libcublas # cublas_v2.h
libcurand # curand.h
libcusparse # cusparse.h
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
]);
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
(lib.cmakeBool "USE_MAADEPS" false)
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "INSTALL_RESOURCE" true)
(lib.cmakeBool "INSTALL_PYTHON" true)
(lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
];
passthru.updateScript = ./update.sh;
postInstall = ''
mkdir -p $out/share/${finalAttr.pname}
mv $out/{Python,resource} $out/share/${finalAttr.pname}
'';
meta = with lib; {
description = "An Arknights assistant";
homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Cryolitia ];
platforms = platforms.linux;
};
})

10
pkgs/by-name/ma/maa-assistant-arknights/pin.json Normal file
View File

@ -0,0 +1,10 @@
{
"stable": {
"version": "5.2.0",
"hash": "sha256-vxGJHm1StQNN+0IVlGMqKVKW56LH6KUC94utDn7FcNo="
},
"beta": {
"version": "5.2.0",
"hash": "sha256-vxGJHm1StQNN+0IVlGMqKVKW56LH6KUC94utDn7FcNo="
}
}

28
pkgs/by-name/ma/maa-assistant-arknights/update.sh Executable file
View File

@ -0,0 +1,28 @@
#!/usr/bin/env -S nix shell nixpkgs#nix nixpkgs#curl nixpkgs#jq nixpkgs#nix-prefetch-github --command bash
set -euo pipefail
directory="$(dirname $0 | xargs realpath)"
version_stable="$(curl "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/releases/latest" | jq -r '.tag_name')"
hash_stable=$(nix-prefetch-github MaaAssistantArknights MaaAssistantArknights --rev ${version_stable} -v | jq -r .hash)
version_beta="$(curl "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/releases?per_page=1" | jq -r '.[0].tag_name')"
hash_beta=$(nix-prefetch-github MaaAssistantArknights MaaAssistantArknights --rev ${version_beta} -v | jq -r .hash)
cat > $directory/pin.json << EOF
{
"stable": {
"version": "${version_stable#*v}",
"hash": "$hash_stable"
},
"beta": {
"version": "${version_beta#*v}",
"hash": "$hash_beta"
}
}
EOF
cat $directory/pin.json

68
pkgs/by-name/ma/maa-cli/package.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, installShellFiles
, makeWrapper
, pkg-config
, openssl
, maa-assistant-arknights
, android-tools
, git
}:
rustPlatform.buildRustPackage rec {
pname = "maa-cli";
version = "0.4.4";
src = fetchFromGitHub {
owner = "MaaAssistantArknights";
repo = "maa-cli";
rev = "v${version}";
hash = "sha256-pAtv6gCLFKRwUQEF6kD2bCPGpQGzahsfq/tAnQjrZrw=";
};
nativeBuildInputs = [
installShellFiles
makeWrapper
pkg-config
];
buildInputs = [
openssl
];
# https://github.com/MaaAssistantArknights/maa-cli/pull/126
buildNoDefaultFeatures = true;
buildFeatures = [ "git2" "core_installer" ];
cargoHash = "sha256-KjI/5vl7oKVtXYehGLgi9jcaO4Y/TceL498rCPGHMD0=";
# maa-cli would only seach libMaaCore.so and resources in itself's path
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
postInstall = ''
mkdir -p $out/share/maa-assistant-arknights/
ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
mv $out/bin/maa $out/share/maa-assistant-arknights/
makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
--prefix PATH : "${lib.makeBinPath [
android-tools git
]}"
installShellCompletion --cmd maa \
--bash <($out/bin/maa complete bash) \
--fish <($out/bin/maa complete fish) \
--zsh <($out/bin/maa complete zsh)
'';
meta = with lib; {
description = "A simple CLI for MAA by Rust";
homepage = "https://github.com/MaaAssistantArknights/maa-cli";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ Cryolitia ];
mainProgram = "maa";
};
}

1092
pkgs/by-name/ma/markdown-oxide/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

31
pkgs/by-name/ma/markdown-oxide/package.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "markdown-oxide";
version = "0.0.6";
src = fetchFromGitHub {
owner = "Feel-ix-343";
repo = "markdown-oxide";
rev = "v${version}";
hash = "sha256-RGT8Th4hXmfOyGPYQYqwUtcwz3zVU8ph3l57P5rZHr4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tower-lsp-0.20.0" = "sha256-QRP1LpyI52KyvVfbBG95LMpmI8St1cgf781v3oyC3S4=";
};
};
meta = with lib; {
description = "A markdown LSP server inspired by Obsidian";
homepage = "https://github.com/Feel-ix-343/markdown-oxide";
license = with licenses; [ cc0 ];
maintainers = with maintainers; [ linsui ];
mainProgram = "markdown-oxide";
};
}

43
pkgs/by-name/ma/matchbox-server/package.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "matchbox-server";
version = "v0.11.0";
src = fetchFromGitHub {
owner = "poseidon";
repo = "matchbox";
rev = "${version}";
hash = "sha256-u1VY+zEx2YToz+WxVFaUDzY7HM9OeokbR/FmzcR3UJ8=";
};
vendorHash = "sha256-sVC4xeQIcqAbKU4MOAtNicHcioYjdsleQwKWLstnjfk=";
subPackages = [
"cmd/matchbox"
];
# Go linker flags (go tool link)
# Omit symbol tables and debug info
ldflags = [
"-w -s -X github.com/poseidon/matchbox/matchbox/version.Version=${version}"
];
# Disable cgo to produce a static binary
CGO_ENABLED = 0;
# Don't run Go tests
doCheck = false;
meta = with lib; {
description = "Server to network boot and provision Fedora CoreOS and Flatcar Linux clusters";
homepage = "https://matchbox.psdn.io/";
changelog = "https://github.com/poseidon/matchbox/blob/main/CHANGES.md";
license = licenses.asl20;
maintainers = with maintainers; [ dghubble ];
mainProgram = "matchbox";
};
}

33
pkgs/by-name/mi/microsocks/package.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv,
fetchFromGitHub,
lib,
}:
stdenv.mkDerivation rec {
pname = "microsocks";
version = "1.0.4";
src = fetchFromGitHub {
owner = "rofl0r";
repo = "microsocks";
rev = "v${version}";
hash = "sha256-cB2XMWjoZ1zLAmAfl/nqjdOyBDKZ+xtlEmqsZxjnFn0=";
};
installPhase = ''
runHook preInstall
install -Dm 755 microsocks -t $out/bin/
runHook postInstall
'';
meta = {
changelog = "https://github.com/rofl0r/microsocks/releases/tag/v${version}";
description = "Tiny, portable SOCKS5 server with very moderate resource usage";
homepage = "https://github.com/rofl0r/microsocks";
license = lib.licenses.mit;
mainProgram = "microsocks";
maintainers = with lib.maintainers; [ ramblurr ];
};
}

30
pkgs/by-name/my/myanon/package.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, flex
, bison
}:
stdenv.mkDerivation (finalAttrs: {
pname = "myanon";
version = "0.5";
src = fetchFromGitHub {
owner = "ppomes";
repo = "myanon";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-tTGr8bTxZc75GYhpJ0uzpkPtMB3r/DXRMNqSlG+1eaA=";
};
nativeBuildInputs = [ autoreconfHook flex bison ];
meta = {
description = "Myanon is a mysqldump anonymizer, reading a dump from stdin, and producing on the fly an anonymized version to stdout";
homepage = "https://ppomes.github.io/myanon/";
license = lib.licenses.bsd3;
mainProgram = "myanon";
platforms = lib.platforms.unix;
};
})

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

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "mystmd";
version = "1.1.47";
version = "1.1.48";
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mystmd";
rev = "mystmd@${version}";
hash = "sha256-gF3IGkdMM4pbtHOVnhk35nxPBLqUSc/IzrXvg+duQa4=";
hash = "sha256-Uw/00EzgnrQYunABx7O35V+YwFnDDW+EI5NqMEUV8zk=";
};
npmDepsHash = "sha256-63QS+vnIwkdMES2UrWvHeytWp5NuEf5uKpHA0m1XTHU=";
npmDepsHash = "sha256-JSVdHhzOgzIwB61ST6vYVENtohjU6Q3lrp+hVPye02g=";
dontNpmInstall = true;

65
pkgs/by-name/no/notify-client/package.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, rustPlatform
, rustc
, cargo
, capnproto
, blueprint-compiler
, wrapGAppsHook4
, desktop-file-utils
, libadwaita
, gtksourceview5
, openssl
, sqlite
}:
stdenv.mkDerivation rec {
pname = "notify-client";
version = "0.1.5";
src = fetchFromGitHub {
owner = "ranfdev";
repo = "notify";
rev = "v${version}";
hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-uZRAGnydPGwyzAyHIyY+UlT42m+GyEasM0cSa8Bp9Hs=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
cargo
capnproto
blueprint-compiler
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
gtksourceview5
openssl
sqlite
];
meta = with lib; {
description = "Ntfy client application to receive everyday's notifications";
homepage = "https://github.com/ranfdev/Notify";
license = licenses.gpl3Plus;
mainProgram = "notify";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
};
}

4
pkgs/by-name/nw/nwg-hello/package.nix
View File

@ -9,13 +9,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-hello";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-hello";
rev = "refs/tags/v${version}";
hash = "sha256-HDH5B15MQqJhRNCPeg4IJSeX/676AdCNhmJ7iqn8yco=";
hash = "sha256-WNich+DsRvYS4GiLWZLWRvvWxCAlzrK9Q7aRX7dKjeQ=";
};
nativeBuildInputs = [

6
pkgs/by-name/ob/obs-cmd/package.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "obs-cmd";
version = "0.17.4";
version = "0.17.5";
src = fetchFromGitHub {
owner = "grigio";
repo = "obs-cmd";
rev = "v${version}";
hash = "sha256-HCvIMIQZKzIkpYL9F9oM4xiE/gOeI+7dMj9QmhetHm4=";
hash = "sha256-AphpIehFHZwcZ7vO5FV6PBZSO3y6oLhH/kQhJjr34VY=";
};
cargoHash = "sha256-AQRjZH3WhZXU6NhDSCv4/HWz5un1nFtuzWPYSJA9XaE=";
cargoHash = "sha256-s/nWJ/8JnZwmROFSd2y6btopk2Cxp0zkMdy7mxVxr6k=";
meta = with lib; {
description = "Minimal CLI to control OBS Studio via obs-websocket";

4
pkgs/by-name/or/orchard/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-bDXb8yKaDSYw9fZ/VBvacUebRMdlI+lzIe9KFa7uVyk=";
hash = "sha256-ccmG94OrsfQDmyBKJiPPI97uMFlnL26epsVMdAqO/1o=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;

15
pkgs/by-name/ot/oterm/package.nix
View File

@ -5,22 +5,25 @@
python3Packages.buildPythonApplication rec {
pname = "oterm";
version = "0.1.22";
version = "0.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "ggozad";
repo = "oterm";
rev = "refs/tags/${version}";
hash = "sha256-hRbPlRuwM3NspTNd3mPhVxPJl8zA9qyFwDGNKH3Slag=";
hash = "sha256-p0ns+8qmcyX4gcg0CfYdDMn1Ie0atVBuQbVQoDRQ9+c=";
};
pythonRelaxDeps = [
"aiosqlite"
"pillow"
"httpx"
"packaging"
];
propagatedBuildInputs = with python3Packages; [
ollama
textual
typer
python-dotenv
@ -46,12 +49,12 @@ python3Packages.buildPythonApplication rec {
# Tests require a HTTP connection to ollama
doCheck = false;
meta = with lib; {
meta = {
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
description = "A text-based terminal client for Ollama";
homepage = "https://github.com/ggozad/oterm";
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ suhr ];
license = lib.licenses.mit;
mainProgram = "oterm";
maintainers = with lib.maintainers; [ suhr ];
};
}

6
pkgs/by-name/pm/pmtiles/package.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pmtiles";
version = "1.17.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
rev = "v${version}";
hash = "sha256-BHzQMSIE94LW6SGcpaMdX/ztzVLlmWquwWMbruLAt00=";
hash = "sha256-JVx543uatVUWD1TmnjJBz4X/oHPKpbrGpGcxQd2IYiw=";
};
vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs=";
vendorHash = "sha256-N/8n3NDHShcXjPvLSkLRacY4aqFzLYM/+/mJRGXQAVg=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];

70
pkgs/by-name/ra/ratslap/package.nix Normal file
View File

@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchFromGitHub
, libusb1
, pkg-config
, installShellFiles
, git
}:
stdenv.mkDerivation rec {
pname = "ratslap";
version = "0.4.1";
src = fetchFromGitHub {
owner = "krayon";
repo = "ratslap";
rev = version;
sha256 = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY=";
leaveDotGit = true;
};
nativeBuildInputs = [
pkg-config
installShellFiles
git
];
buildInputs = [
libusb1
];
preBuild = ''
makeFlagsArray+=(
"-W gitup"
"VDIRTY="
"MAJVER=${version}"
"APPBRANCH=main"
"BINNAME=${pname}"
"MARKDOWN_GEN="
"BUILD_DATE=$(git show -s --date=format:'%Y-%m-%d %H:%M:%S%z' --format=%cd)"
"BUILD_MONTH=$(git show -s --date=format:'%B' --format=%cd)"
"BUILD_YEAR=$(git show -s --date=format:'%Y' --format=%cd)"
)
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp ratslap $out/bin
mv manpage.1 ${pname}.1
installManPage ${pname}.1
runHook postInstall
'';
meta = with lib; {
description = "Configure G300 and G300s Logitech mice";
longDescription = ''
A tool to configure Logitech mice on Linux. Supports remapping
all buttons and configuring modes, DPI settings and the LED.
'';
homepage = "https://github.com/krayon/ratslap";
changelog = "https://github.com/krayon/ratslap/releases/tag/${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ zebreus ];
platforms = platforms.all;
};
}

8
pkgs/by-name/rc/rcp/package.nix
View File

@ -5,16 +5,18 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-a/gjphldS17W2OWUXpo+bayqaxINVLI7B27wlicT4Ks=";
hash = "sha256-kVO2WMwB/Lv4fCcdXaWL/Gfmenky6uMNVrUwhWU9y7A=";
};
cargoHash = "sha256-i8CrS0WlqlyXmI1waYrbiSFifAn5vqRW0YeQ1Izu0XE=";
cargoHash = "sha256-Pa8YgFAT9nue/QLhHQm6PlTJU/myK60UcND5TthMOxc=";
RUSTFLAGS = "--cfg tokio_unstable";
checkFlags = [
# this test also sets setuid permissions on a test file (3oXXX) which doesn't work in a sandbox

24
pkgs/development/python-modules/robotframework-tidy/default.nix → pkgs/by-name/ro/robotframework-tidy/package.nix
View File

@ -1,18 +1,10 @@
{
lib,
buildPythonPackage,
python3,
fetchFromGitHub,
setuptools,
robotframework,
click,
colorama,
pathspec,
tomli,
rich-click,
jinja2,
}:
buildPythonPackage rec {
python3.pkgs.buildPythonApplication rec {
pname = "robotframework-tidy";
version = "4.11.0";
pyproject = true;
@ -20,13 +12,13 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "MarketSquare";
repo = "robotframework-tidy";
rev = "${version}";
rev = version;
hash = "sha256-pWW7Ex184WgnPfqHg5qQjfE+9UPvCmE5pwkY8jrp9bI=";
};
build-system = [ setuptools ];
build-system = with python3.pkgs; [ setuptools ];
dependencies = [
dependencies = with python3.pkgs; [
robotframework
click
colorama
@ -34,13 +26,17 @@ buildPythonPackage rec {
tomli
rich-click
jinja2
tomli-w
];
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
meta = with lib; {
changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${version}.rst";
description = "Code autoformatter for Robot Framework";
homepage = "https://robotidy.readthedocs.io";
changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${version}.rst";
license = licenses.asl20;
maintainers = with maintainers; [ otavio ];
mainProgram = "robotidy";
};
}

612
pkgs/by-name/rq/rqbit/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/by-name/rq/rqbit/package.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "rqbit";
version = "5.5.0";
version = "5.5.3";
src = fetchFromGitHub {
owner = "ikatson";
repo = "rqbit";
rev = "v${version}";
hash = "sha256-3Wqej2Zb/RxxOOhWscZiyafGftl3ShozqVkUF7V0fP4=";
hash = "sha256-r/ff/Z/nsmQEWCVvmS0hGKXRuzIoDGhzfIRAxC6EaZk=";
};
cargoLock = {

12
pkgs/by-name/sc/scion/package.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildGo121Module
, buildGoModule
, fetchFromGitHub
, fetchpatch2
}:
let
version = "0.10.0";
@ -18,7 +19,7 @@ let
'';
in
buildGo121Module {
buildGoModule {
pname = "scion";
inherit version;
@ -43,6 +44,13 @@ buildGo121Module {
doCheck = true;
patches = [
(fetchpatch2 {
url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch";
hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU=";
})
];
meta = with lib; {
description = "A future Internet architecture utilizing path-aware networking";
homepage = "https://scion-architecture.net/";

23
pkgs/tools/misc/steampipe/default.nix → pkgs/by-name/st/steampipe/package.nix
View File

@ -1,4 +1,13 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
{
buildGoModule,
fetchFromGitHub,
installShellFiles,
lib,
nix-update-script,
stdenv,
steampipe,
testers,
}:
buildGoModule rec {
pname = "steampipe";
@ -11,7 +20,7 @@ buildGoModule rec {
hash = "sha256-Oz1T9koeXnmHc5oru1apUtmhhvKi/gAtg/Hb7HKkkP0=";
};
vendorHash = "sha256-jC77z/1EerJSMK75np9R5kX+cLzTh55cFFlliAXASEw=";
vendorHash = "sha256-U0BeGCRLjL56ZmVKcKqrrPTCXpShJzJq5/wnXDKax6g=";
proxyVendor = true;
patchPhase = ''
@ -38,10 +47,20 @@ buildGoModule rec {
--zsh <($out/bin/steampipe --install-dir $INSTALL_DIR completion zsh)
'';
passthru = {
tests.version = testers.testVersion {
command = "${lib.getExe steampipe} --version";
package = steampipe;
version = "v${version}";
};
updateScript = nix-update-script { };
};
meta = with lib; {
homepage = "https://steampipe.io/";
description = "select * from cloud;";
license = licenses.agpl3Only;
mainProgram = "steampipe";
maintainers = with maintainers; [ hardselius ];
changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md";
};

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