b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-03-06 18:01:40 +00:00 committed by GitHub
parent 1d6a770957 24c2250935
commit 4bfbd859a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 3278 additions and 1978 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/backport.yml vendored
View file

@ -27,6 +27,7 @@ jobs:
uses: korthout/backport-action@v1.2.0
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'
pull_description: |-
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.

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

@ -19,6 +19,7 @@ fennel,,,,,,misterio77
fifo,,,,,,
fluent,,,,,,alerque
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
haskell-tools.nvim,,,,,,
http,,,,0.3-0,,vcunat
inspect,,,,,,
jsregexp,,,,,,
@ -102,6 +103,8 @@ std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
stdlib,,,,41.2.2,,vyp
teal-language-server,,,http://luarocks.org/dev,,,
telescope.nvim,,,,,5.1,
telescope-manix,,,,,,
tl,,,,,,mephistophiles
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
vusted,,,,,,figsoda

1 name src ref server version luaversion maintainers
19 fifo
20 fluent alerque
21 gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim.git 5.1
22 haskell-tools.nvim
23 http 0.3-0 vcunat
24 inspect
25 jsregexp
103 std.normalize https://github.com/lua-stdlib/normalize.git
104 stdlib 41.2.2 vyp
105 teal-language-server http://luarocks.org/dev
106 telescope.nvim 5.1
107 telescope-manix
108 tl mephistophiles
109 vstruct https://github.com/ToxicFrog/vstruct.git
110 vusted figsoda

2
nixos/modules/installer/tools/tools.nix
View file

@ -180,7 +180,7 @@ in
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# packages = with pkgs; [
# firefox
# thunderbird
# tree
# ];
# };

2
nixos/modules/services/continuous-integration/github-runner/service.nix
View file

@ -149,7 +149,7 @@ in
else
args+=(--token "$token")
fi
${cfg.package}/bin/config.sh "''${args[@]}"
${cfg.package}/bin/Runner.Listener configure "''${args[@]}"
# Move the automatically created _diag dir to the logs dir
mkdir -p "$STATE_DIRECTORY/_diag"
cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"

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

@ -244,6 +244,7 @@ in {
ghostunnel = handleTest ./ghostunnel.nix {};
gitdaemon = handleTest ./gitdaemon.nix {};
gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };
github-runner = handleTest ./github-runner.nix {};
gitlab = handleTest ./gitlab.nix {};
gitolite = handleTest ./gitolite.nix {};
gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};

37
nixos/tests/github-runner.nix Normal file
View file

@ -0,0 +1,37 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "github-runner";
meta = with pkgs.lib.maintainers; {
maintainers = [ veehaitch ];
};
nodes.machine = { pkgs, ... }: {
services.github-runners.test = {
enable = true;
url = "https://github.com/yaxitech";
tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
};
systemd.services.dummy-github-com = {
wantedBy = [ "multi-user.target" ];
before = [ "github-runner-test.service" ];
script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
};
networking.hosts."127.0.0.1" = [ "api.github.com" ];
};
testScript = ''
start_all()
machine.wait_for_unit("dummy-github-com")
try:
machine.wait_for_unit("github-runner-test")
except Exception:
pass
out = machine.succeed("journalctl -u github-runner-test")
assert "Self-hosted runner registration" in out, "did not read runner registration header"
machine.wait_until_succeeds("test -f /tmp/registration-connect")
'';
})

35
pkgs/applications/display-managers/greetd/regreet.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, glib
, gtk4
, pango
}:
rustPlatform.buildRustPackage {
pname = "regreet";
version = "unstable-2023-02-27";
src = fetchFromGitHub {
owner = "rharish101";
repo = "ReGreet";
rev = "2bbabe90f112b4feeb0aea516c265daaec8ccf2a";
hash = "sha256-71ji4x/NUE4qmBuO5PkWTPE1a0uPXqJSwW1Ai1amPJE=";
};
cargoHash = "sha256-rz2eMMhoMtzBXCH6ZJOvGuYLeHSWga+Ebc4+ZO8Kk1g=";
buildFeatures = [ "gtk4_8" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk4 pango ];
meta = with lib; {
description = "Clean and customizable greeter for greetd";
homepage = "https://github.com/rharish101/ReGreet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
};
}

1030
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

327
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -91,6 +91,17 @@
};
meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex";
};
bicep = buildGrammar {
language = "bicep";
version = "b94a098";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-bicep";
rev = "b94a0983b69ebb75e9129329a188199ad6ebcec0";
hash = "sha256-YCVOgLmtCWd4FwfwmQUZhSzP2wS2ZDLwXP1BRrpE0Ls=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-bicep";
};
blueprint = buildGrammar {
language = "blueprint";
version = "6ef91ca";
@ -104,34 +115,34 @@
};
c = buildGrammar {
language = "c";
version = "7175a6d";
version = "f357890";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a";
hash = "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A=";
rev = "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2";
hash = "sha256-TLaqolQEN3m3YuNo8JbuRyaEmbWQCWyJJUaDDv4GFDY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "5b6c4d0";
version = "fcacbeb";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610";
hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U=";
rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d";
hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
capnp = buildGrammar {
language = "capnp";
version = "cb85cdd";
version = "fc6e2ad";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-capnp";
rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
rev = "fc6e2addf103861b9b3dffb82c543eb6b71061aa";
hash = "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
};
@ -148,12 +159,12 @@
};
clojure = buildGrammar {
language = "clojure";
version = "262d6d6";
version = "421546c";
src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-clojure";
rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416";
hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0=";
rev = "421546c2547c74d1d9a0d8c296c412071d37e7ca";
hash = "sha256-GfDaUZjvTELXkRzJXK303QyPDQr7ozfrz/4iOQNDQTU=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
};
@ -201,14 +212,25 @@
};
meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
};
cpon = buildGrammar {
language = "cpon";
version = "eedb93b";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-cpon";
rev = "eedb93bf9e22e82ed6a67e6c57fd78731b44f591";
hash = "sha256-8x+oUbiwt7prGc5cli5HabHoH3q/mBnQzO1Wy2Bauac=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-cpon";
};
cpp = buildGrammar {
language = "cpp";
version = "56cec4c";
version = "03fa93d";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740";
hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA=";
rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076";
hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@ -225,15 +247,26 @@
};
cuda = buildGrammar {
language = "cuda";
version = "a02c214";
version = "91c3ca3";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85";
hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI=";
rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847";
hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
cue = buildGrammar {
language = "cue";
version = "4ffcda8";
src = fetchFromGitHub {
owner = "eonpatapon";
repo = "tree-sitter-cue";
rev = "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2";
hash = "sha256-a72Z67LXmEuHF/mKIaxi1Y9TNzqLjAiPYR3+VUu9fso=";
};
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
};
d = buildGrammar {
language = "d";
version = "c2fbf21";
@ -269,6 +302,17 @@
generate = true;
meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
};
dhall = buildGrammar {
language = "dhall";
version = "affb6ee";
src = fetchFromGitHub {
owner = "jbellerb";
repo = "tree-sitter-dhall";
rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8";
hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ=";
};
meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall";
};
diff = buildGrammar {
language = "diff";
version = "f69bde8";
@ -382,12 +426,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "2422bc9";
version = "9fe5cdf";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "2422bc9373094bfa97653ac540e08759f812523c";
hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo=";
rev = "9fe5cdfab0f0d753112e9949a3501f64b75a3d92";
hash = "sha256-nJikCiksuOAEXEvX2eQ2jZoVmzPQLJ36l4mk0irPW3c=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@ -426,12 +470,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "67cf1c9";
version = "31552ac";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a";
hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ=";
rev = "31552ac43ecaffa443a12ebea68cc526d334892f";
hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@ -470,12 +514,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
version = "31ebb7c";
version = "a4b57cc";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
rev = "a4b57cc3bcbfc24550e858159647e9238e7ad1ac";
hash = "sha256-31FQlLVn5T/9858bPsZQkvejGVjO0ok5T5A13a+S91Y=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@ -637,12 +681,12 @@
};
haskell = buildGrammar {
language = "haskell";
version = "3bdba07";
version = "0da7f82";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
rev = "0da7f826e85b3e589e217adf69a6fd89ee4301b9";
hash = "sha256-5PCwcbF+UOmn4HE99RgBoDvC7w/QP1lo870+11S6cok=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
};
@ -692,12 +736,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "8e2f090";
version = "306d485";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0";
hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI=";
rev = "306d48516a6b3dbb18a184692e8edffa8403018f";
hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -758,23 +802,23 @@
};
java = buildGrammar {
language = "java";
version = "dd597f1";
version = "3c24aa9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6";
hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s=";
rev = "3c24aa9365985830421a3a7b6791b415961ea770";
hash = "sha256-06spTQhAIJvixfZ858vPKKv6FJ1AC4JElQzkugxfTuo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
javascript = buildGrammar {
language = "javascript";
version = "15e85e8";
version = "5720b24";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c";
hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=";
rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7";
hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@ -857,12 +901,12 @@
};
kdl = buildGrammar {
language = "kdl";
version = "c3c4856";
version = "e36f054";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-kdl";
rev = "c3c4856464842e05366b1f3ebc4434c9194cad43";
hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg=";
rev = "e36f054a60c4d9e5ae29567d439fdb8790b53b30";
hash = "sha256-ZZLe7WBDIX1x1lmuHE1lmZ93YWXTW3iwPgXXbxXR/n4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
};
@ -890,12 +934,12 @@
};
latex = buildGrammar {
language = "latex";
version = "6b7ea83";
version = "376f640";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
rev = "6b7ea839307670e6bda011f888717d3a882ecc09";
hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs=";
rev = "376f64097b7a26691a2ca60dc94e4dfa417be932";
hash = "sha256-9hcmCr9HfhKt5dkNN24haubrOySqpxzMoLVEGO53lxk=";
};
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
};
@ -932,6 +976,17 @@
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
luap = buildGrammar {
language = "luap";
version = "bfb38d2";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-luap";
rev = "bfb38d254f380362e26b5c559a4086ba6e92ba77";
hash = "sha256-HpKqesIa+x3EQGnWV07jv2uEW9A9TEN4bPNuecXEaFI=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-luap";
};
m68k = buildGrammar {
language = "m68k";
version = "d097b12";
@ -956,28 +1011,39 @@
};
markdown = buildGrammar {
language = "markdown";
version = "7e7aa9a";
version = "fa6bfd5";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "7e7aa9a";
version = "fa6bfd5";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
matlab = buildGrammar {
language = "matlab";
version = "2d5d3d5";
src = fetchFromGitHub {
owner = "mstanciu552";
repo = "tree-sitter-matlab";
rev = "2d5d3d5193718a86477d4335aba5b34e79147326";
hash = "sha256-Rpa/F3MIFRmHunJFsuvbs3h3vDlR3U7UZ+sTN5tJS8U=";
};
meta.homepage = "https://github.com/mstanciu552/tree-sitter-matlab";
};
menhir = buildGrammar {
language = "menhir";
version = "db7953a";
@ -1002,12 +1068,12 @@
};
meson = buildGrammar {
language = "meson";
version = "5f3138d";
version = "3d6dfbd";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-meson";
rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f";
hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s=";
rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1";
hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
};
@ -1113,14 +1179,25 @@
};
meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git";
};
passwd = buildGrammar {
language = "passwd";
version = "2023939";
src = fetchFromGitHub {
owner = "ath3";
repo = "tree-sitter-passwd";
rev = "20239395eacdc2e0923a7e5683ad3605aee7b716";
hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=";
};
meta.homepage = "https://github.com/ath3/tree-sitter-passwd";
};
perl = buildGrammar {
language = "perl";
version = "749d26f";
version = "ff1f0ac";
src = fetchFromGitHub {
owner = "ganezdragon";
repo = "tree-sitter-perl";
rev = "749d26fe13fb131b92e6515416096e572575b981";
hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE=";
rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5";
hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4=";
};
meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
};
@ -1157,6 +1234,17 @@
};
meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
};
po = buildGrammar {
language = "po";
version = "d6aed22";
src = fetchFromGitHub {
owner = "erasin";
repo = "tree-sitter-po";
rev = "d6aed225290bc71a15ab6f06305cb11419360c56";
hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg=";
};
meta.homepage = "https://github.com/erasin/tree-sitter-po";
};
poe_filter = buildGrammar {
language = "poe_filter";
version = "80dc101";
@ -1190,6 +1278,17 @@
};
meta.homepage = "https://github.com/mitchellh/tree-sitter-proto";
};
prql = buildGrammar {
language = "prql";
version = "5f6c4e4";
src = fetchFromGitHub {
owner = "PRQL";
repo = "tree-sitter-prql";
rev = "5f6c4e4a90633b19e2077c1d37248989789d64be";
hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ=";
};
meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
};
pug = buildGrammar {
language = "pug";
version = "884e225";
@ -1203,12 +1302,12 @@
};
python = buildGrammar {
language = "python";
version = "528855e";
version = "6282715";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "528855eee2665210e1bf5556de48b8d8dacb8932";
hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo=";
rev = "62827156d01c74dc1538266344e788da74536b8a";
hash = "sha256-hVtX4Dyqrq+cSvKTmKMxLbAplcCdR8dfFDoIZNtPFA0=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
};
@ -1223,6 +1322,17 @@
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql";
};
qmldir = buildGrammar {
language = "qmldir";
version = "6b2b5e4";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-qmldir";
rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841";
hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-qmldir";
};
qmljs = buildGrammar {
language = "qmljs";
version = "ab75be9";
@ -1258,12 +1368,12 @@
};
racket = buildGrammar {
language = "racket";
version = "1a5df02";
version = "c2f7baa";
src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-racket";
rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b";
hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk=";
rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985";
hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY=";
};
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
};
@ -1346,12 +1456,12 @@
};
rust = buildGrammar {
language = "rust";
version = "f7fb205";
version = "fbf9e50";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "f7fb205c424b0962de59b26b931fe484e1262b35";
hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU=";
rev = "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a";
hash = "sha256-hWooQfE7sWXfOkGai3hREoEulcwWT6XPT4xAc+dfjKk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@ -1401,12 +1511,12 @@
};
smali = buildGrammar {
language = "smali";
version = "5a742af";
version = "a67a429";
src = fetchFromSourcehut {
owner = "~yotam";
repo = "tree-sitter-smali";
rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5";
hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM=";
rev = "a67a429784dafa0ca4342d71e6530137ca803883";
hash = "sha256-Pby6RZKPXyPR41E9m2iRsLgVt7bOn2AZyyb4lvcwYwY=";
};
meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali";
};
@ -1423,14 +1533,14 @@
};
solidity = buildGrammar {
language = "solidity";
version = "52ed088";
version = "1680203";
src = fetchFromGitHub {
owner = "YongJieYongJie";
owner = "JoranHonig";
repo = "tree-sitter-solidity";
rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a";
hash = "sha256-ZyeUYtE0pyQIPnZhza6u6yQO0Mx8brgAUmUpIXYZwb4=";
rev = "168020304759ad5d8b4a88a541a699134e3730c5";
hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560=";
};
meta.homepage = "https://github.com/YongJieYongJie/tree-sitter-solidity";
meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
};
sparql = buildGrammar {
language = "sparql";
@ -1445,16 +1555,27 @@
};
sql = buildGrammar {
language = "sql";
version = "3a3f92b";
version = "1cb7c7a";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380";
hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs=";
rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b";
hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
starlark = buildGrammar {
language = "starlark";
version = "8ad93a7";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-starlark";
rev = "8ad93a74c2a880bc16325affba3cc66c14bb2bde";
hash = "sha256-HHGE7P/QAPCyu7wecRiDLrQIm8lndFjKOOb9xiyXsfc=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-starlark";
};
supercollider = buildGrammar {
language = "supercollider";
version = "90c6d9f";
@ -1490,12 +1611,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0c32d29";
version = "fe2e325";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "0c32d2948b79939b6464d9ced40fca43912cd486";
hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4=";
rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508";
hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -1604,12 +1725,12 @@
};
tsx = buildGrammar {
language = "tsx";
version = "5d20856";
version = "c6e56d4";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "5d20856f34315b068c41edaee2ac8a100081d259";
hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
rev = "c6e56d44c686a67c89e29e773e662567285d610f";
hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
};
location = "tsx";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1638,24 +1759,35 @@
};
typescript = buildGrammar {
language = "typescript";
version = "5d20856";
version = "c6e56d4";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "5d20856f34315b068c41edaee2ac8a100081d259";
hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
rev = "c6e56d44c686a67c89e29e773e662567285d610f";
hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
};
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
};
ungrammar = buildGrammar {
language = "ungrammar";
version = "debd26f";
src = fetchFromGitHub {
owner = "Philipp-M";
repo = "tree-sitter-ungrammar";
rev = "debd26fed283d80456ebafa33a06957b0c52e451";
hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU=";
};
meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar";
};
v = buildGrammar {
language = "v";
version = "136f3a0";
version = "66cf9d3";
src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6";
hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";
@ -1759,14 +1891,25 @@
};
meta.homepage = "https://github.com/Hubro/tree-sitter-yang";
};
yuck = buildGrammar {
language = "yuck";
version = "48af129";
src = fetchFromGitHub {
owner = "Philipp-M";
repo = "tree-sitter-yuck";
rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030";
hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ=";
};
meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck";
};
zig = buildGrammar {
language = "zig";
version = "6b3f578";
version = "f3bc9ff";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac";
hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};

