nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-18 00:02:20 +00:00 committed by GitHub
commit ac91cf83c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
75 changed files with 2012 additions and 1447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lists.nix
View File

@ -228,7 +228,15 @@ rec {
`acc`
: The initial accumulator value
: The initial accumulator value.
The accumulator value is evaluated in any case before the first iteration starts.
To avoid evaluation even before the `list` argument is given an eta expansion can be used:
```nix
list: lib.foldl' op acc list
```
`list`
@ -254,13 +262,11 @@ rec {
foldl' =
op:
acc:
list:
# The builtin `foldl'` is a bit lazier than one might expect.
# See https://github.com/NixOS/nix/pull/7158.
# In particular, the initial accumulator value is not forced before the first iteration starts.
builtins.seq acc
(builtins.foldl' op acc list);
(builtins.foldl' op acc);
/**
Map with index starting from 0

2
maintainers/maintainer-list.nix
View File

@ -15904,7 +15904,7 @@
githubId = 10837173;
};
qjoly = {
email = "github@thoughtless.eu";
email = "github@une-pause-cafe.fr";
github = "qjoly";
githubId = 82603435;
name = "Quentin JOLY";

15
nixos/lib/systemd-lib.nix
View File

@ -73,13 +73,26 @@ in rec {
optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))
"Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
isNumberOrRangeOf = check: v:
if isInt v
then check v
else let
parts = splitString "-" v;
lower = toIntBase10 (head parts);
upper = if tail parts != [] then toIntBase10 (head (tail parts)) else lower;
in
length parts <= 2 && lower <= upper && check lower && check upper;
isPort = i: i >= 0 && i <= 65535;
isPortOrPortRange = isNumberOrRangeOf isPort;
assertPort = name: group: attr:
optional (attr ? ${name} && ! isPort attr.${name})
"Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number.";
assertPortOrPortRange = name: group: attr:
optional (attr ? ${name} && ! isPortOrPortRange attr.${name})
"Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number or range of port numbers.";
assertValueOneOf = name: values: group: attr:
optional (attr ? ${name} && !elem attr.${name} values)
"Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'.";

1
nixos/modules/services/networking/tinyproxy.nix
View File

@ -7,6 +7,7 @@ let
mkValueStringTinyproxy = with lib; v:
if true == v then "yes"
else if false == v then "no"
else if types.path.check v then ''"${v}"''
else generators.mkValueStringDefault {} v;
mkKeyValueTinyproxy = {
mkValueString ? mkValueStringDefault {}

4
nixos/modules/system/boot/networkd.nix
View File

@ -729,8 +729,8 @@ let
(assertInt "FirewallMark")
(assertRange "FirewallMark" 1 4294967295)
(assertInt "Priority")
(assertPort "SourcePort")
(assertPort "DestinationPort")
(assertPortOrPortRange "SourcePort")
(assertPortOrPortRange "DestinationPort")
(assertValueOneOf "InvertRule" boolValues)
(assertValueOneOf "Family" ["ipv4" "ipv6" "both"])
(assertInt "SuppressPrefixLength")

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

@ -464,7 +464,7 @@ in {
keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {};
komga = handleTest ./komga.nix {};
krb5 = discoverTests (import ./krb5 {});
krb5 = discoverTests (import ./krb5);
ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};

2
nixos/tests/freetube.nix
View File

@ -40,4 +40,4 @@ let
'';
});
in
builtins.mapAttrs (k: v: mkTest k v { }) tests
builtins.mapAttrs (k: v: mkTest k v) tests

32
nixos/tests/keycloak.nix
View File

@ -6,8 +6,8 @@ let
certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}";
keycloakTest = import ./make-test-python.nix (
{ pkgs, databaseType, ... }:
keycloakTest = databaseType: import ./make-test-python.nix (
{ pkgs, ... }:
let
initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
@ -76,16 +76,18 @@ let
enabled = true;
realm = "test-realm";
clients = [ client ];
users = [(
user // {
enabled = true;
credentials = [{
type = "password";
temporary = false;
value = password;
}];
}
)];
users = [
(
user // {
enabled = true;
credentials = [{
type = "password";
temporary = false;
value = password;
}];
}
)
];
};
realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
@ -177,7 +179,7 @@ let
);
in
{
postgres = keycloakTest { databaseType = "postgresql"; };
mariadb = keycloakTest { databaseType = "mariadb"; };
mysql = keycloakTest { databaseType = "mysql"; };
postgres = keycloakTest "postgresql";
mariadb = keycloakTest "mariadb";
mysql = keycloakTest "mysql";
}

3
nixos/tests/krb5/default.nix
View File

@ -1,4 +1,3 @@
{ system ? builtins.currentSystem }:
{
example-config = import ./example-config.nix { inherit system; };
example-config = import ./example-config.nix;
}

2
nixos/tests/make-test-python.nix
View File

@ -1,5 +1,5 @@
f: {
system ? builtins.currentSystem,
system,
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
...
} @ args:

30
nixos/tests/opensearch.nix
View File

@ -1,7 +1,7 @@
let
opensearchTest =
opensearchTest = extraSettings:
import ./make-test-python.nix (
{ pkgs, lib, extraSettings ? {} }: {
{ pkgs, lib, ... }: {
name = "opensearch";
meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
@ -27,20 +27,18 @@ in
{
opensearch = opensearchTest {};
opensearchCustomPathAndUser = opensearchTest {
extraSettings = {
services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.user = "open_search";
services.opensearch.group = "open_search";
systemd.tmpfiles.rules = [
"d /var/opensearch_test 0700 open_search open_search -"
];
users = {
groups.open_search = {};
users.open_search = {
description = "OpenSearch daemon user";
group = "open_search";
isSystemUser = true;
};
services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.user = "open_search";
services.opensearch.group = "open_search";
systemd.tmpfiles.rules = [
"d /var/opensearch_test 0700 open_search open_search -"
];
users = {
groups.open_search = { };
users.open_search = {
description = "OpenSearch daemon user";
group = "open_search";
isSystemUser = true;
};
};
};

2
nixos/tests/vscodium.nix
View File

@ -76,4 +76,4 @@ let
});
in
builtins.mapAttrs (k: v: mkTest k v { }) tests
builtins.mapAttrs (k: v: mkTest k v) tests

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

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "pithos";
version = "1.6.1";
version = "1.6.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-GPDbFlwiGT/B2paX33d3mUCV77q+fPM0LMaKFsQQjjQ=";
rev = "refs/tags/${version}";
hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ=";
};
format = "other";

8
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
View File

@ -9,13 +9,13 @@
}:
let
version = "unstable-2023-12-01";
version = "unstable-2024-02-03";
src = fetchFromGitHub {
owner = "zbelial";
repo = "lspce";
rev = "1958b6fcdfb6288aa17fa42360315d6c4aa85991";
hash = "sha256-HUIRm1z6xNJWgX7ykujzniBrOTh76D3dJHrm0LR3nuQ=";
rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15";
hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo=";
};
meta = {
@ -30,7 +30,7 @@ let
inherit version src meta;
pname = "lspce-module";
cargoHash = "sha256-qMLwdZwqrK7bPXL1bIbOqM7xQPpeiO8FDoje0CEJeXQ=";
cargoHash = "sha256-W9rsi7o4KvyRoG/pqRKOBbJtUoSW549Sh8+OV9sLcxs=";
checkFlags = [
# flaky test

8
pkgs/applications/file-managers/fm/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage {
pname = "fm";
version = "unstable-2023-07-25";
version = "0-unstable-2024-01-03";
src = fetchFromGitHub {
owner = "euclio";
repo = "fm";
rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e";
hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA=";
rev = "f1da116fe703a2c3d5bc9450703ecf1a1f1b4fda";
hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M=";
};
cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic=";
cargoHash = "sha256-E/mT+e17Qse4aPCY5Tuvih+ZMDnUqwvEBY0N70kciMs=";
nativeBuildInputs = [
pkg-config

20
pkgs/applications/misc/electrum/update.nix
View File

@ -4,6 +4,7 @@
, bash
, coreutils
, curl
, fetchurl
, gnugrep
, gnupg
, gnused
@ -13,7 +14,22 @@
let
downloadPageUrl = "https://download.electrum.org";
signingKeys = ["6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6"];
signingKeys = lib.lists.map fetchurl [
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/Emzy.asc";
hash = "sha256-QG0cM6AKlSKFacVlhcso/xvrooUdF7oqoppyezt0hjE=";
}
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/ThomasV.asc";
hash = "sha256-37ApVZlI+2EevxQIKXVKVpktt1Ls3UbWq4dfio2ORdo=";
}
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/sombernight_releasekey.asc";
hash = "sha256-GgdPJ9TB5hh5SPCcTZURfqXkrU4qwl0dCci52V/wpdQ=";
}
];
gpgImportPaths = lib.concatStringsSep " " signingKeys;
in
writeScript "update-electrum" ''
@ -48,7 +64,7 @@ sigFile=$srcFile.asc
export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p "$GNUPGHOME"
gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)}
gpg --batch --import ${gpgImportPaths}
gpg --batch --verify "$sigFile" "$srcFile"
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile")

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

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "inlyne";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "trimental";
repo = pname;
rev = "v${version}";
hash = "sha256-dDGTy5WOCyeWYfemVtv+YswNyHSqDL4C7MbHsKgRwLk=";
hash = "sha256-kZQREYnauR8xusyX6enBPUKHSe39aBLlrZjKEjJlfx0=";
};
cargoHash = "sha256-GDy7/FooHD77X5dZmlLX+isRKr2WjadKPKyVD55M9ZE=";
cargoHash = "sha256-2mQFr2nLJ/iBLpdOUmerY6F2C8Kt+/vMEjS6THpmJic=";
nativeBuildInputs = [
installShellFiles

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

@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "wttrbar";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "bjesus";
repo = "wttrbar";
rev = version;
hash = "sha256-2oUj9G82+aGXU+qB37f+lRz5rctZNnb3bK8IETrt/4g=";
hash = "sha256-9qAluu9W6OG/G1SmAEOe97mUS83PZL/oLYUsIJNunwY=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-yvgqvcOxl/AmvUg6jTFtYh13sgqAWKPt2uMFHaX5OMM=";
cargoHash = "sha256-AVlI2Yi3Gx9jCgP2O5NfaTvUFHdw6HPRmsMqbPFvxf8=";
meta = {
description = "A simple but detailed weather indicator for Waybar using wttr.in";

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View File

@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "123.0.2420.32";
version = "123.0.2420.41";
revision = "1";
hash = "sha256-ItKwlXaHHupTIXrwc4IXaFvldhFGZc4L8aJnxM1XLkM=";
hash = "sha256-tWsd+RyGJp+/1Sf4yDrq4EbLfaYsLkm4wLj9rfWmPlE=";
};
dev = import ./browser.nix {
channel = "dev";
version = "124.0.2438.2";
version = "124.0.2450.2";
revision = "1";
hash = "sha256-QMcq1lgtO50u2DoTdugJvkOcnIkppmeg/UCQ1oc5TZs=";
hash = "sha256-9PRQnnTYhArwRcTxuCufM7JcAcr6K7jKeFCrOsarCh0=";
};
stable = import ./browser.nix {
channel = "stable";
version = "122.0.2365.80";
version = "122.0.2365.92";
revision = "1";
hash = "sha256-fBu5ANA23Oicr3otQiqNznkUT0M9NcrDs6oNW/JuBtk=";
hash = "sha256-6rEVxFS2advEL4O2uczJTsTy31os9r52IGnHXxj3A+g=";
};
}

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.15.22";
version = "0.16.0";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE=";
hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg=";
};
vendorHash = null;
@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [
"-s" "-w"
"-X github.com/cilium/cilium-cli/cli.Version=${version}"
"-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}"
];
# Required to workaround install check error:
@ -26,7 +26,7 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
$out/bin/cilium version | grep ${version} > /dev/null
$out/bin/cilium version --client | grep ${version} > /dev/null
'';
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/networking/cluster/krelay/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "krelay";
version = "0.0.7";
version = "0.0.8";
src = fetchFromGitHub {
owner = "knight42";
repo = pname;
rev = "v${version}";
hash = "sha256-FB+N4gSjAG/HyL5a/D44G4VVzlAQZ8Vjt+YUclCcy3w=";
hash = "sha256-KR5lBLgzv9yjL3JvCjg8dxXWmPgagnnKxYtrPunAyXY=";
};
vendorHash = "sha256-Nktv3yRrK2AypCzvQDH9gax65GJEXq6Fb3eBWvltQVk=";
vendorHash = "sha256-vaWdJyPOLsrLrhipBvUCOHo/TjnJz4Qpvj3lvUPHomU=";
subPackages = [ "cmd/client" ];

4
pkgs/applications/video/pipe-viewer/default.nix
View File

@ -38,13 +38,13 @@ let
in
buildPerlModule rec {
pname = "pipe-viewer";
version = "0.4.9";
version = "0.5.0";
src = fetchFromGitHub {
owner = "trizen";
repo = "pipe-viewer";
rev = version;
hash = "sha256-7l8exCC9robe1hKnQAaIVfnn8L+FuwTOkxaxlwJmpe0=";
hash = "sha256-tNIAGvv3dCPd7MA27yd2AHMSgs+1D2uiJJTQgTsEVNU=";
};
nativeBuildInputs = [ makeWrapper ]

4
pkgs/by-name/am/amazon-ssm-agent/package.nix
View File

@ -42,13 +42,13 @@ let
in
buildGoModule rec {
pname = "amazon-ssm-agent";
version = "3.3.40.0";
version = "3.3.131.0";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-ssm-agent";
rev = "refs/tags/${version}";
hash = "sha256-o1THIj0QAafqhbFoZKVZXWiAEcaYB+xP5Y2e45D/6Xg=";
hash = "sha256-fYFY5HQcArSDdh1qtIo4OzeLt+mIlbwlSr4O1py3MAk=";
};
vendorHash = null;

10
pkgs/by-name/co/codeium/package.nix
View File

@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-/heSkG7TtDHzNfvXblR6A5y+c12EmuQ8XZGDRqIEvtg=";
aarch64-linux = "sha256-WkpcNwWS0e5NURfHloV4xjIGSRPfP0RRflq98NY16AY=";
x86_64-darwin = "sha256-nXPaangEVRZf/dEt+i0AWOyT66jGIcRaN4ZO3k/VMh4=";
aarch64-darwin = "sha256-hs2lLy9thrp414+oQSf9euwNuU06UggLQ/EuMg/lrc0=";
x86_64-linux = "sha256-5rvLkJ0sFRgIekGVxk/r1gxheJHIKYsWqvtukqh+YTI=";
aarch64-linux = "sha256-19jKB71ZLkDqrsuacFb2JLBniOEyMediJBfLCP5Ss7o=";
x86_64-darwin = "sha256-DVuBMNhdQUcz29aidzkBQfHNk/ttOg0WrmUAuu6MG7A=";
aarch64-darwin = "sha256-lf/kBZFVYbE9GMkPPM/5MrMyavywCJF+FO54RTnup8g=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.8.5";
version = "1.8.13";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

23
pkgs/by-name/di/discordchatexporter-cli/deps.nix generated Normal file
View File

@ -0,0 +1,23 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
(fetchNuGet { pname = "AngleSharp"; version = "1.0.7"; sha256 = "1f0sb4jknw7f9mhg4f5khk1q257mn97b9qyy017jjljhqyxp449f"; })
(fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.4"; sha256 = "1sizwdkj7ysk7nvdrnnnvl67r4smyq45k6ih4si38kxm27sqwhjw"; })
(fetchNuGet { pname = "CliFx"; version = "2.3.5"; sha256 = "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin"; })
(fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.26.7"; sha256 = "1pa96gci9nwav1g93vxq4mc0h1bjasax9j6giya1ms6rdmqxxlyn"; })
(fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; })
(fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.2"; sha256 = "0j3z9wdhn6d4np0cjxv2wb5n9blm9frgbxs1p6zdafbxr98qzb73"; })
(fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; })
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
(fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; })
(fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; })
(fetchNuGet { pname = "RazorBlade"; version = "0.5.0"; sha256 = "11s68yqvpp65yam954f281vw9pmb2c5mxnk0n5j6xv1xylng4x5b"; })
(fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; })
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; })
(fetchNuGet { pname = "YoutubeExplode"; version = "6.3.10"; sha256 = "0b3n8mfxa4l7bfk0c1s7yfw4m1kvnm2r5pqfvr6s20gjq3wzfih5"; })
]

8
pkgs/tools/backup/discordchatexporter-cli/default.nix → pkgs/by-name/di/discordchatexporter-cli/package.nix
View File

@ -8,19 +8,19 @@
buildDotnetModule rec {
pname = "discordchatexporter-cli";
version = "2.41.2";
version = "2.42.8";
src = fetchFromGitHub {
owner = "tyrrrz";
repo = "discordchatexporter";
rev = version;
hash = "sha256-8ETEIZXIo7Tx6Vb9Id/E/8IklpcvO9OpcrYD+mHRX3o=";
hash = "sha256-54NTeIs0a8hd2xKQkAxwfyGwEPUlSSXXvDamGLfa9ls=";
};
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-runtime = dotnetCorePackages.runtime_7_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
postFixup = ''
ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli

2
pkgs/tools/backup/discordchatexporter-cli/updater.sh → pkgs/by-name/di/discordchatexporter-cli/updater.sh
View File

@ -4,7 +4,7 @@ set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Up to date"
exit 0

8
pkgs/by-name/gi/git-agecrypt/package.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage {
pname = "git-agecrypt";
version = "unstable-2023-07-14";
version = "unstable-2024-03-11";
src = fetchFromGitHub {
owner = "vlaci";
repo = "git-agecrypt";
rev = "945b80556d8848f6e85a8cc0053f9020bdc8b359";
hash = "sha256-6FjyJRYGyZt+uvYjXWvXI7DGq/+BNZHSSAT/DhOsF/E=";
rev = "126be86c515466c5878a60561f754a9ab4af6ee8";
hash = "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k=";
};
cargoHash = "sha256-QCV0DT0kcDRMzVc+9uTn9FYPpf+xvKJbakP6CHRcibo=";
cargoHash = "sha256-FmlJeWMIIyTsg3TTLUia14et+aTgFCTkOr1J5dp0SGY=";
nativeBuildInputs = [ pkg-config git ];

4
pkgs/by-name/lu/lubelogger/package.nix
View File

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-ZFFTkRCwcoYBjdzlkeAl2MCokF1dXuRV56WpGo2oaiA=";
hash = "sha256-7bU+ZXYvwg33hW0d+4it/3eSnvQ2SW9vWEbqhGMYxQQ=";
};
projectFile = "CarCareTracker.sln";

6
pkgs/by-name/op/open-scq30/package.nix
View File

@ -18,13 +18,13 @@
rustPlatform.buildRustPackage rec {
pname = "open-scq30";
version = "1.10.6";
version = "1.11.0";
src = fetchFromGitHub {
owner = "Oppzippy";
repo = "OpenSCQ30";
rev = "v${version}";
hash = "sha256-qYWLf0ns4YSq+yAspVTMvKQi861iUMJar2wjqm+BV/0=";
hash = "sha256-yls7F6ou0TsoY6CDi694fJrq30Y3B6d96T1VWl47K0w=";
};
nativeBuildInputs = [
@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Foundation
];
cargoHash = "sha256-BQLNm+yyimBh7WomrccdQ2lvrQzCNXf4MEa1LlPhck0=";
cargoHash = "sha256-VxweKzXNWOrBrzLzId8D6O0tZG8bI7HjhD+GJ3vRyhk=";
INSTALL_PREFIX = placeholder "out";

6
pkgs/by-name/qr/qrtool/package.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "qrtool";
version = "0.10.5";
version = "0.10.6";
src = fetchFromGitHub {
owner = "sorairolake";
repo = "qrtool";
rev = "v${version}";
sha256 = "sha256-XYoa5AueI0AYH5Lw7CmzeK9RkNy8WXbAAePAGkcwzWw=";
sha256 = "sha256-uniYvYFrwlYfTPpg4lKa2GLURdLHDRFfym8FjrKfSL4=";
};
cargoHash = "sha256-s68OCW2KS1ADTp8rWaUOGXCrl+Qapyf9FcLVhSF4QMg=";
cargoHash = "sha256-f0ufdFGrOIHFrDLz3rwNSl3AlM6um0r9bQzfn0Syd1M=";
nativeBuildInputs = [ asciidoctor installShellFiles ];

6
pkgs/by-name/sa/sarasa-gothic/package.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic";
version = "1.0.6";
version = "1.0.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${finalAttrs.version}b/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-MkbmEn4vV2WEDC8pW+WewPuVhlLPi2iGmhvJW6Szksw=";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-R0mVOKYlxSk3s6zPG/h9ddKUZX+WJp47QCulFUO97YI=";
};
sourceRoot = ".";

33
pkgs/applications/misc/tilemaker/default.nix → pkgs/by-name/ti/tilemaker/package.nix
View File

@ -1,5 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, cmake, installShellFiles
, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib, testers }:
{ lib
, stdenv
, fetchFromGitHub
, buildPackages
, cmake
, installShellFiles
, boost
, lua
, protobuf_21
, rapidjson
, shapelib
, sqlite
, zlib
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tilemaker";
@ -13,23 +26,26 @@ stdenv.mkDerivation (finalAttrs: {
};
postPatch = ''
substituteInPlace src/tilemaker.cpp \
--replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
--replace "process.lua" "$out/share/tilemaker/process-openmaptiles.lua"
substituteInPlace src/options_parser.cpp \
--replace-fail "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
--replace-fail "process.lua" "$out/share/tilemaker/process-openmaptiles.lua"
substituteInPlace server/server.cpp \
--replace-fail "default_value(\"static\")" "default_value(\"$out/share/tilemaker/static\")"
'';
nativeBuildInputs = [ cmake installShellFiles ];
buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ];
buildInputs = [ boost lua protobuf_21 rapidjson shapelib sqlite zlib ];
cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc";
(lib.cmakeFeature "PROTOBUF_PROTOC_EXECUTABLE" "${buildPackages.protobuf}/bin/protoc");
env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ];
postInstall = ''
installManPage ../docs/man/tilemaker.1
install -Dm644 ../resources/* -t $out/share/tilemaker
install -Dm644 ../resources/*.{json,lua} -t $out/share/tilemaker
cp -r ../server/static $out/share/tilemaker
'';
passthru.tests.version = testers.testVersion {
@ -44,5 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.free; # FTWPL
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
mainProgram = "tilemaker";
};
})

5
pkgs/by-name/wp/wp-cli/package.nix
View File

@ -9,7 +9,7 @@
}:
let
version = "2.9.0";
version = "2.10.0";
completion = fetchurl {
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/wp-cli-${version}.phar";
hash = "sha256-r2t8zCHtCQfLUE21oFnw4SAReQWmAXv91Ddc7jyT2GQ=";
hash = "sha256-TGqTzsrn9JnKSB+nptbUKZyLkyFOXlMI4mdw2/02Md8=";
};
dontUnpack = true;
@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "A command line interface for WordPress";
homepage = "https://wp-cli.org";
changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;

50
pkgs/by-name/yt/yt-dlg/package.nix Normal file
View File

@ -0,0 +1,50 @@
{
lib,
python3,
fetchFromGitHub,
fetchPypi
}:
let
python3Packages =
(python3.override {
packageOverrides = final: prev: {
wxpython = prev.wxpython.overrideAttrs rec {
version = "4.2.0";
src = fetchPypi {
pname = "wxPython";
inherit version;
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
};
};
};
}).pkgs;
in
python3Packages.buildPythonApplication rec {
pname = "yt-dlg";
version = "1.8.5";
src = fetchFromGitHub {
owner = "oleksis";
repo = "youtube-dl-gui";
rev = "v${version}";
hash = "sha256-W1ZlArmM+Ro5MF/rB88me/PD79dJA4v188mPbMd8Kow=";
};
pyproject = true;
build-system = with python3Packages; [
setuptools
wheel
];
dependencies = with python3Packages; [
pypubsub
wxpython
];
meta = {
description = "A cross platform front-end GUI of the popular youtube-dl written in wxPython.";
homepage = "https://oleksis.github.io/youtube-dl-gui";
license = lib.licenses.unlicense;
mainProgram = "yt-dlg";
maintainers = with lib.maintainers; [ quantenzitrone ];
};
}

4
pkgs/data/fonts/sketchybar-app-font/default.nix
View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
version = "2.0.8";
version = "2.0.11";
src = fetchurl {
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
hash = "sha256-WX30kF0DF85RNMapVrADCh1LKLnYpJdpgG/3dGWhuRs=";
hash = "sha256-coTwsCIausXlg1BGRPARnwq50rJgR8WyfER5Q4dkMuw=";
};
dontUnpack = true;

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.98";
hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc=";
version = "3.99";
hash = "sha256-6JocWJpA+VjEPZOxmD74toyEBLOTzCxSWUzrxPi52bU=";
}

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

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "bdffont";
version = "0.0.16";
version = "0.0.17";
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
hash = "sha256-2qR9uKQk9zrKpyekpZJht8uZOp8PK01sv2CYyP+BqcA=";
hash = "sha256-JBPo5tmwnXRzPpZbBrcW2wEC/XNd8M+mi58CRIpOVL0=";
};
format = "pyproject";

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.16.0";
version = "1.17.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/${version}";
hash = "sha256-1haWRuWK9WCgdR4geT2w3E95+CapBYDohGowUmnJ2H4=";
hash = "sha256-EE61RPantD1u9NNhyPRjoRkBifM3u16b0BC2aQC8UBA=";
};
postPatch = ''

5
pkgs/development/python-modules/nosejs/default.nix
View File

@ -5,11 +5,12 @@
}:
buildPythonPackage rec {
pname = "NoseJS";
pname = "nosejs";
version = "0.9.4";
src = fetchPypi {
inherit pname version;
pname = "NoseJS";
inherit version;
sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy";
};

5
pkgs/development/python-modules/plyplus/default.nix
View File

@ -1,10 +1,11 @@
{ lib, fetchPypi, buildPythonPackage, ply, isPy3k }:
buildPythonPackage rec {
pname = "PlyPlus";
pname = "plyplus";
version = "0.7.5";
src = fetchPypi {
inherit pname version;
pname = "PlyPlus";
inherit version;
sha256 = "0g3flgfm3jpb2d8v9z0qmbwca5gxdqr10cs3zvlfhv5cs06ahpnp";
};

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "py-scrypt";
version = "0.8.20";
version = "0.8.24";
src = fetchPypi {
pname = "scrypt";
inherit version;
hash = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g=";
hash = "sha256-mP/eReSpVGHXPe1UunomhXZ5kg1Pj/Mg9vet5uKVMb0=";
};
buildInputs = [ openssl ];

5
pkgs/development/python-modules/pycontracts/default.nix
View File

@ -2,11 +2,12 @@
, nose, pyparsing, decorator, six, future }:
buildPythonPackage rec {
pname = "PyContracts";
pname = "pycontracts";
version = "1.8.14";
src = fetchPypi {
inherit pname version;
pname = "PyContracts";
inherit version;
sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49";
};

18
pkgs/development/r-modules/default.nix
View File

@ -382,6 +382,7 @@ let
nloptr = with pkgs; [ nlopt pkg-config ];
n1qn1 = [ pkgs.gfortran ];
odbc = [ pkgs.unixODBC ];
opencv = [ pkgs.pkg-config ];
pak = [ pkgs.curl.dev ];
pander = with pkgs; [ pandoc which ];
pbdMPI = [ pkgs.mpi ];
@ -534,6 +535,7 @@ let
island = [ pkgs.gsl.dev ];
svKomodo = [ pkgs.which ];
ulid = [ pkgs.zlib.dev ];
unrtf = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev ];
nat = [ pkgs.which ];
nat_templatebrains = [ pkgs.which ];
pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
@ -545,13 +547,16 @@ let
webp = [ pkgs.libwebp ];
RMark = [ pkgs.which ];
RPushbullet = [ pkgs.which ];
stpphawkes = [ pkgs.gsl ];
RCurl = [ pkgs.curl.dev ];
R2SWF = [ pkgs.pkg-config ];
rDEA = [ pkgs.glpk ];
rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ];
RGtk2 = [ pkgs.pkg-config ];
RProtoBuf = [ pkgs.pkg-config ];
Rpoppler = [ pkgs.pkg-config ];
XML = [ pkgs.pkg-config ];
apsimx = [ pkgs.which ];
cairoDevice = [ pkgs.pkg-config ];
chebpol = [ pkgs.pkg-config ];
fftw = [ pkgs.pkg-config ];
@ -1360,6 +1365,12 @@ let
];
});
xslt = old.xslt.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -fpermissive";
};
});
sparklyr = old.sparklyr.overrideAttrs (attrs: {
# Pyspark's spark is full featured and better maintained than pkgs.spark
preConfigure = ''
@ -1414,6 +1425,13 @@ let
RGL_USE_NULL = "true";
});
opencv = let
opencvGtk = pkgs.opencv.override (old : { enableGtk2 = true; });
in old.opencv.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ opencvGtk ];
});
Rhdf5lib = let
hdf5 = pkgs.hdf5_1_10.overrideAttrs (attrs: {configureFlags = attrs.configureFlags ++ ["--enable-cxx"];});
in old.Rhdf5lib.overrideAttrs (attrs: {

6
pkgs/development/tools/go-swag/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-swag";
version = "1.8.12";
version = "1.16.3";
src = fetchFromGitHub {
owner = "swaggo";
repo = "swag";
rev = "v${version}";
sha256 = "sha256-2rnaPN4C4pn9Whk5X2z1VVxm679EUpQdumJZx5uulr4=";
sha256 = "sha256-wS5m3dBiILxmVb6P559fGcONdCWc/5hhLAVMC+G1QZs=";
};
vendorHash = "sha256-yQPmiK1CQNn3sr482OEkdRLK6YP8CvPMA/nPGdVJbMc=";
vendorHash = "sha256-BxWmEcx5IIT/yI46CJGE0vE1BRm5zwngc0x1dVy/04s=";
subPackages = [ "cmd/swag" ];

1231
pkgs/development/tools/language-servers/typst-lsp/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
pkgs/development/tools/language-servers/typst-lsp/default.nix
View File

@ -9,19 +9,18 @@ rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "nvarner";
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-KFW2CzdDi/z3Tk9qEubssy/iTh7Awl/tLQGv9CVkdXw=";
hash = "sha256-OubKtSHw9L4GzVzZY0AVdHY7LzKg/XQIhUfUc2OYAG0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI=";
};

6
pkgs/development/tools/misc/fzf-make/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "fzf-make";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "kyu08";
repo = "fzf-make";
rev = "v${version}";
hash = "sha256-2RA4EVhmn8edolUeL7y9b8PssPSGIZZjHx340J0GqVE=";
hash = "sha256-jElKCOCTG33ysePz4SfrbN9xWdTB83G+/9DUqNKI6x8=";
};
cargoHash = "sha256-Jfh+PMOep1WWTyt+LTGg+3f9pb6DlWu4ZLE9qvv8QyQ=";
cargoHash = "sha256-kXp/2F32aJFQ5z0TeggZWv1S2rDpnTPEYyHNZCtEjtg=";
nativeBuildInputs = [ makeBinaryWrapper ];

6
pkgs/development/tools/protolint/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "protolint";
version = "0.48.0";
version = "0.49.2";
src = fetchFromGitHub {
owner = "yoheimuta";
repo = pname;
rev = "v${version}";
hash = "sha256-8HqIDzt+mmSyxY1XYqMWbPN8MSuoqcQDyYYhtp+ZdF4=";
hash = "sha256-JUSHAIyUMsZOWFhomR6s+gxUIwd/oziBZdlgaZX1sOk=";
};
vendorHash = "sha256-62SxRvoN4ejmAczs823jftXUmeI4ozfb6plHYT1JwZ0=";
vendorHash = "sha256-8yV/YyNSn6O2UjAQlzM90fOoi3TdxO+v4YPtmSQMFC0=";
# Something about the way we run tests causes issues. It doesn't happen
# when using "go test" directly:

6
pkgs/development/tools/rust/cargo-deny/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.14.16";
version = "0.14.17";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
rev = version;
hash = "sha256-Evvr9In/ny+yQP77u47uTCWCtRqg/l9B5y79va8oMbw=";
hash = "sha256-ccj9BvvEtTsiV6jfrmLsQGDfem9f8L7rfCY8lK4cC+Y=";
};
cargoHash = "sha256-JgI4Tbl0C0lJEOMRwVjo9h6fuUL0u0mICGLsx8/0dMc=";
cargoHash = "sha256-pdVHBOxwhPgSl0+zoAobchxVkhtdx5/F/Rpp2uPx1K4=";
nativeBuildInputs = [
pkg-config

40
pkgs/games/chiaki4deck/default.nix
View File

@ -1,38 +1,52 @@
{ lib
, fetchFromGitHub
, mkDerivation
, fetchpatch
, stdenv
, cmake
, pkg-config
, protobuf
, python3
, ffmpeg_6
, libopus
, wrapQtAppsHook
, qtbase
, qtmultimedia
, qtsvg
, qtwayland
, qtdeclarative
, qtwebengine
, SDL2
, libevdev
, udev
, hidapi
, fftw
, speexdsp
, libplacebo
, vulkan-loader
, vulkan-headers
, libunwind
, shaderc
, lcms2
, libdovi
, xxHash
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "chiaki4deck";
version = "1.5.1";
version = "1.6.4";
src = fetchFromGitHub {
owner = "streetpea";
repo = pname;
rev = "v${version}";
hash = "sha256-XNpD9JPbckiq0HgpV/QJR8hDmvGTptxBMoGihHz44lc=";
hash = "sha256-x//E3HgS9NHQW7IHEJYWnAnfw2umcktcL0/28BPh1PY=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
protobuf
python3
python3.pkgs.wrapPython
@ -46,6 +60,9 @@ mkDerivation rec {
qtbase
qtmultimedia
qtsvg
qtdeclarative
qtwayland
qtwebengine
protobuf
SDL2
hidapi
@ -53,6 +70,21 @@ mkDerivation rec {
libevdev
udev
speexdsp
libplacebo
vulkan-headers
libunwind
shaderc
lcms2
libdovi
xxHash
];
cmakeFlags = [
"-Wno-dev"
];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
];
pythonPath = [

6
pkgs/games/heroic/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchYarnDeps
, yarn
, prefetch-yarn-deps
@ -45,6 +46,11 @@ in stdenv.mkDerivation rec {
./remove-drm-support.patch
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
./fix-non-steam-shortcuts.patch
(fetchpatch {
name = "adtraction-fallback.patch";
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3575.patch";
hash = "sha256-XhYYLQf/oSX3uK+0KzfnAb49iaGwhl9W64Tg2Fqi8Gg=";
})
];
postPatch = ''

5
pkgs/games/ultrastardx/default.nix
View File

@ -31,13 +31,13 @@ let
in stdenv.mkDerivation rec {
pname = "ultrastardx";
version = "2024.1.0";
version = "2024.3.0";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
repo = "USDX";
rev = "v${version}";
hash = "sha256-pyX2zQiCp9lHSV1sGz0GaM5jTaBtyw50I6bFVbSm5S4=";
hash = "sha256-0+7PMSnQoNu6tcR9MB6b94fWlMRvH10ySUhdSicWU8U=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
@ -82,5 +82,6 @@ in stdenv.mkDerivation rec {
description = "Free and open source karaoke game";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ Profpatsch ];
platforms = platforms.linux;
};
}

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "psmisc";
version = "23.6";
version = "23.7";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-TjnOn8a7HAgt11zcM0i5DM5ERmsvLJHvo1e5FOsl6IA=";
hash = "sha256-49YpdIh0DxLHfxos4sw1HUkV0XQBqmm4M9b0T4eN2xI=";
};
nativeBuildInputs = [ autoconf automake gettext ];

4
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "xf86-input-wacom";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "linuxwacom";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-PuIfeHlkcoin7w2v822P8uhWBNhYQGuOA7yD62L3qto=";
sha256 = "sha256-ldPNGa1ACjLivs2CVtkvKLsBZSzRuOM8Q7bvMdx0EWA=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

2
pkgs/servers/home-assistant/custom-components/default.nix
View File

@ -26,5 +26,7 @@
prometheus_sensor = callPackage ./prometheus_sensor {};
sensi = callPackage ./sensi {};
waste_collection_schedule = callPackage ./waste_collection_schedule {};
}

30
pkgs/servers/home-assistant/custom-components/sensi/default.nix Normal file
View File

@ -0,0 +1,30 @@
{
lib,
fetchFromGitHub,
buildHomeAssistantComponent,
websockets,
}:
buildHomeAssistantComponent rec {
owner = "iprak";
domain = "sensi";
version = "1.3.1";
src = fetchFromGitHub {
inherit owner;
repo = domain;
rev = "refs/tags/v${version}";
hash = "sha256-RF182b6OBpoXfDsalwZntuaN8VxkQK2jy9qa0zNFQdI=";
};
propagatedBuildInputs = [
websockets
];
meta = with lib; {
changelog = "https://github.com/iprak/sensi/releases/tag/v${version}";
description = "HomeAssistant integration for Sensi thermostat";
homepage = "https://github.com/iprak/sensi";
maintainers = with maintainers; [ ivan ];
license = licenses.mit;
};
}

6
pkgs/servers/monitoring/grafana-image-renderer/default.nix
View File

@ -7,18 +7,18 @@
mkYarnPackage rec {
pname = "grafana-image-renderer";
version = "3.10.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
rev = "v${version}";
hash = "sha256-fl2vDaGLR2ZlHnljfHYPN0EmbGqJwVs5dBkXRDJ3fM8=";
hash = "sha256-hfq0wuDoZ/3kiXVgwFPGRXMGxeRRVvCzi+VWJczOwgM=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-6x42/UaTNmoglgHDqfa0LjQz8PeOwUVqI5BOEuzdnuM=";
hash = "sha256-NqzADMMjxxZQOPt0lJOWoJ8WEU7hFJmnwRnSQPYMtLo=";
};
packageJSON = ./package.json;

2
pkgs/servers/monitoring/grafana-image-renderer/package.json
View File

@ -59,7 +59,7 @@
"@types/supertest": "^2.0.15",
"@typescript-eslint/eslint-plugin": "5.37.0",
"@typescript-eslint/parser": "5.37.0",
"axios": "1.6.0",
"axios": "1.6.7",
"cross-env": "7.0.3",
"eslint": "8.23.1",
"eslint-config-prettier": "8.5.0",

2
pkgs/servers/neard/default.nix
View File

@ -72,5 +72,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
# error: wcwidth-0.2.13 not supported for interpreter python2.7
broken = true; # Added 2024-03-17
};
}

28
pkgs/servers/pufferpanel/bump-sha1cd.patch
View File

@ -1,28 +0,0 @@
diff --git a/go.mod b/go.mod
index 107660ef..8efd7ebf 100644
--- a/go.mod
+++ b/go.mod
@@ -128,7 +128,7 @@ require (
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pierrec/lz4/v4 v4.1.2 // indirect
- github.com/pjbgf/sha1cd v0.2.0 // indirect
+ github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
diff --git a/go.sum b/go.sum
index 021d3ab9..13592e36 100644
--- a/go.sum
+++ b/go.sum
@@ -485,8 +485,9 @@ github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvI
github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
github.com/pierrec/lz4/v4 v4.1.2 h1:qvY3YFXRQE/XB8MlLzJH7mSzBs74eA2gg52YTk6jUPM=
github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pjbgf/sha1cd v0.2.0 h1:gIsJVwjbRviE4gydidGztxH1IlJQoYBcCrwG4Dz8wvM=
github.com/pjbgf/sha1cd v0.2.0/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=

5
pkgs/servers/pufferpanel/default.nix
View File

@ -22,7 +22,8 @@ buildGoModule rec {
patches = [
# Bump sha1cd package, otherwise i686-linux fails to build.
./bump-sha1cd.patch
# Also bump github.com/swaggo/swag for PR 257790.
./deps.patch
# Seems to be an anti-feature. Startup is the only place where user/group is
# hardcoded and checked.
@ -57,7 +58,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper go-swag ];
vendorHash = "sha256-402ND99FpU+zNV1e5Th1+aZKok49cIEdpPPLLfNyL3E=";
vendorHash = "sha256-itiWROoIhnMbG9evH6X7kjClC4VdpX983d/SCwr4HbY=";
proxyVendor = true;
# Generate code for Swagger documentation endpoints (see web/swagger/docs.go).

146
pkgs/servers/pufferpanel/deps.patch Normal file
View File

@ -0,0 +1,146 @@
diff --git a/go.mod b/go.mod
index e7ed3367..6022e4cd 100644
--- a/go.mod
+++ b/go.mod
@@ -36,9 +36,9 @@ require (
github.com/stretchr/testify v1.8.3
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
github.com/swaggo/gin-swagger v1.5.3
- github.com/swaggo/swag v1.8.8
- golang.org/x/crypto v0.9.0
- golang.org/x/sys v0.8.0
+ github.com/swaggo/swag v1.16.3
+ golang.org/x/crypto v0.14.0
+ golang.org/x/sys v0.13.0
gopkg.in/go-playground/validator.v9 v9.31.0
gorm.io/driver/mysql v1.4.4
gorm.io/driver/postgres v1.4.5
@@ -132,7 +132,7 @@ require (
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pierrec/lz4/v4 v4.1.2 // indirect
- github.com/pjbgf/sha1cd v0.2.0 // indirect
+ github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
@@ -151,12 +151,12 @@ require (
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/arch v0.3.0 // indirect
- golang.org/x/mod v0.8.0 // indirect
- golang.org/x/net v0.10.0 // indirect
+ golang.org/x/mod v0.9.0 // indirect
+ golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.1.0 // indirect
- golang.org/x/term v0.8.0 // indirect
- golang.org/x/text v0.9.0 // indirect
- golang.org/x/tools v0.6.0 // indirect
+ golang.org/x/term v0.13.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
+ golang.org/x/tools v0.7.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
diff --git a/go.sum b/go.sum
index 5be69957..b70625d4 100644
--- a/go.sum
+++ b/go.sum
@@ -497,8 +497,9 @@ github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZ
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
github.com/pierrec/lz4/v4 v4.1.2 h1:qvY3YFXRQE/XB8MlLzJH7mSzBs74eA2gg52YTk6jUPM=
github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pjbgf/sha1cd v0.2.0 h1:gIsJVwjbRviE4gydidGztxH1IlJQoYBcCrwG4Dz8wvM=
github.com/pjbgf/sha1cd v0.2.0/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -579,8 +580,8 @@ github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9J
github.com/swaggo/gin-swagger v1.5.3 h1:8mWmHLolIbrhJJTflsaFoZzRBYVmEE7JZGIq08EiC0Q=
github.com/swaggo/gin-swagger v1.5.3/go.mod h1:3XJKSfHjDMB5dBo/0rrTXidPmgLeqsX89Yp4uA50HpI=
github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=
-github.com/swaggo/swag v1.8.8 h1:/GgJmrJ8/c0z4R4hoEPZ5UeEhVGdvsII4JbVDLbR7Xc=
-github.com/swaggo/swag v1.8.8/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=
+github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg=
+github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk=
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
@@ -651,8 +652,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -688,8 +689,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -733,8 +734,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -828,16 +829,16 @@ golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -847,8 +848,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -912,8 +913,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

4
pkgs/stdenv/generic/make-derivation.nix
View File

@ -556,8 +556,8 @@ let
meta = checkMeta.commonMeta {
inherit validity attrs pos;
references = attrs.nativeBuildInputs ++ attrs.buildInputs
++ attrs.propagatedNativeBuildInputs ++ attrs.propagatedBuildInputs;
references = attrs.nativeBuildInputs or [] ++ attrs.buildInputs or []
++ attrs.propagatedNativeBuildInputs or [] ++ attrs.propagatedBuildInputs or [];
};
validity = checkMeta.assertValidity { inherit meta attrs; };

1419
pkgs/tools/admin/google-cloud-sdk/components.json
View File

File diff suppressed because it is too large Load Diff

22
pkgs/tools/admin/google-cloud-sdk/data.nix
View File

@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "452.0.1";
version = "467.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-x86_64.tar.gz";
sha256 = "0dj0hzhfvw1p74ja079jmhrhzrbsivgfm0509rxf9xvh1a0kb8zx";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-x86_64.tar.gz";
sha256 = "09qkz9zw23rza5siz77m52nzfyikdzszrqsl200z2zs2cm69g50w";
};
x86_64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-darwin-x86_64.tar.gz";
sha256 = "0gxz12sblc3slw9rhy0i7x8k61sakr0gwipx75h3cghf72hsx0cn";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-darwin-x86_64.tar.gz";
sha256 = "0il26ivqym4n94kjb22pcizgmy6j1p70l2yxjfrsj8i6vhwi3qbq";
};
aarch64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-arm.tar.gz";
sha256 = "1jcacwqxa5ylffpfp5mr509imay24ddsv43l04fygzahv2sv8a2d";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-arm.tar.gz";
sha256 = "1d72l35jcxg7r2r8ajhyigadj8ydp2k1g25kw6rkwvlg4whv8d7b";
};
aarch64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-darwin-arm.tar.gz";
sha256 = "1mpydxqkmfrnqiifgplvc5ghn6rs4981p4pw5zgxip7khw64dfap";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-darwin-arm.tar.gz";
sha256 = "0yd9hjn8pgaih7hj3hhbl70apcmg5b3gkx758r8m9823vhqkk5wm";
};
i686-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-x86.tar.gz";
sha256 = "1whijjp2bn24j78rlfpp01y832fnlgj557v6fim9l78zcavgnahz";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-x86.tar.gz";
sha256 = "0wag0qjzh0m6kmpzvmzvr7sy74w20xzgysljwjfravqr1xmw9m48";
};
};
}

23
pkgs/tools/backup/discordchatexporter-cli/deps.nix generated
View File

@ -1,23 +0,0 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
(fetchNuGet { pname = "AngleSharp"; version = "1.0.4"; sha256 = "1b4qd0z27fdkgy5l8fqcbpzwm29gmmjm2h0mqb9ac94rv6ynq510"; })
(fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.1"; sha256 = "0281mj9ppz6q454li6xyllb1hdfkl59bh3psbj4z6l9xjbhnjhz0"; })
(fetchNuGet { pname = "CliFx"; version = "2.3.4"; sha256 = "14nj8w3j0hbsr5cghj39jx2sh5cg3wsvl517dk8whva5kgy3q1mf"; })
(fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.25.0"; sha256 = "0xpdb2mss9zhdpks9ajm2h611khhw69xjwxv1k6qf7qrbkb0rgr3"; })
(fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; })
(fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.1"; sha256 = "192795akjmdxvp8p52g256rg0nzriipfsr8j808h69j6himhp4d7"; })
(fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; })
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
(fetchNuGet { pname = "Polly"; version = "8.0.0"; sha256 = "08wzmkz9qjz61sczmipm8m5j4bg8dg4mbjgspagx4hh28q8mvagn"; })
(fetchNuGet { pname = "Polly.Core"; version = "8.0.0"; sha256 = "10w6z81kidkdhbwkhyas9kc1zmvz0r3mzcsii01wpydw27v0rzxp"; })
(fetchNuGet { pname = "RazorBlade"; version = "0.4.4"; sha256 = "1dkyyn58gcrl1sh6mv3g7zqapqg8lb5nzn10aj3vh4l51wpl0l5r"; })
(fetchNuGet { pname = "Spectre.Console"; version = "0.47.0"; sha256 = "0gc9ana660an7d76w9qd8l62lv66dc69vr5lslr896b1313ywakp"; })
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; })
(fetchNuGet { pname = "YoutubeExplode"; version = "6.3.4"; sha256 = "0zlfga8aigxxqa96jmqsp95h5plvxxlgymsrbcl5z1ds9ga0ldkd"; })
]

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -79,11 +79,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3.pkgs.buildPythonApplication rec {
pname = "diffoscope";
version = "259";
version = "260";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-WYgFWM6HKFt3xVcRNytQPWOf3ZpH1cG7Cghhu/AES80=";
hash = "sha256-jZXBX6aIArm3eFmJpr60HxlcSlVNCK/wSL1yeIl/MjQ=";
};
outputs = [

4
pkgs/tools/package-management/dpkg/default.nix
View File

@ -18,12 +18,12 @@
stdenv.mkDerivation rec {
pname = "dpkg";
version = "1.22.4";
version = "1.22.5";
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/dpkg";
rev = "applied/${version}";
hash = "sha256-tpYSOimBd78rAthQUga/MNraWll9qEA+vRG+/F+t3mM=";
hash = "sha256-Rm3DacQF/0yAVtDaixPzE8IZ2Y+RZneCCVBCoYM64K4=";
};
configureFlags = [

1
pkgs/tools/package-management/nix/common.nix
View File

@ -20,6 +20,7 @@ let
# Major.minor versions unaffected by CVE-2024-27297
unaffectedByFodSandboxEscape = [
"2.3"
"2.16"
"2.18"
"2.19"
"2.20"

7
pkgs/tools/package-management/nix/default.nix
View File

@ -230,11 +230,8 @@ in lib.makeExtensible (self: ({
};
nix_2_16 = common {
version = "2.16.2";
hash = "sha256-VXIYCDkvAWeMoU0W2ZI0TeOszCZA1o8trz6YCPFD5ac=";
patches = [
patch-rapidcheck-shared
];
version = "2.16.3";
hash = "sha256-/tnjRCk+VaWPThzdn3C0zU1AMON+7AFsHgTTzErFxV4=";
};
nix_2_17 = common {

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-03-15";
version = "2024-03-17";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5PUgea2Gz0qtHp+O31fxYTTWIc19Z0ZwVB7XqyFAxNU=";
hash = "sha256-Vqdi7/jr+Di20y1HoFbXnl2riZfadgsRmzpSryW03M0=";
};
nativeBuildInputs = [

4
pkgs/tools/security/lynis/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
sha256 = "sha256-NdGq/sItJIjLX+7qKIwKpaZKqS/0PNFSO9H4Hp5umVk=";
sha256 = "sha256-DdsBGISKZuqDwSeuy8/73qskP3XoO3QRT7+bkKIJcBU=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

4
pkgs/tools/security/trufflehog/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.70.0";
version = "3.70.1";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-KcJhnev2j4Y7jlIZe2cUgkiJEz5V+oG69SURs5tXCVU=";
hash = "sha256-02sBzWMzpSUx1wFpKapP93JVLSlPmnXMwLAYhOVqiYE=";
};
vendorHash = "sha256-oJ5aPffmBDCJ6cD2nG1Q5w+R6LV6oDf4v9hIWN9jNdc=";

12
pkgs/top-level/all-packages.nix
View File

@ -6769,7 +6769,9 @@ with pkgs;
cicero-tui = callPackage ../tools/misc/cicero-tui { };
cilium-cli = callPackage ../applications/networking/cluster/cilium { };
cilium-cli = callPackage ../applications/networking/cluster/cilium {
buildGoModule = buildGo122Module;
};
cjdns = callPackage ../tools/networking/cjdns { };
cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
@ -20793,8 +20795,6 @@ with pkgs;
directfb = callPackage ../development/libraries/directfb { };
discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };
discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { };
discord-rpc = callPackage ../development/libraries/discord-rpc {
@ -35284,10 +35284,6 @@ with pkgs;
tijolo = callPackage ../applications/editors/tijolo { };
tilemaker = callPackage ../applications/misc/tilemaker {
protobuf = protobuf_21;
};
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec;
};
@ -37019,7 +37015,7 @@ with pkgs;
chiaki = libsForQt5.callPackage ../games/chiaki { };
chiaki4deck = libsForQt5.callPackage ../games/chiaki4deck { };
chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { };
chromium-bsu = callPackage ../games/chromium-bsu { };