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] 2022-12-13 00:02:51 +00:00 committed by GitHub
parent a2232d0c6b a680c884cc
commit 8506553217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 853 additions and 563 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/CODEOWNERS vendored
View file

@ -224,10 +224,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/top-level/emacs-packages.nix @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis
# Neovim # Neovim
/pkgs/applications/editors/neovim @jonringer @teto /pkgs/applications/editors/neovim @figsoda @jonringer @teto
# VimPlugins # VimPlugins
/pkgs/applications/editors/vim/plugins @jonringer /pkgs/applications/editors/vim/plugins @figsoda @jonringer
# VsCode Extensions # VsCode Extensions
/pkgs/applications/editors/vscode/extensions @jonringer /pkgs/applications/editors/vscode/extensions @jonringer

9
doc/doc-support/parameters.xml
View file

@ -2,11 +2,14 @@
<xsl:stylesheet <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"> version="1.0">
<xsl:param name="section.autolabel" select="1" /> <xsl:param name="chapter.autolabel" select="0" />
<xsl:param name="section.label.includes.component.label" select="1" /> <xsl:param name="part.autolabel" select="0" />
<xsl:param name="preface.autolabel" select="0" />
<xsl:param name="reference.autolabel" select="0" />
<xsl:param name="section.autolabel" select="0" />
<xsl:param name="html.stylesheet" select="'style.css overrides.css highlightjs/mono-blue.css'" /> <xsl:param name="html.stylesheet" select="'style.css overrides.css highlightjs/mono-blue.css'" />
<xsl:param name="html.script" select="'./highlightjs/highlight.pack.js ./highlightjs/loader.js'" /> <xsl:param name="html.script" select="'./highlightjs/highlight.pack.js ./highlightjs/loader.js'" />
<xsl:param name="xref.with.number.and.title" select="1" /> <xsl:param name="xref.with.number.and.title" select="0" />
<xsl:param name="use.id.as.filename" select="1" /> <xsl:param name="use.id.as.filename" select="1" />
<xsl:param name="toc.section.depth" select="0" /> <xsl:param name="toc.section.depth" select="0" />
<xsl:param name="admon.style" select="''" /> <xsl:param name="admon.style" select="''" />

6
maintainers/maintainer-list.nix
View file