3
pkgs/applications/emulators/dolphin-emu/default.nix
View file

@ -135,9 +135,6 @@ stdenv.mkDerivation rec {
"--set QT_QPA_PLATFORM xcb"
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
# Use nix-provided libraries instead of submodules
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \

10
pkgs/applications/emulators/wine/base.nix
View file

@ -108,9 +108,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
])));
patches = [ ]
# Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available
# in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax.
++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch
++ lib.optionals stdenv.isDarwin [
# Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available
# in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax.
./darwin-metal-compat.patch
# Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.
./darwin-qos.patch
]
++ patches';
configureFlags = prevConfigFlags

12
pkgs/applications/emulators/wine/darwin-qos.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index cde37c48b0d..be237bc0ad3 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -65,6 +65,7 @@
# undef LoadResource
# undef GetCurrentThread
# include <pthread.h>
+# include <pthread/qos.h>
# include <mach/mach.h>
# include <mach/mach_error.h>
# include <mach-o/getsect.h>

39
pkgs/applications/misc/feedbackd/default.nix
View file

@ -2,6 +2,8 @@
, stdenv
, fetchFromGitLab
, docbook-xsl-nons
, docutils
, gi-docgen
, gobject-introspection
, gtk-doc
, libxslt
@ -22,30 +24,33 @@ let
domain = "source.puri.sm";
owner = "Librem5";
repo = "feedbackd-device-themes";
rev = "v0.0.20220523";
sha256 = "sha256-RyUZj+tpJSYhyoK+E98CTIoHwXwBdB1YHVnO5821exo=";
rev = "v0.1.0";
sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80=";
};
in
stdenv.mkDerivation rec {
pname = "feedbackd";
# Not an actual upstream project release,
# only a Debian package release that is tagged in the upstream repo
version = "0.0.1";
version = "0.1.0";
outputs = [ "out" "dev" ]
# remove if cross-compiling gobject-introspection works
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = "feedbackd";
rev = "v${version}";
hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ=";
hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc=";
fetchSubmodules = true;
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
docbook-xsl-nons
docutils # for rst2man
gi-docgen
gobject-introspection
gtk-doc
libxslt
@ -64,11 +69,8 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
"-Dgtk_doc=true"
"-Dman=true"
# TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868
# can be removed if cross-compiling gobject-introspection works.
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
];
nativeCheckInputs = [
@ -83,6 +85,17 @@ stdenv.mkDerivation rec {
cp ${themes}/data/* $out/share/feedbackd/themes/
'';
postFixup = ''
# Move developer documentation to devdoc output.
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
if [[ -d "$out/share/doc" ]]; then
find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
| while IFS= read -r -d ''' file; do
moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
done
fi
'';
meta = with lib; {
description = "A daemon to provide haptic (and later more) feedback on events";
homepage = "https://source.puri.sm/Librem5/feedbackd";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.4.36";
version = "6.4.37";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo=";
sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo=";
};
buildInputs = [ openssl python3 ];

3
pkgs/applications/networking/browsers/ladybird/default.nix
View file

@ -57,9 +57,6 @@ stdenv.mkDerivation {
"-Daligned_alloc=_mm_malloc"
]);
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
# https://github.com/SerenityOS/serenity/issues/10055
postInstall = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath $out/lib $out/bin/ladybird

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "acorn";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "acorn-io";
repo = pname;
rev = "v${version}";
hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk=";
hash = "sha256-X4EXF6t6RzjHCbo2+oB69sFoqeRc5blSmB7x1iQCYIA=";
};
vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w=";
vendorHash = "sha256-cx+7vbVpoeNwE4mNaQKuguALObyCrEA7EQPdnJ0H9mM=";
ldflags = [
"-s"

3
pkgs/applications/networking/instant-messengers/nheko/default.nix
View file

@ -83,9 +83,6 @@ stdenv.mkDerivation rec {
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
preFixup = lib.optionalString voipSupport ''
# add gstreamer plugins path to the wrapper
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

1706
pkgs/applications/networking/n8n/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

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

@ -1,25 +1,67 @@
{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, perl, flex, bison
, gettext, libpcap, libnl, c-ares, gnutls, libgcrypt, libgpg-error, geoip, openssl
, lua5, python3, libcap, glib, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
{ lib
, stdenv
, buildPackages
, fetchFromGitLab
, pkg-config
, pcre2
, perl
, flex
, bison
, gettext
, libpcap
, libnl
, c-ares
, gnutls
, libgcrypt
, libgpg-error
, libmaxminddb
, libopus
, bcg729
, spandsp3
, libkrb5
, speexdsp
, libsmi
, lz4
, snappy
, zstd
, minizip
, sbc
, openssl
, lua5
, python3
, libcap
, glib
, libssh
, nghttp2
, zlib
, cmake
, ninja
, makeWrapper
, wrapGAppsHook
, withQt ? true
, qt5 ? null
, ApplicationServices
, SystemConfiguration
, gmp
, asciidoctor
}:
assert withQt -> qt5 != null;
assert withQt -> qt5 != null;
let
version = "4.0.3";
version = "4.0.4";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "wireshark-${variant}";
inherit version;
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE=";
src = fetchFromGitLab {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw=";
};
cmakeFlags = [
@ -36,18 +78,41 @@ in stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions.
env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ];
nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ]
nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [
gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt
libgpg-error gnutls geoip c-ares glib zlib
] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ])
++ lib.optionals stdenv.isLinux [ libcap libnl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
gettext
pcre2
libpcap
lua5
libssh
nghttp2
openssl
libgcrypt
libgpg-error
gnutls
libmaxminddb
libopus
bcg729
spandsp3
libkrb5
speexdsp
libsmi
lz4
snappy
zstd
minizip
c-ares
glib
zlib
] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ lib.optionals (withQt && stdenv.isLinux) [ qt5.qtwayland ]
++ lib.optionals stdenv.isLinux [ libcap libnl sbc ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
strictDeps = true;
@ -70,22 +135,23 @@ in stdenv.mkDerivation {
install_name_tool -change "$dylib" "$out/lib/$dylib" "$f"
done
done
'' else lib.optionalString withQt ''
pwd
install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop
'' else
lib.optionalString withQt ''
pwd
install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop
install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg
mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap}
install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg
mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap}
cp config.h $dev/include/wireshark/
cp ../epan/*.h $dev/include/epan/
cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../include/ws_*.h $dev/include/
cp ../wiretap/*.h $dev/include/wiretap/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/
'');
cp config.h $dev/include/wireshark/
cp ../epan/*.h $dev/include/epan/
cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../include/ws_*.h $dev/include/
cp ../wiretap/*.h $dev/include/wiretap/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/
'');
dontFixCmake = true;

13
pkgs/applications/radio/uhd/default.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
pname = "uhd";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
version = "4.1.0.5";
version = "4.4.0.0";
outputs = [ "out" "dev" ];
@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
owner = "EttusResearch";
repo = "uhd";
rev = "v${version}";
sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA=";
sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg=";
};
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz";
sha256 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A=";
sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4=";
};
cmakeFlags = [
@ -116,7 +116,12 @@ stdenv.mkDerivation rec {
preConfigure = "cd host";
# TODO: Check if this still needed, perhaps relevant:
# https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm
patches = if stdenv.isAarch32 then ./neon.patch else null;
patches = [
# Disable tests that fail in the sandbox
./no-adapter-tests.patch
] ++ lib.optionals stdenv.isAarch32 [
./neon.patch
];
postPhases = [ "installFirmware" "removeInstalledTests" ]
++ optionals (enableUtils) [ "moveUdevRules" ]

17
pkgs/applications/radio/uhd/no-adapter-tests.patch Normal file
View file

@ -0,0 +1,17 @@
diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt
index f40c252ad..b8a07d341 100644
--- i/host/tests/CMakeLists.txt
+++ w/host/tests/CMakeLists.txt
@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST(
${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
)
-UHD_ADD_NONAPI_TEST(
- TARGET "xport_adapter_ctrl_test.cpp"
- EXTRA_SOURCES
- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp
-)
-
########################################################################
# demo of a loadable module
########################################################################

2
pkgs/applications/science/math/mxnet/default.nix
View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
"-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743
"-DCUDA_ARCH_NAME=All"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}"
"-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}"
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";

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

@ -207,9 +207,6 @@ stdenv.mkDerivation rec {
"-Druntime_cxxmodules=OFF"
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
# TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged.
postInstall = ''

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

@ -66,7 +66,7 @@
, sdl2Support ? true, SDL2
, sixelSupport ? false, libsixel
, speexSupport ? true, speex
, swiftSupport ? false, swift
, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift
, theoraSupport ? true, libtheora
, vaapiSupport ? stdenv.isLinux, libva
, vapoursynthSupport ? false, vapoursynth
@ -78,7 +78,7 @@
}:
let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer;
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
in stdenv.mkDerivation (self: {
pname = "mpv";
@ -99,6 +99,11 @@ in stdenv.mkDerivation (self: {
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext ";
preConfigure = lib.optionalString swiftSupport ''
# Ensure we reference 'lib' (not 'out') of Swift.
export SWIFT_LIB_DYNAMIC=${lib.getLib swift.swift}/lib/swift/macosx
'';
mesonFlags = [
(lib.mesonOption "default_library" "shared")
(lib.mesonBool "libmpv" true)
@ -167,7 +172,8 @@ in stdenv.mkDerivation (self: {
++ lib.optionals zimgSupport [ zimg ]
++ lib.optionals stdenv.isLinux [ nv-codec-headers ]
++ lib.optionals stdenv.isDarwin [ libiconv ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]
++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ];
postBuild = lib.optionalString stdenv.isDarwin ''
pushd .. # Must be run from the source dir because it uses relative paths

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

@ -1,5 +1,6 @@
{ lib
, stdenv
, darwin
, buildGoModule
, fetchFromGitHub
, installShellFiles
@ -31,7 +32,8 @@ buildGoModule rec {
'';
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
nativeBuildInputs = [ installShellFiles makeWrapper ]
++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ];
vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4=";
@ -42,8 +44,6 @@ buildGoModule rec {
-X github.com/abiosoft/colima/config.revision=$(cat .git-revision)"
'';
subPackages = [ "cmd/colima" ];
postInstall = ''
wrapProgram $out/bin/colima \
--prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]}

12
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View file

@ -168,6 +168,15 @@ stdenvNoCC.mkDerivation (args // {
if runtimeId != null
then [ runtimeId ]
else map (system: dotnetCorePackages.systemToDotnetRid system) platforms;
defaultDepsFile =
# Wire in the nugetDeps file such that running the script with no args
# runs it agains the correct deps file by default.
# Note that toString is necessary here as it results in the path at
# eval time (i.e. to the file in your local Nixpkgs checkout) rather
# than the Nix store path of the path after it's been imported.
if lib.isPath nugetDeps && !lib.hasPrefix "/nix/store/" (toString nugetDeps)
then toString nugetDeps
else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")'';
in
writeShellScript "fetch-${pname}-deps" ''
set -euo pipefail
@ -238,7 +247,8 @@ stdenvNoCC.mkDerivation (args // {
export DOTNET_NOLOGO=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
depsFile=$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")
depsFile=$(realpath "''${1:-${defaultDepsFile}}")
echo Will write lockfile to "$depsFile"
mkdir -p "$tmp/nuget_pkgs"
storeSrc="${srcOnly args}"

24
pkgs/data/themes/orchis-theme/default.nix
View file

@ -6,29 +6,33 @@
, gtk-engine-murrine
, sassc
, border-radius ? null # Suggested: 2 < value < 16
, tweaks ? [ ] # can be "solid" "compact" "black" "primary"
, tweaks ? [ ] # can be "solid" "compact" "black" "primary" "macos" "submenu" "nord|dracula"
, withWallpapers ? false
}:
let
validTweaks = [ "solid" "compact" "black" "primary" ];
unknownTweaks = lib.subtractLists validTweaks tweaks;
pname = "orchis-theme";
validTweaks = [ "solid" "compact" "black" "primary" "macos" "submenu" "nord" "dracula" ];
nordXorDracula = with builtins; lib.assertMsg (!(elem "nord" tweaks) || !(elem "dracula" tweaks)) ''
${pname}: dracula and nord cannot be mixed. Tweaks ${toString tweaks}
'';
in
assert lib.assertMsg (unknownTweaks == [ ]) ''
You entered wrong tweaks: ${toString unknownTweaks}
Valid tweaks are: ${toString validTweaks}
'';
assert nordXorDracula;
lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
stdenvNoCC.mkDerivation
rec {
pname = "orchis-theme";
version = "2022-10-19";
inherit pname;
version = "2023-02-26";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "sha256-1lJUrWkb8IoUyCMn8J4Lwvs/pWsibrY0pSXrepuQcug=";
sha256 = "sha256-Qk5MK8S8rIcwO7Kmze6eAl5qcwnrGsiWbn0WNIPjRnA=";
};
nativeBuildInputs = [ gtk3 sassc ];

2
pkgs/desktops/plasma-5/default.nix
View file

@ -110,7 +110,7 @@ let
broken = meta.broken or broken;
};
in
(args.stdenv or qtStdenv).mkDerivation (args // {
qtStdenv.mkDerivation (args // {
inherit pname version meta outputs setupHook src nativeBuildInputs;
});
};

7
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -1,5 +1,4 @@
{ mkDerivation
, stdenv
, lib
, extra-cmake-modules
, kdoctools
@ -57,7 +56,6 @@
, plasma-framework
, libqaccessibilityclient
, python3
, gcc12Stdenv
}:
# TODO (ttuegel): investigate qmlplugindump failure
@ -145,12 +143,9 @@ mkDerivation {
})
];
stdenv = if stdenv.isAarch64 then gcc12Stdenv else stdenv;
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
]
++ lib.optional stdenv.isAarch64 "-mno-outline-atomics";
];
postInstall = ''
# Some package(s) refer to these service types by the wrong name.

43
pkgs/development/compilers/cudatoolkit/common.nix
View file

@ -11,7 +11,6 @@ args@
, fetchurl
, fontconfig
, freetype
, gcc
, gdk-pixbuf
, glib
, glibc
@ -22,13 +21,13 @@ args@
, perl
, python3
, requireFile
, stdenv
, backendStdenv # E.g. gcc11Stdenv, set in extension.nix
, unixODBC
, xorg
, zlib
}:
stdenv.mkDerivation rec {
backendStdenv.mkDerivation rec {
pname = "cudatoolkit";
inherit version runPatches;
@ -146,14 +145,23 @@ stdenv.mkDerivation rec {
# Fix builds with newer glibc version
sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
# Ensure that cmake can find CUDA.
'' +
# Point NVCC at a compatible compiler
# FIXME: redist cuda_nvcc copy-pastes this code
# Refer to comments in the overrides for cuda_nvcc for explanation
# CUDA_TOOLKIT_ROOT_DIR is legacy,
# Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
''
mkdir -p $out/nix-support
echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
# Set the host compiler to be used by nvcc for CMake-based projects:
# https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook
cat <<EOF >> $out/nix-support/setup-hook
cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'
cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin'
cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin'
if [ -z "\''${CUDAHOSTCXX-}" ]; then
export CUDAHOSTCXX=${backendStdenv.cc}/bin;
fi
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin'
EOF
# Move some libraries to the lib output so that programs that
# depend on them don't pull in this entire monstrosity.
@ -167,10 +175,6 @@ stdenv.mkDerivation rec {
mv $out/extras/CUPTI/lib64/libcupti* $out/lib
''}
# Set compiler for NVCC.
wrapProgram $out/bin/nvcc \
--prefix PATH : ${gcc}/bin
# nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
wrapProgram $out/bin/nvprof \
--prefix LD_LIBRARY_PATH : $out/lib
@ -191,7 +195,14 @@ stdenv.mkDerivation rec {
preFixup =
let rpath = lib.concatStringsSep ":" [
(lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ]))
"${stdenv.cc.cc.lib}/lib64"
# The path to libstdc++ and such
#
# `backendStdenv` is the cuda-compatible toolchain that we pick in
# extension.nix; we hand it to NVCC to use as a back-end, and we link
# cudatoolkit's binaries against its libstdc++
"${backendStdenv.cc.cc.lib}/lib64"
"$out/jre/lib/amd64/jli"
"$out/lib64"
"$out/nvvm/lib64"
@ -260,7 +271,7 @@ stdenv.mkDerivation rec {
popd
'';
passthru = {
cc = gcc;
inherit (backendStdenv) cc;
majorMinorVersion = lib.versions.majorMinor version;
majorVersion = lib.versions.majorMinor version;
};

24
pkgs/development/compilers/cudatoolkit/extension.nix
View file

@ -7,11 +7,29 @@ final: prev: let
# Version info for the classic cudatoolkit packages that contain everything that is in redist.
cudatoolkitVersions = final.lib.importTOML ./versions.toml;
finalVersion = cudatoolkitVersions.${final.cudaVersion};
# Exposed as cudaPackages.backendStdenv.
# We don't call it just "stdenv" to avoid confusion: e.g. this toolchain doesn't contain nvcc.
# Instead, it's the back-end toolchain for nvcc to use.
# We also use this to link a compatible libstdc++ (backendStdenv.cc.cc.lib)
# Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
backendStdenv = prev.pkgs."${finalVersion.gcc}Stdenv";
### Add classic cudatoolkit package
cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion});
cudatoolkit =
let
attrs = builtins.removeAttrs finalVersion [ "gcc" ];
attrs' = attrs // { inherit backendStdenv; };
in
buildCudaToolkitPackage attrs';
cudaFlags = final.callPackage ./flags.nix {};
in {
inherit cudatoolkit cudaFlags;
in
{
inherit
backendStdenv
cudatoolkit
cudaFlags;
}

127
pkgs/development/compilers/cudatoolkit/flags.nix
View file

@ -1,6 +1,6 @@
{ config
, lib
, cudatoolkit
, cudaVersion
}:
# Type aliases
@ -13,14 +13,21 @@
let
inherit (lib) attrsets lists strings trivial versions;
cudaVersion = cudatoolkit.version;
# Flags are determined based on your CUDA toolkit by default. You may benefit
# from improved performance, reduced file size, or greater hardware suppport by
# passing a configuration based on your specific GPU environment.
#
# config.cudaCapabilities: list of hardware generations to support (e.g., "8.0")
# config.cudaForwardCompat: bool for compatibility with future GPU generations
# config.cudaCapabilities :: List Capability
# List of hardware generations to build.
# E.g. [ "8.0" ]
# Currently, the last item is considered the optional forward-compatibility arch,
# but this may change in the future.
#
# config.cudaForwardCompat :: Bool
# Whether to include the forward compatibility gencode (+PTX)
# to support future GPU generations.
# E.g. true
#
# Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351
@ -40,6 +47,9 @@ let
# GPUs which are supported by the provided CUDA version.
supportedGpus = builtins.filter isSupported gpus;
# supportedCapabilities :: List Capability
supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus;
# cudaArchNameToVersions :: AttrSet String (List String)
# Maps the name of a GPU architecture to different versions of that architecture.
# For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ].
@ -50,12 +60,6 @@ let
(gpu: gpu.archName)
supportedGpus;
# cudaArchNames :: List String
# NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here;
# otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them
# from is already sorted, so we'll preserve that order here.
cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus);
# cudaComputeCapabilityToName :: AttrSet String String
# Maps the version of a GPU architecture to the name of that architecture.
# For example, "8.0" maps to "Ampere".
@ -68,23 +72,6 @@ let
supportedGpus
);
# cudaComputeCapabilities :: List String
# NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here;
# otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them
# from is already sorted, so we'll preserve that order here.
# Use the user-provided list of CUDA capabilities if it's provided.
cudaComputeCapabilities = config.cudaCapabilities
or (lists.map (gpu: gpu.computeCapability) supportedGpus);
# cudaForwardComputeCapability :: String
cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX";
# cudaComputeCapabilitiesAndForward :: List String
# The list of supported CUDA architectures, including the forward compatibility architecture.
# If forward compatibility is disabled, this will be the same as cudaComputeCapabilities.
cudaComputeCapabilitiesAndForward = cudaComputeCapabilities
++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability;
# dropDot :: String -> String
dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver;
@ -102,38 +89,68 @@ let
"-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}"
);
# cudaRealArches :: List String
# The real architectures are physical architectures supported by the CUDA version.
# For example, "sm_80".
cudaRealArches = archMapper "sm" cudaComputeCapabilities;
formatCapabilities = { cudaCapabilities, enableForwardCompat ? true }: rec {
inherit cudaCapabilities enableForwardCompat;
# cudaVirtualArches :: List String
# The virtual architectures are typically used for forward compatibility, when trying to support
# an architecture newer than the CUDA version allows.
# For example, "compute_80".
cudaVirtualArches = archMapper "compute" cudaComputeCapabilities;
# archNames :: List String
# E.g. [ "Turing" "Ampere" ]
archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities);
# cudaArches :: List String
# By default, build for all supported architectures and forward compatibility via a virtual
# architecture for the newest supported architecture.
cudaArches = cudaRealArches ++
lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches);
# realArches :: List String
# The real architectures are physical architectures supported by the CUDA version.
# E.g. [ "sm_75" "sm_86" ]
realArches = archMapper "sm" cudaCapabilities;
# cudaGencode :: List String
# A list of CUDA gencode arguments to pass to NVCC.
cudaGencode =
let
base = gencodeMapper "sm" cudaComputeCapabilities;
forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ];
in
base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat;
# virtualArches :: List String
# The virtual architectures are typically used for forward compatibility, when trying to support
# an architecture newer than the CUDA version allows.
# E.g. [ "compute_75" "compute_86" ]
virtualArches = archMapper "compute" cudaCapabilities;
# arches :: List String
# By default, build for all supported architectures and forward compatibility via a virtual
# architecture for the newest supported architecture.
# E.g. [ "sm_75" "sm_86" "compute_86" ]
arches = realArches ++
lists.optional enableForwardCompat (lists.last virtualArches);
# gencode :: List String
# A list of CUDA gencode arguments to pass to NVCC.
# E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ]
gencode =
let
base = gencodeMapper "sm" cudaCapabilities;
forward = gencodeMapper "compute" [ (lists.last cudaCapabilities) ];
in
base ++ lib.optionals enableForwardCompat forward;
};
in
# When changing names or formats: pause, validate, and update the assert
assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == {
cudaCapabilities = [ "7.5" "8.6" ];
enableForwardCompat = true;
archNames = [ "Turing" "Ampere" ];
realArches = [ "sm_75" "sm_86" ];
virtualArches = [ "compute_75" "compute_86" ];
arches = [ "sm_75" "sm_86" "compute_86" ];
gencode = [ "-gencode=arch=compute_75,code=sm_75" "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_86,code=compute_86" ];
};
{
inherit
cudaArchNames
cudaArchNameToVersions cudaComputeCapabilityToName
cudaRealArches cudaVirtualArches cudaArches
cudaGencode;
cudaCapabilities = cudaComputeCapabilitiesAndForward;
# formatCapabilities :: { cudaCapabilities: List Capability, cudaForwardCompat: Boolean } -> { ... }
inherit formatCapabilities;
# cudaArchNameToVersions :: String => String
inherit cudaArchNameToVersions;
# cudaComputeCapabilityToName :: String => String
inherit cudaComputeCapabilityToName;
# dropDot :: String -> String
inherit dropDot;
} // formatCapabilities {
cudaCapabilities = config.cudaCapabilities or supportedCapabilities;
enableForwardCompat = config.cudaForwardCompat or true;
}

13
pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix
View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, backendStdenv
, fetchurl
, autoPatchelfHook
, autoAddOpenGLRunpathHook
@ -10,7 +10,8 @@ attrs:
let
arch = "linux-x86_64";
in stdenv.mkDerivation {
in
backendStdenv.mkDerivation {
inherit pname;
inherit (attrs) version;
@ -29,7 +30,11 @@ in stdenv.mkDerivation {
];
buildInputs = [
stdenv.cc.cc.lib
# autoPatchelfHook will search for a libstdc++ and we're giving it a
# "compatible" libstdc++ from the same toolchain that NVCC uses.
#
# NB: We don't actually know if this is the right thing to do
backendStdenv.cc.cc.lib
];
dontBuild = true;
@ -43,6 +48,8 @@ in stdenv.mkDerivation {
runHook postInstall
'';
passthru.stdenv = backendStdenv;
meta = {
description = attrs.name;
license = lib.licenses.unfree;

38
pkgs/development/compilers/cudatoolkit/redist/overrides.nix
View file

@ -1,6 +1,8 @@
final: prev: let
final: prev:
let
inherit (prev) lib pkgs;
in (lib.filterAttrs (attr: _: (prev ? "${attr}")) {
in
(lib.filterAttrs (attr: _: (prev ? "${attr}")) {
### Overrides to fix the components of cudatoolkit-redist
# Attributes that don't exist in the previous set are removed.
@ -20,6 +22,38 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) {
prev.libcublas
];
cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs:
let
inherit (prev.backendStdenv) cc;
in
{
# Point NVCC at a compatible compiler
# FIXME: non-redist cudatoolkit copy-pastes this code
# For CMake-based projects:
# https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
# https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html
# https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html
# For non-CMake projects:
# We prepend --compiler-bindir to nvcc flags.
# Downstream packages can override these, because NVCC
# uses the last --compiler-bindir it gets on the command line.
# FIXME: this results in "incompatible redefinition" warnings.
# https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
postInstall = (oldAttrs.postInstall or "") + ''
mkdir -p $out/nix-support
cat <<EOF >> $out/nix-support/setup-hook
cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin'
cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin'
if [ -z "\''${CUDAHOSTCXX-}" ]; then
export CUDAHOSTCXX=${cc}/bin;
fi
export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin'
EOF
'';
});
cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ];
buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ];

6
pkgs/development/compilers/cudatoolkit/versions.toml
View file

@ -76,8 +76,4 @@ gcc = "gcc11"
version = "12.0.1"
url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run"
sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s="
# CUDA 12 is compatible with gcc12, but nixpkgs default gcc is still on gcc11 as
# of 2023-01-08. See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements.
# This should be upgraded to gcc12 once nixpkgs default gcc is upgraded. Other
# CUDA versions should likely have their gcc versions upgraded as well.
gcc = "gcc11"
gcc = "gcc12"

11
pkgs/development/compilers/zig/0.10.nix
View file

@ -11,6 +11,7 @@
stdenv.mkDerivation rec {
pname = "zig";
version = "0.10.1";
outputs = [ "out" "doc" ];
src = fetchFromGitHub {
owner = "ziglang";
@ -52,7 +53,17 @@ stdenv.mkDerivation rec {
"-DZIG_TARGET_MCPU=baseline"
];
postBuild = ''
./zig2 build-exe ../doc/docgen.zig
./docgen ./zig2 ../doc/langref.html.in ./langref.html
'';
doCheck = true;
postInstall = ''
install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html
'';
installCheckPhase = ''
$out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
'';

4
pkgs/development/libraries/bobcat/default.nix
View file

@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# have to link to static gcc lib on aarch64-linux explicitly
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = ''
./build libraries all
./build man

4
pkgs/development/libraries/libvirt/default.nix
View file

@ -112,13 +112,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump:
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "9.0.0";
version = "9.1.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8=";
sha256 = "sha256-V39p0kg+zGdoIY9mJjtMLk2xzlTjHG0SPR2GjvHK9FI=";
fetchSubmodules = true;
};

3
pkgs/development/libraries/mtxclient/default.nix
View file

@ -53,9 +53,6 @@ stdenv.mkDerivation rec {
spdlog
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
meta = with lib; {
description = "Client API library for the Matrix protocol.";
homepage = "https://github.com/Nheko-Reborn/mtxclient";

9
pkgs/development/libraries/opencv/3.x.nix
View file

@ -15,8 +15,8 @@
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false) &&
stdenv.hostPlatform.isx86_64, cudatoolkit
stdenv.hostPlatform.isx86_64
, cudaPackages ? { }
, enableUnfree ? false
, enableIpp ? false
, enablePython ? false, pythonPackages ? null
@ -40,6 +40,9 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
assert enablePython -> pythonPackages != null;
let
inherit (cudaPackages) cudatoolkit;
inherit (cudaPackages.cudaFlags) cudaCapabilities;
version = "3.4.18";
src = fetchFromGitHub {
@ -242,6 +245,8 @@ stdenv.mkDerivation {
"-DCUDA_FAST_MATH=ON"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
"-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}"
"-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}"
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"

13
pkgs/development/libraries/opencv/4.x.nix
View file

@ -37,7 +37,7 @@
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64
, cudatoolkit
, cudaPackages ? { }
, nvidia-optical-flow-sdk
, enableUnfree ? false
@ -79,6 +79,9 @@
}:
let
inherit (cudaPackages) cudatoolkit;
inherit (cudaPackages.cudaFlags) cudaCapabilities;
version = "4.7.0";
src = fetchFromGitHub {
@ -342,6 +345,14 @@ stdenv.mkDerivation {
"-DCUDA_FAST_MATH=ON"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
# OpenCV respects at least three variables:
# -DCUDA_GENERATION takes a single arch name, e.g. Volta
# -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
# -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
"-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}"
"-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}"
"-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}"
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"

3
pkgs/development/libraries/science/chemistry/openmm/default.nix
View file

@ -78,9 +78,6 @@ stdenv.mkDerivation rec {
"-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs"
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
postInstall = lib.strings.optionalString enablePython ''
export OPENMM_LIB_PATH=$out/lib
export OPENMM_INCLUDE_PATH=$out/include

8
pkgs/development/libraries/science/math/cudnn/generic.nix
View file

@ -1,11 +1,11 @@
{
stdenv,
backendStdenv,
lib,
zlib,
useCudatoolkitRunfile ? false,
cudaVersion,
cudaMajorVersion,
cudatoolkit, # if cuda>=11: only used for .cc
cudatoolkit, # For cuda < 11
libcublas ? null, # cuda <11 doesn't ship redist packages
autoPatchelfHook,
autoAddOpenGLRunpathHook,
@ -26,7 +26,7 @@
maxCudaVersion,
}:
assert useCudatoolkitRunfile || (libcublas != null); let
inherit (cudatoolkit) cc;
inherit (backendStdenv) cc;
inherit (lib) lists strings trivial versions;
# majorMinorPatch :: String -> String
@ -46,7 +46,7 @@ assert useCudatoolkitRunfile || (libcublas != null); let
then cudatoolkit
else libcublas;
in
stdenv.mkDerivation {
backendStdenv.mkDerivation {
pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
version = versionTriple;

49
pkgs/development/libraries/science/math/magma/generic.nix
View file

@ -8,10 +8,16 @@
{ blas
, cmake
, cudaPackages
# FIXME: cuda being unfree means ofborg won't eval "magma".
# respecting config.cudaSupport -> false by default
# -> ofborg eval -> throws "no GPU targets specified".
# Probably should delete everything but "magma-cuda" and "magma-hip"
# from all-packages.nix
, cudaSupport ? true
, fetchurl
, gfortran
, gpuTargets ? [ ]
, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
, gpuTargets ? [ ] # Non-CUDA targets, that is HIP
, hip
, hipblas
, hipsparse
@ -36,14 +42,8 @@ let
# of the first list *from* the second list. That means:
# lists.subtractLists a b = b - a
# For CUDA
supportedCudaSmArches = lists.intersectLists cudaFlags.cudaRealArches supportedGpuTargets;
# Subtract the supported SM architectures from the real SM architectures to get the unsupported
# SM architectures.
unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.cudaRealArches;
# For ROCm
# NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.cudaRealArches.
# NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches.
# For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must
# remove it.
rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets;
@ -62,19 +62,32 @@ let
)
supported;
# Create the gpuTargetString.
gpuTargetString = strings.concatStringsSep "," (
if gpuTargets != [ ] then
# If gpuTargets is specified, it always takes priority.
gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets
else if cudaSupport then
gpuArchWarner supportedCudaSmArches unsupportedCudaSmArches
else if rocmSupport then
gpuArchWarner supportedRocmArches unsupportedRocmArches
else if cudaSupport then
[ ] # It's important we pass explicit -DGPU_TARGET to reset magma's defaults
else
throw "No GPU targets specified"
);
# E.g. [ "80" "86" "90" ]
cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities);
cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures;
minArch =
let
minArch' = builtins.head (builtins.sort builtins.lessThan cudaArchitectures);
in
# If this fails some day, something must've changed and we should re-validate our assumptions
assert builtins.stringLength minArch' == 2;
# "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273
"${minArch'}0";
cuda_joined = symlinkJoin {
name = "cuda-redist-${cudaVersion}";
paths = with cudaPackages; [
@ -87,6 +100,8 @@ let
};
in
assert (builtins.match "[^[:space:]]*" gpuTargetString) != null;
stdenv.mkDerivation {
pname = "magma";
inherit version;
@ -116,7 +131,11 @@ stdenv.mkDerivation {
openmp
];
cmakeFlags = lists.optionals cudaSupport [
cmakeFlags = [
"-DGPU_TARGET=${gpuTargetString}"
] ++ lists.optionals cudaSupport [
"-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}"
"-DMIN_ARCH=${minArch}" # Disarms magma's asserts
"-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++"
"-DMAGMA_ENABLE_CUDA=ON"
@ -126,14 +145,10 @@ stdenv.mkDerivation {
"-DMAGMA_ENABLE_HIP=ON"
];
# NOTE: We must set GPU_TARGET in preConfigure in this way because it may contain spaces.
preConfigure = ''
cmakeFlagsArray+=("-DGPU_TARGET=${gpuTargetString}")
''
# NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of
# CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set
# CUDAHOSTCXX.
+ strings.optionalString cudaSupport ''
preConfigure = strings.optionalString cudaSupport ''
export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++
'';

31
pkgs/development/libraries/science/math/magma/releases.nix
View file

@ -1,27 +1,13 @@
# NOTE: Order matters! Put the oldest version first, and the newest version last.
# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest.
# You can update the supportedGpuTargets by looking at the CMakeLists.txt file.
# CUDA starts here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-175
# HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386
# CUDA works around magma's wrappers and uses FindCUDAToolkit directly
[
{
version = "2.6.2";
hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE=";
supportedGpuTargets = [
"sm_20"
"sm_30"
"sm_35"
"sm_37"
"sm_50"
"sm_52"
"sm_53"
"sm_60"
"sm_61"
"sm_62"
"sm_70"
"sm_71"
"sm_75"
"sm_80"
"700"
"701"
"702"
@ -53,21 +39,6 @@
version = "2.7.1";
hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA=";
supportedGpuTargets = [
"sm_20"
"sm_30"
"sm_35"
"sm_37"
"sm_50"
"sm_52"
"sm_53"
"sm_60"
"sm_61"
"sm_62"
"sm_70"
"sm_71"
"sm_75"
"sm_80"
"sm_90"
"700"
"701"
"702"

37
pkgs/development/libraries/science/math/nccl/default.nix
View file

@ -1,11 +1,19 @@
{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }:
{ lib
, backendStdenv
, fetchFromGitHub
, which
, cudaPackages ? { }
, addOpenGLRunpath
}:
with cudaPackages;
let
inherit (cudaPackages) cudatoolkit;
# Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86"
gencode = lib.concatStringsSep " " cudaFlags.gencode;
in
stdenv.mkDerivation rec {
name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
backendStdenv.mkDerivation rec {
name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}";
version = "2.16.5-1";
src = fetchFromGitHub {
@ -17,16 +25,29 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ which addOpenGLRunpath ];
nativeBuildInputs = [
which
addOpenGLRunpath
cuda_nvcc
];
buildInputs = [ cudatoolkit ];
buildInputs = [
cuda_cudart
] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [
cuda_cccl
];
preConfigure = ''
patchShebangs src/collectives/device/gen_rules.sh
makeFlagsArray+=(
"NVCC_GENCODE=${gencode}"
)
'';
makeFlags = [
"CUDA_HOME=${cudatoolkit}"
"CUDA_HOME=${cuda_nvcc}"
"CUDA_LIB=${cuda_cudart}/lib64"
"CUDA_INC=${cuda_cudart}/include"
"PREFIX=$(out)"
];

8
pkgs/development/libraries/science/math/tensorrt/generic.nix
View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, backendStdenv
, requireFile
, autoPatchelfHook
, autoAddOpenGLRunpathHook
@ -18,7 +18,7 @@
assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn)
"This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})";
stdenv.mkDerivation rec {
backendStdenv.mkDerivation rec {
pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt";
version = fullVersion;
src = requireFile rec {
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# Used by autoPatchelfHook
buildInputs = [
cudatoolkit.cc.cc.lib # libstdc++
backendStdenv.cc.cc.lib # libstdc++
cudatoolkit
cudnn
];
@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
"$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}"
'';
passthru.stdenv = backendStdenv;
meta = with lib; {
# Check that the cudatoolkit version satisfies our min/max constraints (both
# inclusive). We mark the package as broken if it fails to satisfies the

61
pkgs/development/libraries/volk/2.5.0.nix Normal file
View file

@ -0,0 +1,61 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, python3
, enableModTool ? true
, removeReferencesTo
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "volk";
# Version 2.5.1 seems to cause a build issue for aarch64-darwin, see:
# https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
version = "2.5.0";
src = fetchFromGitHub {
owner = "gnuradio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
extraPrefix = "";
})
];
cmakeFlags = lib.optionals (!enableModTool) [
"-DENABLE_MODTOOL=OFF"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
# volk_32f_log2_32f: fail on arch neon
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
];
postInstall = lib.optionalString (!stdenv.isDarwin) ''
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
'';
nativeBuildInputs = [
cmake
python3
python3.pkgs.Mako
];
doCheck = true;
meta = with lib; {
homepage = "http://libvolk.org/";
description = "The Vector Optimized Library of Kernels";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all;
};
}

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

@ -1,41 +1,34 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, python3
, enableModTool ? true
, removeReferencesTo
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "volk";
# Version 2.5.1 seems to cause a build issue for aarch64-darwin, see:
# https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
version = "2.5.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "gnuradio";
repo = pname;
rev = "v${version}";
sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg=";
fetchSubmodules = true;
};
patches = [
# Remove a failing test
(fetchpatch {
url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
extraPrefix = "";
url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch";
hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4=";
})
];
cmakeFlags = lib.optionals (!enableModTool) [
"-DENABLE_MODTOOL=OFF"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
# volk_32f_log2_32f: fail on arch neon
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
];
postInstall = lib.optionalString (!stdenv.isDarwin) ''

81
pkgs/development/lua-modules/generated-packages.nix
View file

@ -560,7 +560,30 @@ buildLuarocksPackage {
};
}) {};
http = callPackage({ fetchzip, lua, fifo, luaossl, lpeg_patterns, lpeg, basexx, buildLuarocksPackage, cqueues, bit32, binaryheap, luaOlder, compat53 }:
haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }:
buildLuarocksPackage {
pname = "haskell-tools.nvim";
version = "1.9.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/haskell-tools.nvim-1.9.1-1.rockspec";
sha256 = "1m7fasn5iz9hv9l1ycsjiaah14i1s5nssvqq9sypbwcpc9slj93b";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/1.9.1.zip";
sha256 = "0m425ipfvbb1f1m2wmz8qg57b901vspvvpckxr380crbwl3dflpr";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
meta = {
homepage = "https://github.com/mrcjkb/haskell-tools.nvim";
description = "Supercharge your Haskell experience in neovim!";
license.fullName = "GPL-2.0";
};
}) {};
http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }:
buildLuarocksPackage {
pname = "http";
version = "0.3-0";
@ -2853,7 +2876,61 @@ buildLuarocksPackage {
};
}) {};
tl = callPackage({ compat53, buildLuarocksPackage, argparse, luafilesystem, fetchgit }:
telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "telescope-manix";
version = "0.4.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec";
sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip";
sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua telescope-nvim ];
meta = {
homepage = "https://github.com/mrcjkb/telescope-manix";
description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix";
license.fullName = "GPL-2.0";
};
}) {};
telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }:
buildLuarocksPackage {
pname = "telescope.nvim";
version = "scm-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/telescope.nvim-scm-1.rockspec";
sha256 = "07mjkv1nv9b3ifxk2bbpbhvp0awblyklyz6aaqw418x4gm4q1g35";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-telescope/telescope.nvim",
"rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2",
"date": "2023-02-26T13:26:12+01:00",
"path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim",
"sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
disabled = (lua.luaversion != "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
meta = {
homepage = "https://github.com/nvim-telescope/telescope.nvim";
description = "Find, Filter, Preview, Pick. All lua, all the time.";
license.fullName = "MIT";
};
}) {};
tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }:
buildLuarocksPackage {
pname = "tl";
version = "0.15.1-1";

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "apispec";
version = "6.0.2";
version = "6.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc=";
hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/bpycv/default.nix
View file

@ -15,11 +15,12 @@
buildPythonPackage rec {
pname = "bpycv";
version = "0.2.43";
version = "0.3.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-6LXhKuNkX3yKeZARLXmOVNAUQhJghtzKhnszJ1G/a8U=";
hash = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "caio";
version = "0.9.11";
version = "0.9.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mosquito";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE=";
hash = "sha256-uMq/3yWP9OwaVxixGAFCLMsDPoJhmIuG0I7hO7AnIOk=";
};
nativeCheckInputs = [

19
pkgs/development/python-modules/debugpy/default.nix
View file

@ -13,6 +13,7 @@
, pytest-xdist
, pytestCheckHook
, requests
, llvmPackages
}:
buildPythonPackage rec {
@ -30,12 +31,6 @@ buildPythonPackage rec {
};
patches = [
# Hard code GDB path (used to attach to process)
(substituteAll {
src = ./hardcode-gdb.patch;
inherit gdb;
})
# Use nixpkgs version instead of versioneer
(substituteAll {
src = ./hardcode-version.patch;
@ -51,6 +46,18 @@ buildPythonPackage rec {
# To avoid this issue, debugpy should be installed using python.withPackages:
# python.withPackages (ps: with ps; [ debugpy ])
./fix-test-pythonpath.patch
] ++ lib.optionals stdenv.isLinux [
# Hard code GDB path (used to attach to process)
(substituteAll {
src = ./hardcode-gdb.patch;
inherit gdb;
})
] ++ lib.optionals stdenv.isDarwin [
# Hard code LLDB path (used to attach to process)
(substituteAll {
src = ./hardcode-lldb.patch;
inherit (llvmPackages) lldb;
})
];
# Remove pre-compiled "attach" libraries and recompile for host platform

13
pkgs/development/python-modules/debugpy/hardcode-lldb.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
index ed43e370..b28ab453 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d
is_debug = 0
# Note that the space in the beginning of each line in the multi-line is important!
cmd = [
- 'lldb',
+ '@lldb@/bin/lldb',
'--no-lldbinit', # Do not automatically parse any '.lldbinit' files.
# '--attach-pid',
# str(pid),

4
pkgs/development/python-modules/google-cloud-iot/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "2.8.1";
version = "2.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Rh23HbHv1FVmiZtyofv0bktv7tZWN3IS5jQawzbFfRk=";
hash = "sha256-mr14CDo+M01ZRfNLerFNeikExmIcV0j17zX/Xn8JT80=";
};
propagatedBuildInputs = [

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

@ -164,7 +164,7 @@ let
build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}"
build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}"
build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}"
build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}"
build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}"
'' + ''
CFG
'';

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
version = "9.0.0";
version = "9.1.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
hash = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU=";
hash = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8=";
};
nativeBuildInputs = [ pkg-config ];

5
pkgs/development/python-modules/scikit-survival/default.nix
View file

@ -17,11 +17,12 @@
buildPythonPackage rec {
pname = "scikit-survival";
version = "0.19.0.post1";
version = "0.20.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk=";
hash = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "screenlogicpy";
version = "0.7.2";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "dieselrabbit";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0yQ0upLkx5oroEH9BvIOfM5bgmVJw8o83IeAao5ncVs=";
hash = "sha256-VZ2WZpty7PXxU0uqJ/dftUNBW3QEIXrLghKxsW9lsgE=";
};
propagatedBuildInputs = [

52
pkgs/development/python-modules/tensorflow/default.nix
View file

@ -17,7 +17,9 @@
# that in nix as well. It would make some things easier and less confusing, but
# it would also make the default tensorflow package unfree. See
# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
, cudaSupport ? false, cudaPackages ? {}
, cudaSupport ? false
, cudaPackages ? { }
, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
, mklSupport ? false, mkl
, tensorboardSupport ? true
# XLA without CUDA is broken
@ -30,7 +32,27 @@
}:
let
inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
originalStdenv = stdenv;
in
let
# Tensorflow looks at many toolchain-related variables which may diverge.
#
# Toolchain for cuda-enabled builds.
# We want to achieve two things:
# 1. NVCC should use a compatible back-end (e.g. gcc11 for cuda11)
# 2. Normal C++ files should be compiled with the same toolchain,
# to avoid potential weird dynamic linkage errors at runtime.
# This may not be necessary though
#
# Toolchain for Darwin:
# clang 7 fails to emit a symbol for
# __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the
# translation units, so the build fails at link time
stdenv =
if cudaSupport then cudaPackages.backendStdenv
else if originalStdenv.isDarwin then llvmPackages_11.stdenv
else originalStdenv;
inherit (cudaPackages) cudatoolkit cudnn nccl;
in
assert cudaSupport -> cudatoolkit != null
@ -42,6 +64,7 @@ assert ! (stdenv.isDarwin && cudaSupport);
let
withTensorboard = (pythonOlder "3.6") || tensorboardSupport;
# FIXME: migrate to redist cudaPackages
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-merged";
paths = [
@ -54,10 +77,13 @@ let
];
};
# Tensorflow expects bintools at hard-coded paths, e.g. /usr/bin/ar
# The only way to overcome that is to set GCC_HOST_COMPILER_PREFIX,
# but that path must contain cc as well, so we merge them
cudatoolkit_cc_joined = symlinkJoin {
name = "${cudatoolkit.cc.name}-merged";
name = "${stdenv.cc.name}-merged";
paths = [
cudatoolkit.cc
stdenv.cc
binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip
];
};
@ -173,12 +199,7 @@ let
'';
}) else _bazel-build;
_bazel-build = (buildBazelPackage.override (lib.optionalAttrs stdenv.isDarwin {
# clang 7 fails to emit a symbol for
# __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the
# translation units, so the build fails at link time
stdenv = llvmPackages_11.stdenv;
})) {
_bazel-build = buildBazelPackage.override { inherit stdenv; } {
name = "${pname}-${version}";
bazel = bazel_5;
@ -209,12 +230,13 @@ let
flatbuffers-core
giflib
grpc
icu
# Necessary to fix the "`GLIBCXX_3.4.30' not found" error
(icu.override { inherit stdenv; })
jsoncpp
libjpeg_turbo
libpng
lmdb-core
pybind11
(pybind11.overridePythonAttrs (_: { inherit stdenv; }))
snappy
sqlite
] ++ lib.optionals cudaSupport [
@ -299,9 +321,11 @@ let
TF_NEED_CUDA = tfFeature cudaSupport;
TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}";
TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
# Needed even when we override stdenv: e.g. for ar
GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches;
GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc";
postPatch = ''
# bazel 3.3 should work just as well as bazel 3.1

5
pkgs/development/python-modules/tplink-omada-client/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "tplink-omada-client";
version = "1.1.0";
version = "1.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "tplink_omada_client";
inherit version;
hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo=";
hash = "sha256-Fg1rhTS9aP7C1URDfoC3w1w1IduToxYUtwTLDM3916U=";
};
nativeBuildInputs = [
@ -38,6 +38,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for the TP-Link Omada SDN Controller API";
homepage = "https://github.com/MarkGodwin/tplink-omada-api";
changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

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

@ -50,7 +50,7 @@ buildPythonPackage rec {
'';
pytestFlagsArray = [
] ++ lib.optionals (stdenv.isAarch64) [
"--deselect=tests/test_emitter.py::test_create_wrong_encoding"
"--deselect=tests/test_emitter.py::test_close"
] ++ lib.optionals (stdenv.isDarwin) [
# fails to stop process in teardown

22
pkgs/development/python-modules/yattag/default.nix
View file

@ -1,17 +1,29 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "yattag";
version = "1.15.0";
version = "1.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM=";
hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY=";
};
pythonImportsCheck = [
"yattag"
];
meta = with lib; {
description = "Generate HTML or XML in a pythonic way. Pure python alternative to web template engines. Can fill HTML forms with default values and error messages.";
license = [ licenses.lgpl21 ];
description = "Library to generate HTML or XML";
homepage = "https://www.yattag.org/";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ ];
};
}

385
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -1,49 +1,19 @@
{ autoPatchelfHook
, autoSignDarwinBinariesHook
, coreutils
, curl
, buildDotnetModule
, dotnetCorePackages
, dotnetPackages
, fetchFromGitHub
, fetchurl
, fetchpatch
, git
, glibc
, icu
, libkrb5
, glibcLocales
, lib
, linkFarmFromDrvs
, lttng-ust
, makeWrapper
, nixosTests
, nodejs-16_x
, openssl
, stdenv
, zlib
, writeShellApplication
, nuget-to-nix
, which
}:
let
fetchNuGet = { pname, version, sha256 }: fetchurl {
name = "${pname}.${version}.nupkg";
url = "https://www.nuget.org/api/v2/package/${pname}/${version}";
inherit sha256;
};
nugetSource = linkFarmFromDrvs "nuget-packages" (
import ./deps.nix { inherit fetchNuGet; }
);
dotnetSdk = dotnetCorePackages.sdk_6_0;
# Map Nix systems to .NET runtime ids
runtimeIds = {
"x86_64-linux" = "linux-x64";
"aarch64-linux" = "linux-arm64";
"x86_64-darwin" = "osx-x64";
"aarch64-darwin" = "osx-arm64";
};
runtimeId = runtimeIds.${stdenv.system};
fakeSha1 = "0000000000000000000000000000000000000000";
in
stdenv.mkDerivation rec {
buildDotnetModule rec {
pname = "github-runner";
version = "2.302.1";
@ -51,92 +21,77 @@ stdenv.mkDerivation rec {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8=";
hash = "sha256-hPZzqTJGwcBxajLjU0TuIQ2KLnDl9E66seuutm9JWDo=";
# Required to obtain HEAD's Git commit hash
leaveDotGit = true;
};
patches = [
# Replace some paths that originally point to Nix's read-only store
./patches/host-context-dirs.patch
# Use GetDirectory() to obtain "diag" dir
./patches/use-get-directory-for-diag.patch
# Don't try to install service
./patches/dont-install-service.patch
# Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set
./patches/env-sh-use-runner-root.patch
# Fix FHS path: https://github.com/actions/runner/pull/2464
(fetchpatch {
name = "ln-fhs.patch";
url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
})
];
postPatch = ''
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
substituteInPlace src/dir.proj \
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'true'
'';
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive";
postConfigure = ''
# Generate src/Runner.Sdk/BuildConstants.cs
dotnet msbuild \
-t:GenerateConstant \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:PackageRuntime="${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" \
-p:RunnerVersion="${version}" \
src/dir.proj
'';
nativeBuildInputs = [
dotnetSdk
dotnetPackages.Nuget
makeWrapper
git
which
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
];
buildInputs = [
curl # libcurl.so.4
libkrb5 # libgssapi_krb5.so.2
stdenv.cc.cc.lib # libstdc++.so.6
zlib # libz.so.1
icu
] ++ lib.optionals stdenv.isLinux [
lttng-ust # liblttng-ust.so.0
buildInputs = [ stdenv.cc.cc.lib ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ];
# As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41
projectFile = [
"src/Sdk/Sdk.csproj"
"src/Runner.Common/Runner.Common.csproj"
"src/Runner.Listener/Runner.Listener.csproj"
"src/Runner.Worker/Runner.Worker.csproj"
"src/Runner.PluginHost/Runner.PluginHost.csproj"
"src/Runner.Sdk/Runner.Sdk.csproj"
"src/Runner.Plugins/Runner.Plugins.csproj"
];
patches = [
# Don't run Git, no restore on build/test
./patches/dir-proj.patch
# Replace some paths that originally point to Nix's read-only store
./patches/host-context-dirs.patch
# Use GetDirectory() to obtain "diag" dir
./patches/use-get-directory-for-diag.patch
# Don't try to install systemd service
./patches/dont-install-systemd-service.patch
];
postPatch = ''
# Relax the version requirement
substituteInPlace src/global.json \
--replace '6.0.300' '${dotnetSdk.version}'
# Disable specific tests
substituteInPlace src/dir.proj \
--replace 'dotnet test Test/Test.csproj' \
"dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&amp;" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'"
# We don't use a Git checkout
substituteInPlace src/dir.proj \
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'echo Patched out.'
# Fix FHS path
substituteInPlace src/Test/L0/Util/IOUtilL0.cs \
--replace '/bin/ln' '${coreutils}/bin/ln'
'';
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = stdenv.isDarwin;
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
# Never use nuget.org
nuget sources Disable -Name "nuget.org"
# Restore the dependencies
dotnet restore src/ActionsRunner.sln \
--runtime "${runtimeId}" \
--source "${dotnetSdk.packages}" \
--source "${nugetSource}"
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
dotnet msbuild \
-t:Build \
-p:PackageRuntime="${runtimeId}" \
-p:BUILDCONFIG="Release" \
-p:RunnerVersion="${version}" \
-p:GitInfoCommitHash="${fakeSha1}" \
src/dir.proj
runHook postBuild
'';
nugetDeps = ./deps.nix;
doCheck = true;
@ -162,30 +117,18 @@ stdenv.mkDerivation rec {
"CompositeActionWithActionfile_MaxLimit"
"CompositeActionWithActionfile_Node"
"DownloadActionFromGraph"
"DownloadActionFromGraph_Legacy"
"NotPullOrBuildImagesMultipleTimes"
"NotPullOrBuildImagesMultipleTimes_Legacy"
"RepositoryActionWithActionYamlFile_DockerHubImage"
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
"RepositoryActionWithActionfileAndDockerfile"
"RepositoryActionWithActionfileAndDockerfile_Legacy"
"RepositoryActionWithActionfile_DockerHubImage"
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
"RepositoryActionWithActionfile_Dockerfile"
"RepositoryActionWithActionfile_Dockerfile_Legacy"
"RepositoryActionWithActionfile_DockerfileRelativePath"
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
"RepositoryActionWithActionfile_Node"
"RepositoryActionWithActionfile_Node_Legacy"
"RepositoryActionWithDockerfile"
"RepositoryActionWithDockerfile_Legacy"
"RepositoryActionWithDockerfileInRelativePath"
"RepositoryActionWithDockerfileInRelativePath_Legacy"
"RepositoryActionWithDockerfilePrepareActions_Repository"
"RepositoryActionWithInvalidWrapperActionfile_Node"
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
"RepositoryActionWithWrapperActionfile_PreSteps"
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
]
++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [
"EnsureDotnetsdkBashDownloadScriptUpToDate"
@ -208,156 +151,118 @@ stdenv.mkDerivation rec {
"GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"
"GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"
];
nativeCheckInputs = [ git ];
checkPhase = ''
runHook preCheck
testProjectFile = [ "src/Test/Test.csproj" ];
preCheck = ''
mkdir -p _layout/externals
ln -s ${nodejs-16_x} _layout/externals/node16
printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'
# BUILDCONFIG needs to be "Debug"
dotnet msbuild \
-t:test \
-p:PackageRuntime="${runtimeId}" \
-p:BUILDCONFIG="Debug" \
-p:RunnerVersion="${version}" \
-p:GitInfoCommitHash="${fakeSha1}" \
src/dir.proj
runHook postCheck
'';
installPhase = ''
runHook preInstall
# Copy the built binaries to lib/ instead of bin/ as they
# have to be wrapped in the fixup phase to work
mkdir -p $out/lib
cp -r _layout/bin/. $out/lib/
# Delete debugging files
find "$out/lib" -type f -name '*.pdb' -delete
# Install the helper scripts to bin/ to resemble the upstream package
postInstall = ''
mkdir -p $out/bin
install -m755 src/Misc/layoutbin/runsvc.sh $out/bin/
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/
install -m755 src/Misc/layoutroot/run.sh $out/lib/
install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/run-helper.sh
install -m755 src/Misc/layoutroot/config.sh $out/lib/
install -m755 src/Misc/layoutroot/env.sh $out/lib/
# Rewrite reference in helper scripts from bin/ to lib/
substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib'
substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \
--replace 'source ./env.sh' $out/bin/env.sh
install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/github-runner
install -m755 src/Misc/layoutroot/run.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/github-runner/run-helper.sh
install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner
# env.sh is patched to not require any wrapping
ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
substituteInPlace $out/lib/github-runner/config.sh \
--replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
'' + lib.optionalString stdenv.isLinux ''
# Make binary paths absolute
substituteInPlace $out/lib/config.sh \
--replace 'ldd' '${glibc.bin}/bin/ldd' \
substituteInPlace $out/lib/github-runner/config.sh \
--replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
--replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
--replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
'' + ''
# Remove uneeded copy for run-helper template
substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
# Make paths absolute
substituteInPlace $out/bin/runsvc.sh \
--replace './externals' "$out/externals" \
--replace './bin' "$out/lib"
substituteInPlace $out/lib/github-runner/runsvc.sh \
--replace './externals' "$out/lib/externals" \
--replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
# The upstream package includes Node {12,16} and expects it at the path
# externals/node{12,16}. As opposed to the official releases, we don't
# The upstream package includes Node 16 and expects it at the path
# externals/node16. As opposed to the official releases, we don't
# link the Alpine Node flavors.
mkdir -p $out/externals
ln -s ${nodejs-16_x} $out/externals/node16
mkdir -p $out/lib/externals
ln -s ${nodejs-16_x} $out/lib/externals/node16
# Install Nodejs scripts called from workflows
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js
mkdir -p $out/lib/checkScripts
install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/
runHook postInstall
'';
# Stripping breaks the binaries
dontStrip = true;
preFixup = lib.optionalString stdenv.isLinux ''
patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
'';
postFixup = ''
fix_rpath() {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1
}
wrap() {
makeWrapper $out/lib/$1 $out/bin/$1 \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \
"''${@:2}"
}
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
mkdir -p $out/lib/github-runner/checkScripts
install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
'' + lib.optionalString stdenv.isLinux ''
fix_rpath Runner.Listener
fix_rpath Runner.PluginHost
fix_rpath Runner.Worker
'' + ''
wrap Runner.Listener
wrap Runner.PluginHost
wrap Runner.Worker
wrap run.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}'
wrap env.sh --run 'cd $RUNNER_ROOT'
# Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
makeWrapperArgs=()
wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \
--run 'mkdir -p $RUNNER_ROOT' \
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \
--chdir $out
# We don't wrap with libicu
substituteInPlace $out/lib/github-runner/config.sh \
--replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
'' + ''
# XXX: Using the corresponding Nix argument does not work as expected:
# https://github.com/NixOS/nixpkgs/issues/218449
# Common wrapper args for `executables`
makeWrapperArgs+=(
--run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
--run 'mkdir -p "$RUNNER_ROOT"'
--chdir "$out"
)
'';
# Script to create deps.nix file for dotnet dependencies. Run it with
# $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file
#
# Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument.
#
# Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix
passthru.createDepsFile = writeShellApplication {
name = "create-deps-file";
runtimeInputs = [ coreutils dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ];
text = ''
# Disable telemetry data
export DOTNET_CLI_TELEMETRY_OPTOUT=1
# List of files to wrap
executables = [
"config.sh"
"Runner.Listener"
"Runner.PluginHost"
"Runner.Worker"
"run.sh"
"runsvc.sh"
];
deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")"
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
printf "\n* Setup workdir\n"
workdir="$(mktemp -d /tmp/${pname}.XXX)"
HOME="$workdir"/.fake-home
cp -rT "${src}" "$workdir"
chmod -R +w "$workdir"
trap 'rm -rf "$workdir"' EXIT
export RUNNER_ROOT="$TMPDIR"
pushd "$workdir"
$out/bin/config.sh --help >/dev/null
$out/bin/Runner.Listener --help >/dev/null
mkdir nuget_pkgs
version=$($out/bin/Runner.Listener --version)
if [[ "$version" != "${version}" ]]; then
printf 'Unexpected version %s' "$version"
exit 1
fi
${lib.concatMapStrings (rid: ''
printf "\n* Restore ${pname} (${rid}) dotnet project\n"
dotnet restore src/ActionsRunner.sln --packages nuget_pkgs --no-cache --force --runtime "${rid}"
'') (lib.attrValues runtimeIds)}
commit=$($out/bin/Runner.Listener --commit)
if [[ "$commit" != "$(git rev-parse HEAD)" ]]; then
printf 'Unexpected commit %s' "$commit"
exit 1
fi
printf "\n* Make %s file\n" "$(basename "$deps_file")"
nuget-to-nix "$workdir/nuget_pkgs" "${dotnetSdk.packages}" > "$deps_file"
printf "\n* Dependency file writen to %s" "$deps_file"
'';
runHook postInstallCheck
'';
passthru = {
tests.smoke-test = nixosTests.github-runner;
updateScript = ./update.sh;
};
meta = with lib; {
changelog = "https://github.com/actions/runner/releases/tag/v${version}";
description = "Self-hosted runner for GitHub Actions";
homepage = "https://github.com/actions/runner";
license = licenses.mit;
maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ];
platforms = attrNames runtimeIds;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

3
pkgs/development/tools/continuous-integration/github-runner/deps.nix generated
View file

@ -1,3 +1,6 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; })

45
pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch
View file

@ -1,45 +0,0 @@
From 5a850bb7946ce5c0620ac5f072d93a77cc064219 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 29 Sep 2022 10:12:28 -0400
Subject: [PATCH] [PATCH] Patch dir.proj
Don't execute Git for GitInfoCommitHash property
Don't restore for build target
Don't restore for test target
---
src/dir.proj | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/dir.proj b/src/dir.proj
index 056a312..f029720 100644
--- a/src/dir.proj
+++ b/src/dir.proj
@@ -2,9 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GenerateConstant">
- <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">
- <Output TaskParameter="ConsoleOutput" PropertyName="GitInfoCommitHash" />
- </Exec>
<Message Text="Building $(Product): $(GitInfoCommitHash) --- $(PackageRuntime)" Importance="high"/>
<ItemGroup>
@@ -41,14 +38,13 @@
</ItemGroup>
<Target Name="Build" DependsOnTargets="GenerateConstant">
- <MSBuild Targets="Restore" Projects="@(ProjectFiles)" StopOnFirstFailure="true" />
<MSBuild Targets="Publish" Projects="@(ProjectFiles)" BuildInParallel="false" StopOnFirstFailure="true" Properties="Configuration=$(BUILDCONFIG);PackageRuntime=$(PackageRuntime);Version=$(RunnerVersion);RuntimeIdentifier=$(PackageRuntime);PublishDir=$(MSBuildProjectDirectory)/../_layout/bin" />
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
</Target>
<Target Name="Test" DependsOnTargets="GenerateConstant">
- <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
- <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />
+ <Exec Command="dotnet build Test/Test.csproj --no-restore -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
+ <Exec Command="dotnet test Test/Test.csproj --no-restore -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />
</Target>
<Target Name="Layout" DependsOnTargets="Clean;Build">
--
2.36.2

19
pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch → pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch
View file

@ -1,11 +1,21 @@
From 369b3d98b44abbf061080ab1b17b22f99706ef69 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Sun, 26 Feb 2023 12:55:38 +0100
Subject: [PATCH] Don't generate service config on Linux and OSX
---
src/Runner.Listener/Configuration/ConfigurationManager.cs | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs
index 8d08b06..bdfa3a2 100644
index 392eb0e..4c75324 100644
--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs
@@ -320,10 +320,6 @@ namespace GitHub.Runner.Listener.Configuration
@@ -367,11 +367,6 @@ namespace GitHub.Runner.Listener.Configuration
var serviceControlManager = HostContext.GetService<IWindowsServiceControlManager>();
serviceControlManager.ConfigureService(runnerSettings, command);
}
-
-#elif OS_LINUX || OS_OSX
- // generate service config script for OSX and Linux, GenerateScripts() will no-opt on windows.
- var serviceControlManager = HostContext.GetService<ILinuxServiceControlManager>();
@ -13,3 +23,6 @@ index 8d08b06..bdfa3a2 100644
#endif
}
--
2.38.1

76
pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch Normal file
View file

@ -0,0 +1,76 @@
From 84b2fcdf042771ae8adc0f59f1a3ecd9788a808d Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Sun, 26 Feb 2023 11:37:01 +0100
Subject: [PATCH] Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set
---
src/Misc/layoutbin/runsvc.sh | 4 ++--
src/Misc/layoutroot/env.sh | 10 +++++-----
src/Runner.Listener/Program.cs | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Misc/layoutbin/runsvc.sh b/src/Misc/layoutbin/runsvc.sh
index c135645..bb0fbf6 100755
--- a/src/Misc/layoutbin/runsvc.sh
+++ b/src/Misc/layoutbin/runsvc.sh
@@ -4,9 +4,9 @@
# for more info on how to propagate SIGTERM to a child process see: http://veithen.github.io/2014/11/16/sigterm-propagation.html
trap 'kill -INT $PID' TERM INT
-if [ -f ".path" ]; then
+if [ -f "${RUNNER_ROOT:-"."}/.path" ]; then
# configure
- export PATH=`cat .path`
+ export PATH=`cat "${RUNNER_ROOT:-"."}/.path"`
echo ".path=${PATH}"
fi
diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh
index 641d244..85379bf 100755
--- a/src/Misc/layoutroot/env.sh
+++ b/src/Misc/layoutroot/env.sh
@@ -16,10 +16,10 @@ varCheckList=(
envContents=""
-if [ -f ".env" ]; then
- envContents=`cat .env`
+if [ -f "${RUNNER_ROOT:-"."}/.env" ]; then
+ envContents=`cat "${RUNNER_ROOT:-"."}/.env"`
else
- touch .env
+ touch "${RUNNER_ROOT:-"."}/.env"
fi
function writeVar()
@@ -29,12 +29,12 @@ function writeVar()
if test "${envContents#*$checkDelim}" = "$envContents"
then
if [ ! -z "${!checkVar}" ]; then
- echo "${checkVar}=${!checkVar}">>.env
+ echo "${checkVar}=${!checkVar}">>"${RUNNER_ROOT:-"."}/.env"
fi
fi
}
-echo $PATH>.path
+echo $PATH>"${RUNNER_ROOT:-"."}/.path"
for var_name in ${varCheckList[@]}
do
diff --git a/src/Runner.Listener/Program.cs b/src/Runner.Listener/Program.cs
index d4d5e43..beacc9d 100644
--- a/src/Runner.Listener/Program.cs
+++ b/src/Runner.Listener/Program.cs
@@ -148,7 +148,7 @@ namespace GitHub.Runner.Listener
private static void LoadAndSetEnv()
{
var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
- var rootDir = new DirectoryInfo(binDir).Parent.FullName;
+ var rootDir = Environment.GetEnvironmentVariable("RUNNER_ROOT") ?? new DirectoryInfo(binDir).Parent.FullName;
string envFile = Path.Combine(rootDir, ".env");
if (File.Exists(envFile))
{
--
2.38.1

19
pkgs/development/tools/continuous-integration/github-runner/update.sh Executable file
View file

@ -0,0 +1,19 @@
#! /usr/bin/env nix-shell
#! nix-shell -I nixpkgs=./. -i bash -p coreutils common-updater-scripts jq curl
set -euo pipefail
currentVersion="$(nix --extra-experimental-features nix-command eval -f . github-runner.version --raw)"
latestVersion="$(curl -s -H "Accept: application/vnd.github.v3+json" \
${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
"https://api.github.com/repos/actions/runner/releases/latest" | jq -r ".tag_name")"
latestVersion="${latestVersion#?}" # v2.296.2 -> 2.296.2
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "github-runner is already up to date: $currentVersion"
exit
fi
update-source-version github-runner "$latestVersion"
$(nix-build -A github-runner.fetch-deps --no-out-link) "$(dirname "$BASH_SOURCE")/deps.nix"

9
pkgs/development/tools/ginkgo/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }:
buildGoModule rec {
pname = "ginkgo";
@ -16,6 +16,13 @@ buildGoModule rec {
# types tests are missing CodeLocation
excludedPackages = [ "integration" "types" ];
__darwinAllowLocalNetworking = true;
passthru.tests.version = testers.testVersion {
package = ginkgo;
command = "ginkgo version";
};
meta = with lib; {
homepage = "https://onsi.github.io/ginkgo/";
changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md";

3
pkgs/development/tools/misc/binutils/default.nix
View file

@ -101,6 +101,9 @@ stdenv.mkDerivation (finalAttrs: {
(if stdenv.targetPlatform.isMusl
then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; }
else ./mips64-default-n64.patch)
# This patch fixes a bug in 2.40 on MinGW, which breaks DXVK when cross-building from Darwin.
# See https://sourceware.org/bugzilla/show_bug.cgi?id=30079
++ lib.optional stdenv.targetPlatform.isMinGW ./mingw-abort-fix.patch
;
outputs = [ "out" "info" "man" "dev" ]

30
pkgs/development/tools/misc/binutils/mingw-abort-fix.patch Normal file
View file

@ -0,0 +1,30 @@
From b7eab2a9d4f4e92692daf14b09fc95ca11b72e30 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@suse.de>
Date: Thu, 9 Feb 2023 15:29:00 +0100
Subject: [PATCH 1/1] Fix PR30079: abort on mingw
the early-out in wild_sort is not enough, it might still be
that filenames are equal _and_ the wildcard list doesn't specify
a sort order either. Don't call compare_section then.
Tested on all targets.
---
ld/ldlang.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 84a2914fc26..b5e0d026ae4 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -649,7 +649,8 @@ wild_sort (lang_wild_statement_type *wild,
looking at the sections for this file. */
/* Find the correct node to append this section. */
- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
+ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none
+ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
tree = &((*tree)->left);
else
tree = &((*tree)->right);
--
2.31.1

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View file

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2023-02-27";
cargoSha256 = "sha256-TjUwtM0QlU6A/dE1H7wljfeRAIy8e9Z6hDIh6z1QZ0s=";
version = "2023-03-06";
cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-DD86WRVpIGT2xoCDVYA5CMiMzUPgPUM9gJst65v0uXw=";
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
};
auditable = true; # TODO: remove when this is the default

15
pkgs/games/ddnet/default.nix
View file

@ -33,19 +33,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.7.2";
version = "16.8";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc=";
hash = "sha256-QhRJJQ87WMsf2yTac2lDRj7B+mTaw2r+RProUr+3zoo=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74=";
hash = "sha256-36Afg0Tsf1/dGhZhd5tbxjMX4dKHqGEhIXS4Lal/rXI=";
};
nativeBuildInputs = [
@ -82,15 +82,6 @@ stdenv.mkDerivation rec {
spirv-tools
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ];
patches = [
(fetchpatch {
# error: use of undeclared identifier 'pthread_attr_set_qos_class_np'
# https://github.com/ddnet/ddnet/pull/5913
url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch";
hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs=";
})
];
postPatch = ''
substituteInPlace src/engine/shared/storage.cpp \
--replace /usr/ $out/

4
pkgs/games/grapejuice/default.nix
View file

@ -19,13 +19,13 @@
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "7.2.1";
version = "7.8.3";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "v${version}";
sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas=";
sha256 = "sha256-jNh3L6JDuJryFpHQaP8UesBmepmJopoHxb/XUfOwZz4=";
};
nativeBuildInputs = [

12
pkgs/games/mnemosyne/default.nix
View file

@ -1,5 +1,7 @@
{ fetchurl
{ lib
, stdenv
, python
, fetchurl
, anki
}:
@ -29,18 +31,16 @@ python.pkgs.buildPythonApplication rec {
];
prePatch = ''
substituteInPlace setup.py --replace /usr $out
find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\",
substituteInPlace setup.py \
--replace '("", ["/usr/local/bin/mplayer"])' ""
'';
# No tests/ directrory in tarball
# No tests/ directory in tarball
doCheck = false;
postInstall = ''
mkdir -p $out/share/applications
mv $out/${python.sitePackages}/$out/share/locale $out/share
mv mnemosyne.desktop $out/share/applications
rm -r $out/${python.sitePackages}/nix
'';
dontWrapQtApps = true;

6
pkgs/servers/home-automation/evcc/default.nix
View file

@ -16,16 +16,16 @@
buildGo120Module rec {
pname = "evcc";
version = "0.113.0";
version = "0.114.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ=";
hash = "sha256-YPqt1UfXP2LGSopQuM4PXQJG3MmXg+5VjDpBKpV5axI=";
};
vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso=";
vendorHash = "sha256-CNBwOVykQW7RUuf6oFTxO2DU6sd5IJVqN+6FPytQh+U=";
npmDeps = fetchNpmDeps {
inherit src;

8
pkgs/test/cuda/cuda-library-samples/generic.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, backendStdenv, fetchFromGitHub
, cmake, addOpenGLRunpath
, cudatoolkit
, cutensor
@ -35,13 +35,13 @@ let
in
{
cublas = stdenv.mkDerivation (commonAttrs // {
cublas = backendStdenv.mkDerivation (commonAttrs // {
pname = "cuda-library-samples-cublas";
src = "${src}/cuBLASLt";
});
cusolver = stdenv.mkDerivation (commonAttrs // {
cusolver = backendStdenv.mkDerivation (commonAttrs // {
pname = "cuda-library-samples-cusolver";
src = "${src}/cuSOLVER";
@ -49,7 +49,7 @@ in
sourceRoot = "cuSOLVER/gesv";
});
cutensor = stdenv.mkDerivation (commonAttrs // {
cutensor = backendStdenv.mkDerivation (commonAttrs // {
pname = "cuda-library-samples-cutensor";
src = "${src}/cuTENSOR";

57
pkgs/tools/X11/xborders/default.nix Normal file
View file

@ -0,0 +1,57 @@
{ lib
, python3Packages
, fetchFromGitHub
, libwnck
, gtk3
, libnotify
, wrapGAppsHook
, gobject-introspection
, substituteAll
}:
python3Packages.buildPythonPackage rec {
pname = "xborders";
version = "3.4"; # in version.txt
src = fetchFromGitHub {
owner = "deter0";
repo = "xborder";
rev = "e74ae532b9555c59d195537934fa355b3fea73c5";
hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4=";
};
buildInputs = [
libwnck
gtk3
libnotify
];
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
];
propagatedBuildInputs = with python3Packages; [
pycairo
requests
pygobject3
];
postPatch = let
setup = substituteAll {
src = ./setup.py;
desc = meta.description; # "description" is reserved
inherit pname version;
};
in ''
ln -s ${setup} setup.py
'';
meta = with lib; {
description = "Active window border replacement for window managers";
homepage = "https://github.com/deter0/xborder";
license = licenses.unlicense;
maintainers = with maintainers; [ elnudev ];
platforms = platforms.linux;
};
}

12
pkgs/tools/X11/xborders/setup.py Normal file
View file

@ -0,0 +1,12 @@
from setuptools import setup
setup(
name='@pname@',
version='@version@',
author='deter0',
description='@desc@',
install_requires=['pycairo', 'requests', 'PyGObject'],
scripts=[
'xborders',
],
)

4
pkgs/tools/games/pokefinder/default.nix
View file

@ -4,6 +4,7 @@
, cmake
, qtbase
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
@ -35,7 +36,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ qtbase qttools ];
buildInputs = [ qtbase qttools ]
++ lib.optionals stdenv.isLinux [ qtwayland ];
passthru.updateScript = gitUpdater { };

6
pkgs/tools/misc/ntfy-sh/default.nix
View file

@ -10,16 +10,16 @@ let
in
buildGoModule rec {
pname = "ntfy-sh";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "binwiederhier";
repo = "ntfy";
rev = "v${version}";
sha256 = "sha256-XjSPlaKYkUbiQQQHc/Sm6jWl9oJwOotZBzP6OBmrZLk=";
sha256 = "sha256-pBwlFkkXDgPhGfn2bhwuJTGQz+O0ADhPUU2Fogl98zA=";
};
vendorSha256 = "sha256-an1OseJT+0StTGFfEXob42X2V+9xIaav5tJh4cjDJ0c=";
vendorSha256 = "sha256-XePJaXD83731r5CJG1PHnpU6s+443yq8mrqx7ZPU8Gs=";
doCheck = false;

260
pkgs/tools/misc/ntfy-sh/node-packages.nix generated
View file

@ -1642,67 +1642,67 @@ let
sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==";
};
};
"@mui/base-5.0.0-alpha.118" = {
"@mui/base-5.0.0-alpha.119" = {
name = "_at_mui_slash_base";
packageName = "@mui/base";
version = "5.0.0-alpha.118";
version = "5.0.0-alpha.119";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.118.tgz";
sha512 = "GAEpqhnuHjRaAZLdxFNuOf2GDTp9sUawM46oHZV4VnYPFjXJDkIYFWfIQLONb0nga92OiqS5DD/scGzVKCL0Mw==";
url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz";
sha512 = "XA5zhlYfXi67u613eIF0xRmktkatx6ERy3h+PwrMN5IcWFbgiL1guz8VpdXON+GWb8+G7B8t5oqTFIaCqaSAeA==";
};
};
"@mui/core-downloads-tracker-5.11.9" = {
"@mui/core-downloads-tracker-5.11.11" = {
name = "_at_mui_slash_core-downloads-tracker";
packageName = "@mui/core-downloads-tracker";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.9.tgz";
sha512 = "YGEtucQ/Nl91VZkzYaLad47Cdui51n/hW+OQm4210g4N3/nZzBxmGeKfubEalf+ShKH4aYDS86XTO6q/TpZnjQ==";
url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.11.tgz";
sha512 = "0YK0K9GfW1ysw9z4ztWAjLW+bktf+nExMyn2+EQe1Ijb0kF2kz1kIOmb4+di0/PsXG70uCuw4DhEIdNd+JQkRA==";
};
};
"@mui/icons-material-5.11.9" = {
"@mui/icons-material-5.11.11" = {
name = "_at_mui_slash_icons-material";
packageName = "@mui/icons-material";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.9.tgz";
sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw==";
url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.11.tgz";
sha512 = "Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw==";
};
};
"@mui/material-5.11.10" = {
"@mui/material-5.11.11" = {
name = "_at_mui_slash_material";
packageName = "@mui/material";
version = "5.11.10";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/material/-/material-5.11.10.tgz";
sha512 = "hs1WErbiedqlJIZsljgoil908x4NMp8Lfk8di+5c7o809roqKcFTg2+k3z5ucKvs29AXcsdXrDB/kn2K6dGYIw==";
url = "https://registry.npmjs.org/@mui/material/-/material-5.11.11.tgz";
sha512 = "sSe0dmKjB1IGOYt32Pcha+cXV3IIrX5L5mFAF9LDRssp/x53bluhgLLbkc8eTiJvueVvo6HAyze6EkFEYLQRXQ==";
};
};
"@mui/private-theming-5.11.9" = {
"@mui/private-theming-5.11.11" = {
name = "_at_mui_slash_private-theming";
packageName = "@mui/private-theming";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.9.tgz";
sha512 = "XMyVIFGomVCmCm92EvYlgq3zrC9K+J6r7IKl/rBJT2/xVYoRY6uM7jeB+Wxh7kXxnW9Dbqsr2yL3cx6wSD1sAg==";
url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.11.tgz";
sha512 = "yLgTkjNC1mpye2SOUkc+zQQczUpg8NvQAETvxwXTMzNgJK1pv4htL7IvBM5vmCKG7IHAB3hX26W2u6i7bxwF3A==";
};
};
"@mui/styled-engine-5.11.9" = {
"@mui/styled-engine-5.11.11" = {
name = "_at_mui_slash_styled-engine";
packageName = "@mui/styled-engine";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.9.tgz";
sha512 = "bkh2CjHKOMy98HyOc8wQXEZvhOmDa/bhxMUekFX5IG0/w4f5HJ8R6+K6nakUUYNEgjOWPYzNPrvGB8EcGbhahQ==";
url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.11.tgz";
sha512 = "wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg==";
};
};
"@mui/system-5.11.9" = {
"@mui/system-5.11.11" = {
name = "_at_mui_slash_system";
packageName = "@mui/system";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/system/-/system-5.11.9.tgz";
sha512 = "h6uarf+l3FO6l75Nf7yO+qDGrIoa1DM9nAMCUFZQsNCDKOInRzcptnm8M1w/Z3gVetfeeGoIGAYuYKbft6KZZA==";
url = "https://registry.npmjs.org/@mui/system/-/system-5.11.11.tgz";
sha512 = "a9gaOAJBjpzypDfhbGZQ8HzdcxdxsKkFvbp1aAWZhFHBPdehEkARNh7mj851VfEhD/GdffYt85PFKFKdUta5Eg==";
};
};
"@mui/types-7.2.3" = {
@ -1714,13 +1714,13 @@ let
sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==";
};
};
"@mui/utils-5.11.9" = {
"@mui/utils-5.11.11" = {
name = "_at_mui_slash_utils";
packageName = "@mui/utils";
version = "5.11.9";
version = "5.11.11";
src = fetchurl {
url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.9.tgz";
sha512 = "eOJaqzcEs4qEwolcvFAmXGpln+uvouvOS9FUX6Wkrte+4I8rZbjODOBDVNlK+V6/ziTfD4iNKC0G+KfOTApbqg==";
url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.11.tgz";
sha512 = "neMM5rrEXYQrOrlxUfns/TGgX4viS8K2zb9pbQh11/oUUYFlGI32Tn+PHePQx7n6Fy/0zq6WxdBFC9VpnJ5JrQ==";
};
};
"@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = {
@ -1777,13 +1777,13 @@ let
sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==";
};
};
"@remix-run/router-1.3.2" = {
"@remix-run/router-1.3.3" = {
name = "_at_remix-run_slash_router";
packageName = "@remix-run/router";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz";
sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA==";
url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.3.tgz";
sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w==";
};
};
"@rollup/plugin-babel-5.3.1" = {
@ -2227,13 +2227,13 @@ let
sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==";
};
};
"@types/node-18.14.2" = {
"@types/node-18.14.6" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "18.14.2";
version = "18.14.6";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz";
sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==";
url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz";
sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==";
};
};
"@types/parse-json-4.0.0" = {
@ -2434,85 +2434,85 @@ let
sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==";
};
};
"@typescript-eslint/eslint-plugin-5.53.0" = {
"@typescript-eslint/eslint-plugin-5.54.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz";
sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw==";
url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz";
sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw==";
};
};
"@typescript-eslint/experimental-utils-5.53.0" = {
"@typescript-eslint/experimental-utils-5.54.0" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz";
sha512 = "4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw==";
url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.54.0.tgz";
sha512 = "rRYECOTh5V3iWsrOzXi7h1jp3Bi9OkJHrb3wECi3DVqMGTilo9wAYmCbT+6cGdrzUY3MWcAa2mESM6FMik6tVw==";
};
};
"@typescript-eslint/parser-5.53.0" = {
"@typescript-eslint/parser-5.54.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz";
sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ==";
url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz";
sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ==";
};
};
"@typescript-eslint/scope-manager-5.53.0" = {
"@typescript-eslint/scope-manager-5.54.0" = {
name = "_at_typescript-eslint_slash_scope-manager";
packageName = "@typescript-eslint/scope-manager";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz";
sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==";
url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz";
sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==";
};
};
"@typescript-eslint/type-utils-5.53.0" = {
"@typescript-eslint/type-utils-5.54.0" = {
name = "_at_typescript-eslint_slash_type-utils";
packageName = "@typescript-eslint/type-utils";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz";
sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw==";
url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz";
sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ==";
};
};
"@typescript-eslint/types-5.53.0" = {
"@typescript-eslint/types-5.54.0" = {
name = "_at_typescript-eslint_slash_types";
packageName = "@typescript-eslint/types";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz";
sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==";
url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz";
sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==";
};
};
"@typescript-eslint/typescript-estree-5.53.0" = {
"@typescript-eslint/typescript-estree-5.54.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz";
sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==";
url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz";
sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==";
};
};
"@typescript-eslint/utils-5.53.0" = {
"@typescript-eslint/utils-5.54.0" = {
name = "_at_typescript-eslint_slash_utils";
packageName = "@typescript-eslint/utils";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.53.0.tgz";
sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==";
url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz";
sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==";
};
};
"@typescript-eslint/visitor-keys-5.53.0" = {
"@typescript-eslint/visitor-keys-5.54.0" = {
name = "_at_typescript-eslint_slash_visitor-keys";
packageName = "@typescript-eslint/visitor-keys";
version = "5.53.0";
version = "5.54.0";
src = fetchurl {
url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz";
sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==";
url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz";
sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==";
};
};
"@webassemblyjs/ast-1.11.1" = {
@ -3433,13 +3433,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
"caniuse-lite-1.0.30001458" = {
"caniuse-lite-1.0.30001460" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
version = "1.0.30001458";
version = "1.0.30001460";
src = fetchurl {
url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz";
sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==";
url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz";
sha512 = "Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==";
};
};
"case-sensitive-paths-webpack-plugin-2.4.0" = {
@ -4513,13 +4513,13 @@ let
sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==";
};
};
"electron-to-chromium-1.4.311" = {
"electron-to-chromium-1.4.320" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
version = "1.4.311";
version = "1.4.320";
src = fetchurl {
url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz";
sha512 = "RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw==";
url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz";
sha512 = "h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q==";
};
};
"emittery-0.10.2" = {
@ -4900,13 +4900,13 @@ let
sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
};
};
"esquery-1.4.2" = {
"esquery-1.5.0" = {
name = "esquery";
packageName = "esquery";
version = "1.4.2";
version = "1.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz";
sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==";
url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz";
sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==";
};
};
"esrecurse-4.3.0" = {
@ -5989,13 +5989,13 @@ let
sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==";
};
};
"is-array-buffer-3.0.1" = {
"is-array-buffer-3.0.2" = {
name = "is-array-buffer";
packageName = "is-array-buffer";
version = "3.0.1";
version = "3.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz";
sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==";
url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz";
sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==";
};
};
"is-arrayish-0.2.1" = {
@ -6952,13 +6952,13 @@ let
sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
};
};
"lilconfig-2.0.6" = {
"lilconfig-2.1.0" = {
name = "lilconfig";
packageName = "lilconfig";
version = "2.0.6";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz";
sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==";
url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz";
sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==";
};
};
"lines-and-columns-1.2.4" = {
@ -8869,22 +8869,22 @@ let
sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==";
};
};
"react-router-6.8.1" = {
"react-router-6.8.2" = {
name = "react-router";
packageName = "react-router";
version = "6.8.1";
version = "6.8.2";
src = fetchurl {
url = "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz";
sha512 = "Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==";
url = "https://registry.npmjs.org/react-router/-/react-router-6.8.2.tgz";
sha512 = "lF7S0UmXI5Pd8bmHvMdPKI4u4S5McxmHnzJhrYi9ZQ6wE+DA8JN5BzVC5EEBuduWWDaiJ8u6YhVOCmThBli+rw==";
};
};
"react-router-dom-6.8.1" = {
"react-router-dom-6.8.2" = {
name = "react-router-dom";
packageName = "react-router-dom";
version = "6.8.1";
version = "6.8.2";
src = fetchurl {
url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz";
sha512 = "67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==";
url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.2.tgz";
sha512 = "N/oAF1Shd7g4tWy+75IIufCGsHBqT74tnzHQhbiUTYILYF0Blk65cg+HPZqwC+6SqEyx033nKqU7by38v3lBZg==";
};
};
"react-scripts-5.0.1" = {
@ -11295,23 +11295,23 @@ let
sources."@jridgewell/sourcemap-codec-1.4.14"
sources."@jridgewell/trace-mapping-0.3.17"
sources."@leichtgewicht/ip-codec-2.0.4"
(sources."@mui/base-5.0.0-alpha.118" // {
(sources."@mui/base-5.0.0-alpha.119" // {
dependencies = [
sources."react-is-18.2.0"
];
})
sources."@mui/core-downloads-tracker-5.11.9"
sources."@mui/icons-material-5.11.9"
(sources."@mui/material-5.11.10" // {
sources."@mui/core-downloads-tracker-5.11.11"
sources."@mui/icons-material-5.11.11"
(sources."@mui/material-5.11.11" // {
dependencies = [
sources."react-is-18.2.0"
];
})
sources."@mui/private-theming-5.11.9"
sources."@mui/styled-engine-5.11.9"
sources."@mui/system-5.11.9"
sources."@mui/private-theming-5.11.11"
sources."@mui/styled-engine-5.11.11"
sources."@mui/system-5.11.11"
sources."@mui/types-7.2.3"
(sources."@mui/utils-5.11.9" // {
(sources."@mui/utils-5.11.11" // {
dependencies = [
sources."react-is-18.2.0"
];
@ -11331,7 +11331,7 @@ let
];
})
sources."@popperjs/core-2.11.6"
sources."@remix-run/router-1.3.2"
sources."@remix-run/router-1.3.3"
sources."@rollup/plugin-babel-5.3.1"
sources."@rollup/plugin-node-resolve-11.2.1"
sources."@rollup/plugin-replace-2.4.2"
@ -11383,7 +11383,7 @@ let
sources."@types/json-schema-7.0.11"
sources."@types/json5-0.0.29"
sources."@types/mime-3.0.1"
sources."@types/node-18.14.2"
sources."@types/node-18.14.6"
sources."@types/parse-json-4.0.0"
sources."@types/prettier-2.7.2"
sources."@types/prop-types-15.7.5"
@ -11405,20 +11405,20 @@ let
sources."@types/ws-8.5.4"
sources."@types/yargs-16.0.5"
sources."@types/yargs-parser-21.0.0"
sources."@typescript-eslint/eslint-plugin-5.53.0"
sources."@typescript-eslint/experimental-utils-5.53.0"
sources."@typescript-eslint/parser-5.53.0"
sources."@typescript-eslint/scope-manager-5.53.0"
sources."@typescript-eslint/type-utils-5.53.0"
sources."@typescript-eslint/types-5.53.0"
sources."@typescript-eslint/typescript-estree-5.53.0"
(sources."@typescript-eslint/utils-5.53.0" // {
sources."@typescript-eslint/eslint-plugin-5.54.0"
sources."@typescript-eslint/experimental-utils-5.54.0"
sources."@typescript-eslint/parser-5.54.0"
sources."@typescript-eslint/scope-manager-5.54.0"
sources."@typescript-eslint/type-utils-5.54.0"
sources."@typescript-eslint/types-5.54.0"
sources."@typescript-eslint/typescript-estree-5.54.0"
(sources."@typescript-eslint/utils-5.54.0" // {
dependencies = [
sources."eslint-scope-5.1.1"
sources."estraverse-4.3.0"
];
})
sources."@typescript-eslint/visitor-keys-5.53.0"
sources."@typescript-eslint/visitor-keys-5.54.0"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
sources."@webassemblyjs/helper-api-error-1.11.1"
@ -11554,7 +11554,7 @@ let
sources."camelcase-6.3.0"
sources."camelcase-css-2.0.1"
sources."caniuse-api-3.0.0"
sources."caniuse-lite-1.0.30001458"
sources."caniuse-lite-1.0.30001460"
sources."case-sensitive-paths-webpack-plugin-2.4.0"
(sources."chalk-2.4.2" // {
dependencies = [
@ -11723,7 +11723,7 @@ let
sources."duplexer-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-3.1.8"
sources."electron-to-chromium-1.4.311"
sources."electron-to-chromium-1.4.320"
sources."emittery-0.8.1"
sources."emoji-regex-9.2.2"
sources."emojis-list-3.0.0"
@ -11818,7 +11818,7 @@ let
})
sources."espree-9.4.1"
sources."esprima-4.0.1"
sources."esquery-1.4.2"
sources."esquery-1.5.0"
sources."esrecurse-4.3.0"
sources."estraverse-5.3.0"
sources."estree-walker-1.0.1"
@ -11981,7 +11981,7 @@ let
sources."internal-slot-1.0.5"
sources."ipaddr.js-2.0.1"
sources."is-arguments-1.1.1"
sources."is-array-buffer-3.0.1"
sources."is-array-buffer-3.0.2"
sources."is-arrayish-0.2.1"
sources."is-bigint-1.0.4"
sources."is-binary-path-2.1.0"
@ -12287,7 +12287,7 @@ let
sources."language-tags-1.0.5"
sources."leven-3.1.0"
sources."levn-0.4.1"
sources."lilconfig-2.0.6"
sources."lilconfig-2.1.0"
sources."lines-and-columns-1.2.4"
sources."loader-runner-4.3.0"
sources."loader-utils-2.0.4"
@ -12558,8 +12558,8 @@ let
sources."react-infinite-scroll-component-6.1.0"
sources."react-is-16.13.1"
sources."react-refresh-0.11.0"
sources."react-router-6.8.1"
sources."react-router-dom-6.8.1"
sources."react-router-6.8.2"
sources."react-router-dom-6.8.2"
sources."react-scripts-5.0.1"
sources."react-transition-group-4.4.5"
sources."read-cache-1.0.0"

3
pkgs/tools/misc/rpm-ostree/default.nix
View file

@ -114,9 +114,6 @@ stdenv.mkDerivation rec {
env NOCONFIGURE=1 ./autogen.sh
'';
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
meta = with lib; {
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
homepage = "https://coreos.github.io/rpm-ostree/";

3
pkgs/tools/networking/zerotierone/default.nix
View file

@ -79,9 +79,6 @@ replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml
outputs = [ "out" "man" ];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
meta = with lib; {
description = "Create flat virtual Ethernet networks of almost unlimited size";
homepage = "https://www.zerotier.com";

27
pkgs/tools/security/ares-rs/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "ares-rs";
version = "0.9.0";
src = fetchFromGitHub {
owner = "bee-san";
repo = "ares";
rev = "refs/tags/${version}";
hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug=";
};
cargoHash = "sha256-7zDq66oWT+j6t9LEBUoeby8MQ1Ihhvk3KLwWPQAThyc=";
meta = with lib; {
description = "Automated decoding of encrypted text without knowing the key or ciphers used";
homepage = "https://github.com/bee-san/ares";
changelog = "https://github.com/bee-san/Ares/releases/tag${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "ares";
};
}

53
pkgs/top-level/all-packages.nix
View file

@ -290,6 +290,8 @@ with pkgs;
ansi = callPackage ../development/tools/ansi { };
ares-rs = callPackage ../tools/security/ares-rs { };
arti = callPackage ../tools/security/arti {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -2318,8 +2320,6 @@ with pkgs;
inherit (darwin) moltenvk;
stdenv =
if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv
# https://github.com/NixOS/nixpkgs/issues/201254
else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv
else stdenv;
};
@ -4984,13 +4984,9 @@ with pkgs;
cairo = cairo.override { xcbSupport = true; };
};
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc12Stdenv;
};
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
stdenv = gcc12Stdenv;
};
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
hysteria = callPackage ../tools/networking/hysteria { };
@ -6973,7 +6969,11 @@ with pkgs;
volctl = callPackage ../tools/audio/volctl { };
volk = callPackage ../development/libraries/volk { };
volk = if (stdenv.isDarwin && stdenv.isAarch64) then
(callPackage ../development/libraries/volk/2.5.0.nix { })
else
(callPackage ../development/libraries/volk { })
;
vorta = libsForQt5.callPackage ../applications/backup/vorta { };
@ -8814,12 +8814,7 @@ with pkgs;
wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; });
kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { });
kakoune-unwrapped = callPackage ../applications/editors/kakoune {
# See comments on https://github.com/NixOS/nixpkgs/pull/198836
# Remove below when stdenv for linux-aarch64 become recent enough.
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
kakoune-unwrapped = callPackage ../applications/editors/kakoune { };
kakoune = wrapKakoune kakoune-unwrapped {
plugins = [ ]; # override with the list of desired plugins
};
@ -11716,8 +11711,6 @@ with pkgs;
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0;
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
rpm2targz = callPackage ../tools/archivers/rpm2targz { };
@ -19269,11 +19262,7 @@ with pkgs;
else callPackage ../os-specific/linux/bionic-prebuilt { };
bobcat = callPackage ../development/libraries/bobcat {
# C++20 is required, aarch64-linux has gcc 9 by default
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
bobcat = callPackage ../development/libraries/bobcat { };
boehmgc = callPackage ../development/libraries/boehm-gc { };
@ -22475,10 +22464,7 @@ with pkgs;
mtpfs = callPackage ../tools/filesystems/mtpfs { };
mtxclient = callPackage ../development/libraries/mtxclient {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
mtxclient = callPackage ../development/libraries/mtxclient { };
mu = callPackage ../tools/networking/mu {
texinfo = texinfo4;
@ -29762,6 +29748,7 @@ with pkgs;
dlm = callPackage ../applications/display-managers/greetd/dlm.nix { };
greetd = callPackage ../applications/display-managers/greetd { };
gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { };
regreet = callPackage ../applications/display-managers/greetd/regreet.nix { };
tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { };
wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };
};
@ -31173,8 +31160,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv;
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv;
};
lazpaint = callPackage ../applications/graphics/lazpaint { };
@ -31774,7 +31760,7 @@ with pkgs;
libdvdnav = libdvdnav_4_2_1;
} // (config.mplayer or {}));
mpv-unwrapped = callPackage ../applications/video/mpv {
mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv {
inherit lua;
};
@ -32192,10 +32178,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
};
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
@ -34360,6 +34343,8 @@ with pkgs;
gtk = gtk2;
};
xborders = callPackage ../tools/X11/xborders { };
xxh = callPackage ../tools/networking/xxh { };
kodiPackages = recurseIntoAttrs (kodi.packages);
@ -37546,8 +37531,6 @@ with pkgs;
root = callPackage ../applications/science/misc/root {
python = python3;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL;
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {