diff options
Diffstat (limited to 'pkgs')
181 files changed, 3349 insertions, 1054 deletions
diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix deleted file mode 100644 index 850f644afc34e..0000000000000 --- a/pkgs/applications/audio/apple-music-electron/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ appimageTools, lib, fetchurl }: -let - pname = "apple-music-electron"; - version = "1.5.5"; - name = "Apple.Music-${version}"; - - src = fetchurl { - url = "https://github.com/cryptofyre/Apple-Music-Electron/releases/download/v${version}/${name}.AppImage"; - sha256 = "1gb6j3nvam9fcpsgiv56jccg9a4y14vzsyw11h3hckaigy90knpx"; - }; - - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; - - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes"; - homepage = "https://github.com/iiFir3z/Apple-Music-Electron"; - license = licenses.mit; - maintainers = [ maintainers.ivar ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 711444651c333..d795138a4b562 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -2,6 +2,7 @@ , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config +, libjack2 }: stdenv.mkDerivation rec { @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto + libjack2 ]; nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; @@ -34,5 +36,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; + # undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29' + broken = true; # at 2022-09-30 }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 30b7abc6dfba7..a1613946150bc 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220714"; + version = "20220923"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-myrHOfgpCwuW8YX0jZ3RutoqtXysU0ejBNcuxN3stXU="; + sha256 = "sha256-9Y9up5Ziipm6ums1wESfcADKgMwas2SESgGPn74RTt4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index bed21ea5c3af2..ad5e5b2d5c845 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.171.0"; + version = "1.172.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-+NTxZ5UkmaFDcTYliNi/5c8xGztVu6P8C7Ga99MHSFM="; + hash = "sha256-AYIgYLrOVutsv0cHUd/TwNAyLbog6xjcepV9/3fTshc="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 529c66125e877..2b78b5155bc24 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,13 +16,13 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-HjW4V7MctQoHbDYIlMv7VS0nS7FFG6Qir0sCju+isI0=" + "rev": "2022.10.01", + "hash": "sha256-cfjpPTOc8KjhaD1wVY3Tb/lQwEeT3Rq22lJ1MKdTNF0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-yIbIRo4hpwbCdH+3fIhjnQPtdvuFmfJSqloKjWqKEuY=" + "rev": "2022.10.03", + "hash": "sha256-2XP3LyB18ZHLQOxzP4lBuhlUA8u1+wHl97cxmRYa7Xg=" }, "EControl": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2bfc2f18e97dd..94ca0cdf0b6d8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -96,7 +96,7 @@ self: let ./build.sh -j$NIX_BUILD_CORES ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' ./install.sh --prefix=$out ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 39835c58b6501..6190d25ce93d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -186,7 +186,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' install -m=755 -D source/sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite ''; @@ -301,7 +301,7 @@ let make popd ''; - postInstall = '' + postInstall = (attrs.postInstall or "") + "\n" + '' outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) mkdir $outd/build install -m444 -t $outd/build ./source/src/libegit2.so @@ -426,7 +426,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mkdir -p $out/bin install -m755 -Dt $out/bin ./source/server/telega-server ''; @@ -456,7 +456,7 @@ let pkgs.libtool (pkgs.zeromq.override { enableDrafts = true; }) ]; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-* rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile @@ -533,7 +533,7 @@ let ]; # we need the proper out directory to exist, so we do this in the # postInstall instead of postBuild - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' pushd source/build >/dev/null make install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d2fb08a807fc1..f2476b0412d69 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-09-16"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4098ba53139d3e59efae1c9140180440d3df9174"; - sha256 = "053a6b7xxz85bkh4v4s5kmjwvdlj26sksv5vyjmjk3anps9lc0dr"; + rev = "98c99cc950f147a877d56a590d92b357c24086b9"; + sha256 = "06q4riwy7gdmcrqjqnsgw98r382jwsk5qn1f43pg04cwdaksjy4k"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-09-24"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "687fc5aca8eef79278a01345f1a93dcc68453f29"; - sha256 = "0mldl6zssdxnkxls4r9rbb94f9i5yi7bc0r99k34v4bq25j9ls55"; + rev = "33873c71335a31988b62025c3b2224f3a9fe8e15"; + sha256 = "134z58jhi343ylr6nip8f180cqvyf2l7gxrzygxyv55d2iz182qk"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "2adcaae6f53e0bc42445f14caa210e8d64368469"; - sha256 = "039rfly4knc7d9n3wkvi4f7m4pwh4ifpci59gnbvqlyhr9x29mzs"; + rev = "46f53be2f8e538e5b5aa5344bd9f9dd1a9ef1679"; + sha256 = "1c02vql960mfpgj96zmzkij8yc2xpsxwgs7dfqphkmwq3b02r1nx"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-09-22"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cdd88b5e46109c01a69f3f9b10eae53811b4a65c"; - sha256 = "0v7dg2s7igs11566kxd5qjl81fq4iw5i6xn9qrl23wg5mbksvwiy"; + rev = "8c173bc4d2c5b03cf53575092a7c5c2bc67afd9a"; + sha256 = "1m2sk3pqc2825px3x8l8jrwjwrdljygrf3pb2wy4y15dbjy56hf1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "87099324fdf55e5219e852676769f3b5f0290d98"; - sha256 = "039mh32k1vz3g7sdagavsir79wzxgp1y6747rgpgdrrf5jdf3crh"; + rev = "6f1b28b549147c2f9e09de16869fcc34cf076253"; + sha256 = "02k6p7bx63xsj98hvi0chm2g8wyk8kv9y8cz265lv9i5yrh6fpcc"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-09-25"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "78942df284a4a00c59a6edcc187684cdbc333fb9"; - sha256 = "1i29zqi1xqar0i0a0y30jssl914a3mxvvvfki3k3c6gdhskf9in3"; + rev = "a33960eb51b638f232dff71cfeac5ede87b38312"; + sha256 = "1v56lzs9i29bwzb1iqwanzv3khr9gd9lmwv5v5ddhg9b3bq55rnv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -678,12 +678,12 @@ final: prev: asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-08-23"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "4b6abc813b67e743fee205da2f996f737df1ae20"; - sha256 = "03vqz5yz76wymsrvbkyvnfl3453b4hba2h0ji9lyy3brxb6lf1bg"; + rev = "1a5f4916192767973c05b3bb648548b0891865a2"; + sha256 = "0ghg00bflnp9lyrjjls7si0vvjzxzy72fxz36dvps15rddm4bry2"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -736,6 +736,18 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-save-nvim = buildVimPluginFrom2Nix { + pname = "auto-save.nvim"; + version = "2022-08-06"; + src = fetchFromGitHub { + owner = "pocco81"; + repo = "auto-save.nvim"; + rev = "2c7a2943340ee2a36c6a61db812418fca1f57866"; + sha256 = "0zfy1pw39c0zf4mfd8kgl1hj9h1hcbsql32rp0wk0kf714hbxqli"; + }; + meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; + }; + auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; version = "2022-09-19"; @@ -786,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-09-01"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c41ad6e3f68c2c9f6aa268c6232cdef885107303"; - sha256 = "0mdimwsiclpjn2df75lc92ryyjyql4m1x0bvpl629z33hvhlcvs0"; + rev = "95f2c58c84726eac14fd6e86dbcab599d7ecaedd"; + sha256 = "19nja82dcv7gr0sc1404zjak00wb5n7k3plnnnndl0siah3i4d7k"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -978,12 +990,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "19483e6c226650f14acabfc4b1ec6521cf964a4e"; - sha256 = "11p4mzbyjsxik9jzg11d17mnacj8krxzrq4hjjg0pn1cggh3wqyh"; + rev = "0a8a6f1b42dd3c8031fe5d96cc835998169e1ac9"; + sha256 = "01k31s7mpl3kkh2yl078915yq78ga9x0rhawbz03s0kjssvlsfyd"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1050,12 +1062,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-09-23"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "f2ca89d978f9fc907beb432a472a89fced7e10bd"; - sha256 = "0g0w950l7pam1fibkc5fggchvsfi4fsyvrky2f1yizrndpmq09yz"; + rev = "7fa598a4a1bfd61a8f194d7db1e4d820221e9ea9"; + sha256 = "1wxyy98gal3zdwrh6z92044yyj3nbw2bzq9diwa1h5waraf9jg7r"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1530,12 +1542,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-06-09"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "c2886bbb09ef6daf996a258db29546cc1e7c12a7"; - sha256 = "1ar6d6pqybn4vqynbh18mc7fy1ybv0s9mi1r2j1nfcmgvh4wsvwk"; + rev = "5f695e4173ad74a4c8dbbfd8990286464bf69293"; + sha256 = "1l32k8fdmpg8lfh1qqmahash957izz9zr6gfjvfs5s4if0fl3f2r"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1710,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ca63592c1ba484aa7146a6a9f34b9a6cb8d8ffb9"; - sha256 = "10dr4kp8z2kzg167n1n7ndmdm7hhvsv4423g290yljlk0vbvflfn"; + rev = "487d077e1131ee5b09e329d15f9d9ae53aa8f44a"; + sha256 = "148wajzy64ys74km0k1mgvrfk3mqdib0nh2wylwfnx83s50f2sx2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1794,12 +1806,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "7cc86127d30f7001a6e83c8b72656f17a67bc55f"; - sha256 = "1jl2wwr8ssszgkynnkxpz2c57mw7yapvrc892jrnkbkj6lv7h8vi"; + rev = "97a188a98b5a3a6f9b1b850799ac078faa17ab67"; + sha256 = "05836nr9nwssjzjmg8zmbdfx8wclhnjb6pp4cwiykgi6kv4dzjnz"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1866,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "12641f77bea3e1bd93560653cba6e9f1c264c0dd"; - sha256 = "1fm81s16ccrm0ia21hwc299mnpx3r2i3byggkwsi7cb5kh4lh6zw"; + rev = "737ec0937c2e3f8279bedb6e308a1c183b81f08a"; + sha256 = "1jawin6rvz5rkmh1vh3l980zghnc5hmppqginnj82n8s0lz1dl0d"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1998,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "dbebb09f0c48d9af2b36f4e36e30e74ee7cef558"; - sha256 = "09bv552gg5pkkzz8b0bj1xgp41ywz2yjwgrzqi64xhk98hdhhpy6"; + rev = "a72ed519665c483706e99c8e080b6333fece6030"; + sha256 = "1im5lrpz7b3nhc53sy7nn0i4ngiy47l2l3h8c0yjrbqz9j3gcjcm"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "be1075ca88e3fd1d22bb8d3c8490701b4c90d2cb"; - sha256 = "007gsvd0n53hgk92dk2wxx91lfdng8rq8cxl469gd9n71ixr31d0"; + rev = "563bdd935c282d1d380bd98d53923c2f7d02eae9"; + sha256 = "06lh0rm15frv741fv21hc8gwjahbp49iz03h944abqfh69cf4a35"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2034,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8988534294ceaa8fc0a76e68b188efdca88626bf"; - sha256 = "09s8x7knsjbbbwnx13m3911nddapr92xink75lhn2k3hkr0hwmvq"; + rev = "55b4222262ad8e826ce1c144a7b2b35f16f8a8e5"; + sha256 = "0bmcv72nw0vk8qlzhs5lfirh4jq13azva1wm2w2a8hlvnfg764ij"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2178,12 +2190,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1c4802a654c9127c745cbe2ffff9909a3a9ff965"; - sha256 = "1fs9qk3xskvhbbs33kywk9krkcrbsrmizm0imqsbsp3c1cr3m8xk"; + rev = "1676ebeb334a644dd68f7858f9e993602dd8577c"; + sha256 = "164giy2s45dc1zlf63fsbf9z8qvf81npdmy304xxr81azpb8amqi"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2492,12 +2504,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2022-08-24"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4e30d980f51087241499e20d687b76dc5000274e"; - sha256 = "0ll5wb8kpqy907rw6c9v99vkldp9lcvbrzdysjcdq4z8gzcwrvac"; + rev = "14578f1d0c7ed8faca7e640104840b7eaa1c35ee"; + sha256 = "1gwq7nhd90ifh1gys2jvrq2s8521pyz7w3nsr2pmnv64h3yl1f2f"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2758,12 +2770,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-09-19"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "496975425a28ef1f974e90e9664fe3409738f071"; - sha256 = "14p688anpsfj09yhmmjbl949xfx61qv79vg26hbxif149i3z5035"; + rev = "83fcde2853a8881ea1b59cca80a5285662c1706c"; + sha256 = "0v3xmvk8jgad29wpxqdkqq95s1cap7gdz07i299hcz94l1y5fiqz"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2806,12 +2818,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-07-25"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "492492e7d50452a9ace8346d31f6d6da40439f0e"; - sha256 = "1s3qv09gbsjjmqkb85hc4832j18hd21j37rg4iqks0a4n2z5yi4b"; + rev = "1097a86db8ba38e390850dc4035a03ed234a4673"; + sha256 = "15pspfihd2rjzyw6pzd3yycjrn98nx79njasrn4j4sl4ivlay5g6"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2891,12 +2903,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-08-26"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "07a746e6df6bf4c77766aa6c19723da618a38781"; - sha256 = "0qffbwvb3vh92vixk8wq6h11ayvzvlq64x4qdwx7nz7dfd6cwlhb"; + rev = "88aa63ba216708611b472d8737b96af71c2f3785"; + sha256 = "0x55w1fs0pciinapdvs3vdsiql29753vi2f9sr3jpxlk4rgaygpa"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3023,12 +3035,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "316879662ff9c33ae4b1072f8238e4bba2999e0a"; - sha256 = "1b334fqvv49d9cnk4yv3hd3qgnw4x48l1i2ja1pxxiwi91q1hgwr"; + rev = "e7c610889ff954101c644cdb9cf68e499a3751ac"; + sha256 = "15bkdkr9jr9rdg3nwjyzb3rzx27h5ldi6484whqaij40gpk1ifgz"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3335,12 +3347,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-09-15"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c632f629026cf41308b4473ab9bb9686318c993c"; - sha256 = "1dn4a5wnahh2hnhx3sda2lrmfi675bmifpm3g1xjxqj3771ivznk"; + rev = "24f9e795bfac5fabbaba703116e747dcf2ad8d2f"; + sha256 = "0an08vf70ispd3alywz964vlxkgg17dgfz5n18q60ix2fs6pmgii"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3490,12 +3502,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "a71c37feb8fe878d54f15135ddea0d2b3ea04a44"; - sha256 = "1z7wq8dzfqw0m6ydvfahqi513x4a77vg7kxq3476awq8601h1525"; + rev = "86f4f2f7c1cebdbeb9a9bd498810a0154e80dbab"; + sha256 = "0gzxnh13l1ys8jbcnkgfrjz901qf8wvyslqyldyzm3ryis823acg"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4103,12 +4115,12 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-09-27"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "04e766756aa755e00a400cd09dae867a03f6f25d"; - sha256 = "050a19kmilxlh4pknw6jakhnnkwwl51cddvi9aw2742pspddhnyy"; + rev = "e2dffec35740032258fee3a3c7f30123226f2271"; + sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -4127,12 +4139,12 @@ final: prev: litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "4cbb64f3aa433522160c4e340fdf19900198e4ea"; - sha256 = "0v8w2ddf8zwb0vpqwxc0294cgi4674ff335w0f226hrpkl962022"; + rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; + sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; @@ -4294,12 +4306,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "e18c4ce4048497384972052d8118eeaa0a681ada"; - sha256 = "1yg3g613i2wp6zhvf940gvgz3318g8hzw4m5x76i63qpz6nanbmx"; + rev = "2ffe2f6de00360f13ac939b7f7257e6de5e80132"; + sha256 = "04nks3j6ah2dn4hlqabz0cvlwam86ig0a89mzpnw52injl95k9a1"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4330,12 +4342,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-09-20"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d36c063b7f6e701852f7880f1314656592a61b4f"; - sha256 = "1kqarf2710iqwa1zz8y7dm8s37b1q4330ldnw2adyzlyh6zifjwv"; + rev = "8f8d493e7836f2697df878ef9c128337cbf2bb84"; + sha256 = "17kz2w90m1f7wg8gyaz6lhg8hdkjq4zly092halgd1fn6brhd23f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4439,12 +4451,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "49f970355e7b0dc5407057eb39b778d20209b7aa"; - sha256 = "13fa6anil5y4wj0a543j4pip9a1slvrxwvlqihvh57cqn3r7vxsz"; + rev = "3f2c7a2aee528309fb42091b723285fb7630a0c2"; + sha256 = "18049zbm2gxm6gjif6radwy09x84ix1y30657q294n7scsh25mg5"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4811,12 +4823,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-09-22"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "463820a83f4ba387655f370a17c87dc3100cdf0d"; - sha256 = "1h0mil77s8pbgjvqb0kf6l4avz1y33116rgv2kkaii1zn4dwmnws"; + rev = "74c9e29b61780345d3ad9d7a4a4437607caead4a"; + sha256 = "07szj9ajv3n8hpx0ibvysi0p5rfshcnbk0v3jyh2lvrcvky2qkqg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4871,12 +4883,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-09-23"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9279eb2de80c8a9af12b1a35f3e0fd8d742b61dd"; - sha256 = "0l7k6bf9jnqakzy7931fjr1pna2fvwcwd9y4y0yp7rsql5a5fk3d"; + rev = "c5345e72ebdd84585eec6272755aa26233431317"; + sha256 = "0ip2gy11xhvfdrin1yz3fqr9z2hwbd51avm1616825pj6mr8dxn5"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4931,12 +4943,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0198dcf2d5585742220e21e002f095464874e19e"; - sha256 = "1qbh4rpv4gzrsaqq0s64rq3c93ghspfd1ida76wpivzbzcrj4q7w"; + rev = "bae6314522e47172564203d4f1c56dc1e39c1c14"; + sha256 = "0hwhcdswa5msxndcfcn68dq8aj6gka7vmfcvbnaxmwza23ik09cd"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5051,12 +5063,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-09-05"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "83f6ee9e646c803aa14c7293ad7775900f24ea1a"; - sha256 = "07fi55ilkqmb7xqwk1vd6nkmpfwrpqjnjz8wv8z84h1s3dpcslzx"; + rev = "59c3dbcec362eff7794f1cb576d56fd8a3f2c8bb"; + sha256 = "1dkwgqx576xc8fryhi61q7mka93vv28hfsw340k594jkqc3da9i2"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5159,12 +5171,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8af89c5fa2b732aaa9c3bf8aed95bccc9c4ce295"; - sha256 = "0801yhgh6vjhskcmcwd9z62zvcp7szmb4q8xdrzn30gfwxzci04j"; + rev = "c0c19f32b614b3921e17886c541c13a72748d450"; + sha256 = "1dvxpbl5jkzwcq1hk0b4r09qmjh5dxknbfmsyjxb6d4pzwv795xh"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5207,12 +5219,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "14cc2a4fc6243152ba085cc2059834113496c60a"; - sha256 = "1z5dmlzvp0dmji8zl7nggl6wp9qh4cgkabqk0wabl1fa4y913qxp"; + rev = "4fc96c8f3df89b6d23e5092d31c866c53a346347"; + sha256 = "09aka75d7a0acixrp2b7hfy08vdnjxxiknd5ngf2pk479k8z5zbj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5279,12 +5291,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "2427d06b6508489547cd30b6e86b1c75df363411"; - sha256 = "14ksk5c2dds7plqn5kfvxa65kck1yjn3dbgzalrfwn35ynxl92nx"; + rev = "b0dff0ec4f2748626aae13f011d1a47071fe9abc"; + sha256 = "1md42dvgphrrcrs8vb8ff98l5j2sfrfkfip7vfjapymdlk356byp"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5303,12 +5315,12 @@ final: prev: nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2022-09-22"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "20fd0091ef4d873fb1ce8b2bbb278664514cac7a"; - sha256 = "02wj29bm7fwkp7igvynfmvndxmz6gngkhjz740xbwv2ncxiv974j"; + rev = "9dd7ecde55b06b5114e1fa67c522433e7e59db8b"; + sha256 = "1lmvxz8k680yfjhadkh0km2v16vhg8p07xbkkvc0jhkp6hg4sxx4"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -5375,24 +5387,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-09-24"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "764899df5ca39076acb08a447f7e5bd0b4fa3147"; - sha256 = "1l02prap758nhgcfgnf440ndv6cchns1rd7wd2acpwhzdvx5xfdf"; + rev = "0b320f5bd4e5f81e8376f9d9681b5c4ee4483c25"; + sha256 = "1308jj5jqqadw7kw8zkh7x1hs9cn0030xnb5bms4wsp013krdr08"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "8d0768a83f7b89bd8cb8811800bc121b9353f0b2"; - sha256 = "0hic4wf4lpl4ya4zbdng0ih2lbcc1bp6mqxc588nlmw044m68bia"; + rev = "c8ce83a66deb0ca6f5af5a9f9d5fcc05a6d0f66b"; + sha256 = "18v77mx5806v2g9yksbfxv97b6nb1c9jp09gad1bcd09lvwqd3d9"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5469,6 +5481,18 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; + nvim-highlight-colors = buildVimPluginFrom2Nix { + pname = "nvim-highlight-colors"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "brenoprata10"; + repo = "nvim-highlight-colors"; + rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; + sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + }; + meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; + }; + nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; version = "2022-08-22"; @@ -5483,12 +5507,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-09-26"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "b00336ebecc7115740577afa267ff8c26c6b31dc"; - sha256 = "08k4j4qhdiq50rkq8q13dplyga6jrn9nkmzyn6m55sahh3cqz4xn"; + rev = "5e6ea33cfdf8be57bb33146f1927b7723d3ddff6"; + sha256 = "0zhjsg627avq3755a9q28hy8g6iahrn17cwavx47q69j3hp0cl7q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5507,12 +5531,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-09-18"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e9f40e793a16f3cebbd7e864e1ea0c32afa38747"; - sha256 = "111962k5axifxmc5jilgimj2ly7sk7wwjskmviqc7i3wpc9pahia"; + rev = "75d27daa061458dd5735b5eb5bbc48d3baad1186"; + sha256 = "12yr1awyjl3chifq02yk3477vylli6vx4d2jkypqy7z91c1xf5jf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5567,12 +5591,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-09-21"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "1b3468b07452e3736b67afd43547f766cc1db307"; - sha256 = "096yp2lpqkr7fv2nh3kk3v06d5mcy1lsr0x3d0y3j7zsy2xxn8fb"; + rev = "eefa696036d7cbaa23d4b72ad272f2c615936e73"; + sha256 = "1wfsv7c4gl7dwy9n7x5pa0xrasim6ksl58ah8l4a6dpayyw2wrgm"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5591,12 +5615,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-09-23"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d4eb971db353ccf78cefb3be1b05483b69ec1e69"; - sha256 = "0hrf4lkd8ikdrncajylbsgjkpj8vg6yfmbdlqaw6z8bqqk0n28dq"; + rev = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda"; + sha256 = "0nr58hq0ywid1ickzs6wqx3dsiggh2384kqp8gr3325p9ygkmkgx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5627,12 +5651,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-09-05"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "b7587a9155d22761f1b28c18f7927e6df0d08387"; - sha256 = "03jym28bk49609m5k0lw18xir6ia23df4m4av5046zqm9dmvhkj0"; + rev = "2b795eed773d4d693bee9feae1ade84a5e9a39e7"; + sha256 = "12kdn7xg5j6flqafnfx98zv3cr2166730qwmkh48jb18p8pwci3b"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5675,12 +5699,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "3a8ec89e1918ea2acbb9b22c5ac2006d31773052"; - sha256 = "00ixzciwgzpi2sg6s5cyw8101nnwrv0ks8x77mcqrvpmqnlg6hky"; + rev = "414465468c93f693be4e2f69f47586cf37f3f751"; + sha256 = "04gzpjv8a7hwszs0smd23n11mhia90r00h15ywmlgx7xbp8a9c8y"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5697,6 +5721,18 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; + nvim-rename-state = buildVimPluginFrom2Nix { + pname = "nvim-rename-state"; + version = "2022-09-29"; + src = fetchFromGitHub { + owner = "olrtg"; + repo = "nvim-rename-state"; + rev = "d8a2ad1d3e9269d673007dbd0e76871bb10da878"; + sha256 = "1aj9pz1y3yn63z4nyifs3f47j3zcbwl4v42l64rjz7m9pzdsa34b"; + }; + meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2022-09-26"; @@ -5711,12 +5747,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-09-22"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "afff8a8cbda4de2b75249ee08359d0584458f0ef"; - sha256 = "1swhn82b2a9gc5kxas9cgdpkvykpb9322ghmk5nwss99i05nrnl0"; + rev = "ee5ed2100b953c315d9fa2bfd08e93d6548253e0"; + sha256 = "0k8x58f12y565283h2rjw8mdlnhv39awldc4d9aqm0ny8vh4mj1h"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5747,12 +5783,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-09-26"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "a0b35fd410e16f00543e81dbb6c52c723f49717e"; - sha256 = "1krsgy0x3x9bml8iszd0svz9iqmdn73yn15n49ffznq3vj3gafr2"; + rev = "17191679202978b1de8c1bd5d975400897b1b92d"; + sha256 = "0d9vq7zkn1pzdzhh68qxzciky27n57cwb74ma1s6ibkks9s52f9d"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -5771,24 +5807,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "9914780cbabdffe3cd030867f0bc34c6e51bcb95"; - sha256 = "1w6icjxl3l9djr8gx2p3rvwg0878g64npxn2l6s40iyizdb4qvc6"; + rev = "7282f7de8aedf861fe0162a559fc2b214383c51c"; + sha256 = "1x8alllrhd1ns2gghv8cl0lra9f9rk0qy3h4z4b6rj2dq6if3jx9"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0289160c963fac1d0330966a798acacf85a43a88"; - sha256 = "0c78089lk5wrj8brszcy08gzp6wvpmwiraynbixnnaxq8cnfmxgn"; + rev = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac"; + sha256 = "1ah1ywrdcqzqd8jm2rhb9k4wpkq0xcm011vnalkiw1xiax251ndv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5831,12 +5867,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-09-03"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e63c2ff8e38fad77299dd74e14c7c9360e1b3181"; - sha256 = "1f3lkjfb7nh68yd2466fglz5xvzplghq522irfndq8ik5jpwcwbn"; + rev = "41e8d8964e5c874d9ce5e37d00a52f37f218502e"; + sha256 = "0bl98fbxp7sjd943wvz127xqivj8830pgdfwf510lyzczaixn1ds"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5867,24 +5903,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-09-17"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "fad8badcd9baa4deb2cf2a5376ab412a1ba41797"; - sha256 = "1q6daj6q89pf16pxgq8phcjad1l3i8m6afmra2b5ay5f9f2qk53q"; + rev = "1ec3f880585c644ddd50a51502c59f4e36f03e62"; + sha256 = "03403mx5rdknsaia8br0ymc9y53kv8jnnlawfrwralxm1fsrml5h"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-09-18"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "969728506c0175644a1d448f55e311ccdada7eaf"; - sha256 = "0ycxr16bxqjrp9mzq263j561jb8si9161asgdq2g1644r7mlzhbv"; + rev = "563f3635c2d8a7be7933b9e547f7c178ba0d4352"; + sha256 = "0lfhv9pd9a9q5qy45f9zag2fzfjlsisrf5h4xd64033331a67pgg"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -6023,12 +6059,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "d8ca7cfd1c64f262568da4531257fa9f54f211b3"; - sha256 = "194yvzk7hi21hbbxrfmnk2xfhkylkl2nc5ymbjvgsy992x16d52r"; + rev = "a8cac3f8634edf16fb0fa855329b48ef3a8eea8d"; + sha256 = "1siwvam38mlcazv6kq1qvrc7rkxs817zah4pkk0107821z38hpyr"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6047,12 +6083,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-09-18"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "a31be34c1186f240fbadb9646ff00774f5759595"; - sha256 = "1zicshnz0s4cfv793rd2wyi5mzh90ykg27a4jsydblgcgbqbgnih"; + rev = "749ee2f7fdeb9a02f25195d4850d2ff16240c863"; + sha256 = "0zagysrszabwfxr942dhj4aqdsnbr15qsvq6pvnd99nc3rs05w45"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6083,12 +6119,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-09-25"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "77ea13332f3c811b707e902c7cb8605c471a2f4c"; - sha256 = "02276gfmkik74248fy2zx888v0vf2fyf9vywagy5d9q566c78zac"; + rev = "95f927355d4c275a9aad1e7fcc576cdb59f42d60"; + sha256 = "197ijymf7ad36zpk9d62nm4nb54d4n1ai17yimx7ji2a2z0qc845"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6227,12 +6263,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "62dc2a7acd2fb2581871a36c1743b29e26c60390"; - sha256 = "1qrdv9as2h591rgv47irz374rwndv0jgaia5a7x931j6j8zr0kkp"; + rev = "4b7e52044bbb84242158d977a50c4cbcd85070c7"; + sha256 = "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6517,12 +6553,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-08-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "23f9efc71cc7aa42a44df8a2f20f6812f6c54abf"; - sha256 = "0aj4mx8riiclaccii1y0yzkp6kkkcfvjqgvkkkvr93ywncrfc6h9"; + rev = "d155742d5727373be0b484e87a0635348bbe2895"; + sha256 = "047c1nirs4qldxikx70dgchb8clmqac8255hbwrcydlbqrv6b66y"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6637,12 +6673,12 @@ final: prev: rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2021-10-05"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "4aa69b84c8a58fcec6b6dad6fe244b916b1cf830"; - sha256 = "07nh8gvkwq91i7qcz0rk5jlc8sb4d3af4zq2892kmmw576zg1wd8"; + rev = "1cdc5cb4bd061bc30b502e07321682b5a4396dca"; + sha256 = "1xklq4g6dvqd3a5msnrir899hzqmjkscpb8bq9wd4fi3ivmjjjgg"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -6890,12 +6926,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-08-03"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "f1465f4c586962cec9231e237f1d6c15b9156a98"; - sha256 = "0qq4g2kldg3hjv5g18na0r2442vg5xa52fs0h004908prnwdsnjr"; + rev = "ad92c42f97c2cb495c34b83f43d91b3d6cfdfa4e"; + sha256 = "1ijzvnj3hff2c0kilqlb2gwv7l141p61176xv4nz5r4v9knqgl5s"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6999,12 +7035,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-07-23"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "56c5aacd5e31496d9b3cd3d1b0e570bb9a65d35b"; - sha256 = "1yx3bar8gsapaka0x9bkm5d7frzz3k1kpwbc7n110f5x3cirf1yx"; + rev = "47685f0adb89928fc1b2a9b812418680f29aaf27"; + sha256 = "03l86sr766kpggxxk97rc3fy6j4igsprsh19wdq8mzk119nmww0i"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7409,12 +7445,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-09-06"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "d51c7631dcc0f598692676f554c4e79d7596d541"; - sha256 = "03mjzlk28igjjwln61r8g4xz972ps7yfhdxgs4fh3b2m08gqkdnd"; + rev = "9634c3508c6565284065ec011476204ce13f354a"; + sha256 = "1d0d9lwrpxqhvjn1r4jd1dnmra48jabjjbhi35sw41iw1v5v3al3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -7494,12 +7530,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "91e9a9737b8522b5a4ecbd8464504da35a1e96cd"; - sha256 = "1nlamiyswmkx39m61lqnazdkak6vk6wyv6izl0g5k9g0ribdcjiw"; + rev = "a0dec67decbc85cf1af2002807c8a963f72c1d13"; + sha256 = "0gz7rxzn7phq45ss1bhb5g35z1kq97r7yapvrnb1yi0259jwbxsa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7578,16 +7614,28 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-09-17"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "30e2dc5232d0dd63709ef8b44a5d6184005e8602"; - sha256 = "1nn6gpmaw8qdx3qf89sjayhhh31x80h52dprxdllyyj0n79a10w4"; + rev = "76ea9a898d3307244dce3573392dcf2cc38f340f"; + sha256 = "0f5x1jxmzj2mndknrz3cbyz8inb127hfw3zvmxiqpg2kjvmvxrhd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + template-string-nvim = buildVimPluginFrom2Nix { + pname = "template-string.nvim"; + version = "2022-08-18"; + src = fetchFromGitHub { + owner = "axelvc"; + repo = "template-string.nvim"; + rev = "84e50b878caa92100c65deec12ccb41aa4ef3fae"; + sha256 = "1ibz9vpqy0lck8pxzr3bikrw3zcrrw0nx5kz53a5n38qrb4l95gg"; + }; + meta.homepage = "https://github.com/axelvc/template-string.nvim/"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; @@ -7722,12 +7770,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-09-17"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "02eb3019786d9083b93ab9457761899680c6f3ec"; - sha256 = "1p8gyi405knrb0rf9nqzy4d1ginhamrgsg4nz5x73bjxjf4klmg6"; + rev = "8df75dbb9ddd78a378b9661f25f0b193f38f06dd"; + sha256 = "149rq2w65gqi3972bwsp243qkflkyj2aqc4gc561kj9rkspqh82x"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -7771,12 +7819,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-09-24"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81f0db1bd0b7f4eb8eb9e81c4b4f12b878cefb10"; - sha256 = "0msaz7lh6x2dcgwrxjw1dxrbwh09qx87mcqnhx2hlwy5b10apvmf"; + rev = "66bfc2e8f754869c7b651f3f47a2ee56ae557764"; + sha256 = "1ld3cddnp7hl2zv86b2y2b2fjb3pivq3vlfn2mmnyy5vgflpq0w5"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -7903,12 +7951,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-08-13"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "4f5249b2a6f6308377cb2bf734974a4e6f8a960e"; - sha256 = "0zaiyv63hzk1vaa9xd317zs0s2x1d9rbjam13g7qsm2i3lip6n65"; + rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; + sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -8359,12 +8407,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "78abec3b83b5fb1bef51fcdddbcbebd7d4293685"; - sha256 = "0ifd90mb1ysry9cpsimd7x2i2q63y17ragwv2rvvxppb4q7kkbdq"; + rev = "46dd87223757619a0a7fb0b075e2cf7d23ea899d"; + sha256 = "0xcv66ic68hgiw5cqdfbnimqdya7hg3zbrrzafgvfx6v468kgy96"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8743,12 +8791,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5cd460ca66a734824d35e95f51750858bce1dc1c"; - sha256 = "1521kv2fcay1kx9zyvcwrd1cj85y0slicpj04dhhnvc9my97ydpa"; + rev = "dc7089bef1e9759a219dc7df7efe39053f20fad3"; + sha256 = "1brkxd0yjrpkv9wzd42dzg5xqy3xifd7590f27lqjz2z0fymzgcy"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9031,12 +9079,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "dec7689004dcf6e5a3a4efd2a55944f7d43aed40"; - sha256 = "0w0k5m3lb29ack7kh8yb1h58r2jc3ygnjywf6v7m7z91py933c40"; + rev = "29ffd51107bff410f9fa667575541e253f4099a1"; + sha256 = "0ibknwr8lc58aggblndr7zm5qjb6nspxcmqad2b8whaxs9176a3h"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9067,12 +9115,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2022-01-10"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "a2258658661e42dd4cdba4958805dbad1fe29ef4"; - sha256 = "044aim36332ss5zlv8vxww8gqv0pldmn3nw08msldkfxmi86ybbd"; + rev = "71f239af28b7214eebb60d4ea5bd040291fb7e33"; + sha256 = "0kshppxgi63wn96a8h9zv7drwqcbljin5jhszh8q7pqw2xsd83gn"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -9307,12 +9355,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "6dc03035315a5d694c8e5bd852937784766b7904"; - sha256 = "0n6wm3pydc08ryvqkhs98lszqaxql975w9smlzr55h3a9xmyj7p6"; + rev = "f7d4bbdcff675000d4345d9834cc7d825a84ed3f"; + sha256 = "0b4f2jwsbsbysg364pslw8c94nvh5q2clfxfnz3lqrkkl1cpr3cs"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -10281,12 +10329,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-08-12"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "519befb7004bf3a66a3ddfdc2d431b0bd360dc97"; - sha256 = "0dg23ayi191xjvhyyb52byjvl731xrrf9255h3qci7hi3p20jkcy"; + rev = "212e3aa210c9f0965e4b234653a08fd3aa525470"; + sha256 = "1vbkm5rs0n9hhcv462ldrf3acx4q170fgzzp44444dmxd7w2pgf9"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10510,12 +10558,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-09-21"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "80ad7817e58755a602f993163f61f3500978ebe5"; - sha256 = "1q001rwqp04nl09xl32c328vbbdmm9n51i3a8wszqpz3blp4jl3s"; + rev = "3fa1b2283e957784922fe891de361a2342b90bca"; + sha256 = "0x86wmph3pb4bkqddb1zm381q9214hvf7cq9ydch4hjbx0vmbjwi"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10606,12 +10654,12 @@ final: prev: vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2022-05-25"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "71269817dd8f5a9122ae40891bb116050cadbf89"; - sha256 = "1f0rjxb7x6haz96j3wqrayk972k6g8kw4c40m3rcfhp2bxsn1g9m"; + rev = "03bcd4a7dfe0a2f6d432e8ce936d35273a15209d"; + sha256 = "04vqya8dsphxia5j080ir7jk61jak2gc6xhg810wwxql4zls3fs1"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -11951,12 +11999,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-09-22"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "8e2d3f55fdf315903a59cfa9ee60bac283a5f7fa"; - sha256 = "0fnjgalxgyjzy5c5j20zvla1c645hgf2d5mqinz397xxss672mfm"; + rev = "e7150de777ef0c81a015972e4feb56c4b3137efd"; + sha256 = "03jc3jf4znhknvw90iqyn4jpwm13fc3w0nw4vllggwxzvihha1hv"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12623,12 +12671,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-09-23"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "46c280d2fb9b329ae8dec8c1e520cab3a3d5b743"; - sha256 = "158yiba4hnai1fk8yq0dz6rmrhy17h8rb8gkaajac2b5c8f823f2"; + rev = "c95ad4c8fb54adb75ceb0397ef6ace1c4eec3790"; + sha256 = "1mxgw6zx529lmi98z4072zc0ri9idf2ysaxmfby3wycl2z73b7k8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12636,12 +12684,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f72d835b40946a2c934f9cb775dc2d6b1eae0b66"; - sha256 = "0828792i2kjjd8yvc3xj7206klhb8i82n1l2flzkl2r4asdncjd7"; + rev = "54fd9f5ba70ba907e683a42e2b1903133a98dd60"; + sha256 = "04ksc7kw8w84ck7j1v7j16f0n85g6sv66cv4k6v8wdr3zm544zhl"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12766,6 +12814,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + windows-nvim = buildVimPluginFrom2Nix { + pname = "windows.nvim"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "windows.nvim"; + rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; + sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; + }; + meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; + }; + winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; version = "2022-09-06"; @@ -12961,12 +13021,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ef90176bb55fb71da491c4b6c098986c22f1d8e5"; - sha256 = "145m98vihgy8qpgdsxqqcv66m804i8ysf30flck896rfz492dqy6"; + rev = "a111e8075101c0ac8be79f293e8c5181efa06402"; + sha256 = "0zqfl8xrwvab2gypw85kjirl10gc4afnwddz9j3spcq1mc11c3sn"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -12985,12 +13045,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7cd1f0acb516f031648d5e93d9abf56c025cc82a"; - sha256 = "1y9jk7pqgbdjiinx9sx7hibxah9rxaq4nfjr8mxg6w04jacwdmn7"; + rev = "f58e1b82cf3c2f2b89d9f9c41a9fa3215880ad5c"; + sha256 = "02dzhfwmvqrkj19cgsinbvzdha6w1nw287dr0b1r6j5i5aqkqapa"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 743c0b99f8a33..204ac0d298f3c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -53,6 +53,7 @@ , zsh # command-t dependencies +, getconf , ruby # cpsm dependencies @@ -239,10 +240,11 @@ self: super: { }; command-t = super.command-t.overrideAttrs (old: { - buildInputs = [ ruby ]; + nativeBuildInputs = [ getconf ruby ]; buildPhase = '' substituteInPlace lua/wincent/commandt/lib/Makefile \ - --replace '/bin/bash' 'bash' + --replace '/bin/bash' 'bash' \ + --replace xcrun "" make build rm ruby/command-t/ext/command-t/*.o ''; @@ -983,7 +985,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-g5yNqDCN1O9x7/HcM8NsZlMwLudDTuPLE5gSpScNQnY="; + cargoSha256 = "sha256-AY14YEdMpHXmiHwEA9hwSwwwJ8hYIomAuIuCJv1OUDw="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d9ab6cf89a212..e02ef4471aaec 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -60,6 +60,7 @@ https://github.com/vmchale/ats-vim/,, https://github.com/ray-x/aurora/,, https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/jiangmiao/auto-pairs/,, +https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, @@ -460,6 +461,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, https://github.com/smiteshp/nvim-gps/,, +https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, https://github.com/kevinhwang91/nvim-hlslens/,, https://github.com/neovimhaskell/nvim-hs.vim/,, @@ -479,6 +481,7 @@ https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, +https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, @@ -636,6 +639,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, +https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, @@ -1071,6 +1075,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/vim-scripts/wombat256.vim/,, @@ -1087,4 +1092,3 @@ https://github.com/ziglang/zig.vim/,, https://github.com/mickael-menu/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, -https://github.com/anuvyklack/windows.nvim/,, diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index d90b3e46f50cb..fabbf862f3d07 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 46480a0325987..2dba8af6c9e08 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 2243a8d093757..f5e10cf7b46c8 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-vneX3Wo1DUK1WIwBP3nMUDV26EN2A7XIqMcTZQ4UI4A="; + sha256 = "sha256-VZsq2HMvhFB6DR+Z3bVtyIJ2O984QaryYWCcP/a7paw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/applications/misc/gtkradiant/default.nix new file mode 100644 index 0000000000000..a8f5c91d1eb8e --- /dev/null +++ b/pkgs/applications/misc/gtkradiant/default.nix @@ -0,0 +1,163 @@ +{ lib, stdenv, fetchFromGitHub, fetchsvn +, scons, pkg-config, python3 +, glib, libxml2, gtk2, libGLU, gnome2 +, runCommand, writeScriptBin, runtimeShell +, makeDesktopItem, copyDesktopItems +}: + +let + q3Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; + rev = 144; + sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; + }; + urtPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; + rev = 144; + sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; + }; + etPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; + rev = 144; + sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; + }; + qlPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; + rev = 144; + sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; + }; + q2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; + rev = 144; + sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; + }; + quetooPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; + rev = 144; + sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; + }; + jaPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; + rev = 144; + sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; + }; + stvefPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; + rev = 144; + sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; + }; + wolfPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; + rev = 144; + sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; + }; + unvanquishedPack = fetchsvn { + url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; + rev = 212; + sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; + }; + q1Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; + rev = 144; + sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; + }; + packs = runCommand "gtkradiant-packs" {} '' + mkdir -p $out + ln -s ${q3Pack} $out/Q3Pack + ln -s ${urtPack} $out/UrTPack + ln -s ${etPack} $out/ETPack + ln -s ${qlPack} $out/QLPack + ln -s ${q2Pack} $out/Q2Pack + ln -s ${quetooPack} $out/QuetooPack + ln -s ${jaPack} $out/JAPack + ln -s ${stvefPack} $out/STVEFPack + ln -s ${wolfPack} $out/WolfPack + ln -s ${unvanquishedPack} $out/UnvanquishedPack + ln -s ${q1Pack} $out/Q1Pack + ''; + +in +stdenv.mkDerivation rec { + pname = "gtkradiant"; + + version = "unstable-2022-07-31"; + + src = fetchFromGitHub { + owner = "TTimo"; + repo = "GtkRadiant"; + rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d"; + sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM="; + }; + + # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store + postPatch = '' + substituteInPlace radiant/preferences.cpp \ + --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \ + --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \ + --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \ + --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";' + ''; + + nativeBuildInputs = + let + python = python3.withPackages (ps: with ps; [ + urllib3 + ]); + svn = writeScriptBin "svn" '' + #!${runtimeShell} -e + if [ "$1" = checkout ]; then + # link predownloaded pack to destination + mkdir -p $(dirname $3) + ln -s ${packs}/$(basename $3) $3 + # verify existence + test -e $(readlink $3) + elif [ "$1" = update ]; then + # verify existence + test -e $(readlink $3) + else + echo "$@" + exit 1 + fi + ''; + in [ + scons + pkg-config + python + svn + copyDesktopItems + ]; + + buildInputs = [ glib libxml2 gtk2 libGLU gnome2.gtkglext ]; + + enableParallelBuilding = true; + + desktopItems = [ (makeDesktopItem { + name = "gtkradiant"; + exec = "gtkradiant"; + desktopName = "GtkRadiant"; + comment = meta.description; + categories = [ "Development" ]; + icon = "gtkradiant"; + # includes its own splash screen + startupNotify = false; + }) ]; + + postInstall = '' + mkdir -p $out/{bin,lib} + cp -ar install $out/lib/gtkradiant + + ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant + ln -s ../lib/gtkradiant/{q3map2,q3map2_urt,q3data} $out/bin/ + + mkdir -p $out/share/pixmaps + ln -s ../../lib/gtkradiant/bitmaps/icon.png $out/share/pixmaps/gtkradiant.png + ''; + + meta = with lib; { + description = "Level editor for idTech games"; + homepage = "https://icculus.org/gtkradiant/"; + license = with licenses; [ gpl2Only bsdOriginal lgpl21Only ]; + maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix new file mode 100644 index 0000000000000..5a9c5122acc36 --- /dev/null +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, pkg-config +, dpkg +, openssl +, webkitgtk +, libappindicator +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "holochain-launcher"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; + sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook # required for FileChooser + ]; + + buildInputs = [ + openssl + webkitgtk + libappindicator + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + preFixup = '' + patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + ''; + + meta = with lib; { + description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + homepage = "https://github.com/holochain/launcher"; + maintainers = [ maintainers.steveej ]; + license = licenses.cal10; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix new file mode 100644 index 0000000000000..77f1c3f9aef52 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub }: +rec { + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "TandoorRecipes"; + repo = "recipes"; + rev = version; + sha256 = "sha256-Q/IwjSByCUXVYxhk3U7oWvlMxrJxyajhpsRyq67PVHY="; + }; + + yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk="; + + meta = with lib; { + homepage = "https://tandoor.dev/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix new file mode 100644 index 0000000000000..008468f1b5e58 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -0,0 +1,140 @@ +{ callPackage +, nixosTests +, python3 +}: +let + python = python3.override { + packageOverrides = self: super: { + django = super.django_4; + + # Tests are incompatible with Django 4 + django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { + doCheck = false; + }); + }; + }; + + common = callPackage ./common.nix { }; + + frontend = callPackage ./frontend.nix { }; +in +python.pkgs.pythonPackages.buildPythonPackage rec { + pname = "tandoor-recipes"; + + inherit (common) version src; + + format = "other"; + + patches = [ + # Allow setting MEDIA_ROOT through environment variable + ./media-root.patch + ]; + + propagatedBuildInputs = with python.pkgs; [ + beautifulsoup4 + bleach + bleach-allowlist + boto3 + cryptography + django + django-allauth + django-annoying + django-auth-ldap + django-autocomplete-light + django-cleanup + django-cors-headers + django-crispy-forms + django-hcaptcha + django-js-reverse + django-oauth-toolkit + django-prometheus + django-scopes + django-storages + django-tables2 + django-webpack-loader + django_treebeard + djangorestframework + drf-writable-nested + gunicorn + icalendar + jinja2 + lxml + markdown + microdata + pillow + psycopg2 + pyppeteer + python-dotenv + pytube + pyyaml + recipe-scrapers + requests + six + uritemplate + validators + webdavclient3 + whitenoise + ]; + + configurePhase = '' + runHook preConfigure + + ln -sf ${frontend}/ cookbook/static/vue + cp ${frontend}/webpack-stats.json vue/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # Avoid dependency on django debug toolbar + export DEBUG=0 + + # See https://github.com/TandoorRecipes/recipes/issues/2043 + mkdir cookbook/static/themes/maps/ + touch cookbook/static/themes/maps/style.min.css.map + touch cookbook/static/themes/bootstrap.min.css.map + touch cookbook/static/css/bootstrap-vue.min.css.map + + ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse + ${python.pythonForBuild.interpreter} manage.py collectstatic + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r . $out/lib/tandoor-recipes + chmod +x $out/lib/tandoor-recipes/manage.py + makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ + --prefix PYTHONPATH : "$PYTHONPATH" + + runHook postInstall + ''; + + checkInputs = with python.pkgs; [ + pytestCheckHook + pytest-django + pytest-factoryboy + ]; + + passthru = { + inherit frontend python; + + updateScript = ./update.sh; + + tests = { + inherit (nixosTests) tandoor-recipes; + }; + }; + + meta = common.meta // { + description = '' + Application for managing recipes, planning meals, building shopping lists + and much much more! + ''; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix new file mode 100644 index 0000000000000..47dcde5aca517 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +let + common = callPackage ./common.nix { }; +in +stdenv.mkDerivation { + pname = "tandoor-recipes-frontend"; + inherit (common) version; + + src = "${common.src}/vue"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${common.src}/vue/yarn.lock"; + sha256 = common.yarnSha256; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 + nodejs-16_x + nodejs-16_x.pkgs.yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup_yarn_lock yarn.lock + command -v yarn + yarn install --frozen-lockfile --offline --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R ../cookbook/static/vue/ $out + cp webpack-stats.json $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + meta = common.meta // { + description = "Tandoor Recipes frontend"; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/applications/misc/tandoor-recipes/media-root.patch new file mode 100644 index 0000000000000..8114ca8aaeb37 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/media-root.patch @@ -0,0 +1,17 @@ +diff --git a/recipes/settings.py b/recipes/settings.py +index 5676fe0a..6c6f1747 100644 +--- a/recipes/settings.py ++++ b/recipes/settings.py +@@ -426,10 +426,10 @@ if os.getenv('S3_ACCESS_KEY', ''): + AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '') + + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + else: + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + + # Serve static files with gzip + STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh new file mode 100755 index 0000000000000..49b6d5f98ae95 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the tandoor-recipes package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/TandoorRecipes/recipes/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version" + +src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd "$tmpdir" +wget "${TOKEN_ARGS[@]}" "$package_src/vue/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5d221a9c70c2e..d6b78a90fecf8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -144,14 +144,15 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = true; dontPatchELF = true; - patchPhase = '' + postPatch = '' # Don't download updates from Mozilla directly echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3e20e6158c979..e09bbef871b59 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config -, fetchurl, zip, unzip, jq, xdg-utils, writeText +, jq, xdg-utils, writeText ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix new file mode 100644 index 0000000000000..ad7f6e5154ada --- /dev/null +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "polypane"; + version = "10.0.1"; + + src = fetchurl { + url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname src version; + }; +in appimageTools.wrapType2 { + inherit pname src version; + + multiPkgs = null; + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + ''; + + meta = with lib; { + description = "Browser with unified devtools targeting responsability and acessibility"; + longDescription = '' + The stand-alone browser for ambitious developers that want to build responsive, + accessible and performant websites in a fraction of the time it takes with other browsers. + ''; + homepage = "https://polypane.app/"; + maintainers = with maintainers; [ zoedsoupe ]; + platforms = [ "x86_64-linux" ]; + changelog = "https://polypane.app/docs/changelog/"; + license = licenses.unfree; + }; +} diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/applications/networking/cluster/hashi-up/default.nix new file mode 100644 index 0000000000000..1efc1c438a5ab --- /dev/null +++ b/pkgs/applications/networking/cluster/hashi-up/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hashi-up"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "jsiebens"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg="; + }; + + vendorSha256 = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; + + meta = with lib; { + description = "A lightweight utility to install HashiCorp Consul, Nomad, or Vault on any remote Linux host"; + homepage = "https://github.com/jsiebens/hashi-up"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index dd2a34a60fa4f..79cceed6feef6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.11"; + version = "0.11.0"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-tBgtSYKSoyze9qFWpy6IUdwMU9KCLZGEIpOkjLdHsHM="; + sha256 = "sha256-BIVeY4H5pn8hdjUkSDrlVMTXy5wuMskkSlccfgCWc6Q="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f1a0de7338344..3e1d4e524d3d5 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -47,23 +47,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.11.9.10046"; - versions.x86_64-darwin = "5.11.9.10046"; - versions.x86_64-linux = "5.11.10.4400"; + versions.aarch64-darwin = "5.12.0.11129"; + versions.x86_64-darwin = "5.12.0.11129"; + versions.x86_64-linux = "5.12.0.4682"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Z+K811azMRnhptZ1UvM+o5IgE0F4p9BrntJC9IgPU7U="; + hash = "sha256-0XhqJrls4X8wO9VNmmmUGexJkA9NDkwJkYRjmyV1kAU="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-7U7qT3xlm5LqcJByMWxhZnqs6XBzylEGhqTNUgiaXJY="; + hash = "sha256-E7+zMrW4y1RfsR1LrxCJRRVlA+BuhzwMI/sfzqNHObo="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-Pi1MtuCHzkQACamsNOIS6pbM03L1CmyosbpdrYVNCkQ="; + hash = "sha256-UNtxyR4SMCP9c1Dre/arfdSVZbAV8qoHyHlvj3ZbXIs="; }; }; diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix deleted file mode 100644 index d8c5de150bb33..0000000000000 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildEnv -, makeWrapper -, ipfs-migrator-unwrapped -, ipfs-migrator-all-fs-repo-migrations -}: - -buildEnv { - name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - - nativeBuildInputs = [ makeWrapper ]; - - paths = [ ipfs-migrator-unwrapped ]; - - pathsToLink = [ "/bin" ]; - - postBuild = '' - wrapProgram "$out/bin/fs-repo-migrations" \ - --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' - ''; - - inherit (ipfs-migrator-unwrapped) meta; -} diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 20cadacb85a1a..d17fcb07a03ba 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-zkSePzmbi/QnUYJO/henkxfhuN+BXTXtKGPW7M2QyBY="; + sha256 = "sha256-AJ02S5+A/n8kO6lic8EbPYqNDmHL/tKbXhIkHTrcXOM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index a376e9f895b1b..a9197c9db5fbc 100644 --- a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -2,23 +2,23 @@ , stdenv , symlinkJoin , buildGoModule -, ipfs-migrator-unwrapped +, kubo-migrator-unwrapped }: # This package contains all the individual migrations in the bin directory. -# This is used by fs-repo-migrations and could also be used by IPFS itself +# This is used by fs-repo-migrations and could also be used by Kubo itself # when starting it like this: ipfs daemon --migrate let fs-repo-common = pname: version: buildGoModule { inherit pname version; - inherit (ipfs-migrator-unwrapped) src; + inherit (kubo-migrator-unwrapped) src; sourceRoot = "source/${pname}"; vendorSha256 = null; doCheck = false; - meta = ipfs-migrator-unwrapped.meta // { + meta = kubo-migrator-unwrapped.meta // { mainProgram = pname; - description = "Individual migration for the filesystem repository of ipfs clients"; + description = "Individual migration for the filesystem repository of Kubo clients"; }; }; @@ -58,6 +58,6 @@ let in symlinkJoin { - name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + name = "kubo-migrator-all-fs-repo-migrations-${version}"; paths = all-migrations; } diff --git a/pkgs/applications/networking/kubo-migrator/default.nix b/pkgs/applications/networking/kubo-migrator/default.nix new file mode 100644 index 0000000000000..e45cbf84d5241 --- /dev/null +++ b/pkgs/applications/networking/kubo-migrator/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildEnv +, makeWrapper +, kubo-migrator-unwrapped +, kubo-migrator-all-fs-repo-migrations +}: + +buildEnv { + name = "kubo-migrator-${kubo-migrator-unwrapped.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ kubo-migrator-unwrapped ]; + + pathsToLink = [ "/bin" ]; + + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ kubo-migrator-all-fs-repo-migrations ]}' + ''; + + inherit (kubo-migrator-unwrapped) meta; +} diff --git a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index c8ade793218f6..a99ab2b2cbb61 100644 --- a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { - pname = "ipfs-migrator"; + pname = "kubo-migrator"; version = "2.0.2"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; + description = "Migrations for the filesystem repository of Kubo clients"; homepage = "https://github.com/ipfs/fs-repo-migrations"; license = licenses.mit; maintainers = with maintainers; [ Luflosi elitak ]; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/kubo/default.nix index 6054bca1d8adb..dc6f1edd574d4 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: buildGoModule rec { - pname = "ipfs"; + pname = "kubo"; version = "0.15.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version - # go-ipfs makes changes to it's source tarball that don't match the git source. + # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; hash = "sha256-GkOY1G2CKXbMbHXkw5v27HmfkJIl2nZOmjjZbzuaRWs="; @@ -15,10 +15,10 @@ buildGoModule rec { # tarball contains multiple files/directories postUnpack = '' - mkdir ipfs-src + mkdir kubo-src shopt -s extglob - mv !(ipfs-src) ipfs-src || true - cd ipfs-src + mv !(kubo-src) kubo-src || true + cd kubo-src ''; sourceRoot = "."; @@ -29,7 +29,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; tags = [ "openssl" ]; - passthru.tests.ipfs = nixosTests.ipfs; + passthru.tests.kubo = nixosTests.kubo; vendorSha256 = null; @@ -57,6 +57,7 @@ buildGoModule rec { homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "ipfs"; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 2e4959ce0a520..be794c529ac3b 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.3"; + version = "0.2.3-1"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; - rev = "v${version}"; - sha256 = "1n9d0i0j67ymnghn8zkqf52c88zby6rqin8aicbw8cpn35fqf5a6"; + rev = "dd41a00b3c6c8b881fa62945165c965634df66f0"; + sha256 = "11yj1zl8hdnqbynkbyzg8kwyx1jl8c87x8f8qyllpk0s6cg304d0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 25749b8947c4a..df9b35a244662 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "11.4"; + version = "12.0"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv"; + sha256 = "sha256-OF6zcyxtWXxMUIAB8YxQ3453JAmw6Q3RnNMjr4HgTmE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index c281f63b3bf87..4ad0380ef1e31 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -7,12 +7,11 @@ , netcdf , glew , glm -, freeglut , libpng , libxml2 -, tk , freetype , msgpack +, qt5 }: let pname = "pymol"; @@ -47,12 +46,11 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; }; - buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; - setupPyBuildFlags = [ "--glut" ]; - installPhase = '' python setup.py install --home="$out" runHook postInstall @@ -60,13 +58,17 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} mkdir -p "$out/share/icons/" ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" cp -r "${desktopItem}/share/applications/" "$out/share/" ''; + preFixup = '' + wrapQtApp "$out/bin/pymol" + ''; + meta = with lib; { broken = stdenv.isDarwin; inherit description; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 15b64938b2565..bd824ac288891 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r"; + sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ee84c15a22cf6..b9cc2274a3d68 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.224"; + version = "4.226"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kn44yWkNcOLkc79HLDTxx5zQn/vqft+hhbvsoUAKR7I="; + sha256 = "sha256-X6Kwpcm+ugu+4gVkWfsqdCPFTESHzJ1jjCPnGqE3/vo="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix new file mode 100644 index 0000000000000..51ee824b6ff14 --- /dev/null +++ b/pkgs/applications/science/math/readstat/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + name = "readstat"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "WizardMac"; + repo = "ReadStat"; + rev = "v${version}"; + sha256 = "1r04lq45h1yn34v1mgfiqjfzyaqv4axqlby0nkandamcsqyhc7y4"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = { + homepage = "https://github.com/WizardMac/ReadStat"; + description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ swflint ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 28dad82fe1626..b6a6ca7780fb6 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -4,6 +4,7 @@ , libxkbcommon, libXi, libXext, wayland-protocols, wayland , lcms2 , librsync +, openssl , installShellFiles , dbus , darwin @@ -27,14 +28,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.25.2"; + version = "0.26.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us="; + sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0="; }; buildInputs = [ @@ -42,6 +43,7 @@ buildPythonApplication rec { ncurses lcms2 librsync + openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics @@ -77,6 +79,9 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. + ./fix-test_ssh_env_vars.patch + # Needed on darwin # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about @@ -98,14 +103,18 @@ buildPythonApplication rec { --update-check-interval=0 \ --shell-integration=enabled\ no-rc ''; + darwinOptions = '' + --disable-link-time-optimization \ + ${commonOptions} + ''; in '' runHook preBuild ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --disable-link-time-optimization \ - ${commonOptions} - make man + ${python.interpreter} setup.py build ${darwinOptions} + make docs + ${python.interpreter} setup.py kitty.app ${darwinOptions} '' else '' + ${python.interpreter} setup.py build-launcher ${python.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ @@ -126,7 +135,7 @@ buildPythonApplication rec { ]; # skip failing tests due to darwin sandbox - preCheck = if stdenv.isDarwin then '' + preCheck = lib.optionalString stdenv.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive @@ -138,15 +147,9 @@ buildPythonApplication rec { --replace test_ssh_connection_data dont_test_ssh_connection_data substituteInPlace kitty_tests/fonts.py \ --replace 'class Rendering(BaseTest)' 'class Rendering' - '' else ""; + ''; - checkPhase = - let buildBinPath = - if stdenv.isDarwin - then "kitty.app/Contents/MacOS" - else "linux-package/bin"; - in - '' + checkPhase = '' runHook preCheck # Fontconfig error: Cannot load default config file: No such file: (null) @@ -155,7 +158,8 @@ buildPythonApplication rec { # Required for `test_ssh_shell_integration` to pass. export TERM=kitty - env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py + make test + runHook postCheck ''; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch new file mode 100644 index 0000000000000..719b38b48159d --- /dev/null +++ b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch @@ -0,0 +1,13 @@ +diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py +index 7b3bdbeb..710aeceb 100644 +--- a/kitty_tests/ssh.py ++++ b/kitty_tests/ssh.py +@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE= + + def check_untar_or_fail(): + q = pty.screen_contents() +- if 'bzip2' in q: +- raise ValueError('Untarring failed with screen contents:\n' + q) + return 'UNTAR_DONE' in q + pty.wait_till(check_untar_or_fail) + self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo'))) diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix new file mode 100644 index 0000000000000..b85133e7aecb1 --- /dev/null +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gtk3, vte, lua5_3, pcre2 }: + +stdenv.mkDerivation rec { + pname = "tym"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "endaaman"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + gtk3 + vte + lua5_3 + pcre2 + ]; + + meta = with lib; { + description = "Lua-configurable terminal emulator"; + homepage = "https://github.com/endaaman/tym"; + license = licenses.mit; + maintainers = [ maintainers.wesleyjrz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix new file mode 100644 index 0000000000000..851289bc06d46 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-waveform"; + namespace = "visualization.waveform"; + version = "19.0.2"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.waveform"; + description = "Waveform visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5584e63ab4466..68750ac918cba 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -50,7 +50,7 @@ homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6719b0412b827..28528318c162f 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -32,9 +32,11 @@ in { buildInputs = [ vdr ]; - src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; - sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; + src = fetchFromGitHub { + repo = "vdr-plugin-femon"; + owner = "rofafor"; + sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs="; + rev = "v${version}"; }; postPatch = "substituteInPlace Makefile --replace /bin/true true"; @@ -42,23 +44,23 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; + inherit (src.meta) homepage; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.25"; + version = "3.0.26"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8="; + sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; rev = "v${version}"; }; @@ -88,11 +90,11 @@ in { installFlags = buildFlags; meta = with lib; { - homepage = "https://github.com/kfb77/vdr-plugin-markad"; + inherit (src.meta) homepage; description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -101,8 +103,9 @@ in { pname = "vdr-epgsearch"; version = "2.4.1"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; rev = "v${version}"; }; @@ -136,18 +139,18 @@ in { outputs = [ "out" "man" ]; meta = with lib; { - homepage = "http://winni.vdr-developer.org/epgsearch"; + inherit (src.meta) homepage; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.0"; + version = "1.8.1"; buildInputs = [ vdr ]; @@ -155,17 +158,17 @@ in { src = fetchFromGitHub { repo = "vdr-plugin-vnsiserver"; - owner = "FernetMenta"; - rev = "v${version}"; - sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; + owner = "vdr-projects"; + rev = version; + sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; }; meta = with lib; { - homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; + inherit (src.meta) homepage; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -201,7 +204,7 @@ in { description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -222,11 +225,11 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "https://github.com/jowi24/vdr-fritz"; + inherit (src.meta) homepage; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; } diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1b7f4128ca61d..187a493b2502e 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo="; + sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg="; rev = "v${version}"; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice"; + inherit (src.meta) homepage; description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; } diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix index 6ef00deab0960..de45b31d86904 100644 --- a/pkgs/applications/video/vdr/streamdev/default.nix +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with lib;{ - homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev"; + inherit (src.meta) homepage; description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix new file mode 100644 index 0000000000000..9536b91ba5403 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "canokey-qemu"; + version = "unstable-2022-06-23"; + rev = "b70af31229f1858089c3366f71b8d771de4a1e84"; + + src = fetchFromGitHub { + owner = "canokeys"; + repo = "canokey-qemu"; + inherit rev; + fetchSubmodules = true; + hash = "sha256-VJb59K/skx+DhoJs5qGUu070hAjQZC2Z6hAMXuX0bMw="; + }; + + postPatch = '' + substituteInPlace canokey-core/CMakeLists.txt \ + --replace "COMMAND git describe --always --tags --long --abbrev=8 --dirty >>" "COMMAND echo '$rev' >>" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/canokeys/canokey-qemu"; + description = "CanoKey QEMU Virt Card"; + license = licenses.asl20; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 8e7a683ed33e7..4f55b48bc540c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -26,6 +26,7 @@ , smbdSupport ? false, samba , tpmSupport ? true , uringSupport ? stdenv.isLinux, liburing +, canokeySupport ? false, canokey-qemu , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -79,7 +80,8 @@ stdenv.mkDerivation rec { ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ] - ++ lib.optionals uringSupport [ liburing ]; + ++ lib.optionals uringSupport [ liburing ] + ++ lib.optionals canokeySupport [ canokey-qemu ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -161,7 +163,8 @@ stdenv.mkDerivation rec { ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" - ++ lib.optional uringSupport "--enable-linux-io-uring"; + ++ lib.optional uringSupport "--enable-linux-io-uring" + ++ lib.optional canokeySupport "--enable-canokey"; dontWrapGApps = true; diff --git a/pkgs/common-updater/directory-listing-updater.nix b/pkgs/common-updater/directory-listing-updater.nix new file mode 100644 index 0000000000000..fb7491ab879ac --- /dev/null +++ b/pkgs/common-updater/directory-listing-updater.nix @@ -0,0 +1,19 @@ +{ lib +, genericUpdater +, common-updater-scripts +}: + +{ pname ? null +, version ? null +, attrPath ? null +, ignoredVersions ? "" +, rev-prefix ? "" +, odd-unstable ? false +, patchlevel-unstable ? false +, url ? null +}: + +genericUpdater { + inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; + versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; +} diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 04adcf563814d..e75a6dd7ab05a 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -62,7 +62,7 @@ let return 1 } - tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1 + tags=$(sh -c "$version_lister --pname=$pname --attr-path=$attr_path --file=\"${fileForGitCommands}\"") || exit 1 # print available tags for tag in $tags; do diff --git a/pkgs/common-updater/http-two-levels-updater.nix b/pkgs/common-updater/http-two-levels-updater.nix index 8ece1161015c4..4656163c18a3f 100644 --- a/pkgs/common-updater/http-two-levels-updater.nix +++ b/pkgs/common-updater/http-two-levels-updater.nix @@ -15,5 +15,5 @@ genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${url}"}"; + versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; } diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 26c77e8763622..d5ee3b58c504b 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,9 +1,28 @@ -{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: +{ lib +, stdenv +, makeWrapper +, coreutils +, diffutils +, git +, gnugrep +, gnused +, jq +, nix +, python3Packages +}: stdenv.mkDerivation { name = "common-updater-scripts"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + + pythonPath = [ + python3Packages.beautifulsoup4 + python3Packages.requests + ]; dontUnpack = true; @@ -11,8 +30,15 @@ stdenv.mkDerivation { mkdir -p $out/bin cp ${./scripts}/* $out/bin + # wrap non python scripts for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} + if ! (head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'); then + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils diffutils git gnugrep gnused jq nix ]} + fi done + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix ]}" ) + wrapPythonPrograms ''; } diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/common-updater/scripts/list-archive-two-levels-versions index 11db08ad07b8f..e7c02ed90b06e 100755 --- a/pkgs/common-updater/scripts/list-archive-two-levels-versions +++ b/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -4,7 +4,7 @@ pname="" # package name attr_path="" # package attribute path -url="" # directory list url +url="" # directory listing url file="" # file for writing debugging information while (( $# > 0 )); do @@ -31,7 +31,7 @@ while (( $# > 0 )); do done if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_NAME" + pname="$UPDATE_NIX_PNAME" fi if [[ -z "$attr_path" ]]; then diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/common-updater/scripts/list-directory-versions new file mode 100755 index 0000000000000..46c9e9d30a5d1 --- /dev/null +++ b/pkgs/common-updater/scripts/list-directory-versions @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +import argparse +import requests +import os +import subprocess +import json +import re +from bs4 import BeautifulSoup + +parser = argparse.ArgumentParser( + description="Get all available versions listed for a package in a site." +) + +parser.add_argument( + "--pname", + default=os.environ.get("UPDATE_NIX_PNAME"), + required="UPDATE_NIX_PNAME" not in os.environ, + help="name of the package", +) +parser.add_argument( + "--attr-path", + default=os.environ.get("UPDATE_NIX_ATTR_PATH"), + help="attribute path of the package", +) +parser.add_argument("--url", help="url of the page that lists the package versions") +parser.add_argument("--file", help="file name for writing debugging information") + + +if __name__ == "__main__": + args = parser.parse_args() + + pname = args.pname + + attr_path = args.attr_path or pname + + url = args.url or json.loads( + subprocess.check_output( + [ + "nix-instantiate", + "--json", + "--eval", + "-E", + f"with import ./. {{}}; dirOf (lib.head {attr_path}.src.urls)", + ], + text=True, + ) + ) + + # print a debugging message + if args.file: + with open(args.file, "a") as f: + f.write(f"# Listing versions for {pname} from {url}\n") + + page = requests.get(url) + soup = BeautifulSoup(page.content, "html.parser") + links = soup.find_all("a") + for link in links: + link_url = link.get("href", None) + if link_url is not None: + match = re.fullmatch( + rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url + ) + if match: + print(match.group(1)) diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 186dfd5ea6d4a..703e71438a71e 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -31,7 +31,7 @@ while (( $# > 0 )); do done if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_NAME" + pname="$UPDATE_NIX_PNAME" fi if [[ -z "$attr_path" ]]; then diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 45366a8e50540..019ed1f371c01 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -128,7 +128,7 @@ in }; noto-fonts-emoji = let - version = "2.034"; + version = "2.038"; emojiPythonEnv = buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); in stdenvNoCC.mkDerivation { @@ -139,7 +139,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; + sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; }; depsBuildBuild = [ @@ -171,8 +171,10 @@ in enableParallelBuilding = true; installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index e829e98bee0b1..82b56b9effff0 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.16"; + version = "0.2.17"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl"; + sha256 = "0jxydivqzggirc31jv7b4mrsjkg646zmra5m4h0pk4amgy65rvyp"; }; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index a3456755045f7..a8d46d578996c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -20,6 +20,8 @@ let + inherit (lib) concatMapStringsSep; + gsettingsOverridePackages = [ # from mint-artwork @@ -38,22 +40,21 @@ let in -with lib; - # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "cinnamon-gsettings-overrides" { } +runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" - mkdir -p $schema_dir + mkdir -p "$schema_dir" - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages} + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + chmod -R a+w "$data_dir" - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" '' diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 52c4a0719d03e..7818df245f693 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -14,10 +14,10 @@ , pam , xkeyboard_config , udisks2 - , waylandSupport ? false, wayland-protocols, xwayland , bluetoothSupport ? true, bluez5 , pulseSupport ? !stdenv.isDarwin, libpulseaudio +, directoryListingUpdater }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "0.25.4"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I="; }; @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "enlightenment" ]; + passthru.updateScript = directoryListingUpdater { }; + meta = with lib; { description = "The Compositing Window Manager and Desktop Shell"; homepage = "https://www.enlightenment.org"; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a0561ca00300b..1169bae6d67e4 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -123,6 +123,8 @@ lib.makeScope pkgs.newScope (self: with self; { withGnome = true; }; + nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; + rygel = callPackage ./core/rygel { }; simple-scan = callPackage ./core/simple-scan { }; diff --git a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix new file mode 100644 index 0000000000000..e75e2eb1e8874 --- /dev/null +++ b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix @@ -0,0 +1,55 @@ +{ lib +, runCommand +, gsettings-desktop-schemas +, gnome-shell +, glib +, gnome-flashback +, nixos-artwork +, nixos-background-light ? nixos-artwork.wallpapers.simple-blue +, nixos-background-dark ? nixos-artwork.wallpapers.simple-dark-gray +, extraGSettingsOverrides ? "" +, extraGSettingsOverridePackages ? [ ] +, favoriteAppsOverride ? "" +, flashbackEnabled ? false +}: + +let + + inherit (lib) concatMapStringsSep; + + gsettingsOverridePackages = [ + gsettings-desktop-schemas + gnome-shell + ] ++ lib.optionals flashbackEnabled [ + gnome-flashback + ] ++ extraGSettingsOverridePackages; + + gsettingsOverrides = '' + [org.gnome.desktop.background] + picture-uri='file://${nixos-background-light.gnomeFilePath}' + picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}' + + [org.gnome.desktop.screensaver] + picture-uri='file://${nixos-background-dark.gnomeFilePath}' + + ${favoriteAppsOverride} + + ${extraGSettingsOverrides} + ''; + +in + +runCommand "gnome-gsettings-overrides" { preferLocalBuild = true; } '' + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" + mkdir -p "$schema_dir" + + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} + + chmod -R a+w "$data_dir" + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF + ${gsettingsOverrides} + EOF + + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" +'' diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dd6b10f5c830a..41c4c099cf2d9 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -10,11 +10,13 @@ , elementary-dock , gsettings-desktop-schemas , extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [] +, extraGSettingsOverridePackages ? [ ] }: let + inherit (lib) concatMapStringsSep; + gsettingsOverridePackages = [ elementary-dock gnome-settings-daemon @@ -27,25 +29,24 @@ let in -with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "elementary-gsettings-desktop-schemas" {} +runCommand "elementary-gsettings-desktop-schemas" { preferLocalBuild = true; } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - mkdir -p $schema_dir + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" - cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir + mkdir -p "$schema_dir" + cp -rf "${glib.getSchemaPath gala}"/*.gschema.override "$schema_dir" - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages} - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${glib.getSchemaPath elementary-default-settings}/* $schema_dir + chmod -R a+w "$data_dir" + cp "${glib.getSchemaPath elementary-default-settings}"/* "$schema_dir" - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF - ${extraGSettingsOverrides} - EOF + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF + ${extraGSettingsOverrides} + EOF - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index bdef71006bd85..9ee2a21bd0f09 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; - version = "unstable-2022-08-02"; + version = "unstable-2022-10-03"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "4bdb73995b871982dd106838296903701ded29c2"; - sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs="; + rev = "61538429a501a09f369366d832799f2e3b196a02"; + sha256 = "sha256-YvqRw0klSqOxIuO5QFKjcUp6aRWlO2j3L+T1ekx8SfA="; }; postPatch = '' diff --git a/pkgs/development/compilers/tinygo/0001-Makefile.patch b/pkgs/development/compilers/tinygo/0001-Makefile.patch index 81774b6e0d6f1..342cce788ba37 100644 --- a/pkgs/development/compilers/tinygo/0001-Makefile.patch +++ b/pkgs/development/compilers/tinygo/0001-Makefile.patch @@ -1,11 +1,11 @@ -From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001 +From ef066db7f5cb7f551f88fb218c82fc947e464425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> -Date: Sat, 30 Apr 2022 16:37:44 +0300 +Date: Sun, 3 Jul 2022 14:30:51 +0300 Subject: [PATCH 1/3] Makefile diff --git a/Makefile b/Makefile -index dc388c21..7efc9901 100644 +index 60a5a574..904d2db5 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11 @@ -20,7 +20,7 @@ index dc388c21..7efc9901 100644 # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -644,9 +639,8 @@ endif +@@ -707,9 +702,8 @@ endif wasmtest: $(GO) test ./tests/wasm @@ -31,8 +31,13 @@ index dc388c21..7efc9901 100644 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 +@@ -721,15 +715,8 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN + @mkdir -p build/release/tinygo/lib/picolibc/newlib/libc + @mkdir -p build/release/tinygo/lib/picolibc/newlib/libm + @mkdir -p build/release/tinygo/lib/wasi-libc +- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0 +- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus +- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 @echo copying source files @cp -p build/tinygo$(EXE) build/release/tinygo/bin -ifneq ($(USE_SYSTEM_BINARYEN),1) @@ -42,7 +47,7 @@ index dc388c21..7efc9901 100644 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -705,8 +695,7 @@ endif +@@ -768,16 +755,9 @@ endif @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot @@ -51,7 +56,15 @@ index dc388c21..7efc9901 100644 + @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins @cp -rp src build/release/tinygo/src @cp -rp targets build/release/tinygo/targets - ./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc + + release: + tar -czf build/release.tar.gz -C build/release tinygo -- -2.36.0 +2.37.2 diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch index 875a2521a9233..54e389fe1401f 100644 --- a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -1,14 +1,14 @@ -From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001 +From 301b2d82cdbfaffe4dfba1d2cfed068a4115f730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> Date: Sat, 30 Apr 2022 16:18:31 +0300 Subject: [PATCH 2/3] Add clang header path diff --git a/builder/builtins.go b/builder/builtins.go -index 479b541d..b35283c6 100644 +index 121398fa..a589988b 100644 --- a/builder/builtins.go +++ b/builder/builtins.go -@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{ +@@ -170,7 +170,7 @@ var aeabiBuiltins = []string{ var CompilerRT = Library{ name: "compiler-rt", cflags: func(target, headerPath string) []string { @@ -31,10 +31,10 @@ index f1b061ae..159f90cf 100644 "-I" + picolibcDir + "/tinystdio", "-I" + headerPath, diff --git a/compileopts/config.go b/compileopts/config.go -index b30e653e..7561b3f2 100644 +index a006b673..3a105b49 100644 --- a/compileopts/config.go +++ b/compileopts/config.go -@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string { +@@ -279,6 +279,7 @@ func (c *Config) CFlags() []string { path, _ := c.LibcPath("picolibc") cflags = append(cflags, "--sysroot="+path, @@ -42,7 +42,7 @@ index b30e653e..7561b3f2 100644 "-isystem", filepath.Join(path, "include"), // necessary for Xtensa "-isystem", filepath.Join(picolibcDir, "include"), "-isystem", filepath.Join(picolibcDir, "tinystdio"), -@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string { +@@ -288,7 +289,6 @@ func (c *Config) CFlags() []string { path, _ := c.LibcPath("musl") arch := MuslArchitecture(c.Triple()) cflags = append(cflags, @@ -51,5 +51,5 @@ index b30e653e..7561b3f2 100644 "-isystem", filepath.Join(root, "lib", "musl", "arch", arch), "-isystem", filepath.Join(root, "lib", "musl", "include"), -- -2.36.0 +2.37.2 diff --git a/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch b/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch new file mode 100644 index 0000000000000..a151c4ff880f7 --- /dev/null +++ b/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch @@ -0,0 +1,56 @@ +From e7357c383188dd735592bd9f2202d2afcfffa39d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> +Date: Sun, 11 Sep 2022 17:08:33 +0300 +Subject: [PATCH 3/3] Use out path as build id on darwin + + +diff --git a/builder/buildid.go b/builder/buildid.go +index e6527700..65cb08e8 100644 +--- a/builder/buildid.go ++++ b/builder/buildid.go +@@ -3,8 +3,6 @@ package builder + import ( + "bytes" + "debug/elf" +- "debug/macho" +- "encoding/binary" + "fmt" + "io" + "os" +@@ -53,30 +51,9 @@ func ReadBuildID() ([]byte, error) { + return goID, nil + } + case "darwin": +- // Read the LC_UUID load command, which contains the equivalent of a +- // build ID. +- file, err := macho.NewFile(f) +- if err != nil { +- return nil, err +- } +- for _, load := range file.Loads { +- // Unfortunately, the debug/macho package doesn't support the +- // LC_UUID command directly. So we have to read it from +- // macho.LoadBytes. +- load, ok := load.(macho.LoadBytes) +- if !ok { +- continue +- } +- raw := load.Raw() +- command := binary.LittleEndian.Uint32(raw) +- if command != 0x1b { +- // Looking for the LC_UUID load command. +- // LC_UUID is defined here as 0x1b: +- // https://opensource.apple.com/source/xnu/xnu-4570.71.2/EXTERNAL_HEADERS/mach-o/loader.h.auto.html +- continue +- } +- return raw[4:], nil +- } ++ // On darwin, os.Executable() returns broken path in nix build environment ++ // So we are using $out path as build id since its also unique ++ return []byte("OUT_PATH"), nil + default: + // On other platforms (such as Windows) there isn't such a convenient + // build ID. Luckily, Go does have an equivalent of the build ID, which +-- +2.37.2 + diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index b335df487c867..43b981ffd068b 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -18,6 +18,7 @@ , avrdude , gdb , openocd +, tinygoTests ? [ "smoketest" ] }: let @@ -27,17 +28,17 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.23.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-YgQGAQJw9Xyw5BF2d9uZTQHfjHsu2evZGo4RV9DtStE="; + sha256 = "sha256-Rxdxum1UIaz8tpEAGqpLvKd25nHdj4Se+IoN29EJEHg="; fetchSubmodules = true; }; - vendorSha256 = "sha256-fK8BlCh+1NtHW6MwW68iSIB+Sw6AK+g3y4lMyMYrXkk="; + vendorSha256 = "sha256-QxLY4KT05PtA/W7d1vKxsq5w35YZ6MJL3Lh726b+E9w="; patches = [ ./0001-Makefile.patch @@ -46,17 +47,22 @@ buildGoModule rec { src = ./0002-Add-clang-header-path.patch; clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include"; }) + + #TODO(muscaln): Find a better way to fix build ID on darwin + ./0003-Use-out-path-as-build-id-on-darwin.patch ]; checkInputs = [ avrgcc binaryen ]; - nativeBuildInputs = [ go makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); + inherit tinygoTests; allowGoReference = true; tags = [ "llvm${llvmMajor}" ]; + ldflags = [ "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" ]; subPackages = [ "." ]; # Output contains static libraries for different arm cpus @@ -83,9 +89,13 @@ buildGoModule rec { substituteInPlace Makefile \ --replace "\$(TINYGO)" "$(pwd)/build/tinygo" \ + --replace "@\$(MD5SUM)" "md5sum" \ --replace "build/release/tinygo/bin" "$out/bin" \ --replace "build/release/" "$out/share/" + substituteInPlace builder/buildid.go \ + --replace "OUT_PATH" "$out" + # TODO: Fix mingw and darwin # Disable windows and darwin cross-compile tests sed -i "/GOOS=windows/d" Makefile @@ -103,24 +113,34 @@ buildGoModule rec { ''; preBuild = '' - export HOME=$TMPDIR - export GOCACHE=$TMPDIR/go-cache - export GOPATH=$TMPDIR/go export PATH=$out/libexec/tinygo:$PATH + export HOME=$TMPDIR ''; - postBuild = '' + postBuild = let + tinygoForBuild = if (stdenv.buildPlatform.canExecute stdenv.hostPlatform) + then "build/tinygo" + else "${buildPackages.tinygo}/bin/tinygo"; + in '' # Move binary mkdir -p build mv $GOPATH/bin/tinygo build/tinygo make gen-device + + export TINYGOROOT=$(pwd) + finalRoot=$out/share/tinygo + + for target in thumbv6m-unknown-unknown-eabi-cortex-m0 thumbv6m-unknown-unknown-eabi-cortex-m0plus thumbv7em-unknown-unknown-eabi-cortex-m4; do + mkdir -p $finalRoot/pkg/$target + for lib in compiler-rt picolibc; do + ${tinygoForBuild} build-library -target=''${target#*eabi-} -o $finalRoot/pkg/$target/$lib $lib + done + done ''; - checkPhase = '' - runHook preCheck - make smoketest XTENSA=0 - runHook postCheck + checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) '' + make ''${tinygoTests[@]} XTENSA=0 ${lib.optionalString stdenv.isDarwin "AVR=0"} ''; installPhase = '' @@ -129,7 +149,6 @@ buildGoModule rec { make build/release wrapProgram $out/bin/tinygo \ - --set TINYGOROOT $out/share/tinygo \ --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo runHook postInstall @@ -142,6 +161,5 @@ buildGoModule rec { description = "Go compiler for small places"; license = licenses.bsd3; maintainers = with maintainers; [ Madouura muscaln ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index c58c79415d406..97ef232135ec9 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([ gettext gmp iconv + imap intl ldap mbstring @@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([ xmlwriter zip zlib -] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) +])) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index aa190bc3866c5..7e73787256d2d 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([ gettext gmp iconv + imap intl ldap mbstring @@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([ xmlwriter zip zlib -] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) +])) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 039d3af37605f..1d6fd44acb69e 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, udev +, libcec_platform +, withLibraspberrypi ? false +, libraspberrypi +}: stdenv.mkDerivation rec { pname = "libcec"; @@ -11,17 +20,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU="; }; + # Fix dlopen path + postPatch = '' + substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" + ''; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ udev libcec_platform ] ++ - lib.optional (libraspberrypi != null) libraspberrypi; + lib.optional withLibraspberrypi libraspberrypi; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; - # Fix dlopen path - patchPhase = '' - substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" - ''; - meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index a00893c157326..5a60241894715 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -6,24 +6,26 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw="; + sha256 = "sha256-bdnYrMnBnpnEKGuMlDLILfzgwfu/e5tyMdSDWqreyto="; }; nativeBuildInputs = [ cmake ]; + # Needed for case-insensitive filesystems like on macOS + # because a file named BUILD exists already. + cmakeBuildDir = "build_dir"; + meta = { homepage = "https://github.com/google/nsync"; description = "C library that exports various synchronization primitives"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ puffnfresh ]; - # On macOS we get an error for some reason: - # > mkdir: cannot create directory 'build': File exists - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 07e84a2ae0666..207017b5edd5e 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -53,6 +53,8 @@ let url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ./static-executables-have-no-rpath.patch ]; nativeBuildInputs = let diff --git a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch new file mode 100644 index 0000000000000..cd2474e14590d --- /dev/null +++ b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 26a55be8b..b6823c3f9 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) +- set_property(TARGET protoc +- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +- elseif (APPLE) +- set_property(TARGET protoc +- PROPERTY INSTALL_RPATH "@loader_path/../lib") +- endif() + endif (protobuf_BUILD_PROTOC_BINARIES) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index d8934a1ebf53c..831558152ad80 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w="; + sha256 = "sha256-OAjPSTSQap2m2gsC3mTae7UZ3Bq4qjK2eShdVTZUzFM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 525abf0cfb210..822d4dfa2f920 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "11.0.0"; + version = "11.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HHVA/eH6Ucn1shQy6QzcxvHWRQqjv/OEgHgq0ITS23Q="; + sha256 = "sha256-jD/VAxehUvR98SpGQD04Qqrsr8k2L8SLw/1vd9zzku0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 8425cb3f86c77..c90e2b74cb29d 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "35"; + version = "36"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mKAg6LNtHEmF223xIrZM7rSxE2+B4jUPCv0dCtHmHXc="; + hash = "sha256-ko3lfFitY6fFomh4dLSHdY6moeG2k11fmdcViT3IKGU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d703240cec451..ca2075cab7a30 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -4,7 +4,6 @@ , cython , datamodeldict , fetchFromGitHub -, fetchpatch , matplotlib , numericalunits , numpy @@ -18,47 +17,27 @@ , pythonAtLeast , requests , scipy +, setuptools , toolz , xmltodict }: buildPythonPackage rec { - version = "1.4.5"; + version = "1.4.6"; pname = "atomman"; - format = "setuptools"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; rev = "v${version}"; - hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys="; + hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI="; }; - patches = [ - # Fix several tests that are failing on master. - # https://github.com/usnistgov/atomman/pull/9 - (fetchpatch { - name = "fix-tests-1.patch"; - url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch"; - hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU="; - }) - (fetchpatch { - name = "fix-tests-2.patch"; - url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch"; - hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM="; - }) - (fetchpatch { - name = "fix-tests-3.patch"; - url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch"; - hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw="; - }) - (fetchpatch { - name = "fix-tests-4.patch"; - url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch"; - hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix new file mode 100644 index 0000000000000..4c52df127b00d --- /dev/null +++ b/pkgs/development/python-modules/bleach-allowlist/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bleach +}: + +buildPythonPackage rec { + pname = "bleach-allowlist"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; + }; + + propagatedBuildInputs = [ + bleach + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "bleach_allowlist" ]; + + meta = with lib; { + description = "Curated lists of tags and attributes for sanitizing html"; + homepage = "https://github.com/yourcelf/bleach-allowlist"; + license = licenses.bsd2; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 6cda5a23aee95..02e107f27e19c 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder -, clang_7, python2 +{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder +, clang_12, python2, python , graphviz, matplotlib, numpy, pandas, plotly, scipy, six , withCuda ? false, cudatoolkit }: buildPythonPackage rec { pname = "catboost"; - version = "0.24.4"; + version = "1.0.5"; disabled = pythonOlder "3.4"; @@ -13,26 +13,26 @@ buildPythonPackage rec { owner = "catboost"; repo = "catboost"; rev = "v${version}"; - sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8="; + sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; }; - nativeBuildInputs = [ clang_7 python2 ]; + nativeBuildInputs = [ clang_12 python2 ]; propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] ++ lib.optional withCuda [ cudatoolkit ]; patches = [ ./nix-support.patch - (fetchpatch { - name = "format.patch"; - url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch"; - sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo="; - }) ]; + postPatch = '' + # substituteInPlace is too slow for these large files, and the target has lots of numbers in it that change often. + sed -e 's|\$(YMAKE_PYTHON3-.*)/python3|${python.interpreter}|' -i make/*.makefile + ''; + preBuild = '' cd catboost/python-package - ''; + ''; setupPyBuildFlags = [ "--with-ymake=no" ]; CUDA_ROOT = lib.optional withCuda cudatoolkit; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/catboost/nix-support.patch b/pkgs/development/python-modules/catboost/nix-support.patch index feaf97d57070b..b8294420e09c3 100644 --- a/pkgs/development/python-modules/catboost/nix-support.patch +++ b/pkgs/development/python-modules/catboost/nix-support.patch @@ -1,5 +1,5 @@ diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py -index 17f1d8ff14..07da618cd1 100644 +index fe9251a21f..86b880c5d0 100644 --- a/catboost/python-package/setup.py +++ b/catboost/python-package/setup.py @@ -80,7 +80,7 @@ class Helper(object): @@ -15,23 +15,23 @@ index 17f1d8ff14..07da618cd1 100644 def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): logging.info('Buildling {} with gnu make'.format(catboost_ext)) -- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') -+ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') +- makefile = 'python{}.{}CLANG11-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') ++ makefile = 'python{}.{}CLANG12-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') make_cmd = [ 'make', '-f', '../../make/' + makefile, -- 'CC=clang-5.0', -- 'CXX=clang++-5.0', +- 'CC=clang-11', +- 'CXX=clang++-11', + 'CC=clang', + 'CXX=clang++', -+ 'PYTHON=python2', ++ 'PYTHON=python{}'.format(python_version()[0]), 'BUILD_ROOT=' + build_dir, 'SOURCE_ROOT=' + topsrc_dir, ] -diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile -index e54b7078e8..fb7b208af9 100644 ---- a/make/python2.CLANG7-LINUX-X86_64.makefile -+++ b/make/python2.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python2.CLANG12-LINUX-X86_64.makefile b/make/python2.CLANG12-LINUX-X86_64.makefile +index b49a36fb3f..33996af995 100644 +--- a/make/python2.CLANG12-LINUX-X86_64.makefile ++++ b/make/python2.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -43,8 +43,8 @@ index e54b7078e8..fb7b208af9 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -56,20 +56,18 @@ index e54b7078e8..fb7b208af9 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -index 2a22a79b25..522fb54a7c 100644 ---- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -+++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile +index 82935b297e..093cc86532 100644 +--- a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile ++++ b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -81,8 +79,8 @@ index 2a22a79b25..522fb54a7c 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -94,20 +92,18 @@ index 2a22a79b25..522fb54a7c 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile -index fee6750bcb..dc55908371 100644 ---- a/make/python3.CLANG7-LINUX-X86_64.makefile -+++ b/make/python3.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python3.CLANG12-LINUX-X86_64.makefile b/make/python3.CLANG12-LINUX-X86_64.makefile +index 1c5d646ae4..6c091fbe17 100644 +--- a/make/python3.CLANG12-LINUX-X86_64.makefile ++++ b/make/python3.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -119,8 +115,8 @@ index fee6750bcb..dc55908371 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -132,20 +128,18 @@ index fee6750bcb..dc55908371 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -index 5146830476..ff8535b03e 100644 ---- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -+++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile +index fcdb75a719..4e1dbc3cd7 100644 +--- a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile ++++ b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -157,8 +151,8 @@ index 5146830476..ff8535b03e 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -170,12 +164,10 @@ index 5146830476..ff8535b03e 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index c8bd0d67839e7..1a6bf6b2aeb07 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -30,6 +30,10 @@ buildPythonPackage { hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4="; }; + postPatch = '' + sed -i 's/^protobuf.*/protobuf/' requirements.txt + ''; + propagatedBuildInputs = [ coqpit fsspec diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix new file mode 100644 index 0000000000000..3e062f29a0e08 --- /dev/null +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, django +, six +, pytest-django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-annoying"; + version = "0.10.6"; + + src = fetchFromGitHub { + owner = "skorokithakis"; + repo = "django-annoying"; + rev = "v${version}"; + sha256 = "sha256-M1zOLr1Vjf2U0xlW66Mpno+S+b4IKLklN+kYxRaj6cA="; + }; + + patches = [ + (fetchpatch { + name = "django-4-compatibility.patch"; + url = "https://github.com/skorokithakis/django-annoying/pull/101/commits/51b5bd7bc8bb7a410400667e00d0813603df32bd.patch"; + sha256 = "sha256-gLRlAtIHHJ85I88af3C3y+ZT+nXrj2KrV7QgOuEqspk="; + }) + ]; + + propagatedBuildInputs = [ + django + six + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + description = "A django application that tries to eliminate annoying things in the Django framework"; + homepage = "https://skorokithakis.github.io/django-annoying/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix new file mode 100644 index 0000000000000..26138a4ab4af1 --- /dev/null +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, six +, pytestCheckHook +, django-debug-toolbar +, django-extensions +, django-taggit +, django_tagging +, mock +, pytest-django +, selenium +, splinter +, sqlparse +, tenacity +, whitenoise +}: + +buildPythonPackage rec { + pname = "django-autocomplete-light"; + version = "3.9.4"; + + src = fetchFromGitHub { + owner = "yourlabs"; + repo = "django-autocomplete-light"; + rev = version; + sha256 = "sha256-YUiGN6q7ARM/rg7d+ykeDEYZDYjB+DHxMCmdme6QccU="; + }; + + propagatedBuildInputs = [ + django + six + ]; + + # Too many un-packaged dependencies + doCheck = false; + + checkInputs = [ + pytestCheckHook + django-debug-toolbar + django-extensions + django-taggit + django_tagging + mock + pytest-django + selenium + splinter + sqlparse + tenacity + whitenoise + + # FIXME: not packaged + # django-generic-m2m + # django-gm2m + # django-querysetsequence + # pytest-splinter + # dango-nested-admin + # djhacker + ]; + + # Taken from tox.ini + preCheck = "cd test_project"; + + pythonImportsCheck = [ "dal" ]; + + meta = with lib; { + description = "A fresh approach to autocomplete implementations, specially for Django"; + homepage = "https://django-autocomplete-light.readthedocs.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index ace1dc4f2de50..452c00b6e37f8 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.7.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-cors-headers"; rev = version; - sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; + sha256 = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix new file mode 100644 index 0000000000000..2677d8ec5262c --- /dev/null +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-crispy-forms"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "django-crispy-forms"; + rev = version; + sha256 = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8="; + }; + + propagatedBuildInputs = [ + django + ]; + + # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. + doCheck = false; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--ds=crispy_forms.tests.test_settings" + "crispy_forms/tests/" + ]; + + pythonImportsCheck = [ "crispy_forms" ]; + + meta = with lib; { + description = "The best way to have DRY Django forms."; + homepage = "https://django-crispy-forms.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/django-hcaptcha/default.nix b/pkgs/development/python-modules/django-hcaptcha/default.nix new file mode 100644 index 0000000000000..d200444ab50fb --- /dev/null +++ b/pkgs/development/python-modules/django-hcaptcha/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + pname = "django-hcaptcha"; + version = "0.2.0"; + + src = fetchPypi { + inherit version; + pname = "django-hCaptcha"; + sha256 = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; + }; + + propagatedBuildInputs = [ + django + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "hcaptcha" ]; + + meta = with lib; { + description = "Django hCaptcha provides a simple way to protect your django forms using hCaptcha"; + homepage = "https://github.com/AndrejZbin/django-hcaptcha"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix new file mode 100644 index 0000000000000..9757d9aa27825 --- /dev/null +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, python +, django +, nodejs +, js2py +, six +}: + +buildPythonPackage rec { + pname = "django-js-reverse"; + # Support for Django 4.0 not yet released + version = "unstable-2022-09-16"; + + src = fetchFromGitHub { + owner = "ierror"; + repo = "django-js-reverse"; + rev = "7cab78c4531780ab4b32033d5104ccd5be1a246a"; + sha256 = "sha256-oA4R5MciDMcSsb+GAgWB5jhj+nl7E8t69u0qlx2G93E="; + }; + + patches = [ + (fetchpatch { + name = "fix-requires_system_checks-list-or-tuple"; + url = "https://github.com/ierror/django-js-reverse/commit/1477ba44b62c419d12ebec86e56973f1ae56f712.patch"; + sha256 = "sha256-xUtCziewVhnCOaNWddJBH4/Vvhwjjq/wcQDvh2YzWMQ="; + }) + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + nodejs + js2py + six + ]; + + checkPhase = '' + ${python.interpreter} django_js_reverse/tests/unit_tests.py + ''; + + pythonImportsCheck = [ "django_js_reverse" ]; + + meta = with lib; { + description = "Javascript url handling for Django that doesn't hurt"; + homepage = "https://django-js-reverse.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 65bf5045a0351..7905c1c985fec 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # propagates , django @@ -39,6 +40,11 @@ buildPythonPackage rec { requests ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "django" + ]; + DJANGO_SETTINGS_MODULE = "tests.settings"; checkInputs = [ diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix new file mode 100644 index 0000000000000..26810445faad3 --- /dev/null +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-scopes"; + version = "1.2.0.post1"; + + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "django-scopes"; + # No 1.2.0.post1 tag, see https://github.com/raphaelm/django-scopes/issues/27 + rev = "0b93cdb6a8335cb02a8ea7296511358ba841d137"; + sha256 = "sha256-djptJRkW1pfVbxhhs58fJA4d8dKZuvYRy01Aa3Btr+k="; + }; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "django_scopes" ]; + + meta = with lib; { + description = "Safely separate multiple tenants in a Django database"; + homepage = "https://github.com/raphaelm/django-scopes"; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 7feb65620265f..ca81d7bd57bb3 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , coreapi , django , django-guardian @@ -24,6 +25,15 @@ buildPythonPackage rec { sha256 = "sha256-XmX6DZBZYzVCe72GERplAWt5jIjV/cYercZGb0pYjoc="; }; + patches = [ + # See https://github.com/encode/django-rest-framework/issues/8608 + # and https://github.com/encode/django-rest-framework/pull/8591/ + (fetchpatch { + name = "fix-django-collect-static.patch"; + url = "https://github.com/encode/django-rest-framework/pull/8591/commits/65943bb58deba6ee1a89fe4504f270ab1806fce6.patch"; + sha256 = "sha256-wI7EzX9tlyyXAPrJEr+/2uTg7dVY98IKgh7Cc/NZo5k="; + }) + ]; propagatedBuildInputs = [ django diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix new file mode 100644 index 0000000000000..77ce7d37ff8d7 --- /dev/null +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, djangorestframework +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "drf-writable-nested"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "beda-software"; + repo = "drf-writable-nested"; + rev = "v${version}"; + sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + description = "Writable nested model serializer for Django REST Framework"; + homepage = "https://github.com/beda-software/drf-writable-nested"; + license = licenses.bsd2; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index da1f9fa510696..0f5ef9c2e1fa7 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , nose , numpy , pythonOlder @@ -22,6 +23,15 @@ buildPythonPackage rec { fetchSubmodules = true; }; + patches = [ + # Fix for test_interface_bb.py tests + (fetchpatch { + name = "test_interface_bb_use_nparray.patch"; + url = "https://github.com/embotech/ecos-python/commit/4440dcb7ddbd92217bc83d8916b72b61537dffbf.patch"; + hash = "sha256-pcTPviK916jzCLllRhopbC9wDHv+aS6GmV/92sUwzHc="; + }) + ]; + propagatedBuildInputs = [ numpy scipy diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix new file mode 100644 index 0000000000000..39591ac55fa2e --- /dev/null +++ b/pkgs/development/python-modules/extruct/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, html-text +, jstyleson +, lxml +, mf2py +, pyrdfa3 +, rdflib +, six +, w3lib +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "extruct"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = "extruct"; + rev = "v${version}"; + sha256 = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + # rdflib-jsonld functionality is part of rdblib from version 6 onwards + pythonRemoveDeps = [ + "rdflib-jsonld" + ]; + + propagatedBuildInputs = [ + html-text + jstyleson + lxml + mf2py + pyrdfa3 + rdflib + six + w3lib + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "extruct" ]; + + meta = with lib; { + description = "Extract embedded metadata from HTML markup"; + homepage = "https://github.com/scrapinghub/extruct"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index ffa2e73e9acb8..16a903c4962e3 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FlR7jpj/NKJgGLjTvfGr/YusKi+FQ43dyhd6GhTjNE0="; + hash = "sha256-hMVsjdjA/BkEuGDQK1x2zqWZSjIR7KroX4kcyJnIq4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index cd7d980927903..6fe2b0063e3a0 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8zf8PYSOI0KE1P4wAjcehuEzPKZ7RdQlxdUGWYygzIM="; + hash = "sha256-FwwI5rlVspPjfgFSaed+bqQSHuq6OFgLrQN/JL+bffM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 31c0b127c1110..692c6723022d0 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.11.1"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PXZGPMer/Y4zmx2Us8EfrLYLnF1tgF63ZDHmBmPPM0w="; + hash = "sha256-KOvXJUsLAj7Afc1dLE3iMLhZU/piUveIwtvjMN+H/Rw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 1aa58d8728426..f784a412d788c 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.10.2"; + version = "2.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9vAUmK1GG06fNK+d3WMRht2/7Ftaz56ec9xwP5eXxDU="; + hash = "sha256-iICX2Na3FQgOMzx5R66sKgTPrVeZEk5ofPBPKQWRRv0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 7a3e2a85b1b50..2a6518a1a940d 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -7,20 +7,32 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.12.1"; + version = "2.12.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JWwYnz12E56GrUSDoatB8pbS+S9C3ZSPsxDW25GfDhA="; + hash = "sha256-z/rOMqQ+UkJl8zw55JP54+s+Qk+gHxmuBDjZaz3Qacs="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; disabledTests = [ # Disable tests that require credentials diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index dfe50519c428c..aefb77a828292 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.2"; + version = "3.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wxKWoRQ8DW94De9Z0sOYjm+oTXuEcW5Vw3Iu4YITBQ0="; + hash = "sha256-vaz2UAm3kRliZdog/OxEDYvtYnB8tK7JH+4P7ZgTSpc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 0af930a08f2d0..4738926e9d5c7 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.8.1"; + version = "2.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-I86T4Zw7y4pn5ixy+RM6LBMTEGuv7LR2uE2mwoEeCh0="; + hash = "sha256-NqElDocBlpARYFTK4k47kCsC/7D1048rNYrrARHeWmg="; }; - propagatedBuildInputs = [ google-api-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 260c67bed7336..0e2cc1cac3384 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T+a154A4EakPGk7OL65mweveLBEL1ol3ZYYh2MTyxy8="; + hash = "sha256-TBZI32KX1c5XPAV1AmjQvQVhE5UgGOGd5U/enLRV3IU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8a9e0c1e20cd4..a68cbc570f591 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.9.1"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-OWEF1CJ4ZW64P4w3M+uur/NKCmjhS1c19izA041cC8A="; + sha256 = "sha256-1O6MMuRpFDWr85Uf9deW8tjolBXT5852ALsZoDleIpw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix new file mode 100644 index 0000000000000..997cf053a5f78 --- /dev/null +++ b/pkgs/development/python-modules/html-text/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "html-text"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "TeamHG-Memex"; + repo = "html-text"; + rev = version; + sha256 = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; + }; + + propagatedBuildInputs = [ + lxml + ]; + + checkInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "html_text" ]; + + meta = with lib; { + description = "Extract text from HTML"; + homepage = "https://github.com/TeamHG-Memex/html-text"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index 6af860a398058..71e0194a6b2ff 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -14,7 +14,7 @@ , pytest-order , pytest-cid , mock -, ipfs +, kubo , httpx , httpcore }: @@ -46,7 +46,7 @@ buildPythonPackage rec { pytest-order pytest-cid mock - ipfs + kubo httpcore httpx ]; diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 8bbf257ebdcf4..6ccb1dabebb3c 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, ipfs, packaging, tomli }: +, kubo, packaging, tomli }: buildPythonPackage rec { pname = "ipwhl"; @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; - buildInputs = [ ipfs ]; + buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test pythonImportsCheck = [ "ipwhl" ]; diff --git a/pkgs/development/python-modules/jstyleson/default.nix b/pkgs/development/python-modules/jstyleson/default.nix new file mode 100644 index 0000000000000..be6eff6755f56 --- /dev/null +++ b/pkgs/development/python-modules/jstyleson/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jstyleson"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "linjackson78"; + repo = "jstyleson"; + # https://github.com/linjackson78/jstyleson/issues/6 + rev = "544b9fdb43339cdd15dd03dc69a6d0f36dd73241"; + sha256 = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "jstyleson" ]; + + meta = with lib; { + description = "A python library to parse JSON with js-style comments"; + homepage = "https://github.com/linjackson78/jstyleson"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix new file mode 100644 index 0000000000000..ea3be88335c90 --- /dev/null +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "language-tags"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "OnroerendErfgoed"; + repo = "language-tags"; + rev = version; + sha256 = "sha256-4Ira3EMS64AM8I3SLmUm+m6V5vwtDYf8WDmVDvI+ZOw="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "language_tags" ]; + + meta = with lib; { + description = "Dealing with IANA language tags in Python"; + homepage = "https://language-tags.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index aeae43aeee4d9..370655029e42b 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -5,6 +5,7 @@ , pythonOlder , python , click +, dbus-python , desktop-notifier , dropbox , fasteners @@ -40,6 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click desktop-notifier + dbus-python dropbox fasteners keyring diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix new file mode 100644 index 0000000000000..110da8e60f8f6 --- /dev/null +++ b/pkgs/development/python-modules/mf2py/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, html5lib +, requests +, lxml +, mock +, nose +}: + +buildPythonPackage rec { + pname = "mf2py"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "microformats"; + repo = "mf2py"; + rev = version; + sha256 = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + html5lib + requests + ]; + + checkInputs = [ + lxml + mock + nose + ]; + + pythonImportsCheck = [ "mf2py" ]; + + meta = with lib; { + description = "Microformats2 parser written in Python"; + homepage = "https://microformats.org/wiki/mf2py"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix new file mode 100644 index 0000000000000..39ed19395c5df --- /dev/null +++ b/pkgs/development/python-modules/microdata/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, html5lib +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "microdata"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "edsu"; + repo = "microdata"; + rev = "v${version}"; + sha256 = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; + }; + + propagatedBuildInputs = [ + html5lib + ]; + + checkInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "microdata" ]; + + meta = with lib; { + description = "Library for extracting html microdata"; + homepage = "https://github.com/edsu/microdata"; + license = licenses.cc0; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix new file mode 100644 index 0000000000000..2c9b85e64e0bc --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -0,0 +1,50 @@ +{ buildPythonPackage +, fetchPypi +, ipykernel +, jupytext +, lib +, mkdocs +, mkdocs-material +, nbconvert +, pygments +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "mkdocs-jupyter"; + version = "0.22.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WFzGm+pMufr2iYExl43JqbIlCR7UtghPWrZWUqXhIYU="; + }; + + postPatch = '' + substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \ + --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," + ''; + + propagatedBuildInputs = [ + nbconvert + jupytext + mkdocs + mkdocs-material + pygments + ipykernel + ]; + + pythonImportsCheck = [ "mkdocs_jupyter" ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + meta = with lib; { + description = "Use Jupyter Notebook in mkdocs"; + homepage = "https://github.com/danielfrg/mkdocs-jupyter"; + license = licenses.asl20; + maintainers = with maintainers; [ net-mist ]; + }; +} diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 82d3aad69626c..1940da96047da 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -39,6 +39,18 @@ buildPythonPackage rec { hash = "sha256-kdOmE7BnkRy2lsNQ2OVrEXXZntJUPJ//b139kSsfKmI="; excludes = [ "pyproject.toml" ]; }) + + # patch nbconvert/filters/markdown_mistune.py + (fetchpatch { + name = "clean-up-markdown-parsing.patch"; + url = "https://github.com/jupyter/nbconvert/commit/4df1f5451c9c3e8121036dfbc7e07f0095f4d524.patch"; + hash = "sha256-O+VWUaQi8UMCpE9/h/IsrenmEuJ2ac/kBkUBq7GFJTY"; + }) + (fetchpatch { + name = "fix-markdown-table.patch"; + url = "https://github.com/jupyter/nbconvert/commit/d3900ed4527f024138dc3a8658c6a1b1dfc43c09.patch"; + hash = "sha256-AFE1Zhw29JMLB0Sj17zHcOfy7VEFqLekO8NYbyMLrdI="; + }) ]; postPatch = '' @@ -47,6 +59,10 @@ buildPythonPackage rec { # Use mistune 2.x substituteInPlace setup.py \ --replace "mistune>=0.8.1,<2" "mistune>=2.0.3,<3" + + # Equivalent of the upstream patch https://github.com/jupyter/nbconvert/commit/aec39288c9a6c614d659bcaf9f5cb36634d6b37b.patch + substituteInPlace share/jupyter/nbconvert/templates/lab/base.html.j2 \ + --replace "{{ output.data['image/svg+xml'] | clean_html }}" "{{ output.data['image/svg+xml'].encode(\"utf-8\") | clean_html }}" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d1f493d0279e5..42533cfcacd8c 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.1"; + version = "5.2.2"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "etmlRavPzJKLmyw3PYMgeMveFj4aVi38crHjdtDuaLg="; + sha256 = "sha256-+0s47YhpMojxmRHKC7kazov2ZUsOs2/Y2EmHAAcARf0="; }; checkInputs = [ unittestCheckHook git which ]; diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 83422d319132a..1fe4262df4ca4 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pynobo"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "echoromeo"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7OWCp09XxCZJMz0BJWKfGkkl8z4XpRS2sjowp/bnl0A="; + rev = "refs/tags/v${version}"; + hash = "sha256-msJClYHljib8sATooI8q4irz6cC8hEgvcxLmmgatvwU="; }; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pynobo" ]; + pythonImportsCheck = [ + "pynobo" + ]; meta = with lib; { - description = "Python 3 TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; + description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; homepage = "https://github.com/echoromeo/pynobo"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix new file mode 100644 index 0000000000000..97768e7fed507 --- /dev/null +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, rdflib +, html5lib +}: + +buildPythonPackage rec { + pname = "pyrdfa3"; + version = "3.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit version; + pname = "pyRdfa3"; + sha256 = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ + --replace "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'" "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'," + ''; + + propagatedBuildInputs = [ + rdflib + html5lib + ]; + + # Does not work with python3 + doCheck = false; + + pythonImportsCheck = [ "pyRdfa" ]; + + meta = with lib; { + description = "RDFa 1.1 distiller/parser library"; + homepage = "https://www.w3.org/2012/pyRdfa/"; + license = licenses.w3c; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix new file mode 100644 index 0000000000000..499aa97db8c77 --- /dev/null +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cython, zlib, pandas, readstat }: + +buildPythonPackage rec { + pname = "pyreadstat"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "Roche"; + repo = "pyreadstat"; + rev = "v${version}"; + sha256 = "16aa16ybh3ikmlxsg8zm19x9k6r4gpd0sxqagv318w76jjyw1nrs"; + }; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + readstat + pandas + ]; + + meta = { + homepage = "https://github.com/Roche/pyreadstat"; + description = "Python package to read SAS, SPSS and Stata files into pandas data frames using the readstat C library"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ swflint ]; + }; + +} diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index 37b318ebb7c76..9b8374a0f0516 100644 --- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,8 +1,8 @@ diff --git a/sdl2/dll.py b/sdl2/dll.py -index 6e30259..12e1f7d 100644 +index 2413329..f460bf6 100644 --- a/sdl2/dll.py +++ b/sdl2/dll.py -@@ -145,7 +145,7 @@ class DLL(object): +@@ -235,7 +235,7 @@ class DLL(object): """Function wrapper around the different DLL functions. Do not use or instantiate this one directly from your user code. """ @@ -11,49 +11,31 @@ index 6e30259..12e1f7d 100644 self._dll = None self._deps = None self._libname = libinfo -@@ -157,11 +157,12 @@ class DLL(object): - "SDL2_image": 2001, - "SDL2_gfx": 1003 +@@ -247,11 +247,7 @@ class DLL(object): + "SDL2_image": (2, 0, 1), + "SDL2_gfx": (1, 0, 3) } - foundlibs = _findlib(libnames, path) - dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") - if len(foundlibs) == 0: - raise RuntimeError("could not find any library for %s (%s)" % - (libinfo, dllmsg)) -+ #foundlibs = _findlib(libnames, path) -+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ #if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) + foundlibs = [ libfile ] for libfile in foundlibs: try: self._dll = CDLL(libfile) -@@ -185,19 +186,19 @@ class DLL(object): +@@ -276,9 +272,6 @@ class DLL(object): (foundlibs, libinfo)) if _using_ms_store_python(): self._deps = _preload_deps(libinfo, self._libfile) - if path is not None and sys.platform in ("win32",) and \ - path in self._libfile: - os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ #if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) def bind_function(self, funcname, args=None, returns=None, added=None): """Binds the passed argument and return value types to the specified - function. If the version of the loaded library is older than the - version where the function was added, an informative exception will - be raised if the bound function is called. - - Args: - funcname (str): The name of the function to bind. - args (List or None, optional): The data types of the C function's - arguments. Should be 'None' if function takes no arguments. - returns (optional): The return type of the bound C function. Should - be 'None' if function returns 'void'. -@@ -288,7 +289,7 @@ def nullfunc(*args): - return +@@ -359,7 +352,7 @@ class DLL(object): + # Once the DLL class is defined, try loading the main SDL2 library try: - dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH")) @@ -62,10 +44,10 @@ index 6e30259..12e1f7d 100644 raise ImportError(exc) diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py -index 090752e..a8a7488 100644 +index 015eeaf..d6ce52f 100644 --- a/sdl2/sdlgfx.py +++ b/sdl2/sdlgfx.py -@@ -50,8 +50,7 @@ __all__ = [ +@@ -27,8 +27,7 @@ __all__ = [ try: @@ -76,32 +58,25 @@ index 090752e..a8a7488 100644 raise ImportError(exc) diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py -index a6884e8..95d96df 100644 +index a702136..dcdea51 100644 --- a/sdl2/sdlimage.py +++ b/sdl2/sdlimage.py -@@ -32,15 +32,14 @@ __all__ = [ - "IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW", - "IMG_LoadXV_RW", "IMG_ReadXPMFromArray", - "IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW", -- -+ - # Python Functions - "get_dll_file" - ] +@@ -30,9 +30,7 @@ __all__ = [ try: -- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) +- dll = DLL( +- "SDL2_image", ["SDL2_image", "SDL2_image-2.0"], os.getenv("PYSDL2_DLL_PATH") +- ) + dll = DLL("SDL2_image", "@sdl2_image@") except RuntimeError as exc: raise ImportError(exc) diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py -index 9ad9b85..1c36289 100644 +index 5f2163c..23d95b0 100644 --- a/sdl2/sdlmixer.py +++ b/sdl2/sdlmixer.py -@@ -76,8 +76,7 @@ __all__ = [ +@@ -50,8 +50,7 @@ __all__ = [ ] try: @@ -112,10 +87,10 @@ index 9ad9b85..1c36289 100644 raise ImportError(exc) diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py -index 9c2d951..bd5a16a 100644 +index 7c5f7db..61814cd 100644 --- a/sdl2/sdlttf.py +++ b/sdl2/sdlttf.py -@@ -54,8 +54,7 @@ __all__ = [ +@@ -41,8 +41,7 @@ __all__ = [ try: diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index f5d76eda9b94f..04a59fa5df903 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -3,11 +3,13 @@ buildPythonPackage rec { pname = "PySDL2"; version = "0.9.14"; + # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly # sandboxed. Disable for now. doCheck = false; + pythonImportsCheck = [ "sdl2" ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 925d2e014a03d..22e29ce3a762c 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Fhu2XtreilkxwUZPmr79jFsNoajpLs0AzTMc7BaiduA="; + hash = "sha256-gQow1bNRPhUm4zRu2T5FpcgOTcS2F1TQIz8WP1K0Xww="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix new file mode 100644 index 0000000000000..897a8239f0fa6 --- /dev/null +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, extruct +, language-tags +, regex +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "recipe-scrapers"; + version = "14.14.0"; + + src = fetchFromGitHub { + owner = "hhursev"; + repo = "recipe-scrapers"; + rev = version; + sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + extruct + language-tags + regex + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + disabledTestPaths = [ + # This is not actual code, just some pre-written boiler-plate template + "templates/test_scraper.py" + ]; + + pythonImportsCheck = [ "recipe_scrapers" ]; + + meta = with lib; { + description = "Python package for scraping recipes data "; + homepage = "https://github.com/hhursev/recipe-scrapers"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 3041a7d92a74f..661c6622195fc 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -1,17 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, writeText , isPy27 , pytestCheckHook +, pytest-mpl , numpy , scipy , scikit-learn , pandas +, transformers +, opencv4 +, lightgbm +, catboost +, pyspark +, sentencepiece , tqdm , slicer , numba , matplotlib , nose +, lime +, cloudpickle , ipython }: @@ -35,29 +45,102 @@ buildPythonPackage rec { tqdm slicer numba + cloudpickle ]; - preCheck = '' + passthru.optional-dependencies = { + plots = [ matplotlib ipython ]; + others = [ lime ]; + }; + + preCheck = let + # This pytest hook mocks and catches attempts at accessing the network + # tests that try to access the network will raise, get caught, be marked as skipped and tagged as xfailed. + conftestSkipNetworkErrors = writeText "conftest.py" '' + from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport + import urllib, requests + + class NetworkAccessDeniedError(RuntimeError): pass + def deny_network_access(*a, **kw): + raise NetworkAccessDeniedError + + requests.head = deny_network_access + requests.get = deny_network_access + urllib.request.urlopen = deny_network_access + urllib.request.Request = deny_network_access + + def pytest_runtest_makereport(item, call): + tr = orig_pytest_runtest_makereport(item, call) + if call.excinfo is not None and call.excinfo.type is NetworkAccessDeniedError: + tr.outcome = 'skipped' + tr.wasxfail = "reason: Requires network access." + return tr + ''; + in '' export HOME=$TMPDIR # when importing the local copy the extension is not found rm -r shap + + # coverage testing is a waste considering how much we have to skip + substituteInPlace pytest.ini \ + --replace "--cov=shap --cov-report=term-missing" "" + + # Add pytest hook skipping tests that access network. + # These tests are marked as "Expected fail" (xfail) + cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; - checkInputs = [ pytestCheckHook matplotlib nose ipython ]; - # Those tests access the network + checkInputs = [ + pytestCheckHook + pytest-mpl + matplotlib + nose + ipython + # optional dependencies, which only serve to enable more tests: + opencv4 + #pytorch # we already skip all its tests due to slowness, adding it does nothing + transformers + #xgboost # numerically unstable? xgboost tests randomly fails pending on nixpkgs revision + lightgbm + catboost + pyspark + sentencepiece + ]; + disabledTestPaths = [ + # takes forever without GPU acceleration + "tests/explainers/test_deep.py" + "tests/explainers/test_gradient.py" + # requires GPU. We skip here instead of having pytest repeatedly check for GPU + "tests/explainers/test_gpu_tree.py" + # The resulting plots look sane, but does not match pixel-perfectly with the baseline. + # Likely due to a matplotlib version mismatch, different backend, or due to missing fonts. + "tests/plots/test_summary.py" # FIXME: enable + # 100% of the tests in these paths require network + "tests/explainers/test_explainer.py" + "tests/explainers/test_exact.py" + "tests/explainers/test_partition.py" + "tests/maskers/test_fixed_composite.py" + "tests/maskers/test_text.py" + "tests/models/test_teacher_forcing_logits.py" + "tests/models/test_text_generation.py" + ]; disabledTests = [ - "test_kernel_shap_with_a1a_sparse_zero_background" - "test_kernel_shap_with_a1a_sparse_nonzero_background" - "test_kernel_shap_with_high_dim_sparse" - "test_sklearn_random_forest_newsgroups" - "test_sum_match_random_forest" - "test_sum_match_extra_trees" - "test_single_row_random_forest" - "test_sum_match_gradient_boosting_classifier" - "test_single_row_gradient_boosting_classifier" - "test_HistGradientBoostingClassifier_proba" - "test_HistGradientBoostingClassifier_multidim" - "test_sum_match_gradient_boosting_regressor" - "test_single_row_gradient_boosting_regressor" + # unstable. A xgboost-enabled test. possibly related: https://github.com/slundberg/shap/issues/2480 + "test_provided_background_tree_path_dependent" + ]; + + #pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug + + pythonImportCheck = [ + "shap" + "shap.explainers" + "shap.explainers.other" + "shap.plots" + "shap.plots.colors" + "shap.benchmark" + "shap.maskers" + "shap.utils" + "shap.actions" + "shap.models" ]; meta = with lib; { @@ -66,7 +149,5 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; - # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest' - broken = true; }; } diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 3fd28acef9cbd..10f45cb6a7d5d 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -36,5 +36,8 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-book-theme"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + # Missing sphinx 5.X support + # https://github.com/executablebooks/sphinx-book-theme/issues/592 + broken = true; }; } diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 76507a11e09b5..7d0a28a4198cd 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -8,7 +8,7 @@ , moto , numpy , pillow -, protobuf3_8 +, protobuf , pytestCheckHook , torch , six @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.5"; + version = "2.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; - rev = "refs/tags/${version}"; - sha256 = "sha256-g6x0yUpofeSNA4rKPidqOKC7/TrOICstcc98VnQcfDY="; + rev = "refs/tags/v${version}"; + hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno="; }; # apparently torch API changed a bit at 1.6 @@ -39,9 +40,10 @@ buildPythonPackage rec { sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py ''; - # Wanted protobuf version is mentioned here: - # https://github.com/lanpa/tensorboardX/blob/0d08112618a2bbda4c028a15a137fed3afe77401/compile.sh#L6 - nativeBuildInputs = [ which protobuf3_8 ]; + nativeBuildInputs = [ + which + protobuf + ]; # required to make tests deterministic PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 81dcf10537125..44335c7248b92 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-65jX6R3tZ5guouEug/mClvNqg0LE4v9OGzCL0eFyqsA="; + sha256 = "sha256-EFlvO9QlOP351kZAFQ+hwghL+7m+Cin/OyLV3NX+y8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 0672060d35700..2eb878e8d9c2a 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ucz0Ejpgiss8boF8dzt45FwpieNoJ6S3DUvtay6FDrw="; + sha256 = "sha256-QjcoF46GrBH7ExGQno8xDgtOSGNxhAP+NycJb22hL+E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 4247cb7d7895f..ed5edf43c03db 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.9"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-ROw+azrexDfATo7KtFwNEx175s6O6Zqcv9bZbOHMnP8="; + hash = "sha256-uEW8d8b7ObwmGwVTOq25kZWaLVv4lxTl+cqZK5Kjkmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1e511534ec509..583b2bf4c3b51 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -622,6 +622,7 @@ let ncdfFlow = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj.dev ]; rtmpt = [ pkgs.gsl ]; + rmarkdown = [ pkgs.pandoc ]; mixcat = [ pkgs.gsl ]; libstableR = [ pkgs.gsl ]; landsepi = [ pkgs.gsl ]; diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix new file mode 100644 index 0000000000000..ed47d29cffe35 --- /dev/null +++ b/pkgs/development/tools/database/replibyte/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchpatch +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "replibyte"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "Qovery"; + repo = pname; + rev = "v${version}"; + sha256 = "02bdz0464d6gbkgbvn67sgn6cc6p6pjqacblh8nimy0r8b13x2ki"; + }; + + # Lockfile was updated in a commit after the release + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Qovery/Replibyte/commit/15f122cc83fff03ae410be705779ab964fa7b375.patch"; + sha256 = "sha256-v95V4pl/2WN2do2SLVTJIO+5J7esqhC2BZaGBEtDhe0="; + }) + ]; + + cargoSha256 = "sha256-Y9CXpJTY/uszAVAbafa2+FumWKWFGaOLhK1FY+Nc+EU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + cargoBuildFlags = [ "--all-features" ]; + + doCheck = false; # requires multiple dbs to be installed + + meta = with lib; { + description = "Seed your development database with real data"; + homepage = "https://github.com/Qovery/replibyte"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 237f350fa488f..f941b83bb5b40 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_20; + electron = electron_21; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -140,4 +140,13 @@ rec { aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0"; headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii"; }; + + electron_21 = mkElectron "21.0.1" { + armv7l-linux = "07cb5a4642248c3662b64fdba8ff7a245674e09bdc52a45e9067e8b508bf4866"; + aarch64-linux = "86d7eca977042c5fd9204d5aefe2dad5aae81538de1707f04cac59c912edf780"; + x86_64-linux = "4fd6d7b5a65f44a43165ae77d0484db992b30d6efba478a192e984506fbd52b6"; + x86_64-darwin = "f1ee563ac2b2defbf856e444c0f8fdbd7afae1a81dc0a29ebb190e2f68f48efd"; + aarch64-darwin = "0027d3ffe795e44a959e23f0e9e91452e742ea697fc1141eb93f31b840c3a26f"; + headers = "0ra6gd09ly184m6icj6k4wzp6qrjlbc2hdmy06xp2wcdgzc8dsn8"; + }; } diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index 9c28cdf73994c..6444e7215cd0d 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-4WCVXrw/v3cGsl7S1nGqKmWrIHeM/ODCXQBxQJgZLjw="; + sha256 = "sha256-lTfpN+BnWMENRlSjR1+iGlGMTp4BBiMDvzFjvwRpuLQ="; }; - cargoSha256 = "sha256-D+Wpzgj05PJcMlGS9eL43SdncHO/q1Wt00gvPlC7ZAE="; + cargoSha256 = "sha256-z12ecgJJYKYc5kOLyjZU/MfBuBp7aJuEmDAGleiecz0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 7563972d0e17b..519bef162ac2a 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dVarasXLJrB/akMUvjZn313+bqM39Ji4l91PAxwmfG0="; + sha256 = "sha256-f1HSwo0TwNpw02bNT1dzfovXcRQuP/IxAmomBgKuQxQ="; }; - vendorSha256 = "sha256-KlnKWeLbmLH6M5+oD/BYuqkTyrV9Xo7ibrNjukFe7ss="; + vendorSha256 = "sha256-cx5esdxAJInxXHXx0xeKQNGTDBjKD3GhnY0Fu/Tzy9U="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch b/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch deleted file mode 100644 index 874809863523d..0000000000000 --- a/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch +++ /dev/null @@ -1,29 +0,0 @@ -@@ -, +, @@ ---- - bfd/elf32-arm.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) ---- a/bfd/elf32-arm.c -+++ a/bfd/elf32-arm.c -@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - linker to copy the initial value out of the dynamic object and into - the runtime process image. We need to remember the offset into the - .rel(a).bss section we are going to use. */ -- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) -+ if (info->nocopyreloc == 0 -+ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 -+ && h->size != 0) - { - s = globals->root.sdynrelro; - srel = globals->root.sreldynrelro; -@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - } - if (info->nocopyreloc == 0 - && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 - && h->size != 0) - { - elf32_arm_allocate_dynrelocs (info, srel, 1); - diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 3ea42ee422999..820f667bf9d0f 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -90,14 +90,6 @@ stdenv.mkDerivation { ./deterministic-temp-prefixes.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch - # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and indeed - # GHC will refuse to compile with a binutils suffering from it. See this - # comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - ++ lib.optional (targetPlatform.isAarch32 && hostPlatform.system != targetPlatform.system) ./R_ARM_COPY.patch ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch ++ lib.optional stdenv.targetPlatform.isMips64n64 # this patch is from debian: diff --git a/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch b/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch deleted file mode 100644 index 874809863523d..0000000000000 --- a/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch +++ /dev/null @@ -1,29 +0,0 @@ -@@ -, +, @@ ---- - bfd/elf32-arm.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) ---- a/bfd/elf32-arm.c -+++ a/bfd/elf32-arm.c -@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - linker to copy the initial value out of the dynamic object and into - the runtime process image. We need to remember the offset into the - .rel(a).bss section we are going to use. */ -- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) -+ if (info->nocopyreloc == 0 -+ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 -+ && h->size != 0) - { - s = globals->root.sdynrelro; - srel = globals->root.sreldynrelro; -@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - } - if (info->nocopyreloc == 0 - && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 - && h->size != 0) - { - elf32_arm_allocate_dynrelocs (info, srel, 1); - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e5ecc365d48bf..c294dbbb35597 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,14 +93,6 @@ stdenv.mkDerivation { ./gas-dwarf-zero-PR29451.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch - # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and indeed - # GHC will refuse to compile with a binutils suffering from it. See this - # comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - ++ lib.optional (targetPlatform.isAarch32 && hostPlatform.system != targetPlatform.system) ./R_ARM_COPY.patch ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch ++ lib.optional stdenv.targetPlatform.isMips64n64 # this patch is from debian: diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/nil/default.nix index fca968c909a71..29a4a4c425bd2 100644 --- a/pkgs/development/tools/nil/default.nix +++ b/pkgs/development/tools/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2022-09-26"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-2bcAXcJiFV+xKSIy3oD2/TkijV4302jAtTF3xtHiOhU="; + hash = "sha256-Oo0y/333YyeW9zeYQyiUUay7q7GK/Uu/FdEa6+5c4Pk="; }; - cargoHash = "sha256-RL9n2kfWPpu17qudqSx5DkZbgxqVCf2IRBu/koCAqFA="; + cargoHash = "sha256-z7wjap7IL2OTd2wEUB6EbSbP71dZiqbKDmJ7oUjVi0U="; CFG_DATE = version; CFG_REV = "release"; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index b3a56fb9d0987..7ae79d1c14950 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "11.1.1"; + version = "11.3.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ="; + sha256 = "sha256-u10hxJEt08NtwXyLc7CrQj+70NczgOIeyFvudxxb1Qw="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 3913a2a410f4a..795ddd49b2fb7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.50"; + version = "0.0.52"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fKpFchiJ5pVEl39onovlB3eIneta5avXjZ0ApEakHzc="; + sha256 = "sha256-x4aP2CZQLd5K2VVk32Cuopd7/CJbNQvqXMHontrNtSE="; }; - cargoSha256 = "sha256-ezmswwtbuqyeEZ5DrFLAwVySYjQ1EXPZoZdwvMcC2S4="; + cargoSha256 = "sha256-7q+mVu/y/A1+XNTKlxfbAn1s9xWIbdHJxQ2civxjW8o="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 1fd0284784c67..adc088baf217f 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.82"; + version = "0.2.83"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU="; + sha256 = "sha256-+PWxeRL5MkIfJtfN3/DjaDlqRgBgWZMa6dBt1Q+lpd0="; }; - cargoSha256 = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM="; + cargoSha256 = "sha256-GwLeA6xLt7I+NzRaqjwVpt1pzRex1/snq30DPv4FR+g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 9a17d8e8a64cf..d566f92e9f5c4 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.402"; + version = "0.0.403"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-SKnSVa+ZARlCA6lrpDZpn5vkJmdvEp3aMwGtpT31jrc="; + sha256 = "sha256-8hnK/W/ro9FKzddu8VKqldr3JU6Weiszq6Hpy/d96Ok="; }; vendorSha256 = "sha256-gmqCqZ0w7UQDxovxUFm3uweTh/gCAhcqCk/9zt54ndI="; diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 25ac9ce451ccf..ae93d42b67657 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -907,7 +907,7 @@ in lib.makeScopeWithSplicing byacc genassym gencat lorder tsort statHook rsync rpcgen ]; buildInputs = with self; [ headers csu ]; - NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; + NIX_CFLAGS_COMPILE = "-B${self.csu}/lib -fcommon"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix new file mode 100644 index 0000000000000..b099c5dc140cc --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.0"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index dcb1c4e9dcc12..5e0b5850f015d 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper +{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, python3Packages, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped , libiberty, audit, libbfd, libbfd_2_38, libopcodes, libopcodes_2_38, openssl, systemtap, numactl , zlib @@ -53,7 +53,8 @@ stdenv.mkDerivation { ++ lib.optional withGtk gtk2 ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) ++ lib.optional withZstd zstd - ++ lib.optional withLibcap libcap; + ++ lib.optional withLibcap libcap + ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" @@ -63,7 +64,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts + patchShebangs scripts tools/perf/pmu-events/jevents.py ''; doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix new file mode 100644 index 0000000000000..6c2ece4b8cb11 --- /dev/null +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -0,0 +1,63 @@ +{ fetchFromGitHub +, json_c +, lib +, libuuid +, meson +, ninja +, openssl +, perl +, pkg-config +, python3 +, stdenv +, systemd +}: + +stdenv.mkDerivation rec { + pname = "libnvme"; + version = "1.1"; + + outputs = [ "out" "man" ]; + + src = fetchFromGitHub { + owner = "linux-nvme"; + repo = "libnvme"; + rev = "v${version}"; + sha256 = "EPAPWY6/Bh8I1eLslKJAofLn0IAizmGn00Q5PJPtdRw="; + }; + + postPatch = '' + patchShebangs meson-vcs-tag.sh + chmod +x doc/kernel-doc-check + patchShebangs doc/kernel-doc doc/kernel-doc-check doc/list-man-pages.sh + ''; + + nativeBuildInputs = [ + meson + ninja + perl # for kernel-doc + pkg-config + ]; + + buildInputs = [ + json_c + libuuid + openssl + python3 + systemd + ]; + + mesonFlags = [ + "-Ddocs=man" + "-Ddocs-build=true" + ]; + + doCheck = true; + + meta = with lib; { + description = "C Library for NVM Express on Linux"; + homepage = "https://github.com/linux-nvme/libnvme"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ lgpl21Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/os-specific/linux/libzbc/default.nix new file mode 100644 index 0000000000000..5fa981a767f24 --- /dev/null +++ b/pkgs/os-specific/linux/libzbc/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, autoconf-archive +, autoreconfHook +, fetchFromGitHub +, gtk3 +, libtool +, pkg-config +, guiSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "libzbc"; + version = "5.12.0"; + + src = fetchFromGitHub { + owner = "westerndigitalcorporation"; + repo = "libzbc"; + rev = "v${version}"; + sha256 = "qI09dkMCwMym3j1ELrFDNbNB5hW/CzwmFmZhUNDXsfI="; + }; + + nativeBuildInputs = [ + autoconf-archive # this can be removed with the next release + autoreconfHook + libtool + ] ++ lib.optionals guiSupport [ pkg-config ]; + + buildInputs = lib.optionals guiSupport [ gtk3 ]; + + configureFlags = lib.optional guiSupport "--enable-gui"; + + meta = with lib; { + description = "ZBC device manipulation library"; + homepage = "https://github.com/westerndigitalcorporation/libzbc"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ bsd2 lgpl3Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/os-specific/linux/libzbd/default.nix new file mode 100644 index 0000000000000..f058e09bbd2ca --- /dev/null +++ b/pkgs/os-specific/linux/libzbd/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, autoconf-archive +, autoreconfHook +, fetchFromGitHub +, gtk3 +, libtool +, pkg-config +, guiSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "libzbd"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "westerndigitalcorporation"; + repo = "libzbd"; + rev = "v${version}"; + sha256 = "GoCHwuR4ylyaN/FskIqKyAPe2A2O3iFVcI3UxPlqvtk="; + }; + + nativeBuildInputs = [ + autoconf-archive # this can be removed with the next release + autoreconfHook + libtool + ] ++ lib.optionals guiSupport [ pkg-config ]; + + buildInputs = lib.optionals guiSupport [ gtk3 ]; + + configureFlags = lib.optional guiSupport "--enable-gui"; + + meta = with lib; { + description = "Zoned block device manipulation library and tools"; + homepage = "https://github.com/westerndigitalcorporation/libzbd"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 3a415f9ecf840..b437df04da0c1 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-2QGXyXHU2p7DFKDWyau2+SCzaQnM+o0EbYqHFnErXX4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-llVKoUAB5cIeRE79Lw5oAvR9rwXdtmALYEwiIg1vN9Q="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-16XJUh78B45d1uuLi1xcFeti6CvGUkXYUVe4pS/hhXs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-v6Dvs0Ny39tOO+f9JWadBa07QwKCC9gHU69+OMmPxXM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-ML9WSJwQTC8F07MOTQBpZXH/tHSlbQEzAofGpjHZrLU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-ofx16H6+tSTOEz+UuTXKzzVx3hREwW8EjEqAgXdnqQg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-fGSBfQzlYQbsZExOqsxa2Zdb/gvo0c9O313ziSkvOjY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-kftAZ2snv3xsrVPq3y5uJKwZhHtNO/VQL1LBh5yk/DA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-WR8omfW5udMmXNKuUIfqdXvggumG4Pb1gESJV9YZ9rc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-JVy2dDZGfH+vZhNJ94wvoYY3I0tQA6CSZ/c1rBikZWw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index fee86027c50e6..78bc977b3be3a 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.12"; + version = "0.107.14"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1a8a2b251c0e8..1b3440761abb3 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-09-25T15-44-53Z"; + version = "2022-10-02T19-29-29Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE="; + sha256 = "sha256-J40QbyqywKF2vYqznFqkLxje241WHSdNL7v34chBybA="; }; - vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A="; + vendorSha256 = "sha256-DXvNM9NI2nyoUbvLKRROLc7kA1RYPZzFX8rOhKku8KA="; doCheck = false; diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 90b84367ab7b2..29e082e65cf2e 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, callPackage, fetchurl, fetchFromGitHub, buildGoModule, fetchYarnDeps, nixosTests -, fixup_yarn_lock, jq, nodejs, yarn +{ lib +, stdenv +, callPackage +, fetchurl +, fetchFromGitHub +, buildGoModule +, fetchYarnDeps +, nixosTests +, fixup_yarn_lock +, jq +, nodejs +, which +, yarn }: let arch = @@ -9,36 +20,36 @@ let bcrypt_version = "5.0.1"; bcrypt_lib = fetchurl { url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcrypt_version}/bcrypt_lib-v${bcrypt_version}-napi-v3-${arch}-glibc.tar.gz"; - sha256 = "3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; + hash = "sha256-3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; }; in stdenv.mkDerivation rec { pname = "peertube"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-q6wSk5AO91Z6dw5MgpO7QTAlA8Q5Xx1CboBr7SElVUA="; + hash = "sha256-1QpJtonn/mWGcTv2mSeGKAHwPAqOV6VBAYFZH1/jAH8="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-MMsxh20jcbW4YYsJyoupKbT9+Xa1BWZAmYHoj2/t+LM="; + hash = "sha256-BimtZpU3aZepvlMfhJ/u0trk1rUsGlzjYk2G90fstII="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${src}/server/tools/yarn.lock"; - sha256 = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; + hash = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${src}/client/yarn.lock"; - sha256 = "sha256-6Snx1OwEndGrkMZbAEsoNRUQnZcwH+pwSDZW8igCzXA="; + hash = "sha256-IKMu+gQa+d30+yXjHCu/oQOQXL6kTN9WxDI/Y5IL1E8="; }; - nativeBuildInputs = [ fixup_yarn_lock jq nodejs yarn ]; + nativeBuildInputs = [ fixup_yarn_lock jq nodejs which yarn ]; buildPhase = '' # Build node modules @@ -80,7 +91,7 @@ in stdenv.mkDerivation rec { # Build PeerTube tools cp -r "./server/tools/node_modules" "./dist/server/tools" npm run tsc -- --build ./server/tools/tsconfig.json - npm run resolve-tspaths:cli + npm run resolve-tspaths:server # Build PeerTube client npm run build:client diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 14c88e9d04f8c..f438df71949ce 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03CvpAATd8HSKaMY17Sl7v08xzTxrQsoBchkYZ5pz14="; + sha256 = "sha256-pHYbz1LuPZDOtg3xrvgr+16ziZMZHCtSbY685E8RA1E="; }; vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc="; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 835307ae0a008..55b082f994847 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config -, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: +, openssl, boost, grpc, abseil-cpp, protobuf, libnsl }: let sqlite3 = fetchurl rec { @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkg-config cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf libnsl ]; preConfigure = '' export HOME=$PWD diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9dca908a07733..ce4023ff27811 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nixosTests }: -let version = "0.28.1"; +let version = "0.29.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "v${version}"; - sha256 = "sha256-AjSzzOQ1K47tyc8Zn7kAU3B1UE9Tfvd3SvP7W13m6/o="; + sha256 = "sha256-/B44rqw4oilR7w2GnJ5LYFIWh9qv2N5Bwa+ZCgugTpQ="; }; - cargoSha256 = "sha256-zRSAjOKKmL79eXrA6/ZNE3lo8MFdOqYJkcagcA51c6M="; + cargoSha256 = "sha256-70Nn2yvIM05K1TWh4umbh0ZHkrjPFogQ4DfCjQmgOcM="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index e296112045d49..d7d1c94d9de2a 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,31 +1,32 @@ -{ fetchurl, fetchpatch, lib, stdenv, libtirpc }: +{ lib +, stdenv +, fetchurl +, pkg-config +, libtirpc +}: stdenv.mkDerivation rec { pname = "xinetd"; - version = "2.3.15"; + version = "2.3.15.4"; src = fetchurl { - url = "http://www.xinetd.org/xinetd-${version}.tar.gz"; - sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; + url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz"; + hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ="; }; - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02"; - name = "CVE-2013-4342.patch"; - sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v"; - }) + nativeBuildInputs = [ + pkg-config ]; - buildInputs = [ libtirpc ]; - - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; + buildInputs = [ + libtirpc + ]; meta = { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; - homepage = "http://xinetd.org"; + homepage = "https://github.com/openSUSE/xinetd"; license = lib.licenses.free; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d3e6c5978f8ba..49c102afa67d5 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-09-10"; + version = "2022-10-03"; pname = "oh-my-zsh"; - rev = "7dcabbe6826073ef6069c8a4b6f9a943f00d2df0"; + rev = "23f3ded92d07184b3611d08c62d7b474a76c956f"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Mk2GQh7Yh0cyklSEIutIIUEQNMAcPC1i3QT5K6lCEt8="; + sha256 = "s4YwOOog+FxN0Dyyo8Jo7XZE9s0Wg/pexGujhqFxykQ="; }; strictDeps = true; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6e61b6f12be11..03856d5c07111 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -415,12 +415,6 @@ in inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { - # remove before 22.11 - glibc = lib.warn - ( "`stdenv.glibc` is deprecated and will be removed in release 22.11." - + " Please use `pkgs.glibc` instead.") - prevStage.glibc; - inherit bootstrapTools; shellPackage = prevStage.bash; }; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index ddb4874267a25..37f472c147f90 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.40.1"; + version = "3.40.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-linux-x64.tar.gz"; - sha256 = "07zh77spxsgrq409p61pfik0b8r87ib02x8hcpfhsjd9kgmc9614"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-linux-x64.tar.gz"; + sha256 = "0xd307r3280nb11yz5nmm51jg4jd1in1n42jz8ibb20vzqlwb1f3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; @@ -29,12 +29,12 @@ sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-linux-amd64.tar.gz"; - sha256 = "099ljh9kkjp2cy64qs6mvbscgr9whmgqd81c6nfmvxjbfy1i118p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-linux-amd64.tar.gz"; + sha256 = "0f3lzx9k6r20cqkccdcwskk3wya4d9zchfbid2yd08kyrx8ga6z5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-linux-amd64.tar.gz"; - sha256 = "10xmh1apjhp1b94c8z8v7x3zpmv2nlh85vbkd83d7pb4cvv0dixq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-linux-amd64.tar.gz"; + sha256 = "1icichldk238f9r630vcc8a4hq8pqaqz2wj4cvyr68nqwnibxh95"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-amd64.tar.gz"; @@ -45,8 +45,8 @@ sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-linux-amd64.tar.gz"; - sha256 = "16hkrmw35vvsg1m9bfh6bw989yfmn784hzj7058hpd6mwhac7c07"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-linux-amd64.tar.gz"; + sha256 = "177s1vi6ci4v04gyck8c2p9r17w8538migw6d1n7yzyf74qjdwhl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1wcxz4sg7ca0n8csp3j2qjd60cvn984mllbv3js55rrzbh8iqfwp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-linux-amd64.tar.gz"; - sha256 = "0dv6vnm34qnj4qlw65fffb4knbph3yy1afj7zim9bzxbm07nv2wh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; + sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "1087d10z0h2vlx18czh4yhplb4qqyy94zf0hvqm5n6vmyh9kpr8j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-linux-amd64.tar.gz"; - sha256 = "11wpxzvzw4mbp3mqywgy5n9fx6217w823hqmb6an6m8zskrfgh5m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-amd64.tar.gz"; + sha256 = "11qik0dg12svgh93f5xr7sbqs0bkb8m680cn252lwcwdyz06hfni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-linux-amd64.tar.gz"; - sha256 = "14sdhvn2y32y1a6ydqgy1bsbld976c66aiyc9raybxjn9ym28gkd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1n7hmbqc3a4z44wa8pzmfxqzg895pynqsjk0php9z052nkl034kz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-linux-amd64.tar.gz"; - sha256 = "1ihy52ckcvw2kpaz7905nm19lzahw26c39x4v8mrlz7zjb0pgxj8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-linux-amd64.tar.gz"; + sha256 = "0xdwl5xh114s61wb662239nsqad7jbkr26xs3d3gxm8z1wy6nw90"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; @@ -121,16 +121,16 @@ sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-amd64.tar.gz"; - sha256 = "1ymcbqb2rx8g1nsvppasqlc2ws00jzrx33k6cghy14yjkd82n6pv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-amd64.tar.gz"; + sha256 = "1i43wmldn3q0jshfa07rldbn7rhyg5r536dzwnfmp47dvk6jhzyl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-amd64.tar.gz"; - sha256 = "1i5y1kqyc84v90c7lh5gaydk5qvvs62gc6xxd6n8zzmn9ygkr0c4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-amd64.tar.gz"; + sha256 = "1xf1xikal6fp381pxb7xnq37vx3ica81452xckgpsdn0b2dybxlz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-darwin-x64.tar.gz"; - sha256 = "0av0i5g2450l5ndvihxw32cxzamjqwr338200yaw4wh2qyl8p7rw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-darwin-x64.tar.gz"; + sha256 = "0c7k32bsjw98f5hshlkhjdsvjflnfmcvykq4zzwi43z68zhmla0s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; @@ -187,12 +187,12 @@ sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-darwin-amd64.tar.gz"; - sha256 = "1ar4cfjmq3iszh08i9xmrqvhwc7lb8qvyhnnx4nh99wyw32ssk0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-darwin-amd64.tar.gz"; + sha256 = "1qmifh4mbjlmahwhj7359m8849pb2b1av6n3df5d070vlxqab33v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-darwin-amd64.tar.gz"; - sha256 = "1g5hjpi7w2zwknv6lcvlrbwvd7nq73n5953qzx764hfh6whp5431"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-darwin-amd64.tar.gz"; + sha256 = "1p9vkmjda2pf5bzrzwmj7ch6275drc77smgfxg0033hj2f421lsv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-amd64.tar.gz"; @@ -203,8 +203,8 @@ sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-darwin-amd64.tar.gz"; - sha256 = "0gs08839j2miqvw8rx4b3hz76y5ac6sy7h8pryychcficgf3h2px"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-darwin-amd64.tar.gz"; + sha256 = "18k9gzsbx48q17y9p8i5wqbjcq9bq94ha96lxvljcyf0jmsklkj6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1g3wxvw27v942s4fdym6nxcgipxrqgkh219mi6dn4j3n3kp15scj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-darwin-amd64.tar.gz"; - sha256 = "031pkzx7xshzbf9x5fb84a9699c6zcwqvx295s5diqw4jrcx6003"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "02p8g3kirc9g9jgmv50l8c9jamidk389in33f7qnz22hck880dr8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-darwin-amd64.tar.gz"; - sha256 = "1p37i9c8d66rvjp11ghjh5fhxg07lgwgpjmr0amjic1vpxlx96wc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-amd64.tar.gz"; + sha256 = "0s2lvm3zf5dnirm9ka8ilrk5l4m39bdid2r6dpldfc326h079xva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "16a8q87yb4d6ssdrvw5zgflq7bfr6zpf4ldf01y0ffc7hmgwpwbn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "0kz7ah6a1lai12n0lq0lygvszs8fh7fnnz92na06p517bl5dbink"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-darwin-amd64.tar.gz"; - sha256 = "038phqrwvyjqh9kvnrn9ic4ac3h6niahrlwz81lllqg757ibrd08"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-darwin-amd64.tar.gz"; + sha256 = "1afb90qzwgdvl3lvgqzrkcknv4gd4krdcxmwd39xzzb2kjfd1fh3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; @@ -279,16 +279,16 @@ sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-amd64.tar.gz"; - sha256 = "1imgmpn2n9daghpaca6qlww7bp3dmw894fv54j43cpxkm6z29kjk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-amd64.tar.gz"; + sha256 = "1a7mq8qw17g4f6zfgdnym77q7j8dc1iigxcwmnz46d07mjq34d0h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-amd64.tar.gz"; - sha256 = "0yv03kh209cwzi1b47bhsbxslmnk454qkx5lqcn6qnjyc7ij7k6x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-amd64.tar.gz"; + sha256 = "08nr4qwilg4l3rrjndpr5r9k7fccdqlfzgh0i2np7hk3d5g5nar7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-linux-arm64.tar.gz"; - sha256 = "1vb7ad3gadqhxf4jv5fkr9pf7lzliwaazmfl6j2ja5imqdl4iyri"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-linux-arm64.tar.gz"; + sha256 = "0bpkz0j7d3aidq26dfas81f9ln8kdv3nhpdcypdx82ddglqi78wr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; @@ -345,12 +345,12 @@ sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-linux-arm64.tar.gz"; - sha256 = "0knzcqjpvgs9blarj0rf36racnaav8vii2yxl99rrs731cnf4l1w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-linux-arm64.tar.gz"; + sha256 = "1vkv48109lg1wkim5gk52w2vb6fh7qx7rxq3gr05l1xpy2cr28f6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-linux-arm64.tar.gz"; - sha256 = "0agz4izq6plzsb4j5jic6dvnkks8q37gy025y5xlrlnczrr45k41"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-linux-arm64.tar.gz"; + sha256 = "0j9dcqxmpbg8ng9lcxa742fmql2cc77c29q51jqiazy91zaz09ya"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-arm64.tar.gz"; @@ -361,8 +361,8 @@ sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-linux-arm64.tar.gz"; - sha256 = "1l54kgg14lhgx694yrzabjn27m4xy90v7kifj9b0cdfly4jlhzhz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-linux-arm64.tar.gz"; + sha256 = "0gr30lgad0xf7f4acxj9v7r69gncfzh1x7rn7nvyibsfy7ggn80z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "1kmp1lg312d8l1b3sylc6fan5rracmb7rd2v871gwyqx6gya6aqk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-linux-arm64.tar.gz"; - sha256 = "0vanpq5mb3rdbdqflfwp8f1w94xim42ih3a7hc2cmbavyf1vg16a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "1cymvx8dx836d2vcnakgqz51nc033702dph66w8j4swj0sg4wd92"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-linux-arm64.tar.gz"; - sha256 = "0wihyyww8nr2asfw1qkcn7zb31w6f15j94135v7wnzljil6pfibx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-arm64.tar.gz"; + sha256 = "1bdbf17z8a2rfgs79xvd71vj7k0zhyvjjvb3vwc46qlf9if3kzsm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-linux-arm64.tar.gz"; - sha256 = "0bjpccmn7h4cl7cvmflfzz5avh2hzmkfh3gibnjxfmgs5m92h0bf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-arm64.tar.gz"; + sha256 = "0nf5s17x2k57rbmfi0b7lyicmsnm1gq1y5vfy5gpb0wxrcmnyadm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-linux-arm64.tar.gz"; - sha256 = "12awf88y3iy3hhvpclwlvf6nx46phn0gb84z77k3mb3mp296fnyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-linux-arm64.tar.gz"; + sha256 = "1xsmnym5i7m8sqw1yciy6xgwxy5sryl0c8dqmyyclzmmxss4y3ng"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; @@ -437,16 +437,16 @@ sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-arm64.tar.gz"; - sha256 = "0bpmmfgmi0061xrfadpijskw1hsgxk64l4kl4vrvc9l9iwjnbk64"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-arm64.tar.gz"; + sha256 = "0rwvp6v00iybqlnf52n3a1afvpvr3vvvsxql9jsv4n2wxn4w1bhb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-arm64.tar.gz"; - sha256 = "1b9nw8q5m30csgxq0mg6npzwbsna4nwkwh7b33gax6fimalbcpal"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-arm64.tar.gz"; + sha256 = "0p82fkch37zr53vl6wk2i1c8aplv8nk5hypjgzhjcg64a7ahlsv3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-darwin-arm64.tar.gz"; - sha256 = "1zhga32lii81pdgdj6bc2zsm45v8w0sqxk1m2srxgx27kynm848q"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-darwin-arm64.tar.gz"; + sha256 = "0y4gxwk77yxxxv9rmms3cwk6m64xmkd9mpx0nsp0gvihyxsgrbbv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; @@ -503,12 +503,12 @@ sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-darwin-arm64.tar.gz"; - sha256 = "1ib3162lbcg4ri0mrqj9qjzfxfgbf47vrazx58bj24j0z804wpcg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-darwin-arm64.tar.gz"; + sha256 = "07gfp1gqd9djd7qvvw9his8qxd6jlgvm9z2iazq66hblqyra5chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-darwin-arm64.tar.gz"; - sha256 = "1lw0gp5lyc2r1a3dsgr55adcja3rj66bfrmp5qncpdmpkcx2fs74"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-darwin-arm64.tar.gz"; + sha256 = "1iq2kcpwr4bmwjx0jm7vn7i8qmsbwa9pafcfbpmlcbbd23d90y99"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-arm64.tar.gz"; @@ -519,8 +519,8 @@ sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-darwin-arm64.tar.gz"; - sha256 = "1762izxr7vm2invlpff99afs76vln8q87xa0kxdlsn3jp664gbhw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-darwin-arm64.tar.gz"; + sha256 = "0jp50xcv9ss156i3v173j28ia7ykslmcv8nb4a8bz10jmhkxg52v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0903sjihlr5wjf9ddnib3j072549d4342p0pnjprb4kacc1b43ln"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-darwin-arm64.tar.gz"; - sha256 = "1s2faanxajzd0x8qd1a42nzkzfjrkinwqw7654zgb8l25bgnhykd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "1gmx1lympd3r4i2vsnnmd70qq3x0ijbv53j7vkys59g560rw1bvm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-darwin-arm64.tar.gz"; - sha256 = "029zq7r58m69gwxr8ihay70qsgm2609daqn0h62ach0p9dzyisdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-arm64.tar.gz"; + sha256 = "1rfxrqyfm7dijmcg1h6ipic1wj0r177aqnrfhrql50asy0c0spmf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-darwin-arm64.tar.gz"; - sha256 = "0kqp1w7w6g9a6q0h0ahmrq2klxxj128x9dcln577f5js0yb14g1w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "0246m5df3xbh5kjfj2g3lifk443daphq0sccs1rbmvfzhb8lm7yv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-darwin-arm64.tar.gz"; - sha256 = "0csvmcbwpqlychwg5h12vjmdxf803aw5m6v10rlbhdhncg38zgcj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-darwin-arm64.tar.gz"; + sha256 = "0f6qyr1g96skvgvbdkgaqjmp5rb97558s2g1viar9pv729zk8ijr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; @@ -595,16 +595,16 @@ sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-arm64.tar.gz"; - sha256 = "0pvfnycvnz3ram5lpvaggbhfn7lxbi74rbcndw5xw0ihpk31kjim"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-arm64.tar.gz"; + sha256 = "07kj6rz7dh08n74zfjprjnzjcrizcmy8rfbnvfi9qkavh0mgcxvv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-arm64.tar.gz"; - sha256 = "09vg056rjzrp8zqh4kjjlq4dnkkzxz32kzawmaj8fxi6ds1s9y9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-arm64.tar.gz"; + sha256 = "1y1hb4s9214a5nlm0byzm0w4n1c190w57b0q4grl064hnw6490v1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 23b400f249480..24e4ab2250920 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.40.1" +VERSION="3.40.2" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index bf048eeb87df2..579ee9b2094cc 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, valgrind +{ lib, stdenv, fetchFromGitHub, fetchpatch, valgrind , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { owner = pname; }; + patches = lib.optionals (!enableShared) [ + # This patch is already part of the `dev` branch. + # Remove when upgrading to the next version. + (fetchpatch { + name = "lz4-fix-BUILD_SHARED=no.patch"; + url = "https://github.com/lz4/lz4/commit/5ccbd38277989ae6a728171d59ae03bad6f2f4d5.patch"; + sha256 = "sha256-P+/uz3m7EAmHgXF/1Vncc0uKKxNVq6HNIsElx0rGxpw="; + }) + ]; + # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8d4a93a375ecf..7333558aaaef1 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "063c41f1d7c1a877f44c1f8caad6be1897350336"; - sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; + rev = "refs/tags/${version}"; + hash = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 0a1ce3108f231..9137b834555dd 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -29,28 +29,20 @@ # failures when building. Override this to true to run tests anyway # See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306 , withDoCheck ? false - # Version and rev and hash are package arguments to allow overriding - # while ensuring the values in prePatch and src match - # https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 - # The names are prefixed with input_remapper to avoid potential - # collisions with package names -, input_remapper_version ? "1.4.2" -, input_remapper_src_rev ? "af20f87a1298153e765b840a2164ba63b9ef937a" -, input_remapper_src_hash ? "sha256-eG4Fx1z74Bq1HrfmzOuULQLziGdWnHLax8y2dymjWsI=" }: let maybeXmodmap = lib.optional withXmodmap xmodmap; in -buildPythonApplication { +(buildPythonApplication { pname = "input-remapper"; - version = input_remapper_version; + version = "1.5.0"; src = fetchFromGitHub { - rev = input_remapper_src_rev; + rev = "e31a1b2bc5d23fe13130afcc242063196335399f"; owner = "sezanzeb"; repo = "input-remapper"; - hash = input_remapper_src_hash; + hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU="; }; # Fixes error @@ -58,17 +50,14 @@ buildPythonApplication { # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - prePatch = '' - # set revision for --version output - echo "COMMIT_HASH = '${input_remapper_src_rev}'" > inputremapper/commit_hash.py - + postPatch = '' # fix FHS paths substituteInPlace inputremapper/configs/data.py \ --replace "/usr/share/input-remapper" "$out/usr/share/input-remapper" - '' + (lib.optionalString (withDebugLogLevel) '' + '' + lib.optionalString withDebugLogLevel '' # if debugging substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" - ''); + ''; doCheck = withDoCheck; checkInputs = [ @@ -161,4 +150,14 @@ buildPythonApplication { maintainers = with maintainers; [ LunNova ]; mainProgram = "input-remapper-gtk"; }; -} +}).overrideAttrs (final: prev: { + # Set in an override as buildPythonApplication doesn't yet support + # the `final:` arg yet from #119942 'overlay style overridable recursive attributes' + # this ensures the rev matches the input src's rev after overriding + # See https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 for more + # discussion + postPatch = prev.postPatch or "" + '' + # set revision for --version output + echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py + ''; +}) diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix new file mode 100644 index 0000000000000..bed689651a4bd --- /dev/null +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, inkscape +, meson +, ninja +, pkg-config +, libyamlcpp +, nvramtool +, qtbase +, qtsvg +, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "coreboot-configurator"; + version = "unstable-2022-08-22"; + + src = fetchFromGitHub { + owner = "StarLabsLtd"; + repo = "coreboot-configurator"; + rev = "37c93e7e101a20f85be309904177b9404875cfd8"; + sha256 = "2pk+uJk1EnVNO2vO1zF9Q6TLpij69iRdr5DFiNcZlM0="; + }; + + nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ]; + buildInputs = [ libyamlcpp qtbase qtsvg ]; + + postPatch = '' + substituteInPlace src/application/*.cpp \ + --replace '/usr/bin/pkexec' 'sudo' \ + --replace '/usr/bin/systemctl' 'systemctl' \ + --replace '/usr/sbin/nvramtool' '${nvramtool}/bin/nvramtool' + ''; + + meta = with lib; { + description = "A simple GUI to change settings in Coreboot's CBFS"; + homepage = "https://support.starlabs.systems/kb/guides/coreboot-configurator"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ danth ]; + }; +} diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 65b66b4cf43fb..3884807bd7196 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -67,25 +67,12 @@ python3Packages.buildPythonApplication rec { ''; disabledTests = [ - # Disable flaky test and a failing one - "test_android_manifest" "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" - "test_obj_no_differences" # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" - - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/pytest-of-nixbld/pytest-0/\xf0(\x8c(' - "test_non_unicode_filename" - - # disable formatting tests because they can break on black updates - "test_code_is_black_clean" - - # fails at 2022-09-30 - "test_identification" - "test_diff" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix index f847f615756a5..c44d37505155b 100644 --- a/pkgs/tools/misc/discocss/default.nix +++ b/pkgs/tools/misc/discocss/default.nix @@ -1,4 +1,10 @@ -{ stdenvNoCC, lib, fetchFromGitHub }: +{ stdenvNoCC +, lib +, fetchFromGitHub +, discordAlias ? false +, discord +, makeWrapper +}: stdenvNoCC.mkDerivation rec { pname = "discocss"; @@ -13,8 +19,16 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - install -Dm755 ./discocss $out/bin/discocss + install -Dm755 discocss $out/bin/discocss + '' + lib.optionalString discordAlias '' + wrapProgram $out/bin/discocss --set DISCOCSS_DISCORD_BIN ${discord}/bin/Discord + ln -s $out/bin/discocss $out/bin/Discord + ln -s $out/bin/discocss $out/bin/discord + mkdir -p $out/share + ln -s ${discord}/share/* $out/share ''; meta = with lib; { diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ff6458243a622..56a3159511436 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hbgInZZ1ahFPIGHiHs68GqbMfFfYMcJy92iL2fvGxr0="; + sha256 = "sha256-RertNRBwrlodsjwv1NqNOR6ZDEMaRsHG1dVEu0Z501I="; }; - vendorSha256 = "sha256-iUXbvwh04W8cZ4pa+OS4bRi3bCyFQ2shPzHNh6/e3Vs="; + vendorSha256 = "sha256-d068X29Lh0l9S7HTmO75HcsV9ZdUsjp977Esxy7gzKI="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/inklingreader/default.nix b/pkgs/tools/misc/inklingreader/default.nix new file mode 100644 index 0000000000000..8710da482a655 --- /dev/null +++ b/pkgs/tools/misc/inklingreader/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk3 +, librsvg +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "inklingreader"; + version = "unstable-2017-09-07"; + + src = fetchFromGitHub { + owner = "roelj"; + repo = "inklingreader"; + rev = "90f9d0d7f5353657f4d25fd75635e29c10c08d2e"; + sha256 = "sha256-852m8g61r+NQhCYz9ghSbCG0sjao2E8B9GS06NG4GyY="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + gtk3 + librsvg + libusb1 + ]; + + meta = { + homepage = "https://github.com/roelj/inklingreader"; + description = "A GNU/Linux-friendly version of the Wacom Inkling SketchManager"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ totoroot ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 21dd287f56ad5..3d34dda25a524 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; rev = version; - sha256 = "sha256-PF6DVpiAPL9NG4jK6wDqdqYw+26Nks/bGEbbaV/5aIs="; + sha256 = "sha256-EAI60Mw+OTPfjOS6lkGMul7QvTR7NXyNfevWY2JP1yI="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch index 402f78ed04b13..194bb55902aec 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch +++ b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -2,20 +2,20 @@ diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilu index b02a995..a616399 100644 --- a/nautilus_open_any_terminal/open_any_terminal_extension.py +++ b/nautilus_open_any_terminal/open_any_terminal_extension.py -@@ -125,9 +125,10 @@ def set_terminal_args(*args): +@@ -205,9 +205,10 @@ def set_terminal_args(*args): - class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): - def __init__(self): -- source = Gio.SettingsSchemaSource.get_default() -- if source.lookup(GSETTINGS_PATH, True): -- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) -+ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) -+ if True: -+ _schema = source.lookup(GSETTINGS_PATH, False) -+ self._gsettings = Gio.Settings.new_full(_schema, None, None); - self._gsettings.connect("changed", self._bind_shortcut) - self._create_accel_group() - self._window = None + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None @@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): return items @@ -28,5 +28,4 @@ index b02a995..a616399 100644 + _schema = source.lookup(GSETTINGS_PATH, False) + _gsettings = Gio.Settings.new_full(_schema, None, None); _gsettings.connect("changed", set_terminal_args) - value = _gsettings.get_string(GSETTINGS_TERMINAL) - if value in TERM_PARAMS: + set_terminal_args() diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 611874ab76841..31a9e3a7f041e 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-ko2UB7jy2sob5i/TAjjJVBuVyvqgh4awB1jEv8DplM0="; + sha256 = "sha256-ukIH6hiWg8GMq28chfxIb2uHZaaymL9x/BhbFnIzw0Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index a35b576261106..aec0bd62addd7 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -3,14 +3,14 @@ , libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xfstests"; - version = "unstable-2019-09-08"; + version = "2022.09.04"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "0837e907988a5f410cae0ae714f42f9c4242e072"; - sha256 = "1f5cv0vwc1g9difzp69k49rc5nfd08y72vdg318j25nv3rwv7wc9"; + rev = "v${version}"; + sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix new file mode 100644 index 0000000000000..9b8bf0fb2ce4d --- /dev/null +++ b/pkgs/tools/networking/doggo/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "doggo"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "mr-karan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6jNs8vigrwKk47Voe42J9QYMTP7KnNAtJ5vFZTUW680="; + }; + + vendorSha256 = "sha256-pyzu89HDFrMQqYJZC2vdqzOc6PiAbqhaTgYakmN0qj8="; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/doggo" ]; + + ldflags = [ + "-w -s" + "-X main.buildVersion=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd doggo \ + --fish --name doggo.fish completions/doggo.fish \ + --zsh --name _doggo completions/doggo.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/mr-karan/doggo"; + description = "Command-line DNS Client for Humans. Written in Golang"; + longDescription = '' + doggo is a modern command-line DNS client (like dig) written in Golang. + It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ georgesalkhouri ]; + }; +} diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index d0178698775f9..695c580917c41 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,18 +4,29 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aHIb79P1a+91hIcK1toHZqqXIZ0rwfGXDQc42rQQmX4="; + sha256 = "sha256-xL8xRVJdCyaP39TO+cJLAPbdc7WHxgBQMEyxkyhWlA8="; }; - vendorSha256 = "sha256-yAQpyz4pDXOfGF4hho/2Pt9yD3VdWYAmIvaXJjDMjis="; + vendorSha256 = "sha256-DxbH0vtNnuOycvUp2TBN2TS9sF6RYVqwfUbVH11HDN8="; proxyVendor = true; + ldflags = [ + "-s" + "-w" + "-X main.appVersion=${version}" + "-X main.appCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/hysteria + ''; + # Network required doCheck = false; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 8b11514b1085f..767ef35fd0c6c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-09-16T09-16-47Z"; + version = "2022-10-01T07-56-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-8oy61ueCXJTV58CxtsB8uiKS5NVaomICu8yQ1wSxl7s="; + sha256 = "sha256-UAzSqxBQNMpCJsVly6Z7x03CjOWB4VGL0PE4NQbp0PE="; }; - vendorSha256 = "sha256-1jws2is/n3+l7ULTgBfO2glq4l9GzOP5AJ2wwhluQb8="; + vendorSha256 = "sha256-vnJPc2yZUs6rS2+ysUIG6YreSFxxL8hD/FaNbGFDo+s="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index cb11e9f7eab67..0b7941ce46e18 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -2,8 +2,9 @@ , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap -, tpm2-tss, pinentry, readline, sqlite, zlib +, pinentry, readline, sqlite, zlib , withPcsc ? !enableMinimal, pcsclite +, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss }: assert guiSupport -> enableMinimal == false; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { libgcrypt libassuan libksba libiconv npth gettext ] ++ lib.optionals (!enableMinimal) ([ readline libusb1 gnutls adns openldap zlib bzip2 sqlite - ] ++ lib.optional (!stdenv.isDarwin) tpm2-tss); + ] ++ lib.optional withTpm2Tss tpm2-tss); patches = [ ./fix-libusb-include-path.patch @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" - ++ lib.optional ((!stdenv.isDarwin) && (!enableMinimal)) "--with-tss=intel"; + ++ lib.optional withTpm2Tss "--with-tss=intel"; postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 891f83f1a61df..b53a1189193b9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -78,6 +78,7 @@ mapAliases ({ ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 antimicroX = antimicrox; # Added 2021-10-31 + apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 @@ -515,6 +516,10 @@ mapAliases ({ interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2022-09-24 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 + ipfs = kubo; # Added 2022-09-27 + ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 + ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 + ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2022-09-24 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 @@ -651,6 +656,7 @@ mapAliases ({ linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -671,6 +677,7 @@ mapAliases ({ linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; + linux_6_0 = linuxKernel.kernels.linux_6_0; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be4c2b3183c9c..4b262dea1144e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ with pkgs; _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { }; + directoryListingUpdater = callPackage ../common-updater/directory-listing-updater.nix { }; + gitUpdater = callPackage ../common-updater/git-updater.nix { }; httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; @@ -1901,6 +1903,8 @@ with pkgs; tilix = callPackage ../applications/terminal-emulators/tilix { }; + tym = callPackage ../applications/terminal-emulators/tym { }; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { @@ -3420,6 +3424,8 @@ with pkgs; acpidump-all coreboot-utils; + coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; + corosync = callPackage ../servers/corosync { }; cowsay = callPackage ../tools/misc/cowsay { }; @@ -4306,8 +4312,14 @@ with pkgs; libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { }; + libnvme = callPackage ../os-specific/linux/libnvme { }; + libxnd = callPackage ../development/libraries/libxnd { }; + libzbc = callPackage ../os-specific/linux/libzbc { }; + + libzbd = callPackage ../os-specific/linux/libzbd { }; + lifeograph = callPackage ../applications/editors/lifeograph { }; limitcpu = callPackage ../tools/misc/limitcpu { }; @@ -4874,8 +4886,6 @@ with pkgs; appleseed = callPackage ../tools/graphics/appleseed { }; - apple-music-electron = callPackage ../applications/audio/apple-music-electron { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; arping = callPackage ../tools/networking/arping { }; @@ -5342,7 +5352,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; @@ -5821,6 +5831,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + doggo = callPackage ../tools/networking/doggo { }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; @@ -7397,6 +7409,8 @@ with pkgs; gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtkradiant = callPackage ../applications/misc/gtkradiant { }; + gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; @@ -7594,6 +7608,8 @@ with pkgs; hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; + holochain-launcher = callPackage ../applications/misc/holochain-launcher { }; + homesick = callPackage ../tools/misc/homesick { }; honcho = callPackage ../tools/system/honcho { }; @@ -7834,17 +7850,10 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs = callPackage ../applications/networking/ipfs { - openssl = openssl_1_1; - }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo119Module; }; - ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { }; - ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; ipget = callPackage ../applications/networking/ipget { }; @@ -8189,6 +8198,14 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; + kubo = callPackage ../applications/networking/kubo { + openssl = openssl_1_1; + }; + + kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; + kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; + kubo-migrator = callPackage ../applications/networking/kubo-migrator { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; @@ -10244,6 +10261,8 @@ with pkgs; poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; + polypane = callPackage ../applications/networking/browsers/polypane { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -10589,6 +10608,8 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; + readstat = callPackage ../applications/science/math/readstat { }; + redir = callPackage ../tools/networking/redir { }; redmine = callPackage ../applications/version-management/redmine { }; @@ -11568,6 +11589,8 @@ with pkgs; inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; + tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; t1utils = callPackage ../tools/misc/t1utils { }; @@ -14557,6 +14580,10 @@ with pkgs; rasm = callPackage ../development/compilers/rasm { }; + replibyte = callPackage ../development/tools/database/replibyte { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rgbds = callPackage ../development/compilers/rgbds { }; rgxg = callPackage ../tools/text/rgxg { }; @@ -15895,7 +15922,8 @@ with pkgs; electron_17 electron_18 electron_19 - electron_20; + electron_20 + electron_21; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -19466,9 +19494,7 @@ with pkgs; libccd = callPackage ../development/libraries/libccd { }; - libcec = callPackage ../development/libraries/libcec { - libraspberrypi = null; - }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -23143,6 +23169,8 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; + hashi-up = callPackage ../applications/networking/cluster/hashi-up { }; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -29015,6 +29043,8 @@ with pkgs; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inklingreader = callPackage ../tools/misc/inklingreader { }; + inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; @@ -30838,6 +30868,8 @@ with pkgs; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; + wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; @@ -31401,7 +31433,10 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { + bzip2 = bzip2_1_1; + stdenv = gcc10StdenvCompat; + }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 5057ca10e105a..a47655f114243 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -9,11 +9,11 @@ let mkMassRebuild = args: mkOption (builtins.removeAttrs args [ "feature" ] // { type = args.type or (types.uniq types.bool); default = args.default or false; - description = (args.description or '' + description = lib.mdDoc ((args.description or '' Whether to ${args.feature} while building nixpkgs packages. '') + '' Changing the default may cause a mass rebuild. - ''; + ''); }); options = { @@ -34,35 +34,35 @@ let /* Config options */ warnUndeclaredOptions = mkOption { - description = "Whether to warn when <literal>config</literal> contains an unrecognized attribute."; + description = lib.mdDoc "Whether to warn when `config` contains an unrecognized attribute."; type = types.bool; default = false; }; doCheckByDefault = mkMassRebuild { - feature = "run <literal>checkPhase</literal> by default"; + feature = "run `checkPhase` by default"; }; strictDepsByDefault = mkMassRebuild { - feature = "set <literal>strictDeps</literal> to true by default"; + feature = "set `strictDeps` to true by default"; }; enableParallelBuildingByDefault = mkMassRebuild { - feature = "set <literal>enableParallelBuilding</literal> to true by default"; + feature = "set `enableParallelBuilding` to true by default"; }; configurePlatformsByDefault = mkMassRebuild { - feature = "set <literal>configurePlatforms</literal> to <literal>[\"build\" \"host\"]</literal> by default"; + feature = "set `configurePlatforms` to `[\"build\" \"host\"]` by default"; }; contentAddressedByDefault = mkMassRebuild { - feature = "set <literal>__contentAddressed</literal> to true by default"; + feature = "set `__contentAddressed` to true by default"; }; allowAliases = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to expose old attribute names for compatibility. The recommended setting is to enable this, as it @@ -82,10 +82,10 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow unfree packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree">Installing unfree packages</link> in the NixOS manual. + See [Installing unfree packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree) in the NixOS manual. ''; }; @@ -94,10 +94,10 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow broken packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken">Installing broken packages</link> in the NixOS manual. + See [Installing broken packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken) in the NixOS manual. ''; }; @@ -106,22 +106,22 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow unsupported packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system">Installing packages on unsupported systems</link> in the NixOS manual. + See [Installing packages on unsupported systems](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system) in the NixOS manual. ''; }; showDerivationWarnings = mkOption { type = types.listOf (types.enum [ "maintainerless" ]); default = []; - description = '' + description = lib.mdDoc '' Which warnings to display for potentially dangerous or deprecated values passed into `stdenv.mkDerivation`. A list of warnings can be found in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix">/pkgs/stdenv/generic/check-meta.nix</link>. + [/pkgs/stdenv/generic/check-meta.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix). This is not a stable interface; warnings may be added, changed or removed without prior notice. diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 11dd5270e63d8..7891669e0fce3 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -100,6 +100,8 @@ let self = rec { vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; + visualization-waveform = callPackage ../applications/video/kodi/addons/visualization-waveform { }; + youtube = callPackage ../applications/video/kodi/addons/youtube { }; # addon packages (dependencies) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 139848b4fe97b..6cf5da069e0a9 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -177,6 +177,13 @@ in { ]; }; + linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -531,6 +538,7 @@ in { linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); + linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); }; rtPackages = { @@ -588,7 +596,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_19; + linux_latest = packages.linux_6_0; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2be63015122ff..e5eb38c32e440 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -22,6 +22,7 @@ , libffi , libiconv , libjpeg +, libkrb5 , libpng , libsodium , libwebp @@ -342,10 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "imap"; - buildInputs = [ uwimap openssl pam pcre2 ]; - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; - # uwimap doesn't build on darwin. - enable = (!stdenv.isDarwin); + buildInputs = [ uwimap openssl pam pcre2 libkrb5 ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ]; } { name = "intl"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4336b1767bc78..047e0ae394dc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1385,6 +1385,8 @@ in { bleach = callPackage ../development/python-modules/bleach { }; + bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; + bleak = callPackage ../development/python-modules/bleak { }; bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { }; @@ -2499,10 +2501,14 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; + django-annoying = callPackage ../development/python-modules/django-annoying { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; @@ -2527,6 +2533,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; + django-cryptography = callPackage ../development/python-modules/django-cryptography { }; django-csp = callPackage ../development/python-modules/django-csp { }; @@ -2555,6 +2563,8 @@ in { django-haystack = callPackage ../development/python-modules/django-haystack { }; + django-hcaptcha = callPackage ../development/python-modules/django-hcaptcha { }; + django-health-check = callPackage ../development/python-modules/django-health-check { }; django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; @@ -2568,6 +2578,8 @@ in { django-js-asset = callPackage ../development/python-modules/django-js-asset { }; + django-js-reverse = callPackage ../development/python-modules/django-js-reverse { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; @@ -2602,6 +2614,8 @@ in { django-q = callPackage ../development/python-modules/django-q { }; + django-scopes = callPackage ../development/python-modules/django-scopes { }; + djangoql = callPackage ../development/python-modules/djangoql { }; django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; @@ -2796,6 +2810,8 @@ in { drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { }; + drf-writable-nested = callPackage ../development/python-modules/drf-writable-nested { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drivelib = callPackage ../development/python-modules/drivelib { }; @@ -3126,6 +3142,8 @@ in { extras = callPackage ../development/python-modules/extras { }; + extruct = callPackage ../development/python-modules/extruct { }; + eyeD3 = callPackage ../development/python-modules/eyed3 { }; ezdxf = callPackage ../development/python-modules/ezdxf { }; @@ -4289,6 +4307,8 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html-text = callPackage ../development/python-modules/html-text { }; + HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -4862,6 +4882,8 @@ in { json-tricks = callPackage ../development/python-modules/json-tricks { }; + jstyleson = callPackage ../development/python-modules/jstyleson { }; + jug = callPackage ../development/python-modules/jug { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -5071,6 +5093,8 @@ in { language-data = callPackage ../development/python-modules/language-data { }; + language-tags = callPackage ../development/python-modules/language-tags { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; @@ -5700,8 +5724,12 @@ in { mezzanine = callPackage ../development/python-modules/mezzanine { }; + mf2py = callPackage ../development/python-modules/mf2py { }; + micawber = callPackage ../development/python-modules/micawber { }; + microdata = callPackage ../development/python-modules/microdata { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; @@ -5760,6 +5788,7 @@ in { mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; + mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; @@ -7001,6 +7030,8 @@ in { pypoolstation = callPackage ../development/python-modules/pypoolstation { }; + pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; @@ -9525,12 +9556,16 @@ in { readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + readstats = callPackage ../development/python-modules/pyreadstat { }; + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; rebulk = callPackage ../development/python-modules/rebulk { }; recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { }; + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; }); |