@ -3847,12 +3847,6 @@
githubId = 15128988; githubId = 15128988;
name = "Maksim Dzabraev"; name = "Maksim Dzabraev";
}; };
e-user = {
email = "nixos@sodosopa.io";
github = "outergod";
githubId = 93086;
name = "Alexander Kahl";
};
eadwu = { eadwu = {
email = "edmund.wu@protonmail.com"; email = "edmund.wu@protonmail.com";
github = "eadwu"; github = "eadwu";

1
maintainers/team-list.nix
View file

@ -743,6 +743,7 @@ with lib.maintainers; {
vim = { vim = {
members = [ members = [
figsoda
jonringer jonringer
softinio softinio
teto teto

2
nixos/doc/manual/configuration/wireless.section.md
View file

@ -50,7 +50,7 @@ networking.wireless.networks = {
echelon = { echelon = {
pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435";
}; };
} };
``` ```
or you can use it to directly generate the `wpa_supplicant.conf`: or you can use it to directly generate the `wpa_supplicant.conf`:

9
nixos/doc/manual/default.nix
View file

@ -102,11 +102,14 @@ let
''; '';
manualXsltprocOptions = toString [ manualXsltprocOptions = toString [
"--param section.autolabel 1" "--param chapter.autolabel 0"
"--param section.label.includes.component.label 1" "--param part.autolabel 0"
"--param preface.autolabel 0"
"--param reference.autolabel 0"
"--param section.autolabel 0"
"--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
"--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
"--param xref.with.number.and.title 1" "--param xref.with.number.and.title 0"
"--param toc.section.depth 0" "--param toc.section.depth 0"
"--param generate.consistent.ids 1" "--param generate.consistent.ids 1"
"--stringparam admon.style ''" "--stringparam admon.style ''"

2
nixos/doc/manual/from_md/configuration/wireless.section.xml
View file

@ -54,7 +54,7 @@ networking.wireless.networks = {
echelon = { echelon = {
pskRaw = &quot;dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435&quot;; pskRaw = &quot;dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435&quot;;
}; };
} };
</programlisting> </programlisting>
<para> <para>
or you can use it to directly generate the or you can use it to directly generate the

2
pkgs/applications/audio/sisco.lv2/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format";
homepage = "http://x42.github.io/sisco.lv2/"; homepage = "http://x42.github.io/sisco.lv2/";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.e-user ]; maintainers = [ ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

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

@ -185,12 +185,12 @@ final: prev:
Navigator-nvim = buildVimPluginFrom2Nix { Navigator-nvim = buildVimPluginFrom2Nix {
pname = "Navigator.nvim"; pname = "Navigator.nvim";
version = "2022-11-16"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numToStr"; owner = "numToStr";
repo = "Navigator.nvim"; repo = "Navigator.nvim";
rev = "2ef04f4be7a9ffc648751e8c0d0c7236074c1dc1"; rev = "4a1043074517fc35217f47c7fa3ff320c47f83f5";
sha256 = "0yszjbl4q4pn3f6k90jx2i4bkqm55r4gjl7s6fmf6igcphmslkgm"; sha256 = "17w2qnaxq0iyhcfv6613zsh4g0plwr5fiv9qvs3m8z049jm5rbiv";
}; };
meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
}; };
@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix { SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim"; pname = "SchemaStore.nvim";
version = "2022-12-06"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "b0o"; owner = "b0o";
repo = "SchemaStore.nvim"; repo = "SchemaStore.nvim";
rev = "cb67722e14fbfafd2ba3913bd9850005816ccccf"; rev = "88a5121859a96c42b75165946e7ff0d318c31a8e";
sha256 = "1afsd603v2v68d7cwp9vhjbdy5b89jwrkrra284akc1gmzkbck3d"; sha256 = "10aqwqx9jxc9hpp9ivni4lq91n5zm0qpiqr6f9zz0ch2m8yz3mdv";
}; };
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
}; };
@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix { aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim"; pname = "aerial.nvim";
version = "2022-12-01"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stevearc"; owner = "stevearc";
repo = "aerial.nvim"; repo = "aerial.nvim";
rev = "50d28ad4e3e1ff89b5fc1bff985760c19c2fa782"; rev = "97279a10cc797af96d3e7295026e51e4968d09a1";
sha256 = "1m8wix6myx572d13qbn3g77az9zwbiszcldjk1nqq3isz2ix2b8n"; sha256 = "14mylgpk764iac0rwvwgm1k77na7p2df5q1iav5mygl2jfl5amss";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/stevearc/aerial.nvim/"; meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -979,12 +979,12 @@ final: prev:
calendar-vim = buildVimPluginFrom2Nix { calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar.vim"; pname = "calendar.vim";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "itchyny"; owner = "itchyny";
repo = "calendar.vim"; repo = "calendar.vim";
rev = "3b91377f0e8655894b29c166c796ab9e2c0bf077"; rev = "d3aad0aa9d432cf8a312f3c33ae63987f8eae0f5";
sha256 = "1121rlyd9kj08ixnjq541x02ckf5g2l1gyic342d11lpwwbpmqc7"; sha256 = "1i2w80h0zcm7i40hlp1r1ym5d7hk3m2ar19a6i6q4j6ws2wr29a0";
}; };
meta.homepage = "https://github.com/itchyny/calendar.vim/"; meta.homepage = "https://github.com/itchyny/calendar.vim/";
}; };
@ -1735,12 +1735,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix { coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim"; pname = "coc.nvim";
version = "2022-12-06"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neoclide"; owner = "neoclide";
repo = "coc.nvim"; repo = "coc.nvim";
rev = "6adfb13aa16733aa5ede483f428750ce03954c4d"; rev = "45346d5a2591c55ac464e4060a281d6b09a9fed3";
sha256 = "02nchj8kb038x75p7p4kvlpvvhfnc51v88ymffpjszplxmih5znn"; sha256 = "04sm1kaav6m1m72bwzkvr1scr8m36vxw9pgjk65nbahraiasf71p";
}; };
meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.homepage = "https://github.com/neoclide/coc.nvim/";
}; };
@ -2023,24 +2023,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix { coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts"; pname = "coq.artifacts";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "coq.artifacts"; repo = "coq.artifacts";
rev = "9a1f60036152f55337095f754d2cba7c56224357"; rev = "9a227a77325daaaba4605e5423d70302724a2b9c";
sha256 = "1idfkgvgswz2jlrp06ijazfh6j3qd57x9m1swzq0r412q504bnll"; sha256 = "0w4gxph7lfn2l5hsipnqxa4lzsy4zw54c66ws78kkj2hgf4l7g8w";
}; };
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
}; };
coq-thirdparty = buildVimPluginFrom2Nix { coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty"; pname = "coq.thirdparty";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "coq.thirdparty"; repo = "coq.thirdparty";
rev = "eb30460696570af7d6adc75870274ec541cfce71"; rev = "4c8ccb671c03903bae9af3c5c4f9af72957dfc98";
sha256 = "1d67vyvz8fwibsp8vbiqjkjdkxcixgj53czc1v2p50q3d98bhv49"; sha256 = "1kl6cjr0hvciwpg18q7bmqvi71i1pirxdcv09vp4zk6mi7f9d9qm";
}; };
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
}; };
@ -2059,12 +2059,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix { coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim"; pname = "coq_nvim";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "coq_nvim"; repo = "coq_nvim";
rev = "6a49da213ab217360cbcad46df01f3be74a2970e"; rev = "000dab4a373bc9ca86bb9392578edefbb90e33fe";
sha256 = "0dn47bwk4irpwb0r99zw2m23nqvas9hc5k78vxssr1zpilcbg58d"; sha256 = "03niqwmnkn3dz4n1hi7mjn290hnmvcn3nxg17nzr8akj6ks8cxv1";
}; };
meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
}; };
@ -2625,12 +2625,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix { dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim"; pname = "dracula.nvim";
version = "2022-12-09"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mofiqul"; owner = "Mofiqul";
repo = "dracula.nvim"; repo = "dracula.nvim";
rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff"; rev = "1ee6072c6638de86abc9aef43ac315fd7eede6aa";
sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi"; sha256 = "0xq0m5qy3c48bvc6rrhr9w3rzy51a0gl2wi4y64mxp96aapz7j6h";
}; };
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
}; };
@ -2831,12 +2831,12 @@ final: prev:
fern-vim = buildVimPluginFrom2Nix { fern-vim = buildVimPluginFrom2Nix {
pname = "fern.vim"; pname = "fern.vim";
version = "2022-11-07"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lambdalisue"; owner = "lambdalisue";
repo = "fern.vim"; repo = "fern.vim";
rev = "908a3db77d5a061d98a45c36f8483886a8868c90"; rev = "41710c31fffa76d08b8cfcd53d5defa7c07a3fc6";
sha256 = "0fbz3317bilp8iznrjm6vzqgby20fq11nha5c2wzps92f4bcyp96"; sha256 = "0859is1vxk8qz3bav12ppqsdrwaf2lfwfc55wnjpwjhld951pky3";
}; };
meta.homepage = "https://github.com/lambdalisue/fern.vim/"; meta.homepage = "https://github.com/lambdalisue/fern.vim/";
}; };
@ -2976,12 +2976,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2022-12-05"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "9b3e497cf0c3abcf73d791968a9768a22405fa13"; rev = "6e527e04b003739b67bcf62152282e658de16063";
sha256 = "14j3w7aqnz62fxkrhyklbip9qpdj0cmfxj3japvxbjksh7iba35b"; sha256 = "1ji0k854gjvf5qd6brcbwvz7kp9whl12yjmfvnji6cldwhaprx0q";
}; };
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
}; };
@ -3144,12 +3144,12 @@ final: prev:
ghcid = buildVimPluginFrom2Nix { ghcid = buildVimPluginFrom2Nix {
pname = "ghcid"; pname = "ghcid";
version = "2022-09-19"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ndmitchell"; owner = "ndmitchell";
repo = "ghcid"; repo = "ghcid";
rev = "0e05a83f7683140038b1c5513938e1256f9b190e"; rev = "41dd2cfd805478c5601df229549029b20f930381";
sha256 = "04zn8a7b47z9vkg5acqv6my790d0f28gi94wwrxndm9c70fcw55l"; sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v";
}; };
meta.homepage = "https://github.com/ndmitchell/ghcid/"; meta.homepage = "https://github.com/ndmitchell/ghcid/";
}; };
@ -3396,12 +3396,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix { gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim"; pname = "gruvbox.nvim";
version = "2022-12-06"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ellisonleao"; owner = "ellisonleao";
repo = "gruvbox.nvim"; repo = "gruvbox.nvim";
rev = "d2efdea91ec79e480e51d5149d58daa328633c43"; rev = "c64ec557672c9c8ecc71a438533525482021377f";
sha256 = "1nqx2g2z1gbg907n7vhcgak4bd0qz7na5pl8i3jyk5cc22z0mzfc"; sha256 = "0q8y068cl75c12c2l9viw58p7swcjgn2p42wlvm9c0ks4mz03bgm";
}; };
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
}; };
@ -3467,12 +3467,12 @@ final: prev:
haskell-tools-nvim = buildVimPluginFrom2Nix { haskell-tools-nvim = buildVimPluginFrom2Nix {
pname = "haskell-tools.nvim"; pname = "haskell-tools.nvim";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MrcJkb"; owner = "MrcJkb";
repo = "haskell-tools.nvim"; repo = "haskell-tools.nvim";
rev = "c2701b5d15f9634dbdcae0e34d6f6ec952adc5da"; rev = "eefbcd2b1bd0b0e5ef8fcc2c087017db1e126d66";
sha256 = "1s8vm54d3n5c1g89cw04n88fmyn6cgcyygshpj46m0qgykpigs20"; sha256 = "1gk3471lz4mg2k3jsl5y2jh3a16b564s6907i9bhprc4mgq5p7bg";
}; };
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
}; };
@ -4043,12 +4043,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix { leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim"; pname = "leap.nvim";
version = "2022-12-05"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "leap.nvim"; repo = "leap.nvim";
rev = "f28b1e7c1eee525adb17c24de3cc15a7fa1a6ef9"; rev = "3336057e841e1adcf1daf9430c9b435a9a010b84";
sha256 = "0b311535cvqybg4m517wm7xpjrc0shi3za56c0v5zs6sjnm0n2vs"; sha256 = "1c0dasxgq057z2jv1cngrk2gqrwzci2rx5mhizwixk2g40n6d4xy";
}; };
meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.homepage = "https://github.com/ggandor/leap.nvim/";
}; };
@ -4151,12 +4151,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix { lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline"; pname = "lightline-bufferline";
version = "2022-11-23"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mengelbrecht"; owner = "mengelbrecht";
repo = "lightline-bufferline"; repo = "lightline-bufferline";
rev = "b6773302598503da8f6cb32aa47c96ff456dbdac"; rev = "e4db24252d9b1bd7b329511e8caa69fefed67362";
sha256 = "1g2afxk8gi09v6j6hddymis2xvn1d20ndks0mjzc0lwrr3yvwzkv"; sha256 = "0lf8sbf1m0y76sqcqv7faybiballgy9n775vv33v80ax2rmgq62y";
}; };
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
}; };
@ -4486,12 +4486,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix { luasnip = buildVimPluginFrom2Nix {
pname = "luasnip"; pname = "luasnip";
version = "2022-12-10"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "l3mon4d3"; owner = "l3mon4d3";
repo = "luasnip"; repo = "luasnip";
rev = "40b5c6272384d90365e7149e0fcc73afae5e87cc"; rev = "8b25e74761eead3dc47ce04b5e017fd23da7ad7e";
sha256 = "1hsp7d9mb877whm7rcbvg4k3l9rjz3p3jfjwsr6n6wpspq9xids1"; sha256 = "0jf85bynp91dyg4xx06w4ha0cim6m5v26g5wxpml3flmwglj58fa";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/l3mon4d3/luasnip/"; meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4967,12 +4967,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix { neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim"; pname = "neoconf.nvim";
version = "2022-12-10"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "neoconf.nvim"; repo = "neoconf.nvim";
rev = "7c59fa1292377a43e314d6d493438ff8af8aa853"; rev = "7b6ec340b347fe560e77db25785ffd0b215ff138";
sha256 = "0n4n5cyppnhwg5gd865iy6ifm36ysw876v5rphnhlvlsa34alng6"; sha256 = "0sqsn7amvlfgg4avwwp0vjay1l867g6wf8d7g8971hp1dssz4x51";
}; };
meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.homepage = "https://github.com/folke/neoconf.nvim/";
}; };
@ -4991,12 +4991,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix { neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim"; pname = "neodev.nvim";
version = "2022-12-07"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "neodev.nvim"; repo = "neodev.nvim";
rev = "f353ec5ac10a9e581c92dc0f937025c54e216022"; rev = "17c6f31af8cb4c561275e89cd93d2cedda896706";
sha256 = "1wmy5hncm1lz5r99vcspg95435yyg0jdzm2kjca79nsmqp613ffl"; sha256 = "0r5d0zfq3ch6l5khrggb7b6c7lammgbq5bl787rscvmvdmcngf6c";
}; };
meta.homepage = "https://github.com/folke/neodev.nvim/"; meta.homepage = "https://github.com/folke/neodev.nvim/";
}; };
@ -5015,12 +5015,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix { neogit = buildVimPluginFrom2Nix {
pname = "neogit"; pname = "neogit";
version = "2022-12-06"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimUntersberger"; owner = "TimUntersberger";
repo = "neogit"; repo = "neogit";
rev = "19bc8377e61482f36703a3e1651aef206af88086"; rev = "66030fc1c3b7b6d5bc31ece188bc472ee2d91ee1";
sha256 = "0599ljv4f8vsk3h4rpisqj69c4sgjw51rpv8nz7s9nbn43crcqy1"; sha256 = "1mfap26fpfh4ynxgg7m6a8k132d5h07iv6hfmpd55csfa19prvp5";
}; };
meta.homepage = "https://github.com/TimUntersberger/neogit/"; meta.homepage = "https://github.com/TimUntersberger/neogit/";
}; };
@ -5351,12 +5351,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix { nord-nvim = buildVimPluginFrom2Nix {
pname = "nord.nvim"; pname = "nord.nvim";
version = "2022-11-25"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shaunsingh"; owner = "shaunsingh";
repo = "nord.nvim"; repo = "nord.nvim";
rev = "4b6d4072923cfc3a3f6aea55eafd8b4ad0ddc489"; rev = "11445b5a28155baaf289c2212b5eb6a3e29e0e57";
sha256 = "1bvwhqcpdkym94wyr7jn26jd81sz5hzsikd129x22ynwakq0ajzw"; sha256 = "0bs5cck14hyipxxmpvpw5vlifhl1cn3hfajxz87hhvlw6bgsghzs";
}; };
meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
}; };
@ -5399,12 +5399,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix { null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim"; pname = "null-ls.nvim";
version = "2022-12-10"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "adaa799264c92eea42d500c8b98e19caf32c14dc"; rev = "623cc25016647eb62392aead7612f27d539c33de";
sha256 = "1vi9n07mf258pkkhh8c28l846j88f248gzwcrv40i8n3v3mxz7f6"; sha256 = "0kxjd17qxs6x18r5hxg9ii7mlcj1nwvj6j0d3rdplp2bqbrx6hb1";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
}; };
@ -5627,12 +5627,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix { nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap"; pname = "nvim-dap";
version = "2022-12-09"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "a8fd28aec46fe9f5dd42f8d5939217ce60787d73"; rev = "68d96871118a13365f3c33e4838990030fff80ec";
sha256 = "0sxq0nlhgk2q1yz8nyj21z2mxgfg383jm00s6j0hggq02v3a86mz"; sha256 = "0kb2kc61fhnf4g95vy5mhck4jm9ijlgmv3rv613j0i9aslnlipm1";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
}; };
@ -5759,12 +5759,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix { nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite"; pname = "nvim-highlite";
version = "2022-12-03"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Iron-E"; owner = "Iron-E";
repo = "nvim-highlite"; repo = "nvim-highlite";
rev = "bc4f02545a0ee3b474e30d6654efe41f5a0a1cb5"; rev = "44895245d10d98b221ba60858a4a94fd229b54ff";
sha256 = "0v0yva74h1gk8piwil0pg5r5w663psrkg42y1sgpbla70i7j12ff"; sha256 = "0ns32lk3k1dshvikbpm43nkciiv9d0frwm1bp8721p9w1cgi0amm";
}; };
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
@ -5879,12 +5879,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386"; rev = "0c038493b37e67bed287ff99722a9ced5cdfe617";
sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9"; sha256 = "1hpxvmm407dhzaqb531wz1147y28m9z62lsz8s8ry60zc5s8rqhd";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -5915,12 +5915,12 @@ final: prev:
nvim-luapad = buildVimPluginFrom2Nix { nvim-luapad = buildVimPluginFrom2Nix {
pname = "nvim-luapad"; pname = "nvim-luapad";
version = "2022-10-26"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafcamlet"; owner = "rafcamlet";
repo = "nvim-luapad"; repo = "nvim-luapad";
rev = "6efe3806c6e0d9ae684d756d4d7053cbdfb562eb"; rev = "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce";
sha256 = "0d0lcaxxqwg2cw8gx4zmddwvb49xxrvlc03ij68wwwmvjgvw2v01"; sha256 = "05b2wnw9p5wpcc85fh40ddw90ls4k0mcmpa5rcadhy5c4xaf3q2h";
}; };
meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/";
}; };
@ -5951,12 +5951,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix { nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic"; pname = "nvim-navic";
version = "2022-11-27"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smiteshp"; owner = "smiteshp";
repo = "nvim-navic"; repo = "nvim-navic";
rev = "343e07de11b15f93e44ebd47eb98dce6b7da2e6b"; rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c";
sha256 = "14rdzmh8w7qvmvqdv360nba1l2phmmbxs90ifjrxicw21b48jmyi"; sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4";
}; };
meta.homepage = "https://github.com/smiteshp/nvim-navic/"; meta.homepage = "https://github.com/smiteshp/nvim-navic/";
}; };
@ -6083,12 +6083,12 @@ final: prev:
nvim-surround = buildVimPluginFrom2Nix { nvim-surround = buildVimPluginFrom2Nix {
pname = "nvim-surround"; pname = "nvim-surround";
version = "2022-11-24"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kylechui"; owner = "kylechui";
repo = "nvim-surround"; repo = "nvim-surround";
rev = "6b45fbffdabb2d8cd80d310006c92e59cec8fd74"; rev = "6cc6b54d3728a17e34bb5c9b9db05c7e5690813d";
sha256 = "1qdhyclzsw1inwwzw3kr1jxq3cz0qr358whj93y16x7id3ylsx52"; sha256 = "06sbki4m8za9zsj643fj5wzx44xsa1nv23as1m9ip99cwqrvxqcc";
}; };
meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.homepage = "https://github.com/kylechui/nvim-surround/";
}; };
@ -6107,24 +6107,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix { nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua"; pname = "nvim-tree.lua";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-tree"; owner = "nvim-tree";
repo = "nvim-tree.lua"; repo = "nvim-tree.lua";
rev = "7177d95ac0f46bf02ff3f8375e135149a3fc79b8"; rev = "0cd8ac4751c39440a1c28c6be4704f3597807d29";
sha256 = "1h0qvy6dh1lkm74r11r6d989adfbcx3xszyj13pchcangp7mhfrv"; sha256 = "1avm9ds7lbi2fjpqcq7v05j7h91d0id3absdc95q4bgrfx3rnw5w";
}; };
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2022-12-10"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "619f1ace03860d668c7a661332c38480f2db2584"; rev = "ae0317d78a9f6fad78870d6645b60528e13ae6fa";
sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3"; sha256 = "16d70n17fli233y4aigsr4ddm2h6myj85p4lsl2xk5sypd5bkczc";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -6167,12 +6167,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix { nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2022-12-10"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "e8b7807e0398754bd7dbb5cae043340374975f77"; rev = "731be7f2358fb9f3e2bc7d8698b82c882cf132a4";
sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9"; sha256 = "08wfd3ykas1pzqmfljk0945fp78337jfnl0maqws6il5f5l8lbzg";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
}; };
@ -6359,12 +6359,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix { onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim"; pname = "onedarkpro.nvim";
version = "2022-12-09"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "olimorris"; owner = "olimorris";
repo = "onedarkpro.nvim"; repo = "onedarkpro.nvim";
rev = "ceb1ad90a20c39a87799e5f0facfa02d7cb19a23"; rev = "74275ddff64746b311b0f1ee1a60b01f857ff2c8";
sha256 = "0wq15k4g02hi7dvkwg1j7mr2cgl6yvisk9dsyzkdsh30yfpg11cb"; sha256 = "0ib109jrz6jvag8jghr21jjd4rrsql9iqk1bl8gjd4ylhjsb38li";
}; };
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
}; };
@ -6419,12 +6419,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix { orgmode = buildVimPluginFrom2Nix {
pname = "orgmode"; pname = "orgmode";
version = "2022-12-09"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-orgmode"; owner = "nvim-orgmode";
repo = "orgmode"; repo = "orgmode";
rev = "aba09c510a60ad469f3fd46e0a7c492ec610e5fb"; rev = "1b8819bc6201b0a32c64ca13852c82186c2b2119";
sha256 = "0mv1wa4p5bsylvjc7z979bhh3flpyndkvzvz079l2kanja033996"; sha256 = "0dnv47ai6f9rcbr1q345smj3nxhyqfmb92a17w5hqfpifgsmsaim";
}; };
meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
}; };
@ -8239,12 +8239,12 @@ final: prev:
treesj = buildVimPluginFrom2Nix { treesj = buildVimPluginFrom2Nix {
pname = "treesj"; pname = "treesj";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Wansmer"; owner = "Wansmer";
repo = "treesj"; repo = "treesj";
rev = "3a28195c7d683fe076df51849f8252c7da50c8b4"; rev = "9afe7983ce6351936a81d57adac651dc8f16c20b";
sha256 = "1aj8m1845dajiffisw23fha6w5r34m2k7dipdarm9qkipf59i3b2"; sha256 = "1na8yxl0b1150c6b4shigh3asm2gy1yjlidp6bxhivzwh01rpp9j";
}; };
meta.homepage = "https://github.com/Wansmer/treesj/"; meta.homepage = "https://github.com/Wansmer/treesj/";
}; };
@ -9499,12 +9499,12 @@ final: prev:
vim-dasht = buildVimPluginFrom2Nix { vim-dasht = buildVimPluginFrom2Nix {
pname = "vim-dasht"; pname = "vim-dasht";
version = "2020-07-11"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sunaku"; owner = "sunaku";
repo = "vim-dasht"; repo = "vim-dasht";
rev = "c1c91ecfd30f0e4e946854a6f7c67eb2d1e21c98"; rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52";
sha256 = "0ldkyzsn4b555pb9qdr0k6w6m3w7ziy7v6bcnx0n8ppq4fl68pz2"; sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9";
}; };
meta.homepage = "https://github.com/sunaku/vim-dasht/"; meta.homepage = "https://github.com/sunaku/vim-dasht/";
}; };
@ -10605,12 +10605,12 @@ final: prev:
vim-jsdoc = buildVimPluginFrom2Nix { vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc"; pname = "vim-jsdoc";
version = "2021-11-20"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "heavenshell"; owner = "heavenshell";
repo = "vim-jsdoc"; repo = "vim-jsdoc";
rev = "71c98ed6eacb4f1c0b9e4950ef679eda6a651cdd"; rev = "9234b2e2590e973c06113c05abd180de0c9dbcc1";
sha256 = "0jxcmriva73s0icllpbh6q6s2fw0ysjm7fk449kdd5fvd5y5ssq5"; sha256 = "04793snqfy6p27pl31mghfaszbwwb08fg93bv35ah3ghv3abyh7c";
}; };
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
}; };
@ -12416,6 +12416,18 @@ final: prev:
meta.homepage = "https://github.com/tpope/vim-tbone/"; meta.homepage = "https://github.com/tpope/vim-tbone/";
}; };
vim-teal = buildVimPluginFrom2Nix {
pname = "vim-teal";
version = "2021-01-05";
src = fetchFromGitHub {
owner = "teal-language";
repo = "vim-teal";
rev = "d2aa107b257879e774680792a2aebaf9cd5742e0";
sha256 = "02ag8vhmh1zj99vhvqslfnasw9i5psx396r7qyag0yyzyp9ynzkc";
};
meta.homepage = "https://github.com/teal-language/vim-teal/";
};
vim-terraform = buildVimPluginFrom2Nix { vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform"; pname = "vim-terraform";
version = "2021-07-10"; version = "2021-07-10";
@ -13294,6 +13306,18 @@ final: prev:
meta.homepage = "https://github.com/gcmt/wildfire.vim/"; meta.homepage = "https://github.com/gcmt/wildfire.vim/";
}; };
winbar-nvim = buildVimPluginFrom2Nix {
pname = "winbar.nvim";
version = "2022-07-18";
src = fetchFromGitHub {
owner = "fgheng";
repo = "winbar.nvim";
rev = "13739fdb31be51a1000486189662596f07a59a31";
sha256 = "1b9zfn5fpgibgjn64a6hb8w9d0zprkm1bz050fcd1vrv9dq1s7s7";
};
meta.homepage = "https://github.com/fgheng/winbar.nvim/";
};
windows-nvim = buildVimPluginFrom2Nix { windows-nvim = buildVimPluginFrom2Nix {
pname = "windows.nvim"; pname = "windows.nvim";
version = "2022-11-17"; version = "2022-11-17";
@ -13525,12 +13549,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix { catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim"; pname = "catppuccin-nvim";
version = "2022-12-10"; version = "2022-12-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "nvim"; repo = "nvim";
rev = "1d22da687d36c37133b13f2b41658c1c989e77e0"; rev = "e7fbf2496ce0f1cdf9883a6b99d86afc2f3efadc";
sha256 = "1mrdb8l4qpq39fbanwgk55mjhx55j8yif2h9bm4q6f0vqqs0n505"; sha256 = "0y7scdkzn3j580vk0m3n4vksnhdnq3fgx6qr9vygk15jn1qxdga8";
}; };
meta.homepage = "https://github.com/catppuccin/nvim/"; meta.homepage = "https://github.com/catppuccin/nvim/";
}; };
@ -13549,24 +13573,24 @@ final: prev:
chad = buildVimPluginFrom2Nix { chad = buildVimPluginFrom2Nix {
pname = "chad"; pname = "chad";
version = "2022-12-11"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "75b70f46770332e1bd51a4b0f2798a16b448e37b"; rev = "ac29dc7e06b340baeee7273d3232cca346f6f7cd";
sha256 = "05jkbs77ffn9cpm8r005r208g6c03ammlmn7x62rlp25in4gyd0n"; sha256 = "0chxw8cm8x9v0nawasipsx5f7fapfp5b31jfz217nydhhwwvfr2h";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
dracula-vim = buildVimPluginFrom2Nix { dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim"; pname = "dracula-vim";
version = "2022-11-30"; version = "2022-12-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "vim"; repo = "vim";
rev = "947e5298766f30bdb813749bf867913b29a06eac"; rev = "b7645942bf91154f76ca016b612131168522d19e";
sha256 = "0yvahswdzqphay5wak2rlaqjaf44kylsvmx697slwp8h1846xchw"; sha256 = "1x91l9dkmzkfj4dmzg2vm0qxkmr2ilmqql7c774jcwfhr90zd54x";
}; };
meta.homepage = "https://github.com/dracula/vim/"; meta.homepage = "https://github.com/dracula/vim/";
}; };
@ -13595,6 +13619,18 @@ final: prev:
meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
}; };
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2022-12-12";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "db0c1414efb928a9387e0a3271d75dcc3370822f";
sha256 = "0gg6vyrj13iwn4kj5jinm8799i6smyxnyrqz8qm7bay4lzbsg7mr";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
mattn-calendar-vim = buildVimPluginFrom2Nix { mattn-calendar-vim = buildVimPluginFrom2Nix {
pname = "mattn-calendar-vim"; pname = "mattn-calendar-vim";
version = "2022-02-10"; version = "2022-02-10";

3
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -373,6 +373,7 @@ https://github.com/ray-x/lsp_signature.nvim/,,
https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,,
https://github.com/onsails/lspkind-nvim/,, https://github.com/onsails/lspkind-nvim/,,
https://github.com/tami5/lspsaga.nvim/,, https://github.com/tami5/lspsaga.nvim/,,
https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original
https://github.com/arkav/lualine-lsp-progress/,, https://github.com/arkav/lualine-lsp-progress/,,
https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/nvim-lualine/lualine.nvim/,,
https://github.com/l3mon4d3/luasnip/,, https://github.com/l3mon4d3/luasnip/,,
@ -1042,6 +1043,7 @@ https://github.com/machakann/vim-swap/,,
https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/dhruvasagar/vim-table-mode/,,
https://github.com/kana/vim-tabpagecd/,, https://github.com/kana/vim-tabpagecd/,,
https://github.com/tpope/vim-tbone/,, https://github.com/tpope/vim-tbone/,,
https://github.com/teal-language/vim-teal/,HEAD,
https://github.com/hashivim/vim-terraform/,, https://github.com/hashivim/vim-terraform/,,
https://github.com/juliosueiras/vim-terraform-completion/,, https://github.com/juliosueiras/vim-terraform-completion/,,
https://github.com/vim-test/vim-test/,, https://github.com/vim-test/vim-test/,,
@ -1115,6 +1117,7 @@ https://github.com/mattn/webapi-vim/,,
https://github.com/folke/which-key.nvim/,, https://github.com/folke/which-key.nvim/,,
https://github.com/gelguy/wilder.nvim/,, https://github.com/gelguy/wilder.nvim/,,
https://github.com/gcmt/wildfire.vim/,, https://github.com/gcmt/wildfire.vim/,,
https://github.com/fgheng/winbar.nvim/,main,
https://github.com/anuvyklack/windows.nvim/,, https://github.com/anuvyklack/windows.nvim/,,
https://github.com/sindrets/winshift.nvim/,, https://github.com/sindrets/winshift.nvim/,,
https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/wannesm/wmgraphviz.vim/,,

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

@ -185,6 +185,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
passthru = { passthru = {
inherit pkgArches; inherit pkgArches;
inherit (src) updateScript;
tests = { inherit (nixosTests) wine; }; tests = { inherit (nixosTests) wine; };
}; };
meta = { meta = {

71
pkgs/applications/emulators/wine/sources.nix
View file

@ -12,6 +12,15 @@ let fetchurl = args@{url, sha256, ...}:
pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}:
pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args;
updateScriptPreamble = ''
set -eou pipefail
PATH=${with pkgs; lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq nix ]}
sources_file=${__curPos.file}
source ${./update-lib.sh}
'';
inherit (pkgs) writeShellScript;
in rec { in rec {
stable = fetchurl rec { stable = fetchurl rec {
@ -42,6 +51,24 @@ in rec {
# Also look for root certificates at $NIX_SSL_CERT_FILE # Also look for root certificates at $NIX_SSL_CERT_FILE
./cert-path.patch ./cert-path.patch
]; ];
updateScript = writeShellScript "update-wine-stable" (''
${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%.*}
latest_stable=$(get_latest_wine_version "$major.0")
latest_gecko=$(get_latest_lib_version wine-gecko)
# Can't use autobump on stable because we don't want the path
# <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>.
if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then
set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")"
fi
autobump stable.gecko32 "$latest_gecko"
autobump stable.gecko64 "$latest_gecko"
do_update
'');
}; };
unstable = fetchurl rec { unstable = fetchurl rec {
@ -56,6 +83,23 @@ in rec {
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
}; };
updateScript = writeShellScript "update-wine-unstable" ''
${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%.*}
latest_unstable=$(get_latest_wine_version "$major.x")
latest_mono=$(get_latest_lib_version wine-mono)
update_staging() {
staging_url=$(get_source_attr staging.url)
set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\""
}
autobump unstable "$latest_unstable" "" update_staging
autobump unstable.mono "$latest_mono"
do_update
'';
}; };
staging = fetchFromGitHub rec { staging = fetchFromGitHub rec {
@ -81,6 +125,22 @@ in rec {
inherit (unstable) gecko32 gecko64; inherit (unstable) gecko32 gecko64;
inherit (unstable) mono; inherit (unstable) mono;
updateScript = writeShellScript "update-wine-wayland" ''
${updateScriptPreamble}
wayland_rev=$(get_source_attr wayland.rev)
latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id)
if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then
latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ')
wayland_url=$(get_source_attr wayland.url)
set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
set_source_attr wayland rev "\"$latest_wayland_rev\""
fi
do_update
'';
}; };
winetricks = fetchFromGitHub rec { winetricks = fetchFromGitHub rec {
@ -90,5 +150,16 @@ in rec {
owner = "Winetricks"; owner = "Winetricks";
repo = "winetricks"; repo = "winetricks";
rev = version; rev = version;
updateScript = writeShellScript "update-winetricks" ''
${updateScriptPreamble}
winetricks_repourl=$(get_source_attr winetricks.gitRepoUrl)
latest_winetricks=$(list-git-tags --url="$winetricks_repourl" | grep -E '^[0-9]{8}$' | sort --reverse --numeric-sort | head -n 1)
autobump winetricks "$latest_winetricks" 'nix-prefetch-url --unpack'
do_update
'';
}; };
} }

49
pkgs/applications/emulators/wine/update-lib.sh Normal file
View file

@ -0,0 +1,49 @@
wine_url_base=https://dl.winehq.org/wine
sed_exprs=()
get_source_attr() {
nix-instantiate --eval --json -E "(let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$1" | jq -r
}
set_source_attr() {
path="$1"
name="$2"
value="$3"
line=$(nix-instantiate --eval -E "(builtins.unsafeGetAttrPos \"$name\" (let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$path).line")
sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@")
}
set_version_and_sha256() {
set_source_attr "$1" version "\"$2\""
set_source_attr "$1" sha256 "\"$(to_sri "$3")\""
}
get_latest_wine_version() {
list-directory-versions --pname=wine --url="$wine_url_base/source/$1" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1
}
get_latest_lib_version() {
curl -s "$wine_url_base/$1/" | grep -o 'href="[0-9.]*/"' | sed 's_^href="\(.*\)/"_\1_' | sort --reverse --version-sort -u | head -n 1
}
to_sri() {
nix --extra-experimental-features nix-command hash to-sri --type sha256 "$1"
}
autobump() {
attr="$1"
latest="$2"
fetcher="${3:-nix-prefetch-url}"
more="${4:-}"
version=$(get_source_attr "$attr.version")
if [[ "$version" != "$latest" ]]; then
url=$(get_source_attr "$attr.url")
set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")"
[[ -z "$more" ]] || $more "$version" "$latest"
fi
}
do_update() {
[[ "${#sed_exprs[@]}" -eq 0 ]] || sed -i "${sed_exprs[@]}" "$sources_file"
}

4
pkgs/applications/emulators/wine/winetricks.nix
View file

@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
"$out/bin/winetricks" "$out/bin/winetricks"
''; '';
passthru = {
inherit (src) updateScript;
};
meta = { meta = {
description = "A script to install DLLs needed to work around problems in Wine"; description = "A script to install DLLs needed to work around problems in Wine";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;

6
pkgs/applications/file-managers/felix-fm/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "felix"; pname = "felix";
version = "2.1.1"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyoheiu"; owner = "kyoheiu";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs="; sha256 = "sha256-wc1hBHqVH/ooXqF97Ev/mVdbfS9JCrreq2n2PIg/pEs=";
}; };
cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw="; cargoSha256 = "sha256-CraJexOepja1CJnp9ngCVBWiFy84rWXzDRTWa0sxQs0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/networking/feedreaders/newsflash/default.nix
View file

@ -21,19 +21,19 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "newsflash"; pname = "newsflash";
version = "2.2.2"; version = "2.2.3";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "news-flash"; owner = "news-flash";
repo = "news_flash_gtk"; repo = "news_flash_gtk";
rev = "refs/tags/v.${finalAttrs.version}"; rev = "refs/tags/v.${finalAttrs.version}";
sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; sha256 = "sha256-ms0CVYSYccRuiLBZ+lEEyMH0Zhti5sMM49XuEUe9sKw=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
name = "${finalAttrs.pname}-${finalAttrs.version}"; name = "${finalAttrs.pname}-${finalAttrs.version}";
src = finalAttrs.src; src = finalAttrs.src;
sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; sha256 = "sha256-QbjXjdKMjGwXQ3DoyAJN1SxnHjVeAk140j1me/iWlZQ=";
}; };
patches = [ patches = [

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

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "gajim"; pname = "gajim";
version = "1.5.3"; version = "1.5.4";
src = fetchurl { src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA="; sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk=";
}; };
buildInputs = [ buildInputs = [

2
pkgs/build-support/fetchgithub/default.nix
View file

@ -59,4 +59,4 @@ let
) // privateAttrs // passthruAttrs // { inherit name; }; ) // privateAttrs // passthruAttrs // { inherit name; };
in in
fetcher fetcherArgs // { meta = newMeta; inherit rev; } fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; }

32
pkgs/development/compilers/hip/default.nix
View file

@ -30,13 +30,13 @@
let let
hip = stdenv.mkDerivation (finalAttrs: { hip = stdenv.mkDerivation (finalAttrs: {
pname = "hip"; pname = "hip";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCm-Developer-Tools"; owner = "ROCm-Developer-Tools";
repo = "HIP"; repo = "HIP";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE="; hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw=";
}; };
patches = [ patches = [
@ -60,9 +60,6 @@ let
-i "$f" -i "$f"
done done
substituteInPlace bin/hip_embed_pch.sh \
--replace '$LLVM_DIR/bin/' ""
sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py
sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
@ -110,13 +107,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hip"; pname = "hip";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCm-Developer-Tools"; owner = "ROCm-Developer-Tools";
repo = "hipamd"; repo = "hipamd";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4="; hash = "sha256-VL0vZVv099pZPX0J2pXPFvrhkVO/b6X+ZZDaD9B1hYI=";
}; };
nativeBuildInputs = [ cmake python3 makeWrapper perl ]; nativeBuildInputs = [ cmake python3 makeWrapper perl ];
@ -168,10 +165,19 @@ stdenv.mkDerivation (finalAttrs: {
wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin
''; '';
# TODO: Separate HIP and hipamd into separate derivations
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
IFS='.' read -a version_arr <<< "$version"
if [ "''${#version_arr[*]}" == 2 ]; then
version="''${version}.0"
fi
current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)" current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")" tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")"
@ -183,7 +189,15 @@ stdenv.mkDerivation (finalAttrs: {
echo hip already up-to-date echo hip already up-to-date
fi fi
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
IFS='.' read -a version_arr <<< "$version"
if [ "''${#version_arr[*]}" == 2 ]; then
version="''${version}.0"
fi
current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)" current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")" tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")"

4
pkgs/development/compilers/llvm/rocm/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:
let let
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "llvm-project"; repo = "llvm-project";
rev = "rocm-${version}"; rev = "rocm-${version}";
hash = "sha256-IKo7N8wWvh5PBrZ2mh1Vu5s3uUXhanqYtC4qLV/+JBs="; hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno=";
}; };
in rec { in rec {
clang = wrapCCWith rec { clang = wrapCCWith rec {

23
pkgs/development/compilers/llvm/rocm/install-symlinks.patch
View file

@ -1,23 +0,0 @@
diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake
index b5c35f706cb7..ac25e40b1436 100644
--- a/cmake/modules/LLVMInstallSymlink.cmake
+++ b/cmake/modules/LLVMInstallSymlink.cmake
@@ -4,11 +4,16 @@
include(GNUInstallDirs)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" ${CMAKE_MODULE_PATH})
+include(ExtendPath)
+
function(install_symlink name target outdir)
set(DESTDIR $ENV{DESTDIR})
- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}")
+ message(STATUS "Creating ${name} at ${bindir} (${CMAKE_MODULE_PATH})")
+ extend_path(prefixed_outdir "${CMAKE_INSTALL_PREFIX}" "${outdir}")
+ set(bindir "${DESTDIR}${prefixed_outdir}")
- message(STATUS "Creating ${name}")
+ message(STATUS "Creating ${name} at ${bindir}")
execute_process(
COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}"

22
pkgs/development/compilers/llvm/rocm/llvm.nix
View file

@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
"-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt;clang-tools-extra" "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt"
] ]
++ lib.optionals enableManpages [ ++ lib.optionals enableManpages [
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
@ -52,21 +52,28 @@ in stdenv.mkDerivation (finalAttrs: {
"-DSPHINX_WARNINGS_AS_ERRORS=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
]; ];
patches = [
./install-symlinks.patch
];
postPatch = '' postPatch = ''
patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh
substituteInPlace ../clang/cmake/modules/CMakeLists.txt \ substituteInPlace ../clang/cmake/modules/CMakeLists.txt \
--replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING' --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING'
''; '';
passthru = {
isClang = true;
updateScript = writeScript "update.sh" '' updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
IFS='.' read -a version_arr <<< "$version"
if [ "''${#version_arr[*]}" == 2 ]; then
version="''${version}.0"
fi
current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")"
@ -78,8 +85,7 @@ in stdenv.mkDerivation (finalAttrs: {
echo rocm-llvm already up-to-date echo rocm-llvm already up-to-date
fi fi
''; '';
};
passthru.isClang = true;
meta = with lib; { meta = with lib; {
description = "ROCm fork of the LLVM compiler infrastructure"; description = "ROCm fork of the LLVM compiler infrastructure";

4
pkgs/development/compilers/sbcl/2.x.nix
View file

@ -173,7 +173,9 @@ stdenv.mkDerivation rec {
# duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o
# Should be fixed past 2.1.10 release. # Should be fixed past 2.1.10 release.
"-fcommon" "-fcommon"
]; ]
# Fails to find `O_LARGEFILE` otherwise.
++ [ "-D_GNU_SOURCE" ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild

7
pkgs/development/interpreters/bqn/cbqn/default.nix
View file

@ -56,12 +56,7 @@ stdenv.mkDerivation rec {
${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
'' else '' '' else ''
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/
'') '');
# Need to adjust ld flags for darwin manually
# https://github.com/dzaima/CBQN/issues/26
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
makeFlagsArray+=(LD_LIBS="-ldl -lffi")
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

4
pkgs/development/interpreters/clojure/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clojure"; pname = "clojure";
version = "1.11.1.1200"; version = "1.11.1.1208";
src = fetchurl { src = fetchurl {
# https://clojure.org/releases/tools # https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-296cS91Ct9paZ9h5VItFKOSQPOc+4mwylia2Fl1Xthw="; sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

16
pkgs/development/libraries/clang-ocl/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-device-libs , rocm-device-libs
@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "clang-ocl"; pname = "clang-ocl";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
@ -34,13 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_CXX_COMPILER=clang++" "-DCMAKE_CXX_COMPILER=clang++"
]; ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version clang-ocl "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "OpenCL compilation with clang compiler"; description = "OpenCL compilation with clang compiler";

9
pkgs/development/libraries/composable_kernel/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, unstableGitUpdater
, cmake , cmake
, rocm-cmake , rocm-cmake
, hip , hip
@ -13,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "composable_kernel"; pname = "composable_kernel";
version = "unstable-2022-11-19"; version = "unstable-2022-12-08";
outputs = [ outputs = [
"out" "out"
@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "composable_kernel"; repo = "composable_kernel";
rev = "43a889b72e3faabf04c16ff410d387ce28486c3e"; rev = "d58b7f5155b44c8b608f3edc6a6eab314493ec1a";
hash = "sha256-DDRrWKec/RcOhW3CrN0gl9NZsp0Bjnja7HAiTcEh7qg="; hash = "sha256-4nzyaWhPnY/0TygcoJAqVzdgfXOkf+o/BE2V9N+Bm7Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -77,6 +78,8 @@ stdenv.mkDerivation (finalAttrs: {
mv bin/example_* $example/bin mv bin/example_* $example/bin
''; '';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; { meta = with lib; {
description = "Performance portable programming model for machine learning tensor operators"; description = "Performance portable programming model for machine learning tensor operators";
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";

18
pkgs/development/libraries/hipcub/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -18,7 +18,7 @@
# CUB can also be used as a backend instead of rocPRIM. # CUB can also be used as a backend instead of rocPRIM.
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hipcub"; pname = "hipcub";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "hipCUB"; repo = "hipCUB";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g="; hash = "sha256-ctt7jbVqHNHcOm/Lhg0IFbMZ6JChnMylG7fJgZtzFuM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -76,13 +76,11 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version hipcub "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "Thin wrapper library on top of rocPRIM or CUB"; description = "Thin wrapper library on top of rocPRIM or CUB";

18
pkgs/development/libraries/hipsparse/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -18,7 +18,7 @@
# This can also use cuSPARSE as a backend instead of rocSPARSE # This can also use cuSPARSE as a backend instead of rocSPARSE
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse"; pname = "hipsparse";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "hipSPARSE"; repo = "hipSPARSE";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c="; hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -112,13 +112,11 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version hipsparse "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "ROCm SPARSE marshalling library"; description = "ROCm SPARSE marshalling library";

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

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.9.0"; version = "2.10.0";
pname = "librem"; pname = "librem";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "rem"; repo = "rem";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HiVM/opZuR7Gkt421ps+nKiiKERG8sUD8qBLIMGNCJI="; sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM=";
}; };
buildInputs = [ zlib openssl libre ]; buildInputs = [ zlib openssl libre ];
makeFlags = [ makeFlags = [

31
pkgs/development/libraries/miopen/default.nix
View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, writeScript , rocmUpdateScript
, pkg-config , pkg-config
, cmake , cmake
, rocm-cmake , rocm-cmake
@ -22,6 +22,7 @@
, boost , boost
, sqlite , sqlite
, bzip2 , bzip2
, nlohmann_json
, texlive , texlive
, doxygen , doxygen
, sphinx , sphinx
@ -30,9 +31,13 @@
, buildDocs ? true , buildDocs ? true
, buildTests ? false , buildTests ? false
# LFS isn't working, so we will manually fetch these # LFS isn't working, so we will manually fetch these
# This isn't strictly required, but is recommended # This isn't strictly required, but is recommended to enable
# https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373 # https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373
, fetchKDBs ? true #
# MIOpen will produce a very large output due to KDBs fetched
# Also possibly in the future because of KDB generation
# This is disabled by default so we can cache on hydra
, fetchKDBs ? false
, useOpenCL ? false , useOpenCL ? false
}: }:
@ -57,7 +62,7 @@ let
}; };
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "miopen"; pname = "miopen";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -71,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "MIOpen"; repo = "MIOpen";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg="; hash = "sha256-EOe3LUafOeVLzRoahPdS6DMZ/+6WWeVI7jG25zfPrx8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -97,6 +102,7 @@ in stdenv.mkDerivation (finalAttrs: {
boost boost
sqlite sqlite
bzip2 bzip2
nlohmann_json
] ++ lib.optionals buildDocs [ ] ++ lib.optionals buildDocs [
latex latex
doxygen doxygen
@ -177,13 +183,11 @@ in stdenv.mkDerivation (finalAttrs: {
patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/* patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/*
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version miopen "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "Machine intelligence library for ROCm"; description = "Machine intelligence library for ROCm";
@ -191,8 +195,5 @@ in stdenv.mkDerivation (finalAttrs: {
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = teams.rocm.members; maintainers = teams.rocm.members;
broken = finalAttrs.version != hip.version; broken = finalAttrs.version != hip.version;
# MIOpen will produce a very large output due to KDBs fetched
# Also possibly in the future because of KDB generation
hydraPlatforms = [ ];
}; };
}) })

16
pkgs/development/libraries/miopengemm/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-opencl-runtime , rocm-opencl-runtime
@ -32,7 +32,7 @@ let
}; };
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "miopengemm"; pname = "miopengemm";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -110,13 +110,11 @@ in stdenv.mkDerivation (finalAttrs: {
patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/*
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version miopengemm "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "OpenCL general matrix multiplication API for ROCm"; description = "OpenCL general matrix multiplication API for ROCm";

18
pkgs/development/libraries/rccl/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rccl"; pname = "rccl";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rccl"; repo = "rccl";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk="; hash = "sha256-NbHzRmrUe4kJwkHZtZ+zHjIy2uk+dpN9caE0L5hUnbc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -72,13 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rccl "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "ROCm communication collectives library"; description = "ROCm communication collectives library";

18
pkgs/development/libraries/rocblas/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, fetchpatch , fetchpatch
, cmake , cmake
, rocm-cmake , rocm-cmake
@ -30,13 +30,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocblas"; pname = "rocblas";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocBLAS"; repo = "rocBLAS";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo="; hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60=";
}; };
# We currently need this patch due to faulty toolchain includes # We currently need this patch due to faulty toolchain includes
@ -113,13 +113,11 @@ stdenv.mkDerivation (finalAttrs: {
--replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" ""
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocblas "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "BLAS implementation for ROCm platform"; description = "BLAS implementation for ROCm platform";

17
pkgs/development/libraries/rocclr/default.nix
View file

@ -1,19 +1,19 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, writeScript , rocmUpdateScript
, rocm-comgr , rocm-comgr
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocclr"; pname = "rocclr";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCm-Developer-Tools"; owner = "ROCm-Developer-Tools";
repo = "ROCclr"; repo = "ROCclr";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E="; hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk=";
}; };
patches = [ patches = [
@ -42,12 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" repo = finalAttrs.src.repo;
update-source-version rocclr "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "Source package of the Radeon Open Compute common language runtime"; description = "Source package of the Radeon Open Compute common language runtime";

18
pkgs/development/libraries/rocfft/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocfft"; pname = "rocfft";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocFFT"; repo = "rocFFT";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM="; hash = "sha256-XlpWT6PS+VpJjA4iG8yaiFRxE63kugNG1ZyQXoQVJL8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -98,13 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/rocfft_rtc_helper $out/bin mv $out/rocfft_rtc_helper $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocfft "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "FFT implementation for ROCm "; description = "FFT implementation for ROCm ";

25
pkgs/development/libraries/rocm-comgr/default.nix
View file

@ -1,14 +1,22 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: { lib
, stdenv
, fetchFromGitHub
, rocmUpdateScript
, cmake
, clang
, rocm-device-libs
, llvm
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-comgr"; pname = "rocm-comgr";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport"; repo = "ROCm-CompilerSupport";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs=";
}; };
sourceRoot = "source/lib/comgr"; sourceRoot = "source/lib/comgr";
@ -27,12 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./cmake.patch ]; patches = [ ./cmake.patch ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" repo = finalAttrs.src.repo;
update-source-version rocm-comgr "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "APIs for compiling and inspecting AMDGPU code objects"; description = "APIs for compiling and inspecting AMDGPU code objects";

17
pkgs/development/libraries/rocm-device-libs/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, clang , clang
, llvm , llvm
@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-device-libs"; pname = "rocm-device-libs";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs"; repo = "ROCm-Device-Libs";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -29,12 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./cmake.patch ]; patches = [ ./cmake.patch ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" repo = finalAttrs.src.repo;
update-source-version rocm-device-libs "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "Set of AMD-specific device-side language runtime libraries"; description = "Set of AMD-specific device-side language runtime libraries";

17
pkgs/development/libraries/rocm-opencl-runtime/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, addOpenGLRunpath , addOpenGLRunpath
, cmake , cmake
, rocm-cmake , rocm-cmake
@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-opencl-runtime"; pname = "rocm-opencl-runtime";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime"; repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I=";
}; };
nativeBuildInputs = [ cmake rocm-cmake ]; nativeBuildInputs = [ cmake rocm-cmake ];
@ -68,12 +68,11 @@ stdenv.mkDerivation (finalAttrs: {
--replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"'
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" repo = finalAttrs.src.repo;
update-source-version rocm-opencl-runtime "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";

17
pkgs/development/libraries/rocm-runtime/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, addOpenGLRunpath , addOpenGLRunpath
, cmake , cmake
, pkg-config , pkg-config
@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-runtime"; pname = "rocm-runtime";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "ROCR-Runtime"; repo = "ROCR-Runtime";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE=";
}; };
sourceRoot = "source/src"; sourceRoot = "source/src";
@ -48,12 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf $out/hsa rm -rf $out/hsa
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" repo = finalAttrs.src.repo;
update-source-version rocm-runtime "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "Platform runtime for ROCm"; description = "Platform runtime for ROCm";

20
pkgs/development/libraries/rocm-thunk/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, pkg-config , pkg-config
, libdrm , libdrm
@ -9,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-thunk"; pname = "rocm-thunk";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface"; repo = "ROCT-Thunk-Interface";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE=";
}; };
preConfigure = '' preConfigure = ''
@ -37,12 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
cp -r $src/include $out cp -r $src/include $out
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" repo = finalAttrs.src.repo;
update-source-version rocm-thunk "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "Radeon open compute thunk interface"; description = "Radeon open compute thunk interface";

36
pkgs/development/libraries/rocmlir/default.nix
View file

@ -1,49 +1,57 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, hip , clang
, git
, libxml2
, libedit
, python3 , python3
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocmlir"; pname = "rocmlir";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocMLIR"; repo = "rocMLIR";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
hip clang
]; ];
buildInputs = [ buildInputs = [
git
libxml2
libedit
python3 python3
]; ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_FAT_LIBMLIRMIOPEN=ON" "-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++"
"-DBUILD_FAT_LIBROCKCOMPILER=ON"
]; ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)" page = "tags?per_page=2";
update-source-version rocmlir "$version" --ignore-same-hash filter = ".[1].name | split(\"-\") | .[1]";
''; };
meta = with lib; { meta = with lib; {
description = "MLIR-based convolution and GEMM kernel generator"; description = "MLIR-based convolution and GEMM kernel generator";
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
license = with licenses; [ asl20 ]; license = with licenses; [ asl20 ];
maintainers = teams.rocm.members; maintainers = teams.rocm.members;
broken = finalAttrs.version != hip.version; broken = finalAttrs.version != clang.version;
}; };
}) })

18
pkgs/development/libraries/rocprim/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocprim"; pname = "rocprim";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocPRIM"; repo = "rocPRIM";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U="; hash = "sha256-VGTrMllQguIJKexdQNXC07KX7TxU/e5oT6VZdlSRcQY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -72,13 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocprim "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "ROCm parallel primitives"; description = "ROCm parallel primitives";

18
pkgs/development/libraries/rocrand/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocrand"; pname = "rocrand";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocRAND"; repo = "rocRAND";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-awQLqPmhVxegrqqSoC8fiCQJ33bPKZlljSAXnHVcIZo="; hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY=";
fetchSubmodules = true; # For inline hipRAND fetchSubmodules = true; # For inline hipRAND
}; };
@ -75,13 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocRAND/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocrand "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "Generate pseudo-random and quasi-random numbers"; description = "Generate pseudo-random and quasi-random numbers";

18
pkgs/development/libraries/rocsparse/default.nix
View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchzip , fetchzip
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocsparse"; pname = "rocsparse";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocSPARSE"; repo = "rocSPARSE";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0="; hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -134,13 +134,11 @@ stdenv.mkDerivation (finalAttrs: {
mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
}; };
updateScript = writeScript "update.sh" '' updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocsparse "$version" --ignore-same-hash
'';
}; };
meta = with lib; { meta = with lib; {

18
pkgs/development/libraries/rocthrust/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, rocm-runtime , rocm-runtime
@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocthrust"; pname = "rocthrust";
version = "5.3.3"; version = "5.4.0";
# Comment out these outputs until tests/benchmarks are fixed (upstream?) # Comment out these outputs until tests/benchmarks are fixed (upstream?)
# outputs = [ # outputs = [
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocThrust"; repo = "rocThrust";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw="; hash = "sha256-3OcJUL6T1HJz6TQb1//lumsTxqfwbWbQ4lGuZoKmqbY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -74,13 +74,11 @@ stdenv.mkDerivation (finalAttrs: {
# rmdir $out/bin # rmdir $out/bin
# ''; # '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocthrust "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "ROCm parallel algorithm library"; description = "ROCm parallel algorithm library";

18
pkgs/development/libraries/rocwmma/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, cmake , cmake
, rocm-cmake , rocm-cmake
, hip , hip
@ -34,7 +34,7 @@ let
}; };
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "rocwmma"; pname = "rocwmma";
version = "5.3.3"; version = "5.4.0";
outputs = [ outputs = [
"out" "out"
@ -50,7 +50,7 @@ in stdenv.mkDerivation (finalAttrs: {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "rocWMMA"; repo = "rocWMMA";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-wU3R1XGTy7uFbceUyE0wy+XayicuyJIVfd1ih6pbTN0="; hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM=";
}; };
patches = lib.optionals buildTests [ patches = lib.optionals buildTests [
@ -121,13 +121,11 @@ in stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin rmdir $out/bin
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = finalAttrs.src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocWMMA/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version rocwmma "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "Mixed precision matrix multiplication and accumulation"; description = "Mixed precision matrix multiplication and accumulation";

18
pkgs/development/libraries/tensile/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, writeScript , rocmUpdateScript
, buildPythonPackage , buildPythonPackage
, pyyaml , pyyaml
, msgpack , msgpack
@ -10,13 +10,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tensile"; pname = "tensile";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform"; owner = "ROCmSoftwarePlatform";
repo = "Tensile"; repo = "Tensile";
rev = "rocm-${version}"; rev = "rocm-${version}";
hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA="; hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag=";
}; };
buildInputs = [ buildInputs = [
@ -25,13 +25,11 @@ buildPythonPackage rec {
pandas pandas
]; ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ repo = src.repo;
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" };
update-source-version tensile "$version" --ignore-same-hash
'';
meta = with lib; { meta = with lib; {
description = "GEMMs and tensor contractions"; description = "GEMMs and tensor contractions";

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

@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/dmlc/xgboost"; homepage = "https://github.com/dmlc/xgboost";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar nviets ];
}; };
} }

69
pkgs/development/libraries/zmusic/default.nix Normal file
View file

@ -0,0 +1,69 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, alsa-lib
, cmake
, fluidsynth
, libsndfile
, mpg123
, ninja
, pkg-config
, soundfont-fluid
, zlib
}:
stdenv.mkDerivation rec {
pname = "zmusic";
version = "1.1.11";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "ZMusic";
rev = version;
hash = "sha256-QvP8ranwBs8VupBie4vrHdm517OOpCuV3Rbjeb/L9PY=";
};
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "system-fluidsynth.patch";
url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0";
hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI=";
})
];
postPatch = ''
substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \
--replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \
--replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"
'';
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
alsa-lib
fluidsynth
libsndfile
mpg123
zlib
];
meta = with lib; {
description = "GZDoom's music system as a standalone library";
homepage = "https://github.com/ZDoom/ZMusic";
license = with licenses; [
free
gpl3Plus
lgpl21Plus
lgpl3Plus
];
platforms = platforms.linux;
maintainers = with maintainers; [ azahi lassulus ];
};
}

27
pkgs/development/rocm-modules/update-script/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ runtimeShell
, writeScript
}:
{ name ? ""
, owner ? ""
, repo ? ""
, page ? "releases?per_page=1"
, filter ? ".[0].tag_name | split(\"-\") | .[1]"
}:
let
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-sL "https://api.github.com/repos/${owner}/${repo}/${page}" | jq '${filter}' --raw-output)"
IFS='.' read -a version_arr <<< "$version"
if [ "''${#version_arr[*]}" == 2 ]; then
version="''${version}.0"
fi
update-source-version ${name} "$version" --ignore-same-hash
'';
in [ updateScript ]

22
pkgs/development/tools/build-managers/rocm-cmake/default.nix
View file

@ -1,24 +1,28 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake }: { lib
, stdenv
, fetchFromGitHub
, rocmUpdateScript
, cmake
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-cmake"; pname = "rocm-cmake";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "rocm-cmake"; repo = "rocm-cmake";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; hash = "sha256-JarQqiiZ36WV1d6vyQD546GN1EtoKLcdvcZsG3QWD2Y=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" repo = finalAttrs.src.repo;
update-source-version rocm-cmake "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "CMake modules for common build tasks for the ROCm stack"; description = "CMake modules for common build tasks for the ROCm stack";

5
pkgs/development/tools/delve/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "delve"; pname = "delve";
version = "1.20.0"; version = "1.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "go-delve"; owner = "go-delve";
repo = "delve"; repo = "delve";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1on1+YTuPCl/XfgfCB49thvqiN45IAHebP12gQlhzsE="; sha256 = "sha256-X1vds6+brQ5pl7MG2/n0CqCoS0nbjnQUcIgJqji/u60=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -46,5 +46,6 @@ buildGoModule rec {
homepage = "https://github.com/go-delve/delve"; homepage = "https://github.com/go-delve/delve";
maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; maintainers = with maintainers; [ SuperSandro2000 vdemeester ];
license = licenses.mit; license = licenses.mit;
mainProgram = "dlv";
}; };
} }

31
pkgs/development/tools/rocminfo/default.nix
View file

@ -1,14 +1,27 @@
{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep { stdenv
, lib
, fetchFromGitHub
, rocmUpdateScript
, fetchpatch
, cmake
, rocm-runtime
, python3
, rocm-cmake
, busybox
, gnugrep
# rocminfo requires that the calling user have a password and be in # rocminfo requires that the calling user have a password and be in
# the video group. If we let rocm_agent_enumerator rely upon # the video group. If we let rocm_agent_enumerator rely upon
# rocminfo's output, then it, too, has those requirements. Instead, # rocminfo's output, then it, too, has those requirements. Instead,
# we can specify the GPU targets for this system (e.g. "gfx803" for # we can specify the GPU targets for this system (e.g. "gfx803" for
# Polaris) such that no system call is needed for downstream # Polaris) such that no system call is needed for downstream
# compilers to determine the desired target. # compilers to determine the desired target.
, defaultTargets ? []}: , defaultTargets ? []
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
version = "5.3.3"; version = "5.4.0";
pname = "rocminfo"; pname = "rocminfo";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "rocminfo"; repo = "rocminfo";
@ -19,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ rocm-cmake rocm-runtime ]; buildInputs = [ rocm-cmake rocm-runtime ];
cmakeFlags = [ cmakeFlags = [
"-DROCM_DIR=${rocm-runtime}" "-DROCM_DIR=${rocm-runtime}"
"-DROCRTST_BLD_TYPE=Release" "-DROCRTST_BLD_TYPE=Release"
@ -37,12 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" repo = finalAttrs.src.repo;
update-source-version rocminfo "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "ROCm Application for Reporting System Info"; description = "ROCm Application for Reporting System Info";

121
pkgs/games/gzdoom/default.nix
View file

@ -1,46 +1,50 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth { lib
, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 , stdenv
, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem, gtk3 }: , fetchFromGitHub
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, SDL2
, bzip2
, cmake
, fluidsynth
, game-music-emu
, gtk3
, libGL
, libjpeg
, libsndfile
, libvpx
, mpg123
, ninja
, openal
, pkg-config
, vulkan-loader
, zlib
, zmusic
}:
let stdenv.mkDerivation rec {
zmusic = stdenv.mkDerivation rec {
pname = "zmusic";
version = "1.1.3";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "ZMusic";
rev = version;
hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fluidsynth ];
cmakeFlags = [ "-DDYN_FLUIDSYNTH=OFF" ];
preConfigure = ''
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
source/mididevices/music_fluidsynth_mididevice.cpp
'';
};
gzdoom = stdenv.mkDerivation rec {
pname = "gzdoom"; pname = "gzdoom";
version = "4.8.2"; version = "4.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ZDoom"; owner = "ZDoom";
repo = "gzdoom"; repo = "gzdoom";
rev = "g${version}"; rev = "g${version}";
hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo=";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw=";
}; };
nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [
cmake
copyDesktopItems
makeWrapper
ninja
pkg-config
];
buildInputs = [ buildInputs = [
SDL2 SDL2
bzip2 bzip2
@ -53,21 +57,23 @@ let
libvpx libvpx
mpg123 mpg123
openal openal
vulkan-loader
zlib zlib
zmusic zmusic
]; ];
patches = [ postPatch = ''
(fetchpatch { # TODO: Delete me when upgrading to 4.9 substituteInPlace tools/updaterevision/UpdateRevision.cmake \
url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch"; --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \
sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0="; --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \
}) --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")"
'';
cmakeFlags = [
"-DDYN_GTK=OFF"
"-DDYN_OPENAL=OFF"
]; ];
NIX_CFLAGS_LINK = "-lopenal -lfluidsynth";
cmakeFlags = [ "-DDYN_GTK=OFF" ];
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = "gzdoom"; name = "gzdoom";
@ -77,31 +83,20 @@ let
}) })
]; ];
installPhase = '' postInstall = ''
runHook preInstall mv $out/bin/gzdoom $out/share/games/doom/gzdoom
makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom
install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom"
for i in *.pk3; do
install -Dm644 "$i" "$out/lib/gzdoom/$i"
done
for i in fm_banks/*; do
install -Dm644 "$i" "$out/lib/gzdoom/$i"
done
for i in soundfonts/*; do
install -Dm644 "$i" "$out/lib/gzdoom/$i"
done
mkdir $out/bin
makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ZDoom/gzdoom"; homepage = "https://github.com/ZDoom/gzdoom";
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine";
longDescription = ''
GZDoom is a feature centric port for all DOOM engine games, based on
ZDoom, adding an OpenGL renderer and powerful scripting capabilities.
'';
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
maintainers = with maintainers; [ azahi lassulus ]; maintainers = with maintainers; [ azahi lassulus ];
}; };
}; }
in gzdoom

2
pkgs/os-specific/linux/semodule-utils/default.nix
View file

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
description = "SELinux policy core utilities (packaging additions)"; description = "SELinux policy core utilities (packaging additions)";
license = licenses.gpl2; license = licenses.gpl2;
inherit (libsepol.meta) homepage platforms; inherit (libsepol.meta) homepage platforms;
maintainers = [ maintainers.e-user ]; maintainers = [ ];
}; };
} }

2
pkgs/os-specific/linux/sssd/default.nix
View file

@ -101,6 +101,6 @@ stdenv.mkDerivation rec {
changelog = "https://sssd.io/release-notes/sssd-${version}.html"; changelog = "https://sssd.io/release-notes/sssd-${version}.html";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ e-user illustris ]; maintainers = with maintainers; [ illustris ];
}; };
} }

30
pkgs/os-specific/linux/sysdig/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
, libyamlcpp, nlohmann_json , libyamlcpp, nlohmann_json, re2
}: }:
with lib; with lib;
let let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; libsRev = "0.9.1";
libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0=";
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
valijson = fetchFromGitHub { valijson = fetchFromGitHub {
@ -17,16 +17,23 @@ let
sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
}; };
driver = fetchFromGitHub {
owner = "falcosecurity";
repo = "libs";
rev = "3.0.1+driver";
sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c=";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sysdig"; pname = "sysdig";
version = "0.29.3"; version = "0.30.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "draios"; owner = "draios";
repo = "sysdig"; repo = "sysdig";
rev = version; rev = version;
sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM=";
}; };
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
@ -40,6 +47,8 @@ stdenv.mkDerivation rec {
gcc gcc
elfutils elfutils
tbb tbb
libb64
re2
protobuf protobuf
grpc grpc
libyamlcpp libyamlcpp
@ -57,12 +66,21 @@ stdenv.mkDerivation rec {
sha256 = libsSha256; sha256 = libsSha256;
}} libs }} libs
chmod -R +w libs chmod -R +w libs
cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") cp -r ${driver} driver-src
chmod -R +w driver-src
cmakeFlagsArray+=(
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
"-DVALIJSON_INCLUDE=${valijson}/include"
"-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver"
)
''; '';
cmakeFlags = [ cmakeFlags = [
"-DUSE_BUNDLED_DEPS=OFF" "-DUSE_BUNDLED_DEPS=OFF"
"-DSYSDIG_VERSION=${version}" "-DSYSDIG_VERSION=${version}"
"-DUSE_BUNDLED_B64=OFF"
"-DUSE_BUNDLED_TBB=OFF"
"-DUSE_BUNDLED_RE2=OFF"
"-DCREATE_TEST_TARGETS=OFF" "-DCREATE_TEST_TARGETS=OFF"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";

4
pkgs/servers/jackett/default.nix
View file

@ -9,13 +9,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.20.2352"; version = "0.20.2365";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "vxe5B+R5zxKlvnxnXXw9tfgtXGNlEZF3z14NZ7pA3zE="; sha256 = "ROnqVJuTotIii87DRVEJ9AKiqZluFEOfVVu6669x2og=";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

2
pkgs/tools/misc/ding-libs/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "'D is not GLib' utility libraries"; description = "'D is not GLib' utility libraries";
homepage = "https://pagure.io/SSSD/ding-libs"; homepage = "https://pagure.io/SSSD/ding-libs";
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ e-user ]; maintainers = with lib.maintainers; [ ];
license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ];
}; };
} }

4
pkgs/tools/security/nuclei/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "nuclei"; pname = "nuclei";
version = "2.8.2"; version = "2.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iH2+y5J6fgHae23YBwZ5WT/V2JCXFz7PtB/t2+S7PDk="; hash = "sha256-yh7bKJBj8Y73wT8MXZp6CYZ2y0gLebYZk9Pif8BC2a0=";
}; };
vendorHash = "sha256-snBbte1TNDRcFwzq4QtixmqHarvQJ7E8euYPEYFlXe0="; vendorHash = "sha256-snBbte1TNDRcFwzq4QtixmqHarvQJ7E8euYPEYFlXe0=";

23
pkgs/tools/system/rocm-smi/default.nix
View file

@ -1,14 +1,20 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: { lib
, stdenv
, fetchFromGitHub
, rocmUpdateScript
, cmake
, wrapPython
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocm-smi"; pname = "rocm-smi";
version = "5.3.3"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RadeonOpenCompute"; owner = "RadeonOpenCompute";
repo = "rocm_smi_lib"; repo = "rocm_smi_lib";
rev = "rocm-${finalAttrs.version}"; rev = "rocm-${finalAttrs.version}";
hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE=";
}; };
nativeBuildInputs = [ cmake wrapPython ]; nativeBuildInputs = [ cmake wrapPython ];
@ -19,12 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
wrapPythonProgramsIn $out wrapPythonProgramsIn $out
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = rocmUpdateScript {
#!/usr/bin/env nix-shell name = finalAttrs.pname;
#!nix-shell -i bash -p curl jq common-updater-scripts owner = finalAttrs.src.owner;
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" repo = finalAttrs.src.repo;
update-source-version rocm-smi "$version" --ignore-same-hash };
'';
meta = with lib; { meta = with lib; {
description = "System management interface for AMD GPUs supported by ROCm"; description = "System management interface for AMD GPUs supported by ROCm";

2
pkgs/tools/text/sgml/jade/default.nix
View file

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
license = "custom"; license = "custom";
homepage = "http://www.jclark.com/jade/"; homepage = "http://www.jclark.com/jade/";
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ e-user ]; maintainers = with lib.maintainers; [ ];
}; };
} }

4
pkgs/tools/wayland/slurp/default.nix
View file

@ -24,6 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q=";
}; };
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja

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

@ -13486,6 +13486,8 @@ with pkgs;
zmap = callPackage ../tools/security/zmap { }; zmap = callPackage ../tools/security/zmap { };
zmusic = callPackage ../development/libraries/zmusic { };
zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { };
@ -15165,7 +15167,9 @@ with pkgs;
rocminfo = callPackage ../development/tools/rocminfo { }; rocminfo = callPackage ../development/tools/rocminfo { };
rocmlir = callPackage ../development/libraries/rocmlir { }; rocmlir = callPackage ../development/libraries/rocmlir {
inherit (llvmPackages_rocm) clang;
};
rocprim = callPackage ../development/libraries/rocprim { }; rocprim = callPackage ../development/libraries/rocprim { };
@ -15204,6 +15208,8 @@ with pkgs;
useOpenCL = true; useOpenCL = true;
}; };
rocmUpdateScript = callPackage ../development/rocm-modules/update-script { };
rtags = callPackage ../development/tools/rtags { rtags = callPackage ../development/tools/rtags {
inherit (darwin) apple_sdk; inherit (darwin) apple_sdk;
}; };