diff options
Diffstat (limited to 'pkgs')
300 files changed, 4140 insertions, 2983 deletions
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 3e1074ad691f..1d91f561c044 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,6 +1,28 @@ -{ lib, stdenv, fetchFromGitHub -, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl -, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, which +, alsa-lib +, curl +, faust +, flac +, gnutls +, libjack2 +, libmicrohttpd +, libmpg123 +, libogg +, libopus +, libsndfile +, libtasn1 +, libvorbis +, libxcb +, llvm +, p11-kit +, qrencode +, qt5 }: stdenv.mkDerivation rec { @@ -10,22 +32,55 @@ stdenv.mkDerivation rec { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; + hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ]; + patches = [ + # move mutex initialization outside assert call + # https://github.com/grame-cncm/faustlive/pull/59 + (fetchpatch { + name = "initalize-mutexes.patch"; + url = "https://github.com/grame-cncm/faustlive/commit/fdd46b12202def9731b9ed2f6363287af16be892.patch"; + hash = "sha256-yH95Y4Jbqgs8siE9rtutmu5C2sNZwQMJzCgDYqNBDj4="; + }) + ]; - buildInputs = [ - llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl - bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit + strictDeps = true; + + nativeBuildInputs = [ + cmake + faust + llvm + pkg-config + qt5.wrapQtAppsHook + which ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + alsa-lib + curl + faust + flac + gnutls + libjack2 + libmicrohttpd + libmpg123 + libogg + libopus + libsndfile + libtasn1 + libvorbis + libxcb + llvm + p11-kit + qrencode + qt5.qtbase + ]; - postInstall = '' - wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" + ]; postPatch = "cd Build"; diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 9b77ac59fd9e..7aeb55bfa712 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -8,7 +8,7 @@ , lib , libmicrohttpd , libusb-compat-0_1 -, llvmPackages_10 +, llvmPackages , qtcharts , qtdeclarative , qtquickcontrols2 @@ -39,7 +39,7 @@ mkDerivation rec { gcc12.cc.lib libmicrohttpd libusb-compat-0_1 - llvmPackages_10.openmp + llvmPackages.openmp qtcharts qtdeclarative qtquickcontrols2 diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 3dbb9c7884f1..71ae712c9f67 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -48,13 +48,13 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-vNA1VPCHLt5kuhIix8kgeq1VlbuIX1lOY3nJaufvuyc="; + sha256 = "sha256-YCeO/ijxA+tZxNviqmlIBkAdjPTrKoOoo1QyMIOqhWU="; }; cmakeFlags = [ diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix index 312cf1db5bac..d679202343d5 100644 --- a/pkgs/applications/audio/string-machine/default.nix +++ b/pkgs/applications/audio/string-machine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, libGL, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, cairo, libGL, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "string-machine"; @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # gcc-13 compatibility fix: + # https://github.com/jpcima/string-machine/pull/36 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/jpcima/string-machine/commit/e1f9c70da46e43beb2654b509bc824be5601a0a5.patch"; + hash = "sha256-eS28wBuFjbx2tEb9gtVRZXfK0w2o1RCFTouNf8Adq+k="; + }) + ]; + postPatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix deleted file mode 100644 index f88abd95e6d2..000000000000 --- a/pkgs/applications/audio/sunvox/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, alsa-lib, libX11, libXi, SDL2 }: - -let - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libX11 libXi SDL2 ]; - arch = - if stdenv.isAarch64 - then "arm64" - else if stdenv.isAarch32 - then "arm_armhf_raspberry_pi" - else if stdenv.is64bit - then "x86_64" - else "x86"; -in -stdenv.mkDerivation rec { - pname = "SunVox"; - version = "2.1.1c"; - - src = fetchurl { - urls = [ - "https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip" - # Upstream removes downloads of older versions, please save bumped versions to archive.org - "https://web.archive.org/web/20231204012052/https://www.warmplace.ru/soft/sunvox/sunvox-2.1.1c.zip" - ]; - sha256 = "sha256-LfBQ/f2X75bcqLp39c2tdaSlDm+E73GUvB68XFqiicw="; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = "unzip $src"; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share $out/bin - mv sunvox $out/share/ - - bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - "$bin" - - ln -s "$bin" $out/bin/sunvox - ''; - - meta = with lib; { - description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; - license = licenses.unfreeRedistributable; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - homepage = "http://www.warmplace.ru/soft/sunvox/"; - maintainers = with maintainers; [ puffnfresh ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 364e6cf58a50..674156e24c06 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.73.1"; + version = "2.75.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-aHA65NLX3tlg8nLnQOOG1TuvcJP57HbQWruiBMvDJ10="; + hash = "sha256-sVaQbfpgHgd1OZgR+R0PUmNENfDOcNRfvO2AVKFyDqM="; }; appimageContents = appimageTools.extractType2 { @@ -34,5 +34,6 @@ appimageTools.wrapType2 rec { maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; mainProgram = "ledger-live-desktop"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 0b3bebca6ac8..15db790b6a1f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.1.1.27"; # "Android Studio Hedgehog | 2023.1.1 Patch 1" - sha256Hash = "sha256-XF+XyHGk7dPTBHKcx929qdFHu6hRJWFO382mh4SuWDs="; + version = "2023.1.1.28"; # "Android Studio Hedgehog | 2023.1.1 Patch 2" + sha256Hash = "sha256-E50Nu0kJNTto+/VcCbbTGjRRIESp1PAs4PGprMyhKPk="; }; betaVersion = { version = "2023.2.1.20"; # "Android Studio Iguana | 2023.2.1 Beta 2" sha256Hash = "sha256-cFEPgFAKkFx0d7PC4fTElTQVrBZMQs0RL3wR+hqTh2I="; }; latestVersion = { - version = "2023.3.1.4"; # "Android Studio Jellyfish | 2023.3.1 Canary 4" - sha256Hash = "sha256-txHkRZ87KnZvzbpBA19mZzQ0HKHWAJsSnNlQCUDsWmA="; + version = "2023.3.1.5"; # "Android Studio Jellyfish | 2023.3.1 Canary 5" + sha256Hash = "sha256-cxlACtSpDBoM5KHAWCEvqPbuKnvH7aDzOo3P+Folgqk="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 0b94ce4337e8..c41b343665a2 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.18.1"; + version = "15.18.2"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-/U3byPCaeDIFoZX3TY+FbIZQWALOoDEwEtNg6RH86GM="; + sha256 = "sha256-cOe6Yt4L3dFEFznqY3kHeHm9vhzoZBKM8MsrSyNK/aU="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 29146a769843..3ff760b21885 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -102,7 +102,7 @@ let --replace 'Name=Neovim' 'Name=Neovim wrapper' '' + lib.optionalString finalAttrs.withPython3 '' - makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH + makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH '' + lib.optionalString (finalAttrs.rubyEnv != null) '' ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f6c75e02213c..bb898eea38f5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-11-30"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "879e29504d43e9f178d967ecc34d482f902e5a91"; - sha256 = "0qvfvcfldrcinmrqvicsxrqa130b4xpgcwz390ai7xripqzqzrbz"; + rev = "a50f92f7550fb6e9f21c0852e6cb190e6fcd50f5"; + sha256 = "01ag75gdn6yfifv5rgk8j72dly511alilqy7z97s7m3fm1zp73mv"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-01-19"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "5012a4758f1ab35f9d2ed5b017a75e9bb67b7e63"; - sha256 = "0q4mjfqj005ayhjrc42wqfjarzr84h15bs1ad7abjmw6x4vkwmmp"; + rev = "0550c6d5754dd2a183efc9c238f5524b68860e21"; + sha256 = "1hd1qnkjbl38k9ivzqxf3j74yyh1gd56r5nz7nmzf8b5yyjkc0ws"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-01-14"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "8ccc18055ba855affec5c251e615b92595ac2dba"; - sha256 = "185nn727czf50liji69h64br6ppn7vl5zmy5i2dbck74302l24vs"; + rev = "e9661d4f739508377f42528fd08a85c4c8feba6e"; + sha256 = "1pskj1vqrcxy4y7rvmb27d6810zcmklrff5163gav26rcgppn6x7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -1039,12 +1039,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-01-05"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "d62cf3c04163a46f3895c70cc807f5ae68dd8ca1"; - sha256 = "0fyrndca1nh26wzvbv37k9w7s2648lrxx9qgj56xz5ncakc2s3yr"; + rev = "7e86edafb8c7e73699e0320f225464a298b96d12"; + sha256 = "14srra6hx5wpr4kcvfmg0bj5zljl7lr6ahq40wnwghdvy06ck5x2"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1171,12 +1171,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-12-13"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "e48ce1805697e4bb97bc171c081e849a65859244"; - sha256 = "06af2lvydw7c2yswin968vdh2f06s5xmwx6pip45c4am8q68a2y6"; + rev = "d6cb9b7cac52887bcac65f8698e67479553c0748"; + sha256 = "05j37sch4m8cxdjg7fyzmawr21mp2ipqlw3ar4adk8as698b68gy"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1255,12 +1255,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-01-03"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d0c6bdd9588fe8514b5ba270e8b7c8d55e42fd05"; - sha256 = "19wddsi5dddcgfynl23pb2hxda4lxlq627sbx193mvqyivdpr3ck"; + rev = "713d374382398df12816b3aa8de5462e29266d8a"; + sha256 = "1zi4v1fsayvcxsvbb60r7lj5zpsbhcysy2n6l9610xn0zmwmcnxq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1531,12 +1531,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-01-08"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "d17bc1f87736b6a7f058b2f246e651d34d648b47"; - sha256 = "04g7f0d61adasqr50bvlf9c0nllf7la83r619mgxc645cli41301"; + rev = "472d0087035762f3c81af63433df15c8dd85601b"; + sha256 = "03i5gb18w93fb7by1djj7b3sqfsdb2rlqlnj5dcl0r8qb4wa8nrc"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1843,12 +1843,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2023-05-09"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "b93f82ef5150e578677fc2e2b4b328b19eed77e1"; - sha256 = "0wbwy7a3w425m14kxvxkk6migk1705n6y7q6bis24wnl2pdqmfyc"; + rev = "a8d76fe729ee2ca6ffc497ebdc2d0f5ddff41b79"; + sha256 = "04yqgb895if25k4h2zn7qr2b0gyq791zq41dqm19c3a4ml7rqafi"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2311,12 +2311,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-01-16"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "cbc5745bf7519acaf3a5cbaaa677fd556aa813d7"; - sha256 = "0x1sr26gb7spcrfkp537819m9v1ra028wpyzl3jvmbkd1viw5001"; + rev = "d99b75b4aedf0e912f41c5740a7267de739cddac"; + sha256 = "1qwrvidiq26fsl7bz3fhfnhn534k8cix488c9kykl9y971kb9mm7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2384,12 +2384,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-01-18"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "49e0348bfb913fae63ca5ddb987a8bccd193da86"; - sha256 = "1zxc18dpafazz5snvra9rq4gzjzb3dpwig24p4nbp4i1gjb6b0dp"; + rev = "a8142d44602f1b3f7b5c03c52b55f8f5d3453bf0"; + sha256 = "08s0n9fyndjkri4lnpdg8hin4ykibxdkl8v3fgpglr944vs7cpff"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2468,12 +2468,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-01-18"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "efb5b306fea2d5eebf3c6c230f956b7686c09aa7"; - sha256 = "060sxilrn4cr08skclh9in48mdss7prfnxbaabrsw1992mn3d9kq"; + rev = "f2a169840e97a8ed2048abb507d2742c3895c85b"; + sha256 = "05j1f2cf9fgsl7kdz2kqq525xm7v6l4p10mh46nf897gllvvajmy"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2600,12 +2600,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2023-12-28"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "13378f67edc112bf0d043bc0c018f8923dc2198d"; - sha256 = "1dkj9bmpz7hpahnmyswpna98d6qacmvrymxk2a7j1q0axvj2c414"; + rev = "0c81cd2bab372bba99815f505eb1fe759d38dd88"; + sha256 = "1vyn98y3mnhdpa1yvlarqrs4wzfkgn1g70n5s0x3h1kvs1256g8c"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2696,12 +2696,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-01-09"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "83f167b034e9e56913d8a89b026a6b0eb79b52b4"; - sha256 = "0a9768w6b37b0s067kx11xp5wa29i3ifciwihzdmks49dvrrr5h7"; + rev = "16d4bbc5c8e359ab50042f66dc5c9a2cdeabff6e"; + sha256 = "19274maj5nbf7psa4d1nwkd2x7wnmnr6i6sp0h36nk5bgjx5jhzg"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3058,36 +3058,36 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-01-10"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "8fc749e2479d62829c9c627867770035b74529a4"; - sha256 = "14j3lz53vfz9w6iiw0zywqwknh0blsma9vzi10qqchq8cf1b6w1d"; + rev = "a6cb758d4b182d9f2b7e742910078d94877c1059"; + sha256 = "1v6hwh225lh7jayq7y18d8lp8n8dk7scy21f0s5jyppy1rn7yrf8"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-01-16"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "c1179336aaeca82a785cade27e9b7b276af3222e"; - sha256 = "05l7xj9bjh4hq4vdy27ibbx6yg2xmj51mq84p3qzvc8xia6gpf0w"; + rev = "42d767b04c50a6966c9633e3968bc65c0c2f2bfc"; + sha256 = "0zd2wswd1x83qgs9d6bsh7k5nmdniqd4ba0x4w3qdndp27nafcz9"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-01-17"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "0383ce9122e698360f19526e024348ae5bbc63ca"; - sha256 = "0i3ap3g20xik52fh2cjrld6mx0azpj02bcvjjr869rzxycfgy7wc"; + rev = "9a8e498374276dd0281736c75b42098ef9fb5622"; + sha256 = "0py5lipmxkd6brzz41sali1bbl61bmaan9visdvvh1jrk7zzzyz6"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3106,12 +3106,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2023-10-24"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "d811acd067193fabadd04f081228fd97827ae5ae"; - sha256 = "1m62wnwkzy48s7a8q3fjzxxf3fgq2bfqvgjhmp7xkpc1bgad2rq1"; + rev = "7506891a93dd0954d59b556ae5bb4c85403150ed"; + sha256 = "1228zzwx0vghmhf2fma6fdj8pcw8kslw6kw14kwv5b1sfxg7rap3"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3130,12 +3130,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-10-14"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "8355be45610afdf79a0bab32b91ee297997455b4"; - sha256 = "0hjlxkyhi5aw6b157i9hr2cdcz63r0qag0l3hf2hcmjzvjjb51ls"; + rev = "0b35dc6da4cae6cc2f724bc610eadf955cd2319b"; + sha256 = "04dv17nvgs1fwfphz1vqk39nqlrq77215077a9sq7x7ligpc87lv"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3252,12 +3252,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2023-10-24"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "72f101bd63228a1a45012325e39c5280ec22c828"; - sha256 = "0airdqkf1yrmsxl2id7v22f063j18rj499kly9rsp0qa8g3zh97r"; + rev = "89080db9637bb297b4c75ae1511e9f6f61ad9c78"; + sha256 = "0xfq7x8cdp45qn1yrq88mxhvcqfri67laq7yk077g0m274phpjdr"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3420,12 +3420,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-01-13"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "8c6c00aae7e5762cbcb4cd0df5848e959c4a9572"; - sha256 = "17fql4bgcvxbky8l5xs11bkv8qchkj0jcwjpchy0h09w0q0gwnw2"; + rev = "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2"; + sha256 = "0d1c3km53v1g8c2aa8fqrs0yhrq80mw1wcfglxkyppg81q91qfs6"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3457,12 +3457,12 @@ final: prev: flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-12-09"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "c78c5200899d2afd171d9d2bf09e139e3710eeb6"; - sha256 = "19r1nndapqg7d3a5h4sfbknh4331vg5lncdz39zknb9bv8721mby"; + rev = "a999f1abd8fa9f8e2447a65726f9f44288c26f3f"; + sha256 = "1c3r5sqqkdbgb8y1gm0pqdjqyk5gp2x7p9905b5ic6kw451vs4vg"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3529,12 +3529,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-01-03"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "b65ad58462116785423d81aeb2ee6c8c16f78679"; - sha256 = "1z9zikl9apba21qijhjhqd9rn62n812zm767xam211ha912z9iq2"; + rev = "271eec9edb0f1a2bf30ad449ec3b4eeb2c88af05"; + sha256 = "0kk6iz1ziymgscgv7z22m8mbkinnmj7qlnnmh0sikh14kwa21xw3"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3577,12 +3577,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-01-08"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "69a2c1675b66e002799f5eef803b87a12f593049"; - sha256 = "0598qidaysarhzdz9p75kl0s8m9k65d0ir7f8vkzw5nbj1pqpkn2"; + rev = "aced40b66b7bae9bc2c37fd7b11841d54727a7b0"; + sha256 = "11lmhx1vnaphljk91aslkzmp71swash5xiqi0jydmdhly753m5g9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3685,12 +3685,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2024-01-15"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "f021b287bf095f20cb5062fc9486dd3243ae220c"; - sha256 = "03srz55cbkpgjd07aq3qxpd93vxci2m6w2hbf3gr0lpqya55fdgr"; + rev = "36195a230246fc44e8144ee0b454fc022ac5326b"; + sha256 = "0v86khin5ac4x3w8sw9ffmg9nz7gqclycaxi5dpsm3r13imgkiym"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3781,24 +3781,24 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-11-09"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "f07e913b7143f19edd6787229f2d51759b478600"; - sha256 = "0gqr1i3g1afjm2p03vjzs0jiy6jycg6lvqa0fdsqdrb7cyircs5r"; + rev = "196602b570b1d754b7b8f9a9f75fa7bd88f12ef8"; + sha256 = "15cq84f1y2z690i25hyz32a6bf9hvd8359dscs4d8wyr4gs4xb37"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-01-03"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "690879ba23741f21646e97ba287333ff56137c4d"; - sha256 = "0d23njkk21pz3imm64wcqw9vnzpg35k41dp7w4ailqknarpyc6qq"; + rev = "4c8e252b87d54d944c1e56bfb477f78b6fdaf661"; + sha256 = "0rv8z3nd150j9ffw12l40cyzvw0q0066kqvj4fr3v2d8ja48kzhg"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -3853,12 +3853,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-01-12"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4aaacbf5e5e2218fd05eb75703fe9e0f85335803"; - sha256 = "0583bcg23hf4clg6r737ns6whg9hinz3rn0bmvs6692lmrjsiinb"; + rev = "300a306da9973e81c2c06460f71fd7a079df1f36"; + sha256 = "1vy1p2cgcmfwzgfd011pnvib2vp1zgwv2kp59xlb0v3jxl8rnsvj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4033,12 +4033,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-11-22"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "7f56d9f9c4860df528031539d321a61f6e081dee"; - sha256 = "14c5ylsnp99viqvgyc67xi3987086kbsrw44yslxkpvf4na8b3a4"; + rev = "479150eb46ddf7a724782730b1414a9b6bbe4628"; + sha256 = "1dj2cm7an9a0n6pj9j6vin242pfv90qd4cad8d9zn93i6axaafwj"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4150,14 +4150,26 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; + haskell-scope-highlighting-nvim = buildVimPlugin { + pname = "haskell-scope-highlighting.nvim"; + version = "2023-04-29"; + src = fetchFromGitHub { + owner = "kiyoon"; + repo = "haskell-scope-highlighting.nvim"; + rev = "ffeda85bae909816cbbf9d061aea9115cf8166f2"; + sha256 = "sha256-f0y6rU0IqN8RZ7d1iyvHot2zLQ0yt4JOZhpdhlGZrqc="; + }; + meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; + }; + haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-01-15"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "54d8018f14cd150c686d303e2b7567469c720367"; - sha256 = "1khkbj9k26xic1h9nj8mmazx5nhhqk3x07yx5qahf1xa1y1i1fgs"; + rev = "24f1ff1ac9f6ad71ba2535d491e6d21e700a6f8b"; + sha256 = "0h7nijxgmwh75nmsim9bzx5qc0sawqj3v1iwzjkkqas05rmnjbjp"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4331,24 +4343,24 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-01-17"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "9d4051550ff68d13aad9432fd3e631674da4e72e"; - sha256 = "173q7ihmrq56v00x95zpdpa5j55c3bq1f9zf7cvmp3pj9pa9hzyf"; + rev = "4deb08235bfccfbba8b0c031b1cfc8189883cdb4"; + sha256 = "0p3q671s1wca9qnyssbigafh7ylbf6yg2rxn1s9gxgmksvmj0d1a"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-01-13"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "a7b7aba3ebf92a85e4cb6ebf1c4ee67862c5980a"; - sha256 = "0k8x2v0xkgyvghbbd5fsmrqa0sxaavlyi4pqxlkyl76mfkrvph1y"; + rev = "060ea7f5a7b28be87689e2b3d940baf6efc2da04"; + sha256 = "1ql2c34h294mmlwl44q3gd3a1v60iplvx9l9lyhzp8k5ddc8c4i0"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4860,12 +4872,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-01-19"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "747bb955c5bfb2dc5d51280132f00a56a53f9f6d"; - sha256 = "0x9zasdj9nikida0csci1mnd4ajbcysqmz19h0rlkm9chd41fgv8"; + rev = "aedcd79811d491b60d0a6577a9c1701063c2a609"; + sha256 = "1lsxb684pdsn625krshxr65lyqb5aa07ryqb5yif8p19766g01pj"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4884,12 +4896,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-01-15"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "5890e34251f276d5808d6390b5eeebc356af801a"; - sha256 = "1lg2vdwp0mqh8x3k23jwg4lsmpczqz1b3h63qxc51gvkdihcsxaz"; + rev = "4dff4c9d40678d895c8fe8a19b7ad98a196d0921"; + sha256 = "1rl8bsnpi095njj23ihhihky0r5nagcffc5d3drhv7q74jj3bz0x"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4920,12 +4932,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-01-17"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "0c2f6a27d0706fa86f2512bb0c470b68876e55fe"; - sha256 = "1b50s51p8bzgi4w4cg5bwmy6wb24ljg2445v48nw5yldaac1ybjy"; + rev = "82f4ae91e8c3a192292d9ffeccbb15f71b57bf2e"; + sha256 = "0lad6zzdws9gjd6lqj0339vc958i488jyiwp98yhmdjg29pfb4mq"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5208,12 +5220,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2023-12-11"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "31fc250a412ab24555b389f61fac0330f6bb7660"; - sha256 = "18kr0avk2vcv6fp9nw2y53ssl5lbv4vh8g9sav123anlqpvd756x"; + rev = "5e18095a637ec969b86c72266872219ad2f4586e"; + sha256 = "0lls2pa86lyfzwmipm6rxpbv7qgyx1mlgzg7rjr44y2rkv4m62fl"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5268,12 +5280,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-01-18"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "dec1c21204e2d9d49dad989b577c88958ed2c113"; - sha256 = "07wam0383qxvgfmiblgv8nyzs9dr48wv2ibmr798bp6z9clcm5qd"; + rev = "c129311f4867675a52551b0a7ef12186308be00b"; + sha256 = "0j1cc55y61bx7mxmxgkdrjx89jbgzfvkhi7kja215gqc144rrd0i"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5339,12 +5351,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-01-05"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "3112b7aba57653199ad20198f477d94781bb2310"; - sha256 = "07ldzrrwz65m3cz1l362dmi4ar278x55q01znjqb0p0lxp0m1cqd"; + rev = "2198c07124bef27ef81335be511c8abfd75db933"; + sha256 = "03p433lw15km3gqf5p5jlw8xi1v8ifxr3byc5f7h692bgnn2983h"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5375,12 +5387,12 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2023-12-26"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "566b7036f717f3d676362742630518a47f132fff"; - sha256 = "1ydnqz06v4qny5k6ldlmq29w54hlgif6w5ds086mxfv29c8br3bn"; + rev = "7d131a8d3ba5016229e8a1d08bf8782acea98852"; + sha256 = "00ns525n4a3yqsnrsfbffj38nhh03s39g0dffjq6r71air2irhrc"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -5412,12 +5424,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2023-12-29"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "e8a58f36c256af65cda36878f6f2024a612154c3"; - sha256 = "0f6lmy754d7bxjznzqcl2c45d54cxv3y4sck7sv15vl6c75m29d0"; + rev = "2e8d34e748642621d761a65e3c2a198154b914e8"; + sha256 = "0v98vaz7d2b5fj61afhhcbrhfjri0s9n6kqg7yxa2qqfyqzd0x6v"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5496,12 +5508,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-01-14"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "3ba1b92b771f33256b4969d696b82c8ae7075364"; - sha256 = "0c6hppxhw2cap5v9m4ni7k9kpaf9vb87j9661j5ypgp6c3y2wvb9"; + rev = "b9084b1f42f790d6230dc66dbcb6bcc35b148552"; + sha256 = "0r8idwgaa2w1ijxkgav2p3bbmka8mm3cihnwljgqc6k5cydbyc6j"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5520,12 +5532,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-01-06"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "e110bc3be1a7309617cecd77bfe4bf86ba1b8134"; - sha256 = "10h6krh9m4mdj40dszpc1jvaqa8zijc670bk56bs0nya7zbmwnv8"; + rev = "9c9416817c9f4e6f333c749327a1ed5355cfab61"; + sha256 = "146p31z37kixchad2rrdndx6wmnfb354i34qhwwjc6xg5jqc1x9i"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5544,12 +5556,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-12-13"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "60416124a07a3358f3b93915092db50fcb712b41"; - sha256 = "160ycm9dh95r240jgz6wgfqgmi2i6wxwf32jq7348jabxbl3n7si"; + rev = "7cf05c682044a528510cc41135d83f52e4356f15"; + sha256 = "1y7906y3c88sxcy4fccjvigy5vmxxllr45c6kg8w55404jaavhvi"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5616,12 +5628,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-01-16"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "910e49d2d45e9d32c815d16cce6cea7c3b43cecf"; - sha256 = "1jvl8ivsqiwcl0ary6d1bbycsxpp4kmqjbih8wrss85k7hqrpsa9"; + rev = "1cd8d7e8318071eddc536815f5cafe50b012ac29"; + sha256 = "03gpcx09a53w73bf4kyhk5xa764bxcaaymwrnw1jr0yqinyz7j62"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5676,12 +5688,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2024-01-17"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "f4b345dff3d91c270b490266c171b13a41eb92ec"; - sha256 = "0ia5i38qhawdngzyj93yn49f49c00m3qhbv2nm6yi96r3zz45kba"; + rev = "81f0e320d63e2bb59219b9de8dc244e856412020"; + sha256 = "18dkiksnnrxhzisarrxzza3lyankw6h3zf1dvzcb6rbbmn946bz5"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5712,24 +5724,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-01-19"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "38833744d5cdffc5cfc84b2be0c5449b5b132495"; - sha256 = "1fhfxmqwzfzfb4zb1ma4w1x0qqg2xhm021bbgq13gqsym51bm84k"; + rev = "4a3980f74742ac6f151cc00e444e74fc02b799a2"; + sha256 = "081x575151glxz0lfpif3msdzx0wjr9730rwj4ynkavjj5fcx9s3"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-01-15"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "add6e9107eec368acde6caed0766256c5dae5005"; - sha256 = "1k1kg1c9i7izdj3x3z4gfyqwix9kmpvap27dz54qraklb0jx9w90"; + rev = "c2fe71f5b47ff5042053dc74cf8a849d662f2275"; + sha256 = "00p0y008w07c5yd3aqczxiidl0x269fsblg3lnjd4xxshjhpdsp9"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -6024,12 +6036,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-01-07"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "2f2d08894bbc679d4d181604c16bb7079f646384"; - sha256 = "0gnlsjcjwmh544amwbf8jjw14wf9qz4m4wwagmf8qc1ss5i5qi18"; + rev = "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a"; + sha256 = "0s0j67zv6hzj4fsa7kp5rkbbgcvx7n7hf7vx14v8lwaz139lml5w"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6048,12 +6060,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-01-19"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "fe9e3a933a8c5f9feb5b0fd4cc451f4241d94263"; - sha256 = "1y3y56bhigsb0g5a54jh3yr2b76l2bmfp62njvdln17c745ziri7"; + rev = "cfc29315288515849aa54c05828d49f01f033b66"; + sha256 = "0h642cscysznr4rxzch4kq99l7f2kgdxyiibws844w1wsail1zqx"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6072,12 +6084,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-01-18"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "482abc6688a028ce183719b0350d0235ae2c2e83"; - sha256 = "180gd8z6mck7gbdhcbpaazk61396v18njdv910lf6cvqnk37bjz1"; + rev = "3408a4daeca5ff8f41cb2c668b6d8fcc665f793a"; + sha256 = "18rgw2jlwyyc586ajrrkhgj6ddnz784ijjxjk73007icdsychyh6"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6108,12 +6120,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-01-16"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "38dd297a905ec6869f4c20ea9184a3e514316e3b"; - sha256 = "0jgp46dsj9drldbjvy2rgc1yyqbzk34ka14lpkzl13y1dcfhxysc"; + rev = "ce0c369ccdba3f644a3b28f4c053421f435352c9"; + sha256 = "0zvs6ygghz786fs436pladaml57mfb28lfx0xciwdrxfcd25rmf0"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6180,12 +6192,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-01-15"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "a6ec80f455f948e122e669ff6039bc977427b158"; - sha256 = "185586rwj8h9ck408fgkxn6gm6ss11qssph6sxkgi45xi64ywvcj"; + rev = "28cbafbc0cde316d8e2618ff26377200225e9393"; + sha256 = "1z1ir56mlwaay20x7yqdhkrj2nl39xhd63maims68jam59l55lq9"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6252,12 +6264,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2024-01-15"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "dcdb40ea48f9c7b67a5576f6bb2e5f63ec15f2c0"; - sha256 = "0nl9m3rc1wfwc27bz60raqbryafp862vapdkn6x56fzqsgj3wwvc"; + rev = "73043d666780e35185a77589e01bec96a52db910"; + sha256 = "1aj4zrp21h7h77sw70l2g3spkgzl5vb24vv2halrfrqms7jfaaqf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6409,12 +6421,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-01-03"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "3c06f239ad260f02c8678141e08b57d20fbe2c55"; - sha256 = "0gplrxwc0h2rsm5aii6aqj82qikwdmslv3yxrxg58dzp63198pc6"; + rev = "d945ccc5041ff02b86313cc5d02affd39f8e1c3f"; + sha256 = "00194ldhg9m2w5mr0wzcvz7d7icjb2ym0plqzhh4yga0iipqsdvb"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6577,12 +6589,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-01-16"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "cca56a8f29e7e55b2044216762d5192d23403946"; - sha256 = "1948p2ywljsdynyp8n2rswli2b37yvbys8lnl7sbvrh3zbc17pfb"; + rev = "7ef3da23c5b7f9e08ca7e1f9807c1a5a93e2f33f"; + sha256 = "0p0cfds0z409c5ydn8j7ycsh9jmaz0a7izakgkmg8lpqihvw6dc2"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -6601,12 +6613,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-01-11"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "a4bc2bd3d7ff1770ae104068458d3b0b8f8ec00d"; - sha256 = "1f50nifai4988g62kki8g6cw9ipsgi7iba791h8n6p5gcypv9m0z"; + rev = "7e9487875dc5f69a2fd6f60d3a3ef4fb457b57c1"; + sha256 = "0yzx95mkgq37hylc9ksca7bds0ny06x8hphin28k4pnwi0vqcf3s"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6661,36 +6673,36 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-12-24"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "b305821ca45897db6276e9ae5893747bb24040c7"; - sha256 = "1gwqfasnjcqd1x6r6lc7kix5psj8zr1zbm5g11mkbz33iq6gxvdb"; + rev = "fc3cc9012d9720aca3203702447caa59bd93f1a6"; + sha256 = "0flml2v5znlgffgn59k82dlz84d705mg8rxrhs8sciqr7jqxk1xk"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-10-25"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "92433164e2f7118d4122c7674c3834d9511722ba"; - sha256 = "0cs7hnjgv1np3pmz0li9g4m01i87z360x0fpbh4aqck4k8mhjn7f"; + rev = "bf67d70bd7265d075191e7812d8eb42b9791f737"; + sha256 = "0f1rx88zjk062w8d1wqk8m1yzpyp20x781s29kdsmr813p09vl4l"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-01-19"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "85da59b7b642b1cab263b74ff1be83536e8c9bda"; - sha256 = "0hr89rrvs2224f898i8aa0l914cc33cf2qmmfi1rk6r1rd1xbb0q"; + rev = "a311c7cc8f17543143a7482cdbe3a384c371d56a"; + sha256 = "1fk52awkplp2c1bf7aa8whs6qaxvphry1crp515b2yz0ik8ykqdk"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6781,12 +6793,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-01-06"; + version = "2024-01-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "c80f3f0501800d02b0085ecc1f79bfc64327d01e"; - sha256 = "0pbq0sjbb8fbr3aknw64gdiklbch563lwricxnsivvmc6liwqa7v"; + rev = "282a23f4469ee305e05ec7a108a728ee389d87fb"; + sha256 = "0b222vc3xqhaa6abkd9w3gd8l50ddrb06lsxwhw1sa9sqssv0bc1"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6829,24 +6841,24 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-12-20"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "9fd41181693dd4106b3e414a822bb6569924de81"; - sha256 = "1xwvw5j81rx7q5jmv14fnphxsjk9anzglf10j8ai8217gc9h530z"; + rev = "096d0baecc34f6c5d8a6dd25851e9d5ad338209b"; + sha256 = "167a5d8rycg703f1x9q7g9bavchfv8cj3qxvq721cf9sz1jniip2"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2024-01-09"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "535f58e10c4c1a5e84ef4a1285ef83ca5056f5b5"; - sha256 = "0ivcids52j11wkpzbqbfq3ch3m27y032mgikm2h6ghvhffzhvd4l"; + rev = "fc26d79fb3420eb3bc6e036f23671e25bfe227d6"; + sha256 = "1fqhngnwas2lykrz5yjw68nfwzy9f0a6f4vmk97jc54npwn5qgkc"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -7057,12 +7069,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-01-15"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "a6beb3a855b42faa1d0fee1081602257719c2c5e"; - sha256 = "0xa8bk272rxh95m9iiiipc1v12j0ln37pshg12dxmqb0bq678d43"; + rev = "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f"; + sha256 = "1by56ffghig930r0cak95h0gxxrf78jwr3f2fxqziyz32dvi5mp2"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7081,12 +7093,12 @@ final: prev: nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; - version = "2023-12-20"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "amrbashir"; repo = "nvim-docs-view"; - rev = "17ff4b73e838b15e791940f745b69e28ec5967d7"; - sha256 = "1y29lw7hj8xx74svka4rh30yfx7y3p3vz1mfpqh86zh084fxfh0n"; + rev = "78d88bca16f32a430572758677f9246f6d7f7b94"; + sha256 = "1sqg4bh6xkq5d2rg97g2350iil9mcl4wh12ygbj93sj5m0jfp4rp"; }; meta.homepage = "https://github.com/amrbashir/nvim-docs-view/"; }; @@ -7153,24 +7165,24 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-01-02"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "c6fe75e3b3193818d94042de1a21f3e62252e994"; - sha256 = "1q788w2pi1idrs13qqbisf0kcpjmhkvi0baa49j2bljsmd2r1hp4"; + rev = "cb3bdad6501d6314fe0ed00eee883b98fc0ec8db"; + sha256 = "0hh6cccs32g7b1ashz7kjmrcgfdjrd5dw3as0b3d5v04shm0vd17"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-01-16"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b228a68653824a41000e9edcaac796786c2088e0"; - sha256 = "1bw3b9pj50mychchj5rddzcyjfgw4ihs5cim28im93q6lx1alnqg"; + rev = "6a69959d5a945970cd59b32e19428c4732d7554a"; + sha256 = "01qw3qaq94vsawm3nnwwrf0x7mra8wqprgw1nc2njzzygqkhivqw"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7284,12 +7296,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-01-18"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "b32127ba52f3a1f7dc86773c2ca3f0029afa12c1"; - sha256 = "19pxi87ji05hyp3xc1z8v3q4gqc9ggq27sg9wrjfi6zsym04xgw5"; + rev = "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744"; + sha256 = "07vs24r8jglq9sjj5lz5k2ay0b5arg21cvvl54j2hl9nrl5fl2z4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7320,12 +7332,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-01-19"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "042aa6b27b8b8d4f4e1bd42de2037c83d676a8a0"; - sha256 = "0gg39lw853r9kvfzkcdp55yymryl9nsr7ggq8ml6szvlkmb8rydl"; + rev = "8917d2c830e04bf944a699b8c41f097621283828"; + sha256 = "0wiqy0k83qjh2y9r3rdm8jrrfmrwfm2729wrshxmxbdns0vjrmja"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7668,36 +7680,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-01-14"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f24afa2cef551122b8bd53bb2e4a7df42343ce2e"; - sha256 = "0mysmbqk1rzw42cvifpnwqvfndfsr2ddzgwsl9iqn1nii6mpiw05"; + rev = "7bdb220d0fe604a77361e92cdbc7af1b8a412126"; + sha256 = "1ij2prf826bp90i9ask2an0aih0nch5c4sax4awwwhpnhic3780h"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-01-19"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4a4dbe1cb1da34d87fc42a40aaf8e218af4cfe0f"; - sha256 = "1a5v7a68ip3vpb884fca3ffhzhgwjhp40vbk6cbb3kn2v51zksnp"; + rev = "cc908cfcd7258b2e5c1a9c583e2f3feda0caf23b"; + sha256 = "0xp9gfcdpxbxf09s449w5dxpkbw5hin6fxzb67kfz18k7fhnwfrw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-01-19"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "85cf977181fb8e816e47ac05df7f756e9cb72caf"; - sha256 = "0i6xm51y61r1x322q90yryqf0azzycg1smfwpcq83v8f4hz0h5gg"; + rev = "2972717355a18d5599e9162f48d6e3e584068bf9"; + sha256 = "136yqfbgcjzy0k99h5zjrfdkcy5xpdqwdkvvc6x0ff4sw4mq0kgj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7764,12 +7776,12 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2023-12-10"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "8515e48a277a2f4947d91004d9aa92c29fdc5e18"; - sha256 = "0bmxkq919dlhblxc7bjsvy6206qq1szi022i8g9kjsvq13726p9v"; + rev = "a65b202cfd08e0e69e531eab737205ff5bc082a4"; + sha256 = "1wysb48l5dfqfqf6mr75jni7n078h1ab1bqyrrjr05sybn3lww8b"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -7812,12 +7824,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-01-15"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "140edfcf25093e8b321d13e154cbce89ee868ca0"; - sha256 = "0vgd17jnknaayhshgn8ik40lwhb94f1wfzp0bww7s65kyxvciqf6"; + rev = "b427ac5f9dff494f839e81441fb3f04a58cbcfbc"; + sha256 = "13ywffn24wlqciy1fnisiqbgsg4h6nxf3wcd0v28kmk29wyzqkf3"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7896,12 +7908,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-01-18"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "bf8083fdd9745f32cf2d30e9e16285a46294fd37"; - sha256 = "1315h1gxhxhgw3swyf4nc2dzmdq2hf1cmbwl8di6v5ymcnxasygl"; + rev = "5f469faab7bebc1ee30942eeebfdfdcbd7f2b411"; + sha256 = "1abrd8zs1cmdw08m3vxlc6j2ay7kvchl53zx052lqps07is3b6ny"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -7932,24 +7944,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-01-18"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "2ab86dc1e882c5e05679faaa2827010494597b8b"; - sha256 = "1vkfxa38rv10ipmz9akcaspykwlak408wcdzx7bmq9nb1pdbnldg"; + rev = "f77d214e5a67f1c1eb601a9c99418a5f7924af22"; + sha256 = "04hsdz0ma7q4c7bs89si2hdjnds5rybagh7z1jnl8xc52kxf2lwk"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-01-16"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "dd432e76d01eda08b8658415588d011009478469"; - sha256 = "1dsiwyjpv8qygpn8pm1ys8jnlrszz0z7kyvyc48xh9z3m912l0fs"; + rev = "bf753c3e3f8736939ad5597f92329dfe7b1df4f5"; + sha256 = "02wjsfhhq8lrai18m3khv7sln070cmwgr7jqp537dwl47v4pq4z3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7993,12 +8005,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-01-07"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "dc3bad0121298f89b50aaff8599d1946e07eb4c2"; - sha256 = "0sniwmmjg488l63zkly4kca0f51s0gjfc7bqh48n5clfwc7kfbpy"; + rev = "14e5de43cf1ff761c280d1ff5b9980897f5b46c7"; + sha256 = "16c3hqpn11bqa39b02x5dn94ny5i3pkyn80gkrcdvibp7zdxjfwf"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8017,12 +8029,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-12-28"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "44badbaa1c4408679adc6b6979b669540db3fb46"; - sha256 = "1wbizvrwjhw32pg0fqm28fvma80v6yf29vsv5hjx30n1hdvihi9v"; + rev = "e39ebd1d8062acd11b2bc0cfef8ce6d88d26c4f9"; + sha256 = "1vaafhvfzcg1g2llb1swazfjy24safc57lkyxd6f0cdh0hxiykx6"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8041,12 +8053,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-12-04"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "879bc64ea4678bf32d2bfda47c4e3a04af52a448"; - sha256 = "1w45z9jy9ckplz1g0smyrbcdll27sqpc059a5r53y8nfb5abllnc"; + rev = "c2219394f20ab4d256d7cf78d6c82dea75491a2a"; + sha256 = "06dwlckfhvzgmfq13a6259krhs69z5r5yp4wqnwf17wvj80n1vvd"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8101,12 +8113,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-01-16"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "651078a2fe60b12c93903e3a2b655491c951bf9d"; - sha256 = "1in5pp7x38qp7miw7vb2qv5n4w52a6j6pmpxf02wcxynnbk5hr54"; + rev = "bd2a65179c814b40ca3073a282507a6a4f2355c1"; + sha256 = "0biqfp0azb2y66zvqlp8y037c4raxhlnwvn89vdpp26d6isyzf93"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8125,12 +8137,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-01-15"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "aa6d92688f4c6ca136bd4c8935c7ac881343043a"; - sha256 = "16plrkfg98gxha5mq2yvnpd09laqr1a28daznv5r65rmasicsklv"; + rev = "151b75410e7b6041fb54f48443a80ecd518cb31e"; + sha256 = "08bni1v06agsm9mpq01wdig3shc78i97a7mfbagzlws0wj38qgpq"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -8342,12 +8354,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-11-30"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "55d9fe89e33efd26f532ef20223e5f9430c8b0c0"; - sha256 = "1f6vqqafk78njpl47xgsf8p199mmvw4h4b9axab9rl86fdlibikz"; + rev = "663246936325062427597964d81d30eaa42ab1e4"; + sha256 = "12cj7f0ghmd58ka9qc1c2qyd5x4cx97wd3avx5ny1x1gb8il013b"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8620,11 +8632,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-01-18"; + version = "2024-01-22"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "8b6099f24e435036a628798585f95f62fb892838"; - sha256 = "0mn8cc3g4hk13gykcf48hgq8618lbz7rnqlgsrb2bd7jilvma42y"; + rev = "35530b4ad48f01bdaa852da34e4de9930fb54c89"; + sha256 = "04a36454m0vhwmq6xfg75252yhck54b58n18kshm9z0razsg4j7m"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8703,12 +8715,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-01-10"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c067e44b8171494fc1b5206ab4c267cd74c043b1"; - sha256 = "02w3l0ir3dlmha2m6dxdgk0pv2bw6qx2xjpbsrl6y8yi1hvyhrmm"; + rev = "f4546284059f7dc01f65be93d03f6c850fd2aba1"; + sha256 = "190438nnqw9nra3vrrpcfw2nib3s2jzld6iyd1kniarlggid4fwd"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8763,12 +8775,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-12-02"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "84e81a19ab24ccf05c9233d34d4dfce61c233abe"; - sha256 = "1z6wkszd84xnqfhb1s59rggcipl9dmyxw21yrksg1q7hhcgq1abb"; + rev = "3035cab370f806651704d5af5d18cbf0b0be0840"; + sha256 = "0v04cc7mgzk7l8dznjqx7vaghh66c2x32zy0kjvwhyb64n07zwxv"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8883,12 +8895,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-01-19"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "dcd8c9a316ab74012f5da87bf56ad51b3c060c30"; - sha256 = "1zgrr0r6fi2fyxi5fsphcfpjhs09srwsa2v4z6fk44gf2pxm1wrj"; + rev = "87fc16de1360cda02470824a17e0073967bf29f1"; + sha256 = "0j3kysif91m3dldk5fwh8r4qxsakr6yk1q6iyi9wajnqdkgxkzcy"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9208,12 +9220,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2023-10-24"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "bdce098fc9e7202d3c555e2dc98c755ca1c23835"; - sha256 = "09brv393ccqgvg0xwg55lh6ss5c16qs1as2hrrqh8952c1kqzxig"; + rev = "42822f8f9b3a5088f05cf72a0aa1477598ad1a40"; + sha256 = "1k881larnnqwsm9fanqp7nbiqpd03m779prshky9hy50hywl5vv2"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -9872,12 +9884,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-12-31"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "9c18474d0a4b82435ce141c2a21d9bd7b9189272"; - sha256 = "1ps927pgapgns60ilpb5z61affky41kjahl6bwbm1s6jrynki0df"; + rev = "1189184484e3153533af66b219f9ed59263a403c"; + sha256 = "0fjl8bjmnm4gy8dxc0596sajf24sd5w2z1p6bwfpjisapykf41hb"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10102,12 +10114,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-01-18"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "9cf58f438f95f04cf1709b734bbcb9243c262d70"; - sha256 = "0plr1ba69mihjd5098mq16hnmqrryn5xh2xnm9x4ng6mgf410mcz"; + rev = "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c"; + sha256 = "08v642fh91c7mj92jjdjfzx86jmz2plvnlja8p8lwbvz0yvida5r"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10318,12 +10330,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2023-10-25"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "4a6737a8d70fe1ac55c64dfa47fcb189ca431872"; - sha256 = "1wf19rahk713qv834gpaw18w8a4ydl44m6jz6l933ns89q1kakk7"; + rev = "833d8dd8b07eeda37a09e99460f72a02616935cb"; + sha256 = "088b3aabv5k6bvmhwsg9v7njgz95dvvklpjab832dvpifmws4b0f"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -10343,24 +10355,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-12-25"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "e3805fed94d487b81e9c21548535cc820f62f840"; - sha256 = "0kzmv598y2l6k2cc91pmg8jq6i15mpz73kwc36jwyiripn5q9dks"; + rev = "b49df5cdce67a8964d1b027dae94bde212092b51"; + sha256 = "1102wcz61bcvkiz1ck2cxxb32id9rf2hjhcs82y3x37n831kgvyb"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-01-19"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a2317487fab23d2869d7f6f24da31b7e5f72ca0c"; - sha256 = "13f5d5b6xivh3s80c4b1hdkh6j3kjdcn6f6hldpinkracb4kik3c"; + rev = "e3301873c1e96903daebb98cc9b5926810bf73dd"; + sha256 = "18acixjcgqzihb86apc1s8r31yp0lxw804ddwiaygwc2b3drfyx8"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10523,12 +10535,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-01-03"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "630bb8b7faf1fe02c253673a37a70c135ad43a40"; - sha256 = "17v64miynw7gnpnzq2cphfljnzpd65chp1iqlw453k408k8ravln"; + rev = "816ba15885cb5eb742e06bafcd53b1a8531d334b"; + sha256 = "092cihsphaxvpimmpzfys64pakrvh23l3zc2r0f3pjzhf69vdsvr"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10547,12 +10559,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2023-11-12"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "36ff7abb6b60980338344982ad4cdf03f7961ecd"; - sha256 = "1rjz58ggkrz0pfrbiq93p2zq4bif2m7rjn9jj8hbqikmp8g7h19g"; + rev = "d9c8b4ef872e078e8c4080812e5a3ed56d151c00"; + sha256 = "1dawzdyrzbiry907i7flqyk5178a18vv9gycxn0g90cd5d5lrrrp"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10571,12 +10583,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-01-16"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "f991abe291b1bf36734d36bb9c9a7196c9ea7ffe"; - sha256 = "16q1vg5ddys7b9xm41iv0ljjn2w2jfbv28n70fv1kfklayggshqm"; + rev = "2ab2ef5142b390e99b2280a4b45b24295f58169f"; + sha256 = "1si3aixiwbb80wwdqx5i51h4sqsvvd75bnc0kv6sijc04gl10fj7"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10667,12 +10679,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-12-17"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "8cea10925699a8f77f6d9ebb5df87a5995fbd3f2"; - sha256 = "13wlrsri5m6yvfrcjkfsr70r5rxbzga90ba03m6n397xfmybx506"; + rev = "b187efe0ba367a47d2cc4785fb724c0451a85260"; + sha256 = "1pmmkalyhzq9v8g1ldkvc06jz3nwidr9iwrwkl9phnssn4v9jsr4"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10847,12 +10859,12 @@ final: prev: vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; - version = "2023-02-28"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-local-vimrc"; - rev = "28514f4aedba1fd824fad8ccbd65fb41bb8057f0"; - sha256 = "1xhdywcyyr86jvrpghn46avgc6qy220fnyjg6rg3pqvf20hz6ld1"; + rev = "5a3b61df34734127d9a1518879ecc06e550547db"; + sha256 = "13ysvhjafx7b5dz8fw672sssf69ayzwbkwpd22sj3rykwbyv3gh4"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; @@ -11087,12 +11099,12 @@ final: prev: vim-apm = buildVimPlugin { pname = "vim-apm"; - version = "2024-01-17"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "vim-apm"; - rev = "e7574a39366866d47a846d25d0d327e2c04aad0a"; - sha256 = "0v46cpllrm5brndx9539rq4ib6z03nj1v8wmdp366yv9zxya4g2i"; + rev = "a4f52e65c3af4282508ba0db0e33c45bbc371968"; + sha256 = "004fy3v1nxjhiiv0kd2ahfbbngdkmkrpr97s5q6aaa8mykgs7rfr"; }; meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; @@ -11747,12 +11759,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-01-13"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "e99dcfd5162d9b9b4b24a5d035cf114315f1aeec"; - sha256 = "08yx7nj49qyhqwsq95imgzy13x3g8mpx2x6ka78b1jwjy1lmx12g"; + rev = "165699c573469e6a95b48d35052f848c340c5911"; + sha256 = "093iyr739xsi8s94kcws6z0zi8whwgircidg2f34qwc0ix9zgppg"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -11831,12 +11843,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-01-02"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "aed4e49df623f3438542924fe6d15e5d090ce921"; - sha256 = "00q8dxp8ksbrf8n3v3r75l034rgzjylcxqml7k9wbw3k0cdqjvjh"; + rev = "0966b866580ec5cc8fbc26ee396a516d72600db5"; + sha256 = "0jmpjrx4kl11hgdaiw5wxfznmn5apl38ykih0mm01hcg49gzirsw"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -12059,12 +12071,12 @@ final: prev: vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; - version = "2022-10-02"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "f7d4bbdcff675000d4345d9834cc7d825a84ed3f"; - sha256 = "0b4f2jwsbsbysg364pslw8c94nvh5q2clfxfnz3lqrkkl1cpr3cs"; + rev = "275454182752162ac680c214675cb2a45d010cdc"; + sha256 = "0crg7sf2ziz1zkjf794fnyb5rfcc0s48g3qngc4in44d71b7gc16"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -12095,12 +12107,12 @@ final: prev: vim-exchange = buildVimPlugin { pname = "vim-exchange"; - version = "2021-10-21"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "784d63083ad7d613aa96f00021cd0dfb126a781a"; - sha256 = "15bwlky7if7jp3g3banxi2kkci1wa54y36b4m27mggsc6kdabd6q"; + rev = "d6c1e9790bcb8df27c483a37167459bbebe0112e"; + sha256 = "0rr8858w0q2a0y7ijag2ja61qay7nqwzd9g8lknn84np9j29lfmf"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -12227,12 +12239,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-01-02"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "bb1fda0cac110aef3f1c0ac00be813377b2b9bf0"; - sha256 = "1rhgcip62ixl7nlnjskf2q6qdzgayd2nhhsbg98jw3lyy84k8m31"; + rev = "6289ab2e237ceeefdbcc7eb584b63d144bf88d94"; + sha256 = "0l085wk1plzxg3hxj9gjqg9ws8b43g2wbzjralzfj0r3py7icnb5"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -12287,12 +12299,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-01-17"; + version = "2024-01-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "ec8f7eed103c6d5b75eac69196bb87db0825629a"; - sha256 = "00z9c3q35lk559wb0fiamb1a55v01fr5qrig1vfwscwhfzvg7lq9"; + rev = "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b"; + sha256 = "0bzsm454bbxyjxfiwjgx5hydhia0i04y895am0m5rl2vbbyykkmq"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12443,12 +12455,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-01-08"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "5bed70defbd46fc4eb7d80f7eecd26746b50ee00"; - sha256 = "0zfjv25zkl2lid54pikpcr7znhfv3y1zxa1kwfn7wznv3ibwck30"; + rev = "ca6c532753e70e4fb093e755773cc6f250a3b4b3"; + sha256 = "0pfizf55abw1rbdrsyw9g65cia165irnj2f0snx7qmg194bgblqg"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12491,12 +12503,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2023-08-04"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "8a634bd8d7539eb645e23147516d6c3054e71306"; - sha256 = "0gj4f65zcawxyh4zgcz6frhh3libi4s28h11mrnacixzg7nc70dx"; + rev = "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7"; + sha256 = "1bih86rm14788b73dkpfzv2ahrca3vxahd5pc39lx122ma31l639"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -12780,12 +12792,12 @@ final: prev: vim-indent-object = buildVimPlugin { pname = "vim-indent-object"; - version = "2018-04-08"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "michaeljsmith"; repo = "vim-indent-object"; - rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; - sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; + rev = "8ab36d5ec2a3a60468437a95e142ce994df598c6"; + sha256 = "04bbr9aiq2pnp7nh1rrcys0cm3a8divkrmvs2557zd1ck3rrx2kw"; }; meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; @@ -13021,12 +13033,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-01-16"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "60fb16e889fc241d172d51c0f43c8dd70384209e"; - sha256 = "1qlcx1nyb38gx2a56pdr17np9s76frq0szbacj5rj238f0j6rr78"; + rev = "6d95cd79c40d82d26f2ca887494d01e8a7e90d6e"; + sha256 = "06sx968r78nx7nmlrh8m9f45l0wpq251p7097r7ygxjn3da3l5rq"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13249,12 +13261,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-12-21"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "d36f381dc8f39a9b86d66ef84c2ebbb7516d91d6"; - sha256 = "0bdkxvm6sypciadlznh1s4xa7in1n2larlr6843k9f63ray4pr9a"; + rev = "c20c6650d32a85e09ae6c7a9747aef7ded3677fb"; + sha256 = "1farhbqp06dkjh480lv07yvgwnmikaaagr5mpwwjrmws3m92xmv4"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13646,12 +13658,12 @@ final: prev: vim-ninja-feet = buildVimPlugin { pname = "vim-ninja-feet"; - version = "2021-05-27"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-ninja-feet"; - rev = "cb9b448dd468a338255aed474e6113ed115612c1"; - sha256 = "1aqmhqaxb72ih56mh85kv4fkxyqw5hfispd208lfyp4w3zhvli30"; + rev = "47ebe12017eed3f980eb6690658deffbf7a59b2e"; + sha256 = "02j2q6r23fk7vkxwkhs5m67j449xjsgy969gdxcnpbfifldmfn3g"; }; meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; @@ -14114,12 +14126,12 @@ final: prev: vim-printer = buildVimPlugin { pname = "vim-printer"; - version = "2022-03-01"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "meain"; repo = "vim-printer"; - rev = "55ab49179838d86f92fd847504cef3570000b7f3"; - sha256 = "1h2wh86qph38mgfyahy8ha6zpvn2kvs4h2znipxq9z4ybnwcxmf4"; + rev = "ab72f348e73fbaa7e72b9251da78f9cad1f74aa9"; + sha256 = "1bzzzq21silsrqjqpr44yrrp15kkpn1jhc2gf45zph18nizkbbl1"; }; meta.homepage = "https://github.com/meain/vim-printer/"; }; @@ -14594,12 +14606,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-01-14"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "008b78cc31364c2829b70486a98d238ece9c6686"; - sha256 = "1wr6xal0i2cdf73j05n2d0cw0picjg97ls24yj2liasyhla0dzc8"; + rev = "4174e7505019c37f754af0717b2c8b75a80193f2"; + sha256 = "1zfjy48s4w2b7sjpgb97sy7blwbf3d91z51id4pnzdi23dzcs5g0"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14702,24 +14714,24 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2024-01-17"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "75cd3fd2a22b8d6eefd553f386e0705e7d2cd4a6"; - sha256 = "07adykwfv6z08cxiblszrpz0anllv9kprdggzmyzwq4s222907fz"; + rev = "9bd88e07865bd4fa982d46356c227b07de66412a"; + sha256 = "0xy0arqhcndasd4gmh7qbr8aw0ssxgaqy261nzib7f0gd21ig6j4"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "2024-01-08"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-solarized8"; - rev = "7e9035486c479c486d8aa8bc288a1110a021e0d6"; - sha256 = "0j6by5km5a4r76xxn4panxlr7ajlc6087gmnpdrz4d9yp4pz9zhj"; + rev = "6178a07f442a1fe559673cef6ac2b7031ab21edb"; + sha256 = "0y0xhcd5p32sni889avjsbjm9g9afysfvfkihm763lj304rf7prs"; }; meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; @@ -14954,12 +14966,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2023-10-02"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "d37ae7e7828aa167877e338dea5d4e1653ed3eb1"; - sha256 = "0630s7jaadd6ndkkj49k3ivink2vkajh0cjx30dw1ip6md360sjh"; + rev = "3d1cfc8e183f1a58f71587442849510462f5857b"; + sha256 = "0nsyv4pasavp8iaakl9l4vybpwxvkxaimzv7rzb51v9m03r6jqyx"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -14979,12 +14991,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-01-19"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "a41a9d571e253d2d02e3898f2a08d129c52ec3f2"; - sha256 = "1l67f8v6sk9gwhg9xql46an0pm1mc0aqn4qmmnfprr6dgh9pwl2g"; + rev = "1f4ee3307e266a64b00d816c727fdaa57b34ada3"; + sha256 = "0y361p1dc5nmv622ml6j5bw3f7ccpwa56jzjfnjhd069qi8xkvrp"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15303,12 +15315,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2023-10-26"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "aec289a9fdabaa0ee6087d044d75b32e12084344"; - sha256 = "04i20r65pqmmspg8bpdlhmjymw8s4qahcyb99yjmj85ysz5lsph6"; + rev = "e67f7fa011c98fc5426352d3bb06362a0f70af3c"; + sha256 = "052hb8ly7yxaylaqmlb7nwnwsjn2sbhr76k3fr618zn9p4nqa3df"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15423,12 +15435,12 @@ final: prev: vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2023-11-29"; + version = "2024-01-18"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "8d13283a15b077e64ff41081792b998154df76ef"; - sha256 = "05ivzp08fhl6agcmiwclpf5mlq8s4cf4jsh8z5v5sjmahdvh45mk"; + rev = "cd4efac3e77177afdf220146948d0e06245946de"; + sha256 = "02kn9dry67jckzwan4rqd4nsycrpvg62vg23prg8wc2i9j0p389p"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -15748,12 +15760,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2023-10-31"; + version = "2024-01-25"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "0bb1b4945bb205a076a35b66174e5d66be8eaafe"; - sha256 = "1vymahgvlgx864f4hwfy1ahpg1py095qz4n2dcj152z3hl7rkd4l"; + rev = "fde35bb87e45abe930eebef5ab99a16289e53789"; + sha256 = "0p9yfx6dg7pl96yjgyyqyyjjwdr781g0vnl7zhkxa1281sla5k9b"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15808,12 +15820,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2023-12-21"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "39841d05ab4a5c03ea0985196b9f3dfa48d83411"; - sha256 = "1xnfvyc1996c0vkpvqc1f4ys0wklq4f4k0lv557zfwmp96dl6x8f"; + rev = "826102511b9b689a16e3e55c30f2eb65eedc99f6"; + sha256 = "0nph82xyqvcvlr0pc78r292q6givc76lz24any7p6zph9rw0zyry"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -15892,12 +15904,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-01-14"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "ea5d5f5a2d9554ef34ddf57ddb7f78d5c57aa022"; - sha256 = "04icrbr14h49w2binlsjj7rgq7w7hvmixa4brqazc6703d2y1pdr"; + rev = "41d63295e2e90a6a587c9b7792cf672b416cf0b4"; + sha256 = "1mrmrlcq3g6ham8ywirf1bxbhrfw3xygvnl6mmrav2xydnv7yg8c"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16121,24 +16133,24 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2023-10-20"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50"; - sha256 = "1xmc17cmjiyg9j0d3kmfa43npczqbhhfcnillc2ff5ai9dz4pm7s"; + rev = "78557d972b4bfbb7488e17b5703d25164ae64e6a"; + sha256 = "0sa7fykwi2qzb14xc8jwf7y8pygh8v1lg531ykjln0y48nrc17qv"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-01-06"; + version = "2024-01-20"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "22cfe4b28e8bb5173624f69ac6bb2803d8653a12"; - sha256 = "15navmngs61ymha7j284yvj69y23liyik65rhyfsnx4n2rf1hgbg"; + rev = "072b21d16cc1d5ae5701455fadaa47b1e8a61780"; + sha256 = "00n9yy41qihayp3312wqnjms3la4kw0yjbb8fid26nq3a2719hjw"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -16217,12 +16229,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-01-19"; + version = "2024-01-23"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "f288876c6d05d3bb91b0e72b8031fe9e26ef05b8"; - sha256 = "0n04dsjwdipq103s69aiwfxwni030h27l6p1b0zg4967j7s37whr"; + rev = "bc1f2151f23227ba02ac203c2c59ad693352a741"; + sha256 = "0qs9s2qc3xmam66ix6blg1n4wfx6847i2ls824a75a5xr73yx15x"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16265,12 +16277,12 @@ final: prev: gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2023-12-10"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "e1f033164931797a67b68089995c8078415f9d7d"; - sha256 = "1ffr4h7vwgnxvvx57jibj5yvyag6mn6n1v29r5haf3md1981s97g"; + rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; + sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -16301,12 +16313,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-01-07"; + version = "2024-01-24"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "0c6e2e88bf15634af94a91fcc2e20e28a09dfecd"; - sha256 = "0bq1am032qdyqcz281mfbw2c69gxnan3rwvpm54ghc4hm4an7vq9"; + rev = "0c5f52d717c65951173455a70592f6383b3487e7"; + sha256 = "0i56cqfkzgccnic23v5k0slyqc8z9zai3zcgxka40wpg3wl02x0m"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index b35ec4ed2bf9..185681984e58 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -95,12 +95,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=7331995"; + version = "0.0.0+rev=f7239f6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94"; - hash = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; + rev = "f7239f638d3dc16762563a9027faeee518ce1bd9"; + hash = "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -172,12 +172,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=212a80f"; + version = "0.0.0+rev=34f4c7e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "212a80f86452bb1316324fa0db730cf52f29e05a"; - hash = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; + rev = "34f4c7e751f4d661be3e23682fe2631d6615141d"; + hash = "sha256-VqTe0teQalt35HG8b2RDPOEJyqgViqUf43MQKdhEcUM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -304,12 +304,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=a714740"; + version = "0.0.0+rev=3deebb6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "a71474021410973b29bfe99440d57bcd750246b1"; - hash = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; + rev = "3deebb663506a06e179e0dd739d2b23e158f4157"; + hash = "sha256-IN4svBz8TiDi6ADLEFgKfuY68GxIX5nG3nvtPRFt4Eo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -326,12 +326,12 @@ }; csv = buildGrammar { language = "csv"; - version = "0.0.0+rev=6c19574"; + version = "0.0.0+rev=cda48a5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "6c1957405bd6f7751b050f61367f1094fab91444"; - hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; + rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; + hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; }; location = "csv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -383,12 +383,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=53b4137"; + version = "0.0.0+rev=6b53bfd"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "53b4137bd37e726116ea918139767f982a1584d8"; - hash = "sha256-eHH6PiOR1xlIYFY2OcnvVVQanfAuJMkbsvDy9Wjm80U="; + rev = "6b53bfdb20a54727bfe344aa40907351a298f75c"; + hash = "sha256-KaLaRfFFVNFrQmKv6G33r4H00hNkHvyTo4Aj9sBkW4s="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -414,6 +414,17 @@ }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; + disassembly = buildGrammar { + language = "disassembly"; + version = "0.0.0+rev=0229c02"; + src = fetchFromGitHub { + owner = "ColinKennedy"; + repo = "tree-sitter-disassembly"; + rev = "0229c0211dba909c5d45129ac784a3f4d49c243a"; + hash = "sha256-IM3HzOhJmbb334PZ8q+r2EMi5Bv/rLoy+llPN0aghr8="; + }; + meta.homepage = "https://github.com/ColinKennedy/tree-sitter-disassembly"; + }; dockerfile = buildGrammar { language = "dockerfile"; version = "0.0.0+rev=33e22c3"; @@ -495,12 +506,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=11426c5"; + version = "0.0.0+rev=511ea5e"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "11426c5fd20eef360d5ecaf10729191f6bc5d715"; - hash = "sha256-/tfxskct2GByqFmmWJ4IZNREpNGvDqz2kbIyLRveGrs="; + rev = "511ea5e0088779e4bdd76e12963ab9a5fe99983a"; + hash = "sha256-gF+bhfaN45KmGGhLa4i2K8LiBLxY8n5fw2m6kYzx5xo="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -737,12 +748,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=62c5388"; + version = "0.0.0+rev=58b7cac"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "62c5388a7badb4e29315690358267a76a734bf83"; - hash = "sha256-Mxjifj5eIyw6rKPMAuhEt6bXTeHX2fDeJ1VaiZ70vgE="; + rev = "58b7cac8fc14c92b0677c542610d8738c373fa81"; + hash = "sha256-VtuGsa8jKndxlyJKy9UHfZXvAgr63Q0iwceXKfEUAYE="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -990,12 +1001,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=d742025"; + version = "0.0.0+rev=949b780"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "d742025fa2d8e6100f134a6ea990443aa1f074b3"; - hash = "sha256-ZpUruxwi9S+gUy/k0DkhDGWLc65XppUhD0NeVVItYg4="; + rev = "949b78051835564bca937565241e5e337d838502"; + hash = "sha256-njOFN1I+Ezg6N6v/FMPk0FKnlPnvfHijqISxex6fO40="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1166,12 +1177,12 @@ }; kconfig = buildGrammar { language = "kconfig"; - version = "0.0.0+rev=aaba009"; + version = "0.0.0+rev=2ba709d"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kconfig"; - rev = "aaba009ba9d7881f0f81742da588ae70b572316d"; - hash = "sha256-yjw1fr4utQHIrP/CA4df2adhpm+xrkvobZ5ZF5tjjEI="; + rev = "2ba709d40caa6c1f68b26e55ff7a53e343154cfd"; + hash = "sha256-36x4t+HPuj+QEmOetlE3JowaAXP6eUhvkx9pZduBWgA="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig"; }; @@ -1298,12 +1309,12 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=990926b"; + version = "0.0.0+rev=d82b430"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"; - hash = "sha256-LU8zF6gM8tlwfbdUy/tlg5ubhyFKUrwF/vU8NPXlOGQ="; + rev = "d82b43018a6b22d70b264ed8713be1c4daf9b0e0"; + hash = "sha256-x1VyDzIAozcCBO6pukhwUjZ5JiZVq2+5CMWE2XXf6Fw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1320,12 +1331,12 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=6953cd4"; + version = "0.0.0+rev=e5f7a02"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "6953cd4fa5967c9aa3c769b4e4c7e69c904b9fa9"; - hash = "sha256-QGJgbwDSgkiiE7yt6HHkGH2t3ZNoY1+0VieX7Ccn/Z4="; + rev = "e5f7a020967407f73959592decdb147bb5fc30bb"; + hash = "sha256-5Tnqt4PA3xX2Gk0CvlzVpWXI3OcqzsIJov4Kn0EWN+w="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; @@ -1377,12 +1388,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=6071891"; + version = "0.0.0+rev=79d8b25"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "6071891a8c39600203eba20513666cf93b4d650a"; - hash = "sha256-H6eCCZtE1MbSpHyvdcVbG3piBijM499imiNDIhCoTJA="; + rev = "79d8b25f57b48f83ae1333aff6723b83c9532e37"; + hash = "sha256-DCAMxQqWHM54yzNzF1FjaU0+vETbLhfSZXNq+62DzhE="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1634,35 +1645,47 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=9c0cea7"; + version = "0.0.0+rev=a30394f"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "9c0cea7720f65a5e832c4d924356d7793f519e36"; - hash = "sha256-HRhUyt2PHP+NiYqoY8iTrO/9F5iZLv4pNYHA7ZjCZmE="; + rev = "a30394f61b607f48c841c6e085d5219f23872816"; + hash = "sha256-3aWBh5jKXUYXxOv+RKyEpwJVOoP7QuaRQZHw0yOy6tQ="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=b569a5f"; + version = "0.0.0+rev=dc8bd41"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"; - hash = "sha256-ScPFOsPVy5We1MePbf0fpyMlnqVad1dszj7uyCdi3Og="; + rev = "dc8bd4150401f6c08591414f2a5480b7f2a874c8"; + hash = "sha256-gQGj6qKjyAie6RgHZl1nVUiELDyR+/iIzFMQQ/obus8="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; + php_only = buildGrammar { + language = "php_only"; + version = "0.0.0+rev=dc8bd41"; + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-php"; + rev = "dc8bd4150401f6c08591414f2a5480b7f2a874c8"; + hash = "sha256-gQGj6qKjyAie6RgHZl1nVUiELDyR+/iIzFMQQ/obus8="; + }; + location = "php_only"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; + }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=915a527"; + version = "0.0.0+rev=67db260"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "915a527d5aafa81b31acf67fab31b0ac6b6319c0"; - hash = "sha256-DYNJ/i+VBuTOxuphJn4nklTLfV7GuNP1RCCuf5qAYR4="; + rev = "67db260cf4e99a02283ae26b808d59b86d42dc0f"; + hash = "sha256-IMj5xL1SB1JYI0hweIq+kSXkoeWBqAzAu/35FO2xi+U="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1789,12 +1812,12 @@ }; psv = buildGrammar { language = "psv"; - version = "0.0.0+rev=6c19574"; + version = "0.0.0+rev=cda48a5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "6c1957405bd6f7751b050f61367f1094fab91444"; - hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; + rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; + hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; }; location = "psv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2043,12 +2066,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=79456e6"; + version = "0.0.0+rev=e0e8b6d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "79456e6080f50fc1ca7c21845794308fa5d35a51"; - hash = "sha256-57CuGp7gP+AVYIR3HbMXnmmSAbtlpWrOHRYpMbmWfds="; + rev = "e0e8b6de6e4aa354749c794f5f36a906dcccda74"; + hash = "sha256-egTxBuliboYbl+5N6Jdt960EMLByVmLqSmQLps3rEok="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2299,12 +2322,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=f1a48a3"; + version = "0.0.0+rev=1c58633"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "f1a48a33a7ceaf8817f7a340ea4ef1b549ffa176"; - hash = "sha256-koMsIPFCvmJ/zIPOcv/ZSyXQSBjbFhGBq8r3IXCPWdQ="; + rev = "1c586339fb00014b23d6933f2cc32b588a226f3b"; + hash = "sha256-bFJfPIc8H133yASZe9chgtJEBuNQ7oWm6/6Yu6jWwhI="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2367,12 +2390,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=c3baaab"; + version = "0.0.0+rev=a3ef3d8"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "c3baaab33f1f1032eedd3613cd932284975bd21f"; - hash = "sha256-7YMHGcDR4Wd2FolFnh2fZ3M65L5E5BLAoJyMuRsh7Uo="; + rev = "a3ef3d8e73515b196d30adf9ee5115f057f7a2c6"; + hash = "sha256-henVqdcvCURqjiueaipB2YVLhh3gbVqFiLMfvGS3t6M="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2456,12 +2479,12 @@ }; tsv = buildGrammar { language = "tsv"; - version = "0.0.0+rev=6c19574"; + version = "0.0.0+rev=cda48a5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "6c1957405bd6f7751b050f61367f1094fab91444"; - hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; + rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; + hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; }; location = "tsv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2681,12 +2704,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=ee58533"; + version = "0.0.0+rev=9c3a40d"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "ee58533169c654b8d7fd47fde01241e528674d8a"; - hash = "sha256-HhOWVBM4SNHgN48wgWARBo6Rd3T9Y1DC91gVm1EzvUo="; + rev = "9c3a40d7e51c2963b19d1f7614f9b551cad66bb6"; + hash = "sha256-4L6vx4MHTuTx/5DKKWSVRygCRHI/y9YYbMs/ejAjZXw="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2748,6 +2771,17 @@ }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; }; + zathurarc = buildGrammar { + language = "zathurarc"; + version = "0.0.0+rev=b47016d"; + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "tree-sitter-zathurarc"; + rev = "b47016df5688ef91ad4532138b6210c7944d6483"; + hash = "sha256-Na0Z8mRdXYwAnw3wyc978aoQjF/m49IYsnQx3AG8kOc="; + }; + meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; + }; zig = buildGrammar { language = "zig"; version = "0.0.0+rev=0d08703"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index cbd7b6a3cce1..c8ac880942c8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -670,6 +670,10 @@ dependencies = with self; [ plenary-nvim ]; }; + haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 878f0521ef62..9acb3dfde6f4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -347,6 +347,7 @@ https://github.com/m4xshen/hardtime.nvim/,HEAD, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 +https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2633ec6eb05..6a163d5bc3e5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -122,6 +122,21 @@ let }; }; + albymor.increment-selection = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "increment-selection"; + publisher = "albymor"; + version = "0.2.0"; + sha256 = "sha256-iP4c0xLPiTsgD8Q8Kq9jP54HpdnBveKRY31Ro97ROJ8="; + }; + meta = { + description = "Increment, decrement or reverse selection with multiple cursors"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=albymor.increment-selection"; + homepage = "https://github.com/albymor/Increment-Selection"; + license = lib.licenses.mit; + }; + }; + alefragnani.bookmarks = buildVscodeMarketplaceExtension { mktplcRef = { name = "bookmarks"; @@ -472,6 +487,21 @@ let }; }; + bazelbuild.vscode-bazel = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-bazel"; + publisher = "bazelbuild"; + version = "0.7.0"; + sha256 = "05wvih09184bsp4rv2m55z0sasra2qrvch5m3bkbrjq7rcqgibgx"; + }; + meta = { + description = "Bazel support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=BazelBuild.vscode-bazel"; + homepage = "https://github.com/bazelbuild/vscode-bazel"; + license = lib.licenses.asl20; + }; + }; + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; @@ -1881,6 +1911,21 @@ let }; }; + iliazeus.vscode-ansi = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ansi"; + publisher = "iliazeus"; + version = "1.1.6"; + sha256 = "sha256-ZPV8zd/GkXOGf6s8fz9ZPmC3i1jO0wFAqV0E67lW0do="; + }; + meta = { + description = "ANSI color styling for text documents"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=iliazeus.vscode-ansi"; + homepage = "https://github.com/iliazeus/vscode-ansi"; + license = lib.licenses.mit; + }; + }; + influxdata.flux = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "influxdata"; @@ -1963,6 +2008,21 @@ let }; }; + jamesyang999.vscode-emacs-minimum = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-emacs-minimum"; + publisher = "jamesyang999"; + version = "1.1.1"; + sha256 = "sha256-qxnAhT2UGTQmPw9XmdBdx0F0NNLAaU1/ES9jiqiRrGI="; + }; + meta = { + description = "Minimal emacs key bindings for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jamesyang999.vscode-emacs-minimum"; + homepage = "https://github.com/futurist/vscode-emacs-minimum"; + license = lib.licenses.unfree; + }; + }; + janet-lang.vscode-janet = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-janet"; @@ -2941,6 +3001,21 @@ let }; }; + quicktype.quicktype = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "quicktype"; + publisher = "quicktype"; + version = "12.0.46"; + sha256 = "sha256-NTZ0BujnA+COg5txOLXSZSp8TPD1kZNfZPjnvZUL9lc="; + }; + meta = { + description = "Infer types from sample JSON data"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=quicktype.quicktype"; + homepage = "https://github.com/glideapps/quicktype"; + license = lib.licenses.asl20; + }; + }; + rebornix.ruby = buildVscodeMarketplaceExtension { mktplcRef = { name = "ruby"; @@ -3538,6 +3613,21 @@ let }; }; + tim-koehler.helm-intellisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "helm-intellisense"; + publisher = "Tim-Koehler"; + version = "0.14.3"; + sha256 = "sha256-TcXn8n6mKEFpnP8dyv+nXBjsyfUfJNgdL9iSZwA5eo0="; + }; + meta = { + description = "Extension to help writing Helm-Templates by providing intellisense"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tim-Koehler.helm-intellisense"; + homepage = "https://github.com/tim-koehler/Helm-Intellisense"; + license = lib.licenses.mit; + }; + }; + timonwong.shellcheck = buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; @@ -3612,6 +3702,21 @@ let }; }; + twpayne.vscode-testscript = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-testscript"; + publisher = "twpayne"; + version = "0.0.4"; + sha256 = "sha256-KOmcJlmmdUkC+q0AQ/Q/CQAeRgQPr6nVO0uccUxHmsY="; + }; + meta = { + description = "Syntax highlighting support for testscript"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=twpayne.vscode-testscript"; + homepage = "https://github.com/twpayne/vscode-testscript"; + license = lib.licenses.mit; + }; + }; + twxs.cmake = buildVscodeMarketplaceExtension { mktplcRef = { name = "cmake"; diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index bc457d0cb702..7523288bd28d 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ install -Dt ${coreDir} ${coreFilename} makeWrapper ${retroarch}/bin/retroarch $out/bin/${mainProgram} \ - --add-flags "-L ${coreDir}/${coreFilename} $@" + --add-flags "-L ${coreDir}/${coreFilename}" runHook postInstall ''; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 68814ca5ba58..08bf9a630682 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -3,6 +3,7 @@ bison, flex, fontforge, makeWrapper, pkg-config, nixosTests, supportFlags, + wineRelease, patches, moltenvk, buildScript ? null, configureFlags ? [], mainProgram ? "wine" @@ -46,7 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit version src; - pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland"; + pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 06c2b7486cd2..ec05cef74414 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -36,7 +36,7 @@ sdlSupport ? false, usbSupport ? false, mingwSupport ? wineRelease != "stable", - waylandSupport ? wineRelease == "wayland", + waylandSupport ? stdenv.isLinux, x11Support ? stdenv.isLinux, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 21e0db3e7b60..b40f92dae81c 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -8,7 +8,7 @@ let in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { pname = "wine"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; @@ -17,7 +17,7 @@ in with src; { }; wine64 = callPackage ./base.nix { pname = "wine64"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; pkgArches = [ pkgs ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; @@ -28,7 +28,7 @@ in with src; { }; wineWow = callPackage ./base.nix { pname = "wine-wow"; - inherit src version supportFlags patches moltenvk; + inherit src version supportFlags patches moltenvk wineRelease; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; @@ -44,7 +44,8 @@ in with src; { }; wineWow64 = callPackage ./base.nix { pname = "wine-wow64"; - inherit src version supportFlags patches moltenvk; + inherit src version patches moltenvk wineRelease; + supportFlags = supportFlags // { mingwSupport = true; }; # Required because we request "--enable-archs=x86_64" pkgArches = [ pkgs ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index d8a154a167f0..8bae07a87e07 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,27 +24,27 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "8.0.2"; - url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; - hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc="; + version = "9.0"; + url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; + hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.3"; + version = "2.47.4"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y="; }; gecko64 = fetchurl rec { - version = "2.47.3"; + version = "2.47.4"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8="; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.4.0"; + version = "8.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA="; }; patches = [ @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.0-rc1"; + version = "9.0"; url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; - hash = "sha256-GDd3V74ffxeGzopWqET2ZXKIH/z3RcC0yjTwmmDi8zA="; + hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-jjy4r9VEJsU7FJ7RmE8+cgHTAkZVGruNUD5hzmGSB8c="; + hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -157,8 +157,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20230212"; - hash = "sha256-pd37QTcqY5ZaVBssGecuqziOIq1p0JH0ZDB+oLmp9JU="; + version = "20240105"; + hash = "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 90dc732c0306..2fef95222b5a 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, help2man +, gzip +, vtk_9 +, autoPatchelfHook +, libX11 +, libGL +, Cocoa +, OpenGL +}: stdenv.mkDerivation rec { pname = "f3d"; - version = "2.2.1"; + version = "2.3.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME="; + hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + help2man + gzip + # https://github.com/f3d-app/f3d/pull/1217 + autoPatchelfHook + ]; buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - # conflict between VTK and Nixpkgs; - # see https://github.com/NixOS/nixpkgs/issues/89167 cmakeFlags = [ + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + + "-DF3D_LINUX_GENERATE_MAN=ON" ]; meta = with lib; { @@ -28,11 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://f3d-app.github.io/f3d"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin pbsds ]; platforms = with platforms; unix; - # As of 2024-01-20, this fails with: - # error while loading shared libraries: libvtkInteractionWidgets.so.1: cannot open shared object file: No such file or directory - # Tracking issue: https://github.com/NixOS/nixpkgs/issues/262328 - broken = true; }; } diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 0463958b4c6c..816d9af62aa3 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -1,14 +1,9 @@ { lib , fetchurl , gnustep -, llvmPackages_9 }: -let - # Earlier llvm than 9 segfaults - gnustep' = gnustep.override { llvmPackages = llvmPackages_9; }; - -in gnustep'.gsmakeDerivation rec { +gnustep.gsmakeDerivation rec { pname = "pikopixel"; version = "1.0-b10"; @@ -20,9 +15,9 @@ in gnustep'.gsmakeDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; buildInputs = [ - gnustep'.base - gnustep'.gui - gnustep'.back + gnustep.base + gnustep.gui + gnustep.back ]; # Fix the Exec and Icon paths in the .desktop file, and save the file in the diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 85bbd1414cd9..cbf4efce28f5 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { "-Wno-deprecated-declarations" "-Wno-unused-result" ]; + env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 99c330fa6804..d61499ed0737 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.16.0"; + version = "0.17.0"; src = fetchCrate { inherit version pname; - hash = "sha256-gLtQIqdU6syTo+Z+P59kIpwEtiGCr/DOom9+jA8Uq98="; + hash = "sha256-efkSiwxL7sZIwFXJZunddAb4lTOfhj8oOEOUW3kyRXI="; }; - cargoHash = "sha256-OA9iYGwKElvRaKoyelH9w5ZphoLKrbk8VXwZ2NyLLQY="; + cargoHash = "sha256-1Cyg4WT4xYqc3s5AOXR9GfcS3qKOgscYujGXR9fzuCA="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index fc8e5cc7aa07..88423e36a956 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -30,8 +30,8 @@ let inherit patches; }; beta = { - version = "2.5.59.3"; - sha256 = "sha256-chHKEEMN0Dllebk7zQDg7mf2BU441RlSyXvXgiCmgA4="; + version = "2.5.59.6"; + sha256 = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c="; inherit patches; }; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index ef6d83703ac9..19afb4fba29c 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.41.0"; + version = "2.41.2"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-tuoSRZ2vSMWwvKFac7x67q+maYoDx7CfpfGfA8NLAnA="; + hash = "sha256-d5+0/+4NaW7BBYsRZ3WK8BJYVpUZUmwtvzjfBhS9lcc="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index eb0f0c133d16..cf0272f075e2 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -21,13 +21,13 @@ python3.pkgs.buildPythonApplication rec { pname = "variety"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; rev = "refs/tags/${version}"; - hash = "sha256-JdfFzlfj1J5gx11MfOqIdzvBiheWBaGLxg5jCvvsrp8="; + hash = "sha256-FjnhV7vzRPVDCgUNK8CHo3arKXuwe+3xH/5AxCVgeIY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index 03630e5b82b4..3e2fb300dd1e 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -6,7 +6,7 @@ , makeWrapper }: let - version = "2.9.0"; + version = "2.10.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-AuZRt02bFr7GzI7qe4giGgjlXK/WX+gmF4+QwD0ChXk="; + hash = "sha256-0kPmr7/2uVncpCGVOeIkYlm2M0n9+ypVl7bQ9HnqLb4="; }; - cargoHash = "sha256-O9w18ae83mgF3zjk0WUMeu16Ap7CF2ubuPnOqeCt4Nw="; + cargoHash = "sha256-p1NKEppBYLdCsTY7FHPzaGladLv5HqIVNJxSoFJOx50="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index e3acf6030680..ce228abdbb22 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -1,5 +1,4 @@ { lib -, writeText , flutter , python3 , fetchFromGitHub @@ -14,13 +13,13 @@ flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.2.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - hash = "sha256-NgzijuvyWNl9sFQzq1Jzk1povF8c/rKuVyVKeve+Vic="; + hash = "sha256-XgRIX2Iv5niJw2NSBPwM0K4uF5sPj9c+Xj4oHtAQSbU="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; @@ -29,9 +28,6 @@ flutter.buildFlutterApplication rec { postPatch = '' rm -f pubspec.lock - ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON { - dependency_overrides.intl = "^0.18.1"; - })}" pubspec_overrides.yaml substituteInPlace linux/CMakeLists.txt \ --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" @@ -60,16 +56,17 @@ flutter.buildFlutterApplication rec { # Symlink binary. ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter" - # Needed for QR scanning to work. - wrapProgram "$out/bin/yubioath-flutter" \ - --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} - # Set the correct path to the binary in desktop file. substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" ''; + # Needed for QR scanning to work + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + ''; + nativeBuildInputs = [ makeWrapper removeReferencesTo diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 7f6bb6095dbe..2fe6bd7904d7 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -1,12 +1,10 @@ { buildPythonApplication -, python3 -, poetry-core , yubikey-manager -, fido2 , mss , zxing-cpp , pillow -, cryptography +, poetry-core +, pythonRelaxDepsHook , src , version @@ -17,11 +15,13 @@ buildPythonApplication { pname = "yubioath-flutter-helper"; inherit src version meta; + pyproject = true; + sourceRoot = "${src.name}/helper"; - format = "pyproject"; nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook + poetry-core + pythonRelaxDepsHook ]; pythonRelaxDeps = true; @@ -39,12 +39,9 @@ buildPythonApplication { ''; propagatedBuildInputs = [ - poetry-core yubikey-manager - fido2 mss zxing-cpp pillow - cryptography ]; } diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json index 16b4a9f744f1..a1973fa9a752 100644 --- a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json +++ b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json @@ -11,7 +11,7 @@ "version": "64.0.0" }, "analyzer": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "analyzer", "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893", @@ -20,18 +20,28 @@ "source": "hosted", "version": "6.2.0" }, + "analyzer_plugin": { + "dependency": "direct dev", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, "archive": { "dependency": "direct main", "description": { "name": "archive", - "sha256": "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a", + "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.7" + "version": "3.4.10" }, "args": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "args", "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", @@ -50,6 +60,16 @@ "source": "hosted", "version": "2.11.0" }, + "base32": { + "dependency": "direct main", + "description": { + "name": "base32", + "sha256": "ddad4ebfedf93d4500818ed8e61443b734ffe7cf8a45c668c9b34ef6adde02e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, "boolean_selector": { "dependency": "transitive", "description": { @@ -84,41 +104,41 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65", + "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.4.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b", + "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.8" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41", + "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.10" + "version": "7.2.11" }, "built_collection": { "dependency": "transitive", @@ -134,11 +154,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf", + "sha256": "c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.6.2" + "version": "8.8.1" }, "characters": { "dependency": "transitive", @@ -160,6 +180,26 @@ "source": "hosted", "version": "2.0.3" }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, "clock": { "dependency": "transitive", "description": { @@ -174,24 +214,24 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.10.0" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.2" + "version": "1.18.0" }, "convert": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "convert", "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", @@ -204,11 +244,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9", + "sha256": "fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+4" + "version": "0.3.3+8" }, "crypto": { "dependency": "direct main", @@ -220,25 +260,55 @@ "source": "hosted", "version": "3.0.3" }, + "custom_lint": { + "dependency": "direct dev", + "description": { + "name": "custom_lint", + "sha256": "dfb893ff17c83cf08676c6b64df11d3e53d80590978d7c1fb242afff3ba6dedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.8" + }, + "custom_lint_builder": { + "dependency": "direct dev", + "description": { + "name": "custom_lint_builder", + "sha256": "8df6634b38a36a6c6cb74a9c0eb02e9ba0b0ab89b29e38e6daa86e8ed2c6288d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.8" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "2b235be098d157e244f18ea905a15a18c16a205e30553888fac6544bbf52f03f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.8" + }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55", + "sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.3.4" }, "desktop_drop": { "dependency": "direct main", "description": { "name": "desktop_drop", - "sha256": "ebba9c9cb0b54385998a977d741cc06fd8324878c08d5a36e9da61cd56b04cc6", + "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.3" + "version": "0.4.4" }, "fake_async": { "dependency": "transitive", @@ -274,11 +344,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "bdfa035a974a0c080576c4c8ed01cdf9d1b406a04c7daa05443ef0383a97bedc", + "sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.3.4" + "version": "6.1.1" }, "fixnum": { "dependency": "transitive", @@ -306,11 +376,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4", + "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "3.0.1" }, "flutter_localizations": { "dependency": "direct main", @@ -322,21 +392,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360", + "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.15" + "version": "2.0.17" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb", + "sha256": "da9591d1f8d5881628ccd5c25c40e74fc3eef50ba45e40c3905a06e1712412d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.9" }, "flutter_test": { "dependency": "direct dev", @@ -354,11 +424,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f", + "sha256": "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.6" }, "freezed_annotation": { "dependency": "direct main", @@ -406,6 +476,16 @@ "source": "hosted", "version": "2.3.1" }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "94ee21a60ea2836500799f3af035dc3212b1562027f1e0031c14e087f0231449", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "http_multi_server": { "dependency": "transitive", "description": { @@ -443,7 +523,7 @@ "version": "0.18.1" }, "io": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "io", "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", @@ -456,11 +536,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.0" }, "json_annotation": { "dependency": "direct main", @@ -482,15 +562,24 @@ "source": "hosted", "version": "6.7.1" }, + "lint": { + "dependency": "direct dev", + "description": { + "path": "lint", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, "lints": { "dependency": "transitive", "description": { "name": "lints", - "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "3.0.0" }, "local_notifier": { "dependency": "direct main", @@ -546,11 +635,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", + "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.1" + "version": "1.10.0" }, "mime": { "dependency": "transitive", @@ -596,101 +685,101 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0", + "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8", + "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.2" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5", + "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.2" }, "path_provider_linux": { "dependency": "transitive", "description": { "name": "path_provider_linux", - "sha256": "ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "path_provider_platform_interface": { "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "path_provider_windows": { "dependency": "transitive", "description": { "name": "path_provider_windows", - "sha256": "ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da", + "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.0" + "version": "6.0.2" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76", + "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.2" }, "plugin_platform_interface": { "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.8" }, "pointycastle": { "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c", + "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.3" + "version": "3.7.4" }, "pool": { "dependency": "transitive", @@ -745,11 +834,21 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4", + "sha256": "942999ee48b899f8a46a860f1e13cee36f2f77609eb54c5b7a669bb20d550b11", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.9" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.7" }, "screen_retriever": { "dependency": "direct main", @@ -765,71 +864,71 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1", + "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.2" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076", + "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef", + "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.3.5" }, "shared_preferences_linux": { "dependency": "transitive", "description": { "name": "shared_preferences_linux", - "sha256": "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1", + "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.2" }, "shared_preferences_platform_interface": { "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.2" }, "shared_preferences_web": { "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a", + "sha256": "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.2" }, "shared_preferences_windows": { "dependency": "transitive", "description": { "name": "shared_preferences_windows", - "sha256": "f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d", + "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.2" }, "shelf": { "dependency": "transitive", @@ -871,11 +970,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "source_helper": { "dependency": "transitive", @@ -901,31 +1000,31 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.0" + "version": "1.11.1" }, "state_notifier": { "dependency": "transitive", "description": { "name": "state_notifier", - "sha256": "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2+1" + "version": "1.0.0" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "stream_transform": { "dependency": "transitive", @@ -971,11 +1070,20 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8", + "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.1" + }, + "test_res": { + "dependency": "direct dev", + "description": { + "path": "integration_test/test_res", + "relative": true + }, + "source": "path", + "version": "0.0.0" }, "timing": { "dependency": "transitive", @@ -991,11 +1099,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "b1975a05e0c6999e983cf9a58a6a098318c896040ccebac5398a3cc9e43b9c69", + "sha256": "4ab709d70a4374af172f8c39e018db33a4271265549c6fc9d269a65e5f4b0225", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" }, "typed_data": { "dependency": "transitive", @@ -1011,81 +1119,81 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e", + "sha256": "d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.12" + "version": "6.2.3" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025", + "sha256": "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.38" + "version": "6.2.2" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2", + "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "6.2.4" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.1.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1", + "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.1.0" }, "url_launcher_platform_interface": { "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea", + "sha256": "a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.3.1" }, "url_launcher_web": { "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4", + "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.18" + "version": "2.2.3" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "3.1.1" }, "uuid": { "dependency": "transitive", @@ -1101,31 +1209,31 @@ "dependency": "direct main", "description": { "name": "vector_graphics", - "sha256": "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f", + "sha256": "18f6690295af52d081f6808f2f7c69f0eed6d7e23a71539d75f4aeb8f0062172", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.9+2" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f", + "sha256": "531d20465c10dfac7f5cd90b60bbe4dd9921f1ec4ca54c83ebb176dbacb7bb2d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.9+2" }, "vector_graphics_compiler": { "dependency": "direct main", "description": { "name": "vector_graphics_compiler", - "sha256": "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e", + "sha256": "03012b0a33775c5530576b70240308080e1d5050f0faf000118c20e6463bc0ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.9+2" }, "vector_math": { "dependency": "transitive", @@ -1141,11 +1249,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f", + "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.7.1" + "version": "11.10.0" }, "watcher": { "dependency": "transitive", @@ -1161,11 +1269,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10", + "sha256": "afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4-beta" + "version": "0.3.0" }, "web_socket_channel": { "dependency": "transitive", @@ -1191,41 +1299,41 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa", + "sha256": "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.7" + "version": "5.2.0" }, "window_manager": { "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd", + "sha256": "dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.6" + "version": "0.3.7" }, "xdg_directories": { "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "1.0.4" }, "xml": { "dependency": "transitive", "description": { "name": "xml", - "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.5.0" }, "yaml": { "dependency": "transitive", @@ -1239,7 +1347,7 @@ } }, "sdks": { - "dart": ">=3.1.0-185.0.dev <4.0.0", - "flutter": ">=3.10.0" + "dart": ">=3.2.0 <4.0.0", + "flutter": ">=3.16.0" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 3d242e750c70..1c40bc81703a 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "121.0.1-1", + "packageVersion": "122.0-1", "source": { - "rev": "121.0.1-1", - "sha256": "15zcrl47w6ib00wai63kks5ykcpfh5wfa0ixxj62v06v50bnd78x" + "rev": "122.0-1", + "sha256": "18b2pfh61cxkl7ww0fi5wjv580ca7i5sshviqym8w0w38lhp7rsv" }, "settings": { "rev": "41623492f2b6970972014f6ce196015d3d7f1b59", "sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by" }, "firefox": { - "version": "121.0.1", - "sha512": "7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e" + "version": "122.0", + "sha512": "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824" } } diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 433a983eb02c..3aee5fe4e3a6 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WGOuFqkrX3/5RINdsegTSxJ28W4iEMPuLVrCjtmCkTw="; + sha256 = "sha256-JRvPRlq4H9PcELozlvIE065LSNIxrh/Ej+2GXO8s2x4="; }; - vendorHash = "sha256-kR13BVbjgQoEjb2xwH8LkxLeMp30h6mbWum9RbzzSGE="; + vendorHash = "sha256-YBcVsuBL5n5ycaY1a0uxlDKX7YyrtF16gi17wCK1Jio="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 8e3b5d297b78..299abe58fbd3 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.28"; + version = "0.6.29"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-/ifr/sSaChZKRe9wCcjURhqZl2/JhIMewZSlJiit/7w="; + hash = "sha256-hN9Kok2+ZNYZsG+3ffzr1jGfIMg99JzgzC0x585KDF4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 457c1fa4d5b0..6463aa7a7ddb 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.5"; + version = "0.31.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-ZNYIGs8oBy4U7y4GiOCcIhnAGRx92V+cQzTE+40QE+A="; + hash = "sha256-DRxS2zhDLAC1pfsHiOEU9Xi7DhKcPwzdI3yw5JbbT18="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-RXKotLyH97EgfDxQzFSSgATGu96SnfwZyR3WprhwsMM="; + vendorHash = "sha256-7eeGME3KOebYYEJEFrrA+5F8rdtYT18WnRoouGyEMD8="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 664c1b693ffc..156c2cae7ac5 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-Xp5PpHIcjh02qesnyrz53yydIAClx0OrBE75Sz5pifg="; + sha256 = "sha256-irMipYDYMyA0l9d7tI1wS7XsxGWjBzTvxmhpKM1gLW8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index a51eea852fc2..2b41250c628b 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WDnuEC2uXo7wybOh0wRiKZt70JMrWteWINuZ+C7lbo8="; + sha256 = "sha256-zXglsfPsJi9DVxlRPniSBsdF1xEMYqqGr46ThpQj3gQ="; }; vendorHash = "sha256-uf7nBnS1wmbz4xcVA5qF82QMPsLdSucje1NNaPyheCw="; @@ -20,6 +20,6 @@ buildGoModule rec { homepage = "https://github.com/kubecolor/kubecolor"; changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ]; + maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 applejag ]; }; } diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index 265c39ae3867..b58044992a6c 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubevela"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${version}"; - hash = "sha256-Bf9OS8IlsahE40JsYTALC3oW6HliyqycA2CTJFRRTag="; + hash = "sha256-4OxkBN0hZ2wtZjU0aQVzhWtWd8kaCokT3WF82WeVS6U="; }; - vendorHash = "sha256-obvlie4P3mhp2VMyUYHNZIlgfICM4PDhu4YKeDsVMxw="; + vendorHash = "sha256-fMo01CmPaNgvNcY8oG4rIGfYa+teKU3ETJsAaF14cnc="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 942a4d3ce013..10c00fc96f5e 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, buildGo120Module , buildGo121Module , fetchFromGitHub , nixosTests @@ -52,22 +51,15 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_6; + nomad = nomad_1_7; - nomad_1_4 = generic { - buildGoModule = buildGo120Module; - version = "1.4.12"; - sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI="; - vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - }; + nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; nomad_1_5 = generic { buildGoModule = buildGo121Module; - version = "1.5.12"; - sha256 = "sha256-BhKetWtwysWTYI0ruEp/Ixh4eoGxDX0Geup2PCXfsZY="; - vendorHash = "sha256-X4pBxKWr5QFRxh9tw5QDpytyuVNXQvV1LHm5IbPELY0="; + version = "1.5.13"; + sha256 = "sha256-SFPjcr3W6Sj1n+1ooi1HDMQEapgGapVy4HtqxSIVi9U="; + vendorHash = "sha256-F9lzO3jMVbDq8sA4rBo81vmIoOhK2N8d4HXX58HOw18="; license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' @@ -77,9 +69,9 @@ rec { nomad_1_6 = generic { buildGoModule = buildGo121Module; - version = "1.6.5"; - sha256 = "sha256-10s/yRWGoYTRbMytWShuTgYc1b388IID5doAvWXpyCU="; - vendorHash = "sha256-gd6a/CBJ+OOTNHEaRLoDky2f2cDCyW9wSZzD6K22voQ="; + version = "1.6.6"; + sha256 = "sha256-E7HLBABOtDO/BUc2+4mD4yJ/sfy85gy67ZylRTZI3Cg="; + vendorHash = "sha256-6jq00RsukuP8OSkXhqYqQxpXtp/jm/GChEwEJTVyO10="; license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' @@ -89,9 +81,9 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.2"; - sha256 = "sha256-tFmsX9C++nuUBqLjjpMMyVCwQHn4nlB3OywIPMYE32Q="; - vendorHash = "sha256-iMEEBDxK7ALa19GMIabofzq557aXcYpt0H3/jAKnBBM="; + version = "1.7.3"; + sha256 = "sha256-Rl/bDglO87kbtxFCy0eiTQVJCAwPobQI4GJQOflvXhk="; + vendorHash = "sha256-M8lGzUvPY8hNhN9ExHasfnLhe+DYBb86RXr1wdrRbgw="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index 6900dc5607ec..a62efd6833fb 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,7 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, sonobuoy }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "6f9e27f1795f10475c9f6f5decdff692e1e228da"; +# The update script can update this automatically, the comment is used to find the line. +let rev = "6f9e27f1795f10475c9f6f5decdff692e1e228da"; # update-commit-sha in buildGoModule rec { pname = "sonobuoy"; @@ -27,11 +28,17 @@ buildGoModule rec { subPackages = [ "." ]; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = sonobuoy; + command = "sonobuoy version"; + version = "v${version}"; + }; + }; + meta = with lib; { - description = '' - Diagnostic tool that makes it easier to understand the - state of a Kubernetes cluster. - ''; + description = "Diagnostic tool that makes it easier to understand the state of a Kubernetes cluster"; longDescription = '' Sonobuoy is a diagnostic tool that makes it easier to understand the state of a Kubernetes cluster by running a set of Kubernetes conformance tests in an @@ -39,7 +46,9 @@ buildGoModule rec { ''; homepage = "https://sonobuoy.io"; + changelog = "https://github.com/vmware-tanzu/sonobuoy/releases/tag/v${version}"; license = licenses.asl20; + mainProgram = "sonobuoy"; maintainers = with maintainers; [ carlosdagos saschagrunert wilsonehusin ]; }; } diff --git a/pkgs/applications/networking/cluster/sonobuoy/update.sh b/pkgs/applications/networking/cluster/sonobuoy/update.sh new file mode 100755 index 000000000000..289069e1919a --- /dev/null +++ b/pkgs/applications/networking/cluster/sonobuoy/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update curl jq gnused + +set -euo pipefail + +# Do the actual update. +nix-update "${UPDATE_NIX_ATTR_PATH}" + +# Get the src metadata. +src=$( + nix-instantiate --json --eval --strict --expr ' + with import ./. {}; + { + owner = '"${UPDATE_NIX_ATTR_PATH}"'.src.owner; + repo = '"${UPDATE_NIX_ATTR_PATH}"'.src.repo; + tag = '"${UPDATE_NIX_ATTR_PATH}"'.src.rev; + }' +) +owner=$(jq -r '.owner' <<< "${src}") +repo=$(jq -r '.repo' <<< "${src}") +tag=$(jq -r '.tag' <<< "${src}") + +# Curl the release to get the commit sha. +curlFlags=("-fsSL") +curlFlags+=(${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"}) + +read -r type tag_sha < <( + curl "${curlFlags[@]}" "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/${tag}" | + jq -j '.object.type, " ", .object.sha, "\n"' +) + +if [[ "${type}" == "commit" ]]; then + sha="${tag_sha}" +else + sha=$( + curl "${curlFlags[@]}" "https://api.github.com/repos/${owner}/${repo}/git/tags/${tag_sha}" | + jq '.object.sha' + ) +fi + +if [[ -z "${sha}" ]]; then + echo "failed to get commit sha of ${owner}/${repo} @ ${tag}" >&2 + exit 1 +fi + +echo "updating commit hash of ${owner}/${repo} @ ${tag} to ${sha}" >&2 + +cd "$(dirname "$(readlink -f "$0")")" + +sed -i "s|\".*\"; # update-commit-sha|${sha}; # update-commit-sha|" default.nix diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 302b91773126..bc75fce9d69e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,8 +167,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.7.0"; - hash = "sha256-oF0osIC/ti9ZkWDTBIQuBHreIBVfeo4f/naGFdaMxJE="; + version = "1.7.1"; + hash = "sha256-e+YXOqXgiUXtm6P8PulZowRK0OLA8ekmS+MZRQP/srg="; vendorHash = "sha256-77W0x6DENB+U3yB4LI3PwJU9bTuH7Eqz2a9FNoERuJg="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 41dd8fb77c61..235a3821919f 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.281"; + version = "1.2.282"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-mUCUj8mm5SE/jrUGp24f7Rsa/6MUNlHKOPlHzfIPTqc="; + hash = "sha256-hlI9OLvirkY5LrcK21mcXe32d+X4s/SRelWWKZrcdu4="; }; vendorHash = "sha256-1rurHe3jFs+jOZhqBlH/IOoEyCEZoNpzBYnYC/UqYAU="; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 371b986f9d6c..2bef721e6df2 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.32.1"; + version = "0.32.2"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-A5GfXdm13u82yW8mTYDX+H6idCBSeYML3C56t1TD2ec="; + hash = "sha256-LQe/M7uX6VKA7q040wFWKYQ96M1Ynp37uglENqvyAaU="; }; - vendorHash = "sha256-7UBqO1O6o/eM04/bZpcGgttLhSoemcBBly3IZbATAz0="; + vendorHash = "sha256-HAIupM30qmOqol661iFm2lNjukoKBvYY1tPTnc0u3lg="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index cf227f6ce0f7..ae4fc0a4e3b7 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-vH+BHTDQNFZTZjTvxV8ItGkTDj6G5q1t2YC/1LVYXUs="; + hash = "sha256-9myo073/yl9CWwmVb3Gkihf6I/60kSOl0Pk8+dE39KM="; }; - vendorHash = "sha256-InLafJxxOVKGW0bhithJV7qYFjsgDEDGeTBwGvPVG4E="; + vendorHash = "sha256-jOLFqCeBxQLXgUAdDbk/QnPBAtMBQi5VR+oKjgZLb28="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 079d73be15fa..4f74168837fd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.6.1"; + version = "115.7.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "f2efaff8b209234b202671b5322fb14a367b955e28c4b24b139af091b838186126e3d387ca21e57ed089629af876e86b38588789b1ef3db14f4f8703095467b3"; + sha512 = "de9edb81cf5da494101bf927a5b963ccdec0cc9bff87ebd72d896c6e25102c1113b326f67302a81abd237048aa1e6150c4a97fe4b1892bc80030cbab9099e2d8"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index 9ad5e54b0dc5..7894a0fd030e 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-tn3vumHjRt5bhNnFA0k8WaJmpCQx7SJea89xf1NGhME="; + x86_64-linux = "sha256-kSJFKKqiSTa7sfHwZ3N7O01Eoi4cr86X7Dxkg+pzSgU="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "1.7.14"; + version = "1.7.16"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index dd966433acfb..49e2334c8093 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -3,6 +3,7 @@ , fetchurl , qmake , qtbase +, qttools , qtsvg , pkg-config , poppler @@ -24,6 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake + qttools pkg-config ]; @@ -39,6 +41,7 @@ mkDerivation rec { ]; preConfigure = '' + lrelease qpdfview.pro qmakeFlags+=(*.pro) ''; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index cb3ec8a4f7ed..c7a1391c3007 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q="; + hash = "sha256-q252KC6SKUN5JaQWAcsVmDprVkLXDvkYzNhC7yHJNpk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 5f08bebd47fc..090c252bb82c 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }: with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "23.12.0"; + version = "23.17.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; + hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws="; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ - --set INSTALL4J_JAVA_HOME "${jre}" \ + --set INSTALL4J_JAVA_HOME "${openjdk17}" \ --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]} } cp -r opt $out diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index c32f4b8a5f9b..db08de018804 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, gfortran, perl, procps +{ lib, stdenv, fetchFromGitLab, gfortran, which, perl, procps , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook , python3 , enableFma ? stdenv.hostPlatform.fmaSupport @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + which perl procps autoreconfHook diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 039a5334969e..e52a51936180 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -56,7 +56,7 @@ let "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; "8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4="; "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; - "8.19+rc1".sha256 = "sha256-hQ57tLj8lXTbMrW+F0skPtzpHJnXbqPIc/EzocRV5qo="; + "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4149e9163a36..a77565e4072a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -62,6 +62,12 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ + # https://github.com/sagemath/sage/pull/37123, to land in 10.3.beta7 + (fetchpatch { + name = "scipy-1.12-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/54eec464e9fdf18b411d9148aecb918178e95909.diff"; + sha256 = "sha256-9wyNrcSfF6mYFTIV4ev2OdD7igb0AeyZZYWSc/+JrIU="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 461c83695d5c..7e84cf7c7c17 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.7.2", - "repo_hash": "sha256-YIwZkmTVmxXlZ07lCUco9VEbylMvE92LQdFOeZXWB2M=", + "version": "16.7.4", + "repo_hash": "sha256-rUEr9G/5T4yWnNY69I+IpjsVOSmfdL0j0u6et4jkIt8=", "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.7.2-ee", + "rev": "v16.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.7.2", - "GITLAB_PAGES_VERSION": "16.7.2", + "GITALY_SERVER_VERSION": "16.7.4", + "GITLAB_PAGES_VERSION": "16.7.4", "GITLAB_SHELL_VERSION": "14.32.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", - "GITLAB_WORKHORSE_VERSION": "16.7.2" + "GITLAB_WORKHORSE_VERSION": "16.7.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c2f295b3b589..754f8027100f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.7.2"; + version = "16.7.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3R7x8eaUJqJ1mKlQ4kYThKyaSfSaow7lGx5EfNo+GNY="; + hash = "sha256-4wdMwLsJiQzaZ8PhQz7gYj+dzA+92NFPm0twMdr65qA="; }; vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index c5a4065d4ccb..0e21984866f2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-rUSZDsQt6faNES3ibzo7fJqpzEmXRbbTXOkhOn7jggA="; + hash = "sha256-6OPpfn+nylTUp7rNI8NqipbHmLmaV0ezE1qrQqHcuqw="; }; vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b3dec6385c28..c05ced41045d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.7.2"; + version = "16.7.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index c1bab7d2949b..8bd17d2f785e 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -31,7 +31,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { }) ]; - pythonRelaxDeps = [ "attrs" ]; + pythonRelaxDeps = [ "attrs" "ruamel.yaml" ]; nativeBuildInputs = [ wrapQtAppsHook diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index bc6fec4c5915..dc016fda0a99 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.5"; + version = "1.17.6"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "ywCcMfaWAeL2bjFZJaCa0XW60EHyfFCW17Bt1QBN8E8="; + sha256 = "KHZGAFAp93HTZs8OT76xf88QM0UtlVVH3q57CZm07Rs="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "/C9LDcUxF6tJkn2aQV+nMILRpK5H3wxOMMxHEMTC/CI="; + sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM="; }; in mkDerivation { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index f2aef5972dc1..e73b54aac18f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-9HPQ17swMlsCnKkYQXIUzEbx2vKuBUfGf58Up2hHVGI="; + sha256 = "sha256-dL/+Y1uaD+7EY0UNWbxvh1TTLYfgk07qCqLLGvfzWZk="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 62109eac2700..9ccda28cfa73 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -238,6 +238,12 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; + longDescription = '' + VirtualBox is an x86 and AMD64/Intel64 virtualization product for enterprise and home use. + + To install on NixOS, please use the option `virtualisation.virtualbox.host.enable = true`. + Please also check other options under `virtualisation.virtualbox`. + ''; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 1c4ac6d778b9..f22b2eaec0f4 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-01-19"; + version = "unstable-2024-01-24"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "f07e593576cd5f8cddbad9c35e1fbfdfcb8e7de9"; - hash = "sha256-KIsgaf18UM9fg5ULy7MO4pFIXSpdDoPuEuRcsqnAcJ0="; + rev = "5202fc91363b63c467e0b0ac4dd4bbc17a00c8b4"; + hash = "sha256-l4m+goZNqWwZo8LTS7vLxhAFfwk/C+8MPWNw5/TV9R8="; }; strictDeps = true; diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 815c2bf14aae..f0e73901c8db 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -16,14 +16,13 @@ "-H:Name=${executable}" "-march=compatibility" "--verbose" - "-J-Dsun.stdout.encoding=UTF-8" - "-J-Dsun.stderr.encoding=UTF-8" ] # Extra arguments to be passed to the native-image , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" , meta ? { } +, LC_ALL ? "en_US.UTF-8" , ... } @ args: @@ -45,6 +44,8 @@ in stdenv.mkDerivation ({ inherit dontUnpack jar; + env = { inherit LC_ALL; }; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales removeReferencesTo ]; nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index e70b8229d356..e09f913bfbd3 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, buildPackages -, targetPackages +, pkgsBuildHost +, pkgsBuildTarget +, pkgsTargetTarget }: rec { @@ -16,26 +17,26 @@ rec { # As a workaround for https://github.com/rust-lang/rust/issues/89626 use lld on pkgsStatic aarch64 shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.isDarwin; - ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++"; linkerForBuild = ccForBuild; ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; linkerForHost = if shouldUseLLD stdenv.targetPlatform && !stdenv.cc.bintools.isLLVM - then "${buildPackages.lld}/bin/ld.lld" + then "${pkgsBuildHost.llvmPackages.bintools}/bin/${stdenv.cc.targetPrefix}ld.lld" else ccForHost; - # Unfortunately we must use the dangerous `targetPackages` here + # Unfortunately we must use the dangerous `pkgsTargetTarget` here # because hooks are artificially phase-shifted one slot earlier # (they go in nativeBuildInputs, so the hostPlatform looks like # a targetPlatform to them). - ccForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"; - linkerForTarget = if shouldUseLLD targetPackages.stdenv.targetPlatform - && !targetPackages.stdenv.cc.bintools.isLLVM # whether stdenv's linker is lld already - then "${buildPackages.lld}/bin/ld.lld" + ccForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"; + cxxForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"; + linkerForTarget = if shouldUseLLD pkgsTargetTarget.stdenv.targetPlatform + && !pkgsTargetTarget.stdenv.cc.bintools.isLLVM # whether stdenv's linker is lld already + then "${pkgsBuildTarget.llvmPackages.bintools}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}ld.lld" else ccForTarget; rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget; @@ -56,9 +57,9 @@ rec { setEnv = '' env \ '' - # Due to a bug in how splicing and targetPackages works, in - # situations where targetPackages is irrelevant - # targetPackages.stdenv.cc is often simply wrong. We must omit + # Due to a bug in how splicing and pkgsTargetTarget works, in + # situations where pkgsTargetTarget is irrelevant + # pkgsTargetTarget.stdenv.cc is often simply wrong. We must omit # the following lines when rustTargetPlatform collides with # rustHostPlatform. + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' @@ -74,8 +75,8 @@ rec { "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \ "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForBuild}" \ "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" \ - "HOST_CXX=${buildPackages.stdenv.cc}/bin/c++" \ + "HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \ + "HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \ ''; }; } // lib.mapAttrs (old: new: platform: diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix new file mode 100644 index 000000000000..40376c646e67 --- /dev/null +++ b/pkgs/by-name/aw/await/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "await"; + version = "0.999"; + + src = fetchFromGitHub { + owner = "slavaGanzin"; + repo = "await"; + rev = "v${version}"; + hash = "sha256-z178TKA0x6UnpBQaA8dig2FLeJKGxPndfvwtmylAD90="; + }; + + buildPhase = '' + runHook preBuild + $CC await.c -o await -l pthread + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 await -t $out/bin + install -Dm444 LICENSE -t $out/share/licenses/await + install -Dm444 README.md -t $out/share/doc/await + + runHook postInstall + ''; + + meta = with lib; { + description = "Small binary that runs a list of commands in parallel and awaits termination"; + homepage = "https://await-cli.app"; + license = licenses.mit; + maintainers = with maintainers; [ chewblacka ]; + platforms = platforms.all; + mainProgram = "await"; + }; +} diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index e9224c9038aa..8691b76b2d6d 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-6N7/YTL18plTbpUr7rn7wzpKNmRqz4hqGTTZ02DpWcs="; + hash = "sha256-jBXg4/Uw5pFk1aCNpmHkXeUYrFwZqwtg0zYQ5zkp5QI="; }; - vendorHash = "sha256-4cBHX7Vhfpd5Z0rZmY0Cl0vgLK2WczKcFhHheBA68aA="; + vendorHash = "sha256-s04XSTs1ISfhezvz8RfcXPlx8cstHXdRBFPIEZlKI7k="; ldflags = [ "-s" diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix new file mode 100644 index 000000000000..746f813f2ea0 --- /dev/null +++ b/pkgs/by-name/de/deskreen/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, fetchurl +, appimageTools +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "deskreen"; + version = "2.0.4"; + + src = fetchurl { + url = "https://github.com/pavlobu/deskreen/releases/download/v${finalAttrs.version}/Deskreen-${finalAttrs.version}.AppImage"; + hash = "sha256-0jI/mbXaXanY6ay2zn+dPWGvsqWRcF8aYHRvfGVsObE="; + }; + deskreenUnwrapped = appimageTools.wrapType2 { + name = "deskreen"; + src = finalAttrs.src; + }; + + buildInputs = [ + finalAttrs.deskreenUnwrapped + ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s ${finalAttrs.deskreenUnwrapped}/bin/deskreen $out/bin/deskreen + + runHook postInstall + ''; + + meta = { + description = "Turn any device into a secondary screen for your computer"; + homepage = "https://deskreen.com"; + license = lib.licenses.agpl3; + mainProgram = "deskreen"; + maintainers = with lib.maintainers; [ leo248 drupol ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index c7e47dfea9cb..bef986b3e04e 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.168.0"; + version = "0.169.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-npnsBWhs9GJXBFvEPt+8QVdHIUj/fQ6GpYpbXyVQG3U="; + hash = "sha256-WVYEjmuSTIe6LVeXJD7fu1TCrZfH4Cs1T/jfqKNJhM4="; }; vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8="; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 701e499c7932..053ca0e8fa2f 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-FcBfi87D3+7MLCBW1+9eZCKSDioDJsZ4u3e6KGvQ3kc="; + hash = "sha256-kjECdZ97v8QOzz+hG0H3q21PWbIWxx2JeIhhLQDZXAY="; }; - cargoHash = "sha256-E3s16hCZ4qc535YV1xdnsBZAPo50T43ZBiIdKvjd4s0="; + cargoHash = "sha256-KAjLnhEWD2c0A/+5w3eQrCMUfbo/C5KoceV9IbNLMCc="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/gp/gprename/package.nix b/pkgs/by-name/gp/gprename/package.nix new file mode 100644 index 000000000000..18591b735385 --- /dev/null +++ b/pkgs/by-name/gp/gprename/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchzip, + makeWrapper, + moreutils, + perlPackages, + gettext, + glib, + gtk3, + gobject-introspection, + pango, + harfbuzz, + gdk-pixbuf, + at-spi2-atk, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gprename"; + version = "20230429"; + + src = fetchzip { + url = "mirror://sourceforge/gprename/gprename-${finalAttrs.version}.zip"; + hash = "sha256-Du9OO2qeB1jUEJFcVYmLbJAGi2p/IVe3sqladq09AyY="; + }; + + nativeBuildInputs = [ + makeWrapper + moreutils + ]; + + postPatch = '' + grep -Ev 'desktop-file-install|update-desktop-database' Makefile | sponge Makefile + + substituteInPlace Makefile \ + --replace '/usr/share' '$(DESTDIR)/share' + + substituteInPlace bin/gprename \ + --replace '/usr/share' $out/share \ + --replace '/usr/local/share' $out/share + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + buildInputs = [ + perlPackages.perl + pango + ]; + postInstall = '' + wrapProgram $out/bin/gprename \ + --set PERL5LIB ${ + perlPackages.makeFullPerlPath ( + with perlPackages; [ + Pango + Glib + Gtk3 + LocaleGettext + libintl-perl + ] + ) + } \ + --prefix GI_TYPELIB_PATH : ${ + lib.makeSearchPath "/lib/girepository-1.0" [ + gtk3 + pango.out + harfbuzz + gdk-pixbuf + at-spi2-atk + ] + } + ''; + + meta = { + description = "Complete batch renamer for files and directories"; + homepage = "https://gprename.sourceforge.net/index.php"; + license = lib.licenses.gpl3Plus; + mainProgram = "gprename"; + maintainers = with lib.maintainers; [ quantenzitrone ]; + }; +}) diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 2e25aa24f789..04376d201722 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -41,11 +41,15 @@ stdenv.mkDerivation (finalAttrs: { configDir = if stdenv.isDarwin then "config_mac" else "config_linux"; in '' + runHook preInstall + install -Dm444 -t $out/share/java/jdtls/plugins/ plugins/* install -Dm444 -t $out/share/java/jdtls/features/ features/* install -Dm444 -t $out/share/java/jdtls/${configDir} ${configDir}/* install -Dm555 -t $out/bin bin/jdtls install -Dm444 -t $out/bin bin/jdtls.py + + runHook postInstall ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix new file mode 100644 index 000000000000..6f005cf411a6 --- /dev/null +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "minijinja"; + version = "1.0.12"; + + src = fetchFromGitHub { + owner = "mitsuhiko"; + repo = "minijinja"; + rev = version; + hash = "sha256-v5YTPcUiCUQvTURqgKepdOjKZ5rFLr+mF7X+s5GvxdM="; + }; + + cargoHash = "sha256-OhfrlT2DZU3ahH9PKqpEK8f34J2E6zNUai3hYBPg7v4="; + + # The tests relies on the presence of network connection + doCheck = false; + + cargoBuildFlags = "--bin minijinja-cli"; + + meta = with lib; { + description = "Command Line Utility to render MiniJinja/Jinja2 templates"; + homepage = "https://github.com/mitsuhiko/minijinja"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ psibi ]; + changelog = "https://github.com/mitsuhiko/minijinja/blob/${version}/CHANGELOG.md"; + mainProgram = "minijinja-cli"; + }; +} diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/by-name/mo/moe/package.nix index 9d0724f1997b..766d80215020 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/by-name/mo/moe/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "moe"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "mirror://gnu/moe/moe-${finalAttrs.version}.tar.lz"; - hash = "sha256-Q6VXvFEvidbHGOX0ECnP46BVaCYg642+zmMC80omFGs="; + hash = "sha256-9Lq9bOCuGVFvmDRU+yDTLf9xrTFjN6xr+TpCpf8gnJ0="; }; prePatch = '' @@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; + strictDeps = true; + meta = { homepage = "https://www.gnu.org/software/moe/"; description = "A small, 8-bit clean editor"; diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 7f00cfd16a8b..0caa5a4b4e50 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-RMLlHopd+PZLvDtI5uqWlvtS2rahp0HnC/PZ3HVdzIo="; + hash = "sha256-7anWK7vg6u7Sz4eV+X3QqeLj6y11iEmsi3iIlnEI79w="; fetchSubmodules = true; }; - cargoHash = "sha256-kvl89btgxa3tFbiiPlCyvXodruHRr7KC0lR2GG5UIKw="; + cargoHash = "sha256-qqPzf56KqVsmey353GpeJ6xdVLnGfjh/KlErWKkB6JU="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock index cc18ccef079e..5c08dbc00fda 100644 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ b/pkgs/by-name/ni/nickel/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -76,37 +76,37 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayvec" @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" dependencies = [ "anstyle", "bstr", @@ -190,9 +190,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "beef" @@ -232,9 +232,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata", @@ -264,9 +264,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" [[package]] name = "cast" @@ -291,9 +291,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -302,15 +302,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -330,9 +330,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -340,9 +340,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -353,11 +353,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" dependencies = [ - "clap 4.4.7", + "clap 4.4.18", ] [[package]] @@ -367,9 +367,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -442,7 +442,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" dependencies = [ - "clap 4.4.7", + "clap 4.4.18", "entities", "memchr", "once_cell", @@ -457,14 +457,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -493,9 +493,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -547,11 +547,10 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -561,56 +560,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -676,9 +665,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" dependencies = [ "cc", "cxxbridge-flags", @@ -688,34 +677,34 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "scratch", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "cxxbridge-flags" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" +checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" [[package]] name = "cxxbridge-macro" -version = "1.0.110" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -729,9 +718,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -743,26 +732,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "rustc_version", "syn 1.0.109", ] [[package]] name = "deunicode" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71dbf1bf89c23e9cd1baf5e654f622872655f195b36588dc9dc38f7eda30758c" -dependencies = [ - "deunicode 1.4.1", -] - -[[package]] -name = "deunicode" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" [[package]] name = "diff" @@ -846,8 +826,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" dependencies = [ "base64 0.13.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -880,9 +860,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -899,12 +879,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -980,18 +960,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1004,9 +984,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1014,15 +994,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1031,38 +1011,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1088,9 +1068,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1099,30 +1079,28 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -1133,9 +1111,13 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" @@ -1154,9 +1136,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1175,9 +1157,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "humantime" @@ -1187,9 +1169,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1208,12 +1190,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1230,12 +1212,12 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inferno" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ "ahash", - "indexmap 2.0.2", + "indexmap 2.1.0", "is-terminal", "itoa", "log", @@ -1262,13 +1244,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.4", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1291,9 +1273,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" @@ -1343,9 +1325,20 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] [[package]] name = "line-wrap" @@ -1373,9 +1366,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1410,8 +1403,8 @@ checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "regex-syntax 0.6.29", "syn 1.0.109", ] @@ -1461,9 +1454,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -1525,9 +1518,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1548,15 +1541,6 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] name = "metrics" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1569,13 +1553,13 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -1617,9 +1601,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -1644,9 +1628,9 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.4.0" +version = "1.4.1" dependencies = [ - "clap 4.4.7", + "clap 4.4.18", "clap_complete", "directories", "git-version", @@ -1662,11 +1646,11 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.4.0" +version = "0.5.0" dependencies = [ "ansi_term", "assert_matches", - "clap 4.4.7", + "clap 4.4.18", "codespan", "codespan-reporting", "comrak", @@ -1717,12 +1701,12 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.4.0" +version = "1.4.1" dependencies = [ "anyhow", "assert_cmd", "assert_matches", - "clap 4.4.7", + "clap 4.4.18", "codespan", "codespan-lsp", "codespan-reporting", @@ -1762,7 +1746,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.4.0" +version = "0.5.0" dependencies = [ "nickel-lang-core", ] @@ -1803,24 +1787,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.4", "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -1892,16 +1876,16 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -1910,7 +1894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap 2.1.0", ] [[package]] @@ -1936,20 +1920,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.5", - "indexmap 1.9.3", + "base64 0.21.7", + "indexmap 2.1.0", "line-wrap", - "quick-xml 0.30.0", + "quick-xml 0.31.0", "serde", "time", ] @@ -1984,9 +1968,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "powerfmt" @@ -2024,13 +2008,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "difflib", - "itertools 0.11.0", "predicates-core", ] @@ -2083,12 +2066,6 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2099,16 +2076,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pyckel" -version = "1.4.0" +version = "1.4.1" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -2125,7 +2102,7 @@ dependencies = [ "cfg-if", "indoc 1.0.9", "libc", - "memoffset 0.6.5", + "memoffset", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -2159,9 +2136,9 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ - "proc-macro2 1.0.69", + "proc-macro2 1.0.78", "pyo3-macros-backend", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -2171,8 +2148,8 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] @@ -2203,9 +2180,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -2221,11 +2198,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.69", + "proc-macro2 1.0.78", ] [[package]] @@ -2249,9 +2226,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -2259,9 +2236,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2269,15 +2246,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -2287,20 +2255,20 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -2310,9 +2278,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -2363,15 +2331,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2409,16 +2377,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safemem" @@ -2449,15 +2417,15 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -2475,20 +2443,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -2497,31 +2465,31 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -2588,9 +2556,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "simple-counter" @@ -2621,18 +2589,19 @@ dependencies = [ [[package]] name = "slug" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" +checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" dependencies = [ - "deunicode 0.4.5", + "deunicode", + "wasm-bindgen", ] [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "stable_deref_trait" @@ -2720,19 +2689,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "unicode-ident", ] @@ -2760,21 +2729,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2790,9 +2759,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -2847,29 +2816,29 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -2887,9 +2856,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -2930,9 +2899,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "pin-project-lite", @@ -2941,13 +2910,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -2977,7 +2946,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -2989,7 +2958,7 @@ name = "topiary" version = "0.3.0" source = "git+https://github.com/tweag/topiary.git?rev=9ae9ef49c2fa968d15107b817864ff6627e0983e#9ae9ef49c2fa968d15107b817864ff6627e0983e" dependencies = [ - "clap 4.4.7", + "clap 4.4.18", "futures", "itertools 0.11.0", "log", @@ -3031,7 +3000,7 @@ dependencies = [ [[package]] name = "tree-sitter-bash" version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#7331995b19b8f8aba2d5e26deb51d2195c18bc94" +source = "git+https://github.com/tree-sitter/tree-sitter-bash#f7239f638d3dc16762563a9027faeee518ce1bd9" dependencies = [ "cc", "tree-sitter", @@ -3097,7 +3066,7 @@ dependencies = [ [[package]] name = "tree-sitter-rust" version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#79456e6080f50fc1ca7c21845794308fa5d35a51" +source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#e0e8b6de6e4aa354749c794f5f36a906dcccda74" dependencies = [ "cc", "tree-sitter", @@ -3132,9 +3101,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3195,9 +3164,9 @@ checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3213,9 +3182,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "version_check" @@ -3245,8 +3214,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", ] [[package]] @@ -3295,8 +3264,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", "wasm-bindgen-shared", ] @@ -3319,7 +3288,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "wasm-bindgen-macro-support", ] @@ -3329,8 +3298,8 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.78", + "quote 1.0.35", "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -3396,15 +3365,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" @@ -3413,18 +3373,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -3443,10 +3397,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] [[package]] name = "windows_aarch64_gnullvm" @@ -3455,10 +3418,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -3467,10 +3430,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -3479,10 +3442,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -3491,10 +3454,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -3503,10 +3466,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -3515,10 +3478,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -3527,10 +3490,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.17" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -3558,20 +3527,20 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.38", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 3067269cf108..76ba075b5a04 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -8,30 +8,29 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-YPS+Szj0T8mbcrYBdAuoQupv1x0EIq4rFS2Wk5oYVsY="; + hash = "sha256-VltrIGo4jXV6lDIqj+hTQQ46PJH1v9CVFOZopyi9tbM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "topiary-0.3.0" = "sha256-1leQLRohX0iDiOOO96ETM2L3yOElW8OwR5IcrsoxfOo="; - "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; + "tree-sitter-bash-0.20.4" = "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; - "tree-sitter-nickel-0.1.0" = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0="; - "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; "tree-sitter-json-0.20.1" = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; + "tree-sitter-nickel-0.1.0" = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0="; "tree-sitter-ocaml-0.20.4" = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8="; "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; + "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + "tree-sitter-rust-0.20.4" = "sha256-egTxBuliboYbl+5N6Jdt960EMLByVmLqSmQLps3rEok="; "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; - "tree-sitter-rust-0.20.4" = "sha256-57CuGp7gP+AVYIR3HbMXnmmSAbtlpWrOHRYpMbmWfds="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; - }; }; diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix new file mode 100644 index 000000000000..8e33c26ae738 --- /dev/null +++ b/pkgs/by-name/po/powersploit/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "powersploit"; + version = "3.0.0-unstable-2020-08-22"; + + src = fetchFromGitHub { + owner = "PowerShellMafia"; + repo = "PowerSploit"; + rev = "d943001a7defb5e0d1657085a77a0e78609be58f"; + hash = "sha256-xVMCB8siyYc8JI7vjlUdO93jI3Qh054F/4CCZyGe75c="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/powersploit + cp -a * $out/share/powersploit + find $out/share -type f -exec chmod -x {} \; + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/"; + description = "A PowerShell Post-Exploitation Framework"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ shard7 ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch b/pkgs/by-name/pu/pupdate/add-runtime-identifier.patch index 38d5dcd3af16..c70aaad58966 100644 --- a/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch +++ b/pkgs/by-name/pu/pupdate/add-runtime-identifier.patch @@ -1,19 +1,19 @@ -From c9ca58262045b82537bd8284d426c91582cc7ed7 Mon Sep 17 00:00:00 2001 +From f56083d95304752c45cc569fe42c3b0d7a2430bd Mon Sep 17 00:00:00 2001 From: Philipp Rintz <git@rintz.net> -Date: Thu, 28 Sep 2023 21:22:18 +0200 +Date: Wed, 24 Jan 2024 22:11:50 +0100 Subject: [PATCH] uncommited --- - pocket_updater.csproj | 1 + + pupdate.csproj | 1 + 1 file changed, 1 insertion(+) -diff --git a/pocket_updater.csproj b/pocket_updater.csproj -index 30f77d5..ad6bf69 100644 ---- a/pocket_updater.csproj -+++ b/pocket_updater.csproj +diff --git a/pupdate.csproj b/pupdate.csproj +index a6f59a8..0563137 100644 +--- a/pupdate.csproj ++++ b/pupdate.csproj @@ -12,6 +12,7 @@ <Authors>Matt Pannella</Authors> - <Product>Analogue Pocket Updater Utility</Product> + <Product>Pupdate</Product> <RepositoryUrl>https://github.com/mattpannella/pocket-updater-utility</RepositoryUrl> + <RuntimeIdentifier>@RuntimeIdentifier@</RuntimeIdentifier> </PropertyGroup> diff --git a/pkgs/tools/games/pocket-updater-utility/deps.nix b/pkgs/by-name/pu/pupdate/deps.nix index eea7ea49accb..eea7ea49accb 100644 --- a/pkgs/tools/games/pocket-updater-utility/deps.nix +++ b/pkgs/by-name/pu/pupdate/deps.nix diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/by-name/pu/pupdate/package.nix index a5ad85fcadac..00e61e9f0140 100644 --- a/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -1,24 +1,24 @@ -{ pkgs ? import <nixpkgs> { system = builtins.currentSystem; } -, stdenv ? pkgs.stdenv -, lib ? pkgs.lib -, fetchFromGitHub ? pkgs.fetchFromGitHub -, buildDotnetModule ? pkgs.buildDotnetModule -, dotnetCorePackages ? pkgs.dotnetCorePackages -, openssl ? pkgs.openssl -, zlib ? pkgs.zlib -, hostPlatform ? stdenv.hostPlatform -, nix-update-script ? stdenv.nix-update-script +{ pkgs +, stdenv +, lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, openssl +, zlib +, hostPlatform +, nix-update-script }: buildDotnetModule rec { - pname = "pocket-updater-utility"; - version = "2.43.1"; + pname = "pupdate"; + version = "3.0.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-ur7BEsG4MIEcdiRt5BkK4GCa7aVkrh2Djd10KhaWf3U="; + hash = "sha256-Lr3orYOSzFQCLduBhp2MtGbgiKtFB1CgP/iMMySSvEk="; }; buildInputs = [ @@ -30,17 +30,17 @@ buildDotnetModule rec { # See https://github.com/NixOS/nixpkgs/pull/196648/commits/0fb17c04fe34ac45247d35a1e4e0521652d9c494 patches = [ ./add-runtime-identifier.patch ]; postPatch = '' - substituteInPlace pocket_updater.csproj \ + substituteInPlace pupdate.csproj \ --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" ''; - projectFile = "pocket_updater.csproj"; + projectFile = "pupdate.csproj"; nugetDeps = ./deps.nix; selfContainedBuild = true; - executables = [ "pocket_updater" ]; + executables = [ "pupdate" ]; dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" @@ -54,11 +54,11 @@ buildDotnetModule rec { }; meta = with lib; { - homepage = "https://github.com/mattpannella/pocket-updater-utility"; - description = "Analogue Pocket Updater Utility"; + homepage = "https://github.com/mattpannella/pupdate"; + description = "Pupdate - A thing for updating your Analogue Pocket "; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ p-rintz ]; - mainProgram = "pocket_updater"; + mainProgram = "pupdate"; }; } diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 72f040a3e31e..7924759ea71a 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-xegMT8+rUMJ8mJDpMT4aLNFy4Atd1Qoe+40OxiociiE="; + hash = "sha256-VS1qWJxTJDRlmb4pfzSqU0geOcPAVYDYy2d/f5KcOpQ="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix index 74ba857f03b0..def921a3f6d0 100644 --- a/pkgs/by-name/qa/qadwaitadecorations/package.nix +++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qadwaitadecorations"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QAdwaitaDecorations"; rev = finalAttrs.version; - hash = "sha256-9uK2ojukuwzOz/genWiCch4c3pL5qEfyy8ERpFxS8/8="; + hash = "sha256-vG6nK+9hUX0ZxNFz5ZA/EC1rSFTGl5rDTBlsraRlrTU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix new file mode 100644 index 000000000000..109d81bec9f5 --- /dev/null +++ b/pkgs/by-name/rc/rcp/package.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rcp"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "wykurz"; + repo = "rcp"; + rev = "v${version}"; + hash = "sha256-5CqQwTJAQhO9mLfMan6JhNY3N2gfwR6wmGtVBYzVxuc="; + }; + + cargoHash = "sha256-sF7RjuVRNfJa3vw71S+BKIBLeWT6biekAE/56BsZYkw="; + + checkFlags = [ + # this test also sets setuid permissions on a test file (3oXXX) which doesn't work in a sandbox + "--skip=copy::copy_tests::check_default_mode" + ]; + + meta = with lib; { + changelog = "https://github.com/wykurz/rcp/releases/tag/v${version}"; + description = "Tools to efficiently copy, remove and link large filesets"; + homepage = "https://github.com/wykurz/rcp"; + license = with licenses; [ mit ]; + mainProgram = "rcp"; + maintainers = with maintainers; [ wykurz ]; + }; +} diff --git a/pkgs/tools/misc/silicon/Cargo.lock b/pkgs/by-name/si/silicon/Cargo.lock index 1902b848c083..0133214e7095 100644 --- a/pkgs/tools/misc/silicon/Cargo.lock +++ b/pkgs/by-name/si/silicon/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph_rasterizer" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "adler" @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -57,9 +57,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bincode" @@ -77,6 +77,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -84,21 +90,24 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -114,7 +123,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "term_size", "textwrap", @@ -146,9 +155,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.4.2" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", @@ -157,20 +166,20 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.48" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] [[package]] name = "cocoa" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -182,15 +191,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", "libc", "objc", ] @@ -228,9 +236,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -238,7 +246,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -247,13 +255,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] @@ -279,20 +286,10 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -301,9 +298,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -314,9 +311,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -328,6 +325,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" [[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -370,9 +376,9 @@ dependencies = [ [[package]] name = "dlib" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ "libloading", ] @@ -391,15 +397,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -408,6 +414,22 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "error-code" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -419,18 +441,24 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ - "instant", + "simd-adler32", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -454,7 +482,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "core-foundation", "core-graphics", @@ -522,9 +550,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -547,9 +575,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -577,9 +605,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "image" -version = "0.24.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -610,24 +638,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -638,15 +657,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jpeg-decoder" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ "rayon", ] @@ -659,18 +678,29 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", ] [[package]] @@ -689,13 +719,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -708,29 +741,37 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ + "autocfg", "rawpointer", ] [[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -750,9 +791,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -764,9 +805,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -775,9 +816,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -817,33 +858,14 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -874,9 +896,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "onig" @@ -884,7 +906,7 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "once_cell", "onig_sys", @@ -902,9 +924,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.5.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", @@ -913,18 +935,18 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.6.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" dependencies = [ "ttf-parser", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pasteboard" @@ -950,59 +972,56 @@ dependencies = [ [[package]] name = "pathfinder_simd" -version = "0.5.1" -source = "git+https://github.com/servo/pathfinder#9e0331742dedfed41d9e7791a9afbead0e0fbcd5" +version = "0.5.2" +source = "git+https://github.com/servo/pathfinder#a3ceb814cac4a817e2883da73df84c3eeddb70de" dependencies = [ "rustc_version", ] [[package]] -name = "pest" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.3.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64", "indexmap", "line-wrap", + "quick-xml", "serde", "time", - "xml-rs", ] [[package]] name = "png" -version = "0.17.6" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -1013,7 +1032,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1030,18 +1049,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1104,77 +1132,77 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.7", - "redox_syscall", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "winapi", + "semver", ] [[package]] -name = "rustc_version" -version = "0.3.3" +name = "rustix" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ - "semver", + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", ] [[package]] name = "rusttype" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" +checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -1182,15 +1210,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -1212,53 +1240,41 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "0.11.0" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1273,11 +1289,11 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "silicon" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "clipboard", - "clipboard-win 4.4.2", + "clipboard-win 4.5.0", "conv", "dirs", "env_logger", @@ -1298,9 +1314,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48e45e5961033db030b56ad67aef22e9c908c493a6e8348c0a0f6b93433cd77" +checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" dependencies = [ "approx", "num-complex", @@ -1310,6 +1326,12 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "str-buf" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1342,14 +1364,25 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.102" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -1358,21 +1391,19 @@ dependencies = [ [[package]] name = "syntect" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" dependencies = [ "bincode", - "bitflags", + "bitflags 1.3.2", "flate2", "fnv", - "lazy_static", "once_cell", "onig", "plist", "regex-syntax", "serde", - "serde_derive", "serde_json", "thiserror", "walkdir", @@ -1381,16 +1412,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1405,9 +1435,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -1424,70 +1454,82 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "time" -version = "0.3.15" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", - "libc", - "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "ttf-parser" -version = "0.6.2" +name = "time-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] -name = "typenum" -version = "1.15.0" +name = "time-macros" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "ttf-parser" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] -name = "ucd-trie" -version = "0.1.5" +name = "typenum" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "vec_map" @@ -1503,12 +1545,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -1526,9 +1567,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wide" -version = "0.7.5" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae41ecad2489a1655c8ef8489444b0b113c0a0c795944a3572a0931cf7d2525c" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" dependencies = [ "bytemuck", "safe_arch", @@ -1552,9 +1593,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1566,6 +1607,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "wio" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1594,12 +1701,6 @@ dependencies = [ ] [[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] name = "yaml-rust" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/by-name/si/silicon/package.nix index 1da4d20c673f..57a86a27213d 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -10,9 +10,7 @@ , libxcb , python3 , libiconv -, AppKit -, CoreText -, Security +, darwin , fira-code , fontconfig , harfbuzz @@ -20,33 +18,30 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - hash = "sha256-RuzaRJr1n21MbHSeHBt8CjEm5AwbDbvX9Nw5PeBTl+w="; + hash = "sha256-fk1qaR7z9taOuNmjMCSdq7RybgV/3u7njU0Gehb98Lk="; }; - patches = [ - # fix build on aarch64-linux, see https://github.com/Aloxaf/silicon/pull/210 - (fetchpatch { - url = "https://github.com/Aloxaf/silicon/commit/f666c95d3dab85a81d60067e2f25d29ee8ab59e7.patch"; - hash = "sha256-L6tF9ndC38yVn5ZNof1TMxSImmaqZ6bJ/NYhb0Ebji4="; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "pathfinder_simd-0.5.1" = "sha256-jQCa8TpGHLWvDT9kXWmlw51QtpKImPlWi082Va721cE="; + "pathfinder_simd-0.5.2" = "sha256-b9RuxtTRKJ9Bnh0AWkoInRVrK/a3KV/2DCbXhN63yF0="; }; }; buildInputs = [ expat freetype fira-code fontconfig harfbuzz ] ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv + AppKit + CoreText + Security + ]); nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ] ++ lib.optionals stdenv.isLinux [ python3 ]; diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix new file mode 100644 index 000000000000..60f7ca0c45f9 --- /dev/null +++ b/pkgs/by-name/su/sunvox/package.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchzip +, alsa-lib +, autoPatchelfHook +, libglvnd +, libjack2 +, libX11 +, libXi +, makeWrapper +, SDL2 +}: + +let + platforms = { + "x86_64-linux" = "linux_x86_64"; + "i686-linux" = "linux_x86"; + "aarch64-linux" = "linux_arm64"; + "armv7l-linux" = "arm_armhf_raspberry_pi"; + "x86_64-darwin" = "macos"; + "aarch64-darwin" = "macos"; + }; + bindir = platforms."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation (finalAttrs: { + pname = "sunvox"; + version = "2.1.1c"; + + src = fetchzip { + urls = [ + "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" + # Upstream removes downloads of older versions, please save bumped versions to archive.org + "https://web.archive.org/web/20231204012052/https://www.warmplace.ru/soft/sunvox/sunvox-2.1.1c.zip" + ]; + hash = "sha256-vJ76ELjqP4wo0tCJJd3A9RarpNo8FJaiyZhj+Q7nEGs="; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libglvnd + libX11 + libXi + SDL2 + ]; + + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ + libjack2 + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # Delete platform-specific data for all the platforms we're not building for + find sunvox -mindepth 1 -maxdepth 1 -type d -not -name "${bindir}" -exec rm -r {} \; + + mkdir -p $out/{bin,share/sunvox} + mv * $out/share/sunvox/ + + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + for binary in $(find $out/share/sunvox/sunvox/${bindir}/ -type f -executable); do + mv $binary $out/bin/$(basename $binary) + done + + # Cleanup, make sure we didn't miss anything + find $out/share/sunvox/sunvox -type f -name readme.txt -delete + rmdir $out/share/sunvox/sunvox/${bindir} $out/share/sunvox/sunvox + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + ln -s $out/share/sunvox/sunvox/${bindir}/SunVox.app $out/Applications/ + ln -s $out/share/sunvox/sunvox/${bindir}/reset_sunvox $out/bin/ + + # Need to use a wrapper, binary checks for files relative to the path it was called via + makeWrapper $out/Applications/SunVox.app/Contents/MacOS/SunVox $out/bin/sunvox + '' + '' + + runHook postInstall + ''; + + meta = with lib; { + description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; + license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + homepage = "https://www.warmplace.ru/soft/sunvox/"; + maintainers = with maintainers; [ puffnfresh OPNA2608 ]; + platforms = lib.attrNames platforms; + }; +}) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 04f67c424ce6..e1468d251313 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ID+4Pz6SUPzZTZYX6IHn/U02Ffw95he/gogV0mNA2OA="; + sha256 = "sha256-8rNoH01fWNGWH3cSqqFCGetl5S/d3yVh+pmIzg79g3k="; }; - vendorHash = "sha256-HseQBCvflmnlKX4PygWejPbyXRJmNUyl2K2//b4/tik="; + vendorHash = "sha256-9ddxgceILBP1NqbGr08cfdPs0BHSjQWN0MkFA5oqyPE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/tl/tlmi-auth/package.nix b/pkgs/by-name/tl/tlmi-auth/package.nix new file mode 100644 index 000000000000..a4640ab5850e --- /dev/null +++ b/pkgs/by-name/tl/tlmi-auth/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, openssl +}: +let + name = "tlmi-auth"; + version = "1.0.1"; +in +stdenv.mkDerivation { + pname = name; + version = version; + + src = fetchFromGitHub { + owner = "lenovo"; + repo = name; + rev = "v${version}"; + hash = "sha256-/juXQrb3MsQ6FxmrAa7E1f0vIMu1397tZ1pzLfr56M4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + openssl + ]; + + meta = with lib; { + homepage = "https://github.com/lenovo/tlmi-auth"; + maintainers = with maintainers; [ snpschaaf ]; + description = "Utility for creating signature strings needed for thinklmi certificate based authentication"; + mainProgram = name; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 44ae8b7775b4..e125ec2b1583 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.32.13"; + version = "2.34.0"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-Meyy6muzJt/Lg76sa+nwZXCOhfeMTwO4VYTXO/o20XI="; + hash = "sha256-cqIiPeQO/M8MtpHRomN/fzxIq7TgUwZSvL3PFCVsEnY="; }; postPatch = '' @@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - lib.optional enableFFI libffi - ++ lib.optional enableSSL openssl - ++ lib.optional (lineEditingLibrary == "readline") readline; + lib.optionals enableFFI [ libffi ] + ++ lib.optionals enableSSL [ openssl ] + ++ lib.optionals (lineEditingLibrary == "readline") [ readline ]; nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [ valgrind ]; @@ -49,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "GIT_VERSION=\"v${finalAttrs.version}\"" ] - ++ lib.optional (lineEditingLibrary == "isocline") "ISOCLINE=1" - ++ lib.optional (!enableFFI) "NOFFI=1" - ++ lib.optional (!enableSSL) "NOSSL=1" - ++ lib.optional enableThreads "THREADS=1"; + ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ] + ++ lib.optionals (!enableFFI) [ "NOFFI=1" ] + ++ lib.optionals (!enableSSL) [ "NOSSL=1" ] + ++ lib.optionals enableThreads [ "THREADS=1" ]; enableParallelBuilding = true; @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "test" - ] ++ lib.optional checkLeaks "leaks"; + ] ++ lib.optionals checkLeaks [ "leaks" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix new file mode 100644 index 000000000000..f2cbbaa73901 --- /dev/null +++ b/pkgs/by-name/ya/yanic/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "yanic"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "FreifunkBremen"; + repo = "yanic"; + rev = "v${version}"; + sha256 = "sha256-++tF6nTFIDeqWSqlBDXw/zEfl5YYa4ufzVZaUG2c8Zo="; + }; + + vendorHash = "sha256-D9V53/+C/+iv1U4kVrYWzJ8iD0MA1QcR8f5ifejFhLo="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd yanic \ + --bash <($out/bin/yanic completion bash) \ + --fish <($out/bin/yanic completion fish) \ + --zsh <($out/bin/yanic completion zsh) + ''; + + meta = with lib; { + description = "A tool to collect and aggregate respondd data"; + homepage = "https://github.com/FreifunkBremen/yanic"; + changelog = "https://github.com/FreifunkBremen/yanic/releases/tag/${src.rev}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ herbetom ]; + mainProgram = "yanic"; + }; +} diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 0e7a9888aed8..2b1425f44cff 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.108"; + version = "1.109"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-Wx2fmvIEHgimu7BJ49xWK7c08Rsf3fsjMLTdyedgK3I="; + hash = "sha256-LnbkHmEyxqv1W/qWeCVQGHKLuv6qX3P8zUMUxx61t38="; }; dontUnpack = true; diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index d7e1ea641bb8..c8d8184768f8 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { name = "alacritty-theme"; - version = "unstable-2024-01-15"; + version = "unstable-2024-01-21"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "489cb8d014e5e2d6aea8bc8a5680a10b8b13b0c3"; - hash = "sha256-47F9YwhIDEvPK01zMwwUcAJ3xAetXhWfRHf1cfpuna4="; + rev = "f03686afad05274f5fbd2507f85f95b1a6542df4"; + hash = "sha256-457kKE3I4zGf1EKkEoyZu0Fa/1O3yiryzHVEw2rNZt8="; }; dontConfigure = true; diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 3ffa3caf8ba8..308392a2450b 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,29 +1,62 @@ -{ lib, stdenv, fetchurl, unzip, gtk-engine-murrine }: +{ lib +, stdenvNoCC +, fetchurl +, unzip +, gtk-engine-murrine +}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sweet"; - version = "3.0"; + version = "4.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; - sha256 = "sha256-6ZrjH5L7Yox7riR+2I7vVbFoG4k7xHGyOq1OnkllyiY"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.zip"; + hash = "sha256-w4jN6PSUNCuqeRQ5wInb5deMTtfpKOa7lj9pN+b/0hU="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; - sha256 = "sha256-FAbf682YJCCt8NKSdFoaFLwxLDU1aCcTgNdlybZtPMo="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.zip"; + hash = "sha256-2hb2FHWyGSowRdUnrWMJENlqRtSr2CrPtDe3DSZlP8M="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; - sha256 = "sha256-t6fczOnKwi4B9hSFhHQaQ533o7MFL+7HPtUJ/p2CIXM="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.zip"; + hash = "sha256-4B0O9hOI9xtzj2gOX354DxtQyiahK5ezr6q6VBpxOJQ="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; - sha256 = "sha256-QGkkpUqkxGPM1DXrvToB3taajk7vK3rqibQF2M4N9i0="; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.zip"; + hash = "sha256-8Aw7CsHRflHoeL/DhpxgxDATaAFm+MTMjeZe9Qg8J8o="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; - sha256 = "sha256-1qVC2n7ypN1BFuSzBpbY7QzJUzF1anYNAVcMkNpGTMM"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.zip"; + hash = "sha256-Ih8/d4qHBAaDDHUIdzw7J6jGu5Zg6KTPffEs+jh0VkM="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.zip"; + hash = "sha256-WdawPwNRW1uVNFIiP7bSQxvcWQtD/i8b4oLplPbPLyU="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.zip"; + hash = "sha256-5vnTneWP5uRFeL6PjuP61OglbNL6+lLGPHmrLeqyk2w="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.zip"; + hash = "sha256-EmXM2/IG82KKm5npl2KLTryhu7Y/5KLKnPv1JxYm0Z4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.zip"; + hash = "sha256-5t9NsxmbjDg7Nf/BSnbdZhx1wl6PQxXYxKuhlNnIPO4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.zip"; + hash = "sha256-ZX7Z9gTMVUjFVtdN+FWuHAkV+Yk8vk7D23gr27efpNM="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.zip"; + hash = "sha256-NHSFgj5iybwzcYw0JyMWijhVXSEvhbMhj1KcvTsHpS4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.zip"; + hash = "sha256-R2ULcqjOQ9aPO4c2o5ow81icZGKxA5Qvq7G5XGGC2Og="; }) ]; @@ -44,8 +77,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fuzen ]; - platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fuzen d3vil0p3r ]; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 17d846f305b2..98d1a4f39c16 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-6Js670Z3/5BwAHvEJrXJkBZvEvx1NeT+eXOKaqKqFqI="; + hash = "sha256-ncYE2dCIAQxCMCe/5zrDU9iHTIkw+iO/IQl8+pfTvLI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a0dfab6503c2..0971731573ee 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-9wdakMCW0RnsYdf9OmK/Q9o8m0g+5EfHVbjqvFY3d/w="; + hash = "sha256-AO4/JUysQyGDsQDbP9X7sqmcxyRSkNGjjTEu4fFzDZA="; }; patches = [ diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix deleted file mode 100644 index c8d645cfa361..000000000000 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ /dev/null @@ -1,457 +0,0 @@ -{ lib, stdenv -, fetchurl, perl, gcc -, ncurses5 -, ncurses6, gmp, libiconv, numactl -, llvmPackages -, coreutils -, targetPackages - - # minimal = true; will remove files that aren't strictly necessary for - # regular builds and GHC bootstrapping. - # This is "useful" for staying within hydra's output limits for at least the - # aarch64-linux architecture. -, minimal ? false -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - downloadsUrl = "https://downloads.haskell.org/ghc"; - - version = "8.10.2"; - - # Information about available bindists that we use in the build. - # - # # Bindist library checking - # - # The field `archSpecificLibraries` also provides a way for us get notified - # early when the upstream bindist changes its dependencies (e.g. because a - # newer Debian version is used that uses a new `ncurses` version). - # - # Usage: - # - # * You can find the `fileToCheckFor` of libraries by running `readelf -d` - # on the compiler binary (`exePathForLibraryCheck`). - # * To skip library checking for an architecture, - # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specfic library, - # set `fileToCheckFor = null`. - ghcBinDists = { - # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) - # nixpkgs uses for the respective system. - defaultLibc = { - i686-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, - # which link it against `libtinfo.so.5` (ncurses 5). - # Other bindists are linked `libtinfo.so.6` (ncurses 6). - { nixPackage = ncurses5; fileToCheckFor = "libtinfo.so.5"; } - ]; - }; - x86_64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; - sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } - ]; - }; - armv7l-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; - sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } - ]; - }; - aarch64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } - { nixPackage = numactl; fileToCheckFor = null; } - ]; - }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - { nixPackage = ncurses6; fileToCheckFor = null; } - { nixPackage = libiconv; fileToCheckFor = null; } - ]; - }; - }; - # Binary distributions for the musl libc for the respective system. - musl = { - x86_64-linux = { - variantSuffix = "-musl"; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; - sha256 = "0xpcbyaxqyhbl6f0i3s4rp2jm67nqpkfh2qlbj3i2fiaix89ml0l"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { nixPackage = gmp; fileToCheckFor = null; } - # In contrast to glibc builds, the musl-bindist uses `libncursesw.so.*` - # instead of `libtinfo.so.*.` - { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } - ]; - isHadrian = true; - }; - }; - }; - - distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; - - binDistUsed = ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - - useLLVM = !stdenv.targetPlatform.isx86; - - libPath = - lib.makeLibraryPath ( - # Add arch-specific libraries. - map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries - ); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" - + "LD_LIBRARY_PATH"; - - runtimeDeps = [ - targetPackages.stdenv.cc - targetPackages.stdenv.cc.bintools - coreutils # for cat - ] - ++ lib.optionals useLLVM [ - (lib.getBin llvmPackages.llvm) - ] - # On darwin, we need unwrapped bintools as well (for otool) - ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ - targetPackages.stdenv.cc.bintools.bintools - ]; - -in - -stdenv.mkDerivation rec { - inherit version; - pname = "ghc-binary${binDistUsed.variantSuffix}"; - - src = fetchurl binDistUsed.src; - - # Note that for GHC 8.10 versions <= 8.10.5, the GHC HQ musl bindist - # has a `gmp` dependency: - # https://gitlab.haskell.org/ghc/ghc/-/commit/8306501020cd66f683ad9c215fa8e16c2d62357d - # Related nixpkgs issues: - # * https://github.com/NixOS/nixpkgs/pull/130441#issuecomment-922452843 - - nativeBuildInputs = [ perl ]; - propagatedBuildInputs = - # Because musl bindists currently provide no way to tell where - # libgmp is (see not [musl bindists have no .buildinfo]), we need - # to propagate `gmp`, otherwise programs built by this ghc will - # fail linking with `cannot find -lgmp` errors. - # Concrete cases are listed in: - # https://github.com/NixOS/nixpkgs/pull/130441#issuecomment-922459988 - # - # Also, as of writing, the release pages of musl bindists claim - # that they use `integer-simple` and do not require `gmp`; however - # that is incorrect, so `gmp` is required until a release has been - # made that includes https://gitlab.haskell.org/ghc/ghc/-/issues/20059. - # (Note that for packaging the `-binary` compiler, nixpkgs does not care - # about whether or not `gmp` is used; this comment is just here to explain - # why the `gmp` dependency exists despite what the release page says.) - # - # For GHC >= 8.10.6, `gmp` was switched out for `integer-simple` - # (https://gitlab.haskell.org/ghc/ghc/-/commit/8306501020cd66f683ad9c215fa8e16c2d62357d), - # fixing the above-mentioned release issue, - # and for GHC >= 9.* it is not clear as of writing whether that switch - # will be made there too. - lib.optionals stdenv.hostPlatform.isMusl [ gmp ]; # musl bindist needs this - - # Set LD_LIBRARY_PATH or equivalent so that the programs running as part - # of the bindist installer can find the libraries they expect. - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location. - ${libEnvVar} = libPath; - - postUnpack = - # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, - # so that we know when ghc bindists upgrade that and we need to update the - # version used in `libPath`. - lib.optionalString - (binDistUsed.exePathForLibraryCheck != null) - # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. - # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. - # As a result, don't shell-quote this glob when splicing the string. - (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in - lib.concatStringsSep "\n" [ - ('' - shopt -u nullglob - echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" - if ! test -e ${buildExeGlob}; then - echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '') - (lib.concatMapStringsSep - "\n" - ({ fileToCheckFor, nixPackage }: - lib.optionalString (fileToCheckFor != null) '' - echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" - if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then - echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - - echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" - if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then - echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - ) - binDistUsed.archSpecificLibraries - ) - ]) - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - '' + - - # Some scripts used during the build need to have their shebangs patched - '' - patchShebangs ghc-${version}/utils/ - patchShebangs ghc-${version}/configure - test -d ghc-${version}/inplace/bin && \ - patchShebangs ghc-${version}/inplace/bin - '' + - # We have to patch the GMP paths for the integer-gmp package. - # Note [musl bindists have no .buildinfo] - # Note that musl bindists do not contain them; unclear if that's intended; - # see: https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231 - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' + - # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in - # FFI_LIB_DIR is a good indication of places it must be needed. - lib.optionalString stdenv.hostPlatform.isAarch64 '' - find . -name package.conf.in \ - -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; - '' + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' - find . -type f -executable -exec patchelf \ - --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - '' + - # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path - # substitution. Which can break the build if the store path / prefix happens - # to contain this string. This will be fixed with 9.4 bindists. - # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 - '' - # Detect hadrian Makefile by checking for the target that has the problem - if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then - echo Hadrian bindist, applying workaround for xxx path substitution. - # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch - substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' - else - echo Not a hadrian bindist, not applying xxx path workaround. - fi - ''; - - # fix for `configure: error: Your linker is affected by binutils #16177` - preConfigure = lib.optionalString - stdenv.targetPlatform.isAarch32 - "LD=ld.gold"; - - configurePlatforms = [ ]; - configureFlags = [ - "--with-gmp-includes=${lib.getDev gmp}/include" - # Note `--with-gmp-libraries` does nothing for GHC bindists: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - # From: https://github.com/NixOS/nixpkgs/pull/43369/commits - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - ''; - - # Apparently necessary for the ghc Alpine (musl) bindist: - # When we strip, and then run the - # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - # below, running ghc (e.g. during `installCheckPhase)` gives some apparently - # corrupted rpath or whatever makes the loader work on nonsensical strings: - # running install tests - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # This is extremely bogus and should be investigated. - dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux - (if stdenv.hostPlatform.isAarch64 then - # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs - # are 2 directories deep from $out/lib, so pooling symlinks there makes - # a short rpath. - '' - (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) - (cd $out/lib; ln -s ${gmp.out}/lib/libgmp.so.10) - (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) - for p in $(find "$out/lib" -type f -name "*\.so*"); do - (cd $out/lib; ln -s $p) - done - - for p in $(find "$out/lib" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p - fi - done - '' - else - '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '') + lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - '' + - lib.optionalString minimal '' - # Remove profiling files - find $out -type f -name '*.p_o' -delete - find $out -type f -name '*.p_hi' -delete - find $out -type f -name '*_p.a' -delete - # `-f` because e.g. musl bindist does not have this file. - rm -f $out/lib/ghc-*/bin/ghc-iserv-prof - # Hydra will redistribute this derivation, so we have to keep the docs for - # legal reasons (retaining the legal notices etc) - # As a last resort we could unpack the docs separately and symlink them in. - # They're in $out/share/{doc,man}. - ''; - - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; - - doInstallCheck = true; - installCheckPhase = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - # can't use env -i here because otherwise we don't find -lgmp on musl - env ${libEnvVar}= PATH= \ - $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - } - # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, - # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. - // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { - # Normal GHC derivations expose the hadrian derivation used to build them - # here. In the case of bindists we just make sure that the attribute exists, - # as it is used for checking if a GHC derivation has been built with hadrian. - # The isHadrian mechanism will become obsolete with GHCs that use hadrian - # exclusively, i.e. 9.6 (and 9.4?). - hadrian = null; - }; - - meta = rec { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - license = lib.licenses.bsd3; - # HACK: since we can't encode the libc / abi in platforms, we need - # to make the platform list dependent on the evaluation platform - # in order to avoid eval errors with musl which supports less - # platforms than the default libcs (i. e. glibc / libSystem). - # This is done for the benefit of Hydra, so `packagePlatforms` - # won't return any platforms that would cause an evaluation - # failure for `pkgsMusl.haskell.compiler.ghc8102Binary`, as - # long as the evaluator runs on a platform that supports - # `pkgsMusl`. - platforms = builtins.attrNames ghcBinDists.${distSetName}; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - }; -} diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 3376671d65b4..16642e56bfd9 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -442,7 +442,7 @@ stdenv.mkDerivation rec { # platforms than the default libcs (i. e. glibc / libSystem). # This is done for the benefit of Hydra, so `packagePlatforms` # won't return any platforms that would cause an evaluation - # failure for `pkgsMusl.haskell.compiler.ghc8102Binary`, as + # failure for `pkgsMusl.haskell.compiler.ghc8107Binary`, as # long as the evaluator runs on a platform that supports # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 5f9d6c824d42..d66f47b661a5 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation rec { "x86_64-darwin" "powerpc64le-linux" ]; - # build segfaults, use ghc8102Binary which has proper musl support instead + # build segfaults, use ghc8107Binary which has proper musl support instead broken = stdenv.hostPlatform.isMusl; maintainers = with lib.maintainers; [ guibou diff --git a/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch b/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch deleted file mode 100644 index c20c62f9cf6f..000000000000 --- a/pkgs/development/compilers/ghc/ghc-8.8.4-sphinx-6.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in -index 2670ad3cf1..d2f9d85c31 100644 ---- a/docs/users_guide/ghc_config.py.in -+++ b/docs/users_guide/ghc_config.py.in -@@ -1,6 +1,6 @@ - extlinks = { -- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue #'), -- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki'), -+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', 'Issue %s'), -+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', 'GHC Wiki %s'), - } - - libs_base_uri = '../libraries' diff --git a/pkgs/development/compilers/ghc/rename-numa-api-call.patch b/pkgs/development/compilers/ghc/rename-numa-api-call.patch deleted file mode 100644 index 747d7a81a11e..000000000000 --- a/pkgs/development/compilers/ghc/rename-numa-api-call.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c ---- a/rts/win32/OSMem.c -+++ b/rts/win32/OSMem.c -@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL; - typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD); - - /* Cache NUMA API call. */ --VirtualAllocExNumaProc VirtualAllocExNuma; -+VirtualAllocExNumaProc _VirtualAllocExNuma; - - void - osMemInit(void) -@@ -52,8 +52,8 @@ osMemInit(void) - /* Resolve and cache VirtualAllocExNuma. */ - if (osNumaAvailable() && RtsFlags.GcFlags.numa) - { -- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); -- if (!VirtualAllocExNuma) -+ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); -+ if (!_VirtualAllocExNuma) - { - sysErrorBelch( - "osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?"); -@@ -569,7 +569,7 @@ void osBindMBlocksToNode( - On windows also -xb is broken, it does nothing so that can't - be used to tweak it (see #12577). So for now, just let the OS decide. - */ -- temp = VirtualAllocExNuma( -+ temp = _VirtualAllocExNuma( - GetCurrentProcess(), - NULL, // addr? See base memory - size, diff --git a/pkgs/development/compilers/ghc/sphinx-4-configuration.patch b/pkgs/development/compilers/ghc/sphinx-4-configuration.patch deleted file mode 100644 index 884a0bb39a5f..000000000000 --- a/pkgs/development/compilers/ghc/sphinx-4-configuration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200 -+++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200 -@@ -100,7 +100,7 @@ - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index c299128aa526..3ad0956e3a08 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, idris2 +{ stdenv, lib, idris2, makeWrapper }: # Usage: let # pkg = idris2Packages.buildIdris { # src = ...; -# projectName = "my-pkg"; +# ipkgName = "my-pkg"; # idrisLibraries = [ ]; # }; # in { @@ -12,62 +12,75 @@ # } # { src -, projectName +, ipkgName +, version ? "unversioned" , idrisLibraries # Other libraries built with buildIdris , ... }@attrs: let - ipkgName = projectName + ".ipkg"; + ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; libDirs = - lib.makeSearchPath libSuffix idrisLibraries; - drvAttrs = builtins.removeAttrs attrs [ "idrisLibraries" ]; + (lib.makeSearchPath libSuffix idrisLibraries) + + ":${idris2}/${idrName}"; + supportDir = "${idris2}/${idrName}/lib"; + drvAttrs = builtins.removeAttrs attrs [ + "ipkgName" + "idrisLibraries" + ]; - sharedAttrs = { - name = projectName; + sharedAttrs = drvAttrs // { + pname = ipkgName; + inherit version; src = src; - nativeBuildInputs = [ idris2 ]; + nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or []; + buildInputs = idrisLibraries ++ attrs.buildInputs or []; IDRIS2_PACKAGE_PATH = libDirs; - configurePhase = '' - runHook preConfigure - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - idris2 --build ${ipkgName} + idris2 --build ${ipkgFileName} runHook postBuild ''; }; in { - executable = stdenv.mkDerivation (lib.attrsets.mergeAttrsList [ - sharedAttrs - { installPhase = '' + executable = stdenv.mkDerivation (sharedAttrs // { + installPhase = '' + runHook preInstall + mkdir -p $out/bin + scheme_app="$(find ./build/exec -name '*_app')" + if [ "$scheme_app" = ''' ]; then + mv -- build/exec/* $out/bin/ + chmod +x $out/bin/* + # ^ remove after Idris2 0.8.0 is released. will be superfluous: + # https://github.com/idris-lang/Idris2/pull/3189 + else + cd build/exec/*_app + rm -f ./libidris2_support.so + for file in *.so; do + bin_name="''${file%.so}" + mv -- "$file" "$out/bin/$bin_name" + wrapProgram "$out/bin/$bin_name" \ + --prefix LD_LIBRARY_PATH : ${supportDir} \ + --prefix DYLD_LIBRARY_PATH : ${supportDir} + done + fi + runHook postInstall + ''; + }); + + library = { withSource ? false }: + let installCmd = if withSource then "--install-with-src" else "--install"; + in stdenv.mkDerivation (sharedAttrs // { + installPhase = '' runHook preInstall - mkdir -p $out/bin - mv build/exec/* $out/bin + mkdir -p $out/${libSuffix} + export IDRIS2_PREFIX=$out/lib + idris2 ${installCmd} ${ipkgFileName} runHook postInstall ''; - } - drvAttrs - ]); - library = { withSource ? false }: - let installCmd = if withSource then "--install-with-src" else "--install"; - in stdenv.mkDerivation (lib.attrsets.mergeAttrsList [ - sharedAttrs - { - installPhase = '' - runHook preInstall - mkdir -p $out/${libSuffix} - export IDRIS2_PREFIX=$out/lib - idris2 ${installCmd} ${ipkgName} - runHook postInstall - ''; - } - drvAttrs - ]); + }); } diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 8a2d28eb1ce0..79a90cbee0f3 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -5,12 +5,13 @@ let in { idris2 = callPackage ./idris2.nix { }; + idris2Lsp = callPackage ./idris2-lsp.nix { }; buildIdris = callPackage ./build-idris.nix { }; idris2Api = (idris2Packages.buildIdris { - inherit (idris2Packages.idris2) src; - projectName = "idris2api"; + inherit (idris2Packages.idris2) src version; + ipkgName = "idris2api"; idrisLibraries = [ ]; preBuild = '' export IDRIS2_PREFIX=$out/lib diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix new file mode 100644 index 000000000000..d73f2d70d6d0 --- /dev/null +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub, idris2Packages, makeWrapper }: + +let + globalLibraries = let + idrName = "idris2-${idris2Packages.idris2.version}"; + libSuffix = "lib/${idrName}"; + in [ + "\\$HOME/.nix-profile/lib/${idrName}" + "/run/current-system/sw/lib/${idrName}" + "${idris2Packages.idris2}/${idrName}" + ]; + globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; + + idris2Api = idris2Packages.idris2Api { }; + lspLib = (idris2Packages.buildIdris { + ipkgName = "lsp-lib"; + version = "2024-01-21"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "LSP-lib"; + rev = "03851daae0c0274a02d94663d8f53143a94640da"; + hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; + }; + idrisLibraries = [ ]; + }).library { }; + + lspPkg = idris2Packages.buildIdris { + ipkgName = "idris2-lsp"; + version = "2024-01-21"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-lsp"; + rev = "a77ef2d563418925aa274fa29f06880dde43f4ec"; + hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o="; + }; + idrisLibraries = [idris2Api lspLib]; + + buildInputs = [makeWrapper]; + postInstall = '' + wrapProgram $out/bin/idris2-lsp \ + --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" + ''; + }; +in lspPkg.executable diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index e19a0e020a4a..09a8c2bce3bf 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -16,10 +16,14 @@ let # Test flaky because of our RPATH patching # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489 "compiler/codegen" + # Test flaky + "read" ] ++ lib.optionals (lib.versionAtLeast version "1.10") [ # Test flaky # https://github.com/JuliaLang/julia/issues/52739 "REPL" + # Test flaky + "ccall" ] ++ lib.optionals stdenv.isDarwin [ # Test flaky on ofborg "FileWatching" diff --git a/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch b/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch index e7bc9187cead..6ff33b342cfd 100644 --- a/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch +++ b/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch @@ -30,5 +30,5 @@ index 1565014a0f..edd5c65244 100644 -rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile -- -2.42.0 +2.43.0 diff --git a/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch index 2b9986107faf..474653bf342c 100644 --- a/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch +++ b/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch @@ -1,4 +1,4 @@ -From c7e2f6ed00c170b68d5d156faac38aa76d4490fd Mon Sep 17 00:00:00 2001 +From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Wed, 10 Jan 2024 20:58:20 -0500 Subject: [PATCH 2/2] skip failing and flaky tests @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] skip failing and flaky tests 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile -index 88dbe5b2b4..f0bdedfdf5 100644 +index 88dbe5b2b4..a2a7a55e20 100644 --- a/test/Makefile +++ b/test/Makefile @@ -28,7 +28,7 @@ default: @@ -16,10 +16,10 @@ index 88dbe5b2b4..f0bdedfdf5 100644 $(TESTS): @cd $(SRCDIR) && \ - $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) -+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall $@) $(addprefix revise-, $(TESTS)): revise-% : @cd $(SRCDIR) && \ -- -2.42.0 +2.43.0 diff --git a/pkgs/development/compilers/llvm/llvm-7-musl.patch b/pkgs/development/compilers/llvm/llvm-7-musl.patch deleted file mode 100644 index 0dac12cc20d6..000000000000 --- a/pkgs/development/compilers/llvm/llvm-7-musl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8c747d3157df2830eed9205e7caf1203b345de17 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 4 Feb 2023 13:54:41 -0800 -Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems - -Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based -systems. This will make sure that 64bit versions of LFS functions are -used e.g. seek will behave same as lseek64. Also revert [1] partially -because this added a cmake test to detect lseek64 but then forgot to -pass the needed macro to actual compile, this test was incomplete too -since libc implementations like musl has 64bit off_t by default on 32bit -systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE -like glibc, which means the compile now fails on musl because the cmake -check passes but we do not have _LARGEFILE64_SOURCE defined. Using the -*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64 -instead - -[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b -[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc - -Reviewed By: MaskRay - -Differential Revision: https://reviews.llvm.org/D139752 - -(cherry picked from commit 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67) ---- - cmake/config-ix.cmake | 13 ++++++++++--- - include/llvm/Config/config.h.cmake | 3 --- - lib/Support/raw_ostream.cpp | 2 -- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake -index 18977d9950ff..b558aa83fa62 100644 ---- a/cmake/config-ix.cmake -+++ b/cmake/config-ix.cmake -@@ -197,9 +197,6 @@ check_symbol_exists(posix_fallocate fcntl.h HAVE_POSIX_FALLOCATE) - if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) - check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) - endif() --set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") --check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) --set(CMAKE_REQUIRED_DEFINITIONS "") - check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) - check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) - check_symbol_exists(malloc_zone_statistics malloc/malloc.h -@@ -237,6 +234,16 @@ if( PURE_WINDOWS ) - check_function_exists(__main HAVE___MAIN) - check_function_exists(__cmpdi2 HAVE___CMPDI2) - endif() -+ -+check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) -+if( LLVM_USING_GLIBC ) -+# enable 64bit off_t on 32bit systems using glibc -+ if (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ add_compile_definitions(_FILE_OFFSET_BITS=64) -+ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") -+ endif() -+endif() -+ - if( HAVE_DLFCN_H ) - if( HAVE_LIBDL ) - list(APPEND CMAKE_REQUIRED_LIBRARIES dl) -diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake -index e934617d7ec7..3c39c373b3c1 100644 ---- a/include/llvm/Config/config.h.cmake -+++ b/include/llvm/Config/config.h.cmake -@@ -112,9 +112,6 @@ - /* Define to 1 if you have the <link.h> header file. */ - #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} - --/* Define to 1 if you have the `lseek64' function. */ --#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} -- - /* Define to 1 if you have the <mach/mach.h> header file. */ - #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} - -diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp -index 038ad00bd608..921ab8409008 100644 ---- a/lib/Support/raw_ostream.cpp -+++ b/lib/Support/raw_ostream.cpp -@@ -677,8 +677,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { - flush(); - #ifdef _WIN32 - pos = ::_lseeki64(FD, off, SEEK_SET); --#elif defined(HAVE_LSEEK64) -- pos = ::lseek64(FD, off, SEEK_SET); - #else - pos = ::lseek(FD, off, SEEK_SET); - #endif --- -2.37.1 - diff --git a/pkgs/development/compilers/rust/1_75.nix b/pkgs/development/compilers/rust/1_75.nix index 829b26cac367..2ca1e2d294bc 100644 --- a/pkgs/development/compilers/rust/1_75.nix +++ b/pkgs/development/compilers/rust/1_75.nix @@ -10,11 +10,9 @@ # 3. Firefox and Thunderbird should still build on x86_64-linux. { stdenv, lib -, buildPackages -, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget , makeRustPlatform , wrapRustcWith , llvmPackages_17, llvm_17 @@ -58,4 +56,4 @@ import ./default.nix { rustcPatches = [ ]; } -(builtins.removeAttrs args [ "pkgsBuildTarget" "pkgsBuildHost" "llvmPackages_17" "llvm_17"]) +(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"]) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c08ffa848ef5..31501e668c89 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -12,18 +12,21 @@ , llvmPackages # Exposed through rustc for LTO in Firefox }: { stdenv, lib -, buildPackages -, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsTargetTarget , makeRustPlatform , wrapRustcWith }: let # Use `import` to make sure no packages sneak in here. - lib' = import ../../../build-support/rust/lib { inherit lib stdenv buildPackages targetPackages; }; + lib' = import ../../../build-support/rust/lib { + inherit lib stdenv pkgsBuildHost pkgsBuildTarget pkgsTargetTarget; + }; # Allow faster cross compiler generation by reusing Build artifacts fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform); in @@ -58,11 +61,11 @@ in else self.buildRustPackages.overrideScope (_: _: lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) - (selectRustPackage buildPackages).packages.prebuilt); + (selectRustPackage pkgsBuildHost).packages.prebuilt); bootRustPlatform = makeRustPlatform bootstrapRustPackages; in { # Packages suitable for build-time, e.g. `build.rs`-type stuff. - buildRustPackages = (selectRustPackage buildPackages).packages.stable // { __attrsFailEvaluation = true; }; + buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // { __attrsFailEvaluation = true; }; # Analogous to stdenv rustPlatform = makeRustPlatform self.buildRustPackages; rustc-unwrapped = self.callPackage ./rustc.nix ({ diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index aee24225021c..c886dfd14981 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.18"; out = "5.1.2"; } + { case = range "8.13" "8.19"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 5250a8f9b8b2..a39e29d25f88 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.2"; } + { cases = [ (range "8.15" "8.19") pred.true ]; out = "2.0.2"; } { cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 9420d69cb4b0..1bd886941ec6 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.18"; out = "8.18"; } + { case = range "8.14" "8.19"; out = "8.18"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index e09eace71850..4ce063339f07 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,12 +7,14 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.19"; out = "3.4.1"; } { case = range "8.12" "8.18"; out = "3.4.0"; } { case = range "8.12" "8.17"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.4.1".sha256 = "sha256-REhvIBl3EaL8CQqI34Gn7Xjf9NhPI3nrUAO26pSLbm0="; release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg="; release."3.3.1".sha256 = "sha256-YCvd4aIt2BxLKBYSWzN7aqo0AuY7z8oADmKvybhYBQI="; release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU="; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index b55715213c9a..704b4f8123b0 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } - { cases = [(range "8.11" "8.18") (isLe "2.0.0")] ; out = "0.1.1"; } + { cases = [(range "8.11" "8.19") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 09b41f2cbc60..3cd742fdd337 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.18") (range "1.12.0" "1.18.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.19") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index bf8155e928fe..8be0213a46eb 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -7,12 +7,14 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.19"; out = "4.1.4"; } { case = range "8.14" "8.18"; out = "4.1.3"; } { case = range "8.14" "8.17"; out = "4.1.1"; } { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."4.1.4".sha256 = "sha256-Use6Mlx79yef1CkCPyGoOItsD69B9KR+mQArCtmre4s="; release."4.1.3".sha256 = "sha256-os3cI885xNpxI+1p5rb8fSNnxKr7SFxqh83+3AM3t4I="; release."4.1.1".sha256 = "sha256-FbClxlV0ZaxITe7s9SlNbpeMNDJli+Dfh2TMrjaMtHo="; release."4.1.0".sha256 = "sha256:09rak9cha7q11yfqracbcq75mhmir84331h1218xcawza48rbjik"; diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 6cf92542dae3..d913b34f0f79 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } - { cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; } + { cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 240e265e3522..28ff7a56786f 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -21,7 +21,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (isGe "8.13") (range "1.13.0" "1.18.0") ]; out = "1.1.4"; } + { cases = [ (isGe "8.13") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index b7551ace4227..5547e22bc59f 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -12,7 +12,7 @@ { cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } - { cases = [ (isGe "8.15") (range "1.15.0" "1.18.0") ]; out = "1.6.0"; } + { cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 0d394617aa32..717100ddfe25 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.18"; out = "4.2.0"; } + { case = range "8.13" "8.19"; out = "4.2.0"; } { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index fd5a37c677e2..325b909d45e4 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -5,14 +5,16 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."1.2.1".sha256 = "sha256-giCRK8wzpVVzXAkFAieQDWqSsP7upSJSUUHkwG4QqO4="; release."1.2.0".sha256 = "sha256-gSqQ7D2HLwM4oYopTWkMFYfYXxsH/7VxI3AyrLwNf3o="; release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg="; release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.2.0"; } - { cases = [ (range "8.10" "8.18") (isLt "2.0.0") ]; out = "1.1.3"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.2.1"; } + { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0") ]; out = "1.2.0"; } + { cases = [ (range "8.10" "8.19") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index d548dee0345b..99528c2d7639 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -36,6 +36,7 @@ let $out/bin/bb '(+ 1 2)' | fgrep '3' $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' $out/bin/bb '(prn "bépo à ê")' | fgrep 'bépo à ê' + $out/bin/bb '(:out (babashka.process/sh "echo" "ä"))' | fgrep 'ä' ''; postInstall = '' diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index 2ff0ffd4f6a9..e81e56da9bf0 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.8"; + version = "1.16.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-leZEP6RJv136z/bNc1S74tw+JQ3QD7NCMbo/Wo7q0ek="; + hash = "sha256-GLh4NayAbqGXI0Ekkk3lXCRwpLwGLbJIo7WjDfpKDhI="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-Rs2tlno0vJo8FSdnnk3cxQCCxdByQD1jRzmePzMMfvs="; + vendorHash = "sha256-42kFO7kXIdqVrp2FQGELZ90OUobOp4zbdo533vresIw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 6bf982aa75fb..dff36cbc3d3a 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; + # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 + env = lib.optionalAttrs stdenv.isx86_32 { + NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; + }; + doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 12347318696c..0f5d88984566 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -350,14 +350,14 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = map (patch: fetchpatch patch) (extraPatches - ++ (lib.optional (lib.versionAtLeast version "6" && lib.versionOlder version "6.1") + ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6" && lib.versionOlder finalAttrs.version "6.1") { # this can be removed post 6.1 name = "fix_aacps_tablegen"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } ) - ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6.1" && lib.versionOlder finalAttrs.version "6.2") { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; @@ -417,7 +417,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature buildAvdevice "avdevice") (enableFeature buildAvfilter "avfilter") (enableFeature buildAvformat "avformat") - ] ++ optionals (lib.versionOlder version "5") [ + ] ++ optionals (lib.versionOlder finalAttrs.version "5") [ # Ffmpeg > 4 doesn't know about the flag anymore (enableFeature buildAvresample "avresample") ] ++ [ @@ -477,7 +477,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withModplug "libmodplug") (enableFeature withMysofa "libmysofa") (enableFeature withOpus "libopus") - (optionalString (versionAtLeast version "5.0" && withLibplacebo) "--enable-libplacebo") + (optionalString (versionAtLeast finalAttrs.version "5.0" && withLibplacebo) "--enable-libplacebo") (enableFeature withSvg "librsvg") (enableFeature withSrt "libsrt") (enableFeature withSsh "libssh") @@ -525,7 +525,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withZimg "libzimg") (enableFeature withZlib "zlib") (enableFeature withVulkan "vulkan") - (optionalString (lib.versionAtLeast version "5") (enableFeature withShaderc "libshaderc")) + (optionalString (lib.versionAtLeast finalAttrs.version "5") (enableFeature withShaderc "libshaderc")) (enableFeature withSamba "libsmbclient") /* * Developer flags @@ -561,7 +561,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] + ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] ++ optionals withAribcaption [ libaribcaption ] @@ -584,7 +584,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] ++ optionals withLadspa [ ladspaH ] - ++ optionals withLibplacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] + ++ optionals withLibplacebo [ (if (lib.versionAtLeast finalAttrs.version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] @@ -693,7 +693,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; - changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; + changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${finalAttrs.version}/Changelog"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 7109a5d6dfd1..942f23cb10e6 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -15,6 +15,9 @@ ffmpeg_6-full.overrideAttrs (old: rec { hash = "sha256-LMwGxx++z6TpZLnpeRGraid4653Mp8T4pY5EP4Z7GXY="; }; + # Clobber upstream patches as they don't apply to the Jellyfin fork + patches = []; + buildInputs = old.buildInputs ++ [ chromaprint ]; configureFlags = old.configureFlags ++ [ diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index e3c960681c5f..d5b0b95f9599 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -1,16 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; pname = "libaal"; src = fetchurl { url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz"; - sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di"; + sha256 = "sha256-fIVohp2PVCaNaQRVJ4zfW8mukiiqM3BgF8Vwu9qrmJE="; }; - patches = [ ./libaal-1.0.6-glibc-2.26.patch ]; - preInstall = '' substituteInPlace Makefile --replace ./run-ldconfig true ''; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.namesys.com/"; description = "Support library for Reiser4"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ mglolenstine ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch b/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch deleted file mode 100644 index 6d49682f03ae..000000000000 --- a/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch +++ /dev/null @@ -1,89 +0,0 @@ -Date: 2017-09-02 13:03:15.353403096 +0200 -From: Jan Engelhardt <jengelh@inai.de> - -Stop redefining libc definitions that cause build failures under glibc-2.26. - -[ 46s] In file included from /usr/include/sys/types.h:156:0, -[ 46s] from /usr/include/stdlib.h:279, -[ 46s] from malloc.c:15: -[ 46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for 'int64_t' -[ 46s] typedef __int64_t int64_t; -[ 46s] ^~~~~~~ -[ 46s] In file included from ../include/aal/libaal.h:17:0, -[ 46s] from malloc.c:6: -[ 46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' was here -[ 46s] typedef long long int int64_t; - - ---- - include/aal/types.h | 48 ++---------------------------------------------- - 1 file changed, 2 insertions(+), 46 deletions(-) - -Index: libaal-1.0.6/include/aal/types.h -=================================================================== ---- libaal-1.0.6.orig/include/aal/types.h -+++ libaal-1.0.6/include/aal/types.h -@@ -26,24 +26,7 @@ - #undef ESTRUCT - #define ESTRUCT 50 - --#ifndef __int8_t_defined --#define __int8_t_defined --typedef signed char int8_t; --typedef short int int16_t; --typedef int int32_t; --__extension__ --typedef long long int int64_t; --#endif -- --typedef unsigned char uint8_t; --typedef unsigned short int uint16_t; --#ifndef __uint32_t_defined --#define __uint32_t_defined --typedef unsigned int uint32_t; --__extension__ --typedef unsigned long long int uint64_t; --#endif -- -+#include <stdint.h> - #define MAX_UINT8 ((uint8_t)~0) - #define MAX_UINT16 ((uint16_t)~0) - #define MAX_UINT32 ((uint32_t)~0) -@@ -53,36 +36,9 @@ typedef unsigned long long int uint64_t - because we don't want use gcc builtins in minimal mode for achive as small - binary size as possible. */ - --#ifndef ENABLE_MINIMAL - # include <stdarg.h> --#else --#ifndef _VA_LIST_ --#define _VA_LIST_ --typedef char *va_list; --#endif --#undef va_arg --#undef va_end --#undef va_start -- --#define va_end(ap) \ -- do {} while(0); -- --#define va_start(ap, p) \ -- (ap = (char *)(&(p)+1)) -- --#define va_arg(ap, type) \ -- ((type *)(ap += sizeof(type)))[-1] --#endif -- --/* As libaal may be used without any standard headers, we need to declare NULL -- macro here in order to avoid compilation errors. */ --#undef NULL - --#if defined(__cplusplus) --# define NULL 0 --#else --# define NULL ((void *)0) --#endif -+#include <stdio.h> - - /* Simple type for direction denoting */ - enum aal_dir { diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 3d8cf70b0db6..439cd74bca63 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-qcVVp+81S3Y0fxDWA/PWQeFT2g0N6tIHNUaOHSru2GA="; + hash = "sha256-wV3y+NobV6J+J6I2z3dJdCvTwvfgMspMtAGNpbwfsYk="; }; postPatch = '' diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 9060b7d0393b..cae3ebed89f6 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # prebuilt in the source tarball. configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ] # See https://github.com/libunwind/libunwind/issues/693 - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) [ + ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [ "CFLAGS=-mno-outline-atomics" ]; diff --git a/pkgs/development/libraries/opencomposite/default.nix b/pkgs/development/libraries/opencomposite/default.nix index 05d09fc1178e..b3b00e83142d 100644 --- a/pkgs/development/libraries/opencomposite/default.nix +++ b/pkgs/development/libraries/opencomposite/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2023-09-11"; + version = "unstable-2024-01-14"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "cca18158a4b6921df54e84a3b23ff459f76a2bde"; - hash = "sha256-VREApt4juz283aJVLZoBbqg01PNs4XBxmpr/UIMlaK8="; + rev = "57ecdd2675fd1baeab7d9cf55b6e827f19a65530"; + hash = "sha256-OOJNQzFRPSdLrIaDrGke12ubIiSjdD/vvHBz0WjGf3c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index d822c691417d..530c57877cf8 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "10.0.1"; + version = "11.0.0"; outputs = [ "out" "dev" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec owner = "AcademySoftwareFoundation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "sha256-kaf5gpGYVWinmnRwR/IafE1SJcwmP2psfe/UZdtH1Og="; + sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 1dd2aeb38b4e..87e4050f534d 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -25,9 +25,9 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index b27b42bf3ae8..7ef60e0418ed 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -142,6 +142,8 @@ stdenv.mkDerivation { ] ++ lists.optionals rocmSupport [ "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" + ] ++ lists.optionals (cudaPackages.cudaAtLeast "12.0.0") [ + (lib.cmakeBool "USE_FORTRAN" false) ]; buildFlags = [ diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 1e6098aa637a..5e3a73febe9b 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -5,13 +5,13 @@ tcl.mkTclDerivation rec { pname = "tclx"; - version = "8.6.2"; + version = "8.6.3"; src = fetchFromGitHub { owner = "flightaware"; repo = "tclx"; rev = "v${version}"; - hash = "sha256-ZYJcaVBM5DQWBFYAcW6fx+ENMWJwHzTOUKYPkLsd6o8="; + hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs="; }; # required in order for tclx to properly detect tclx.tcl at runtime diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 68f95a2f3b02..88d9d76e46e3 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -400,9 +400,10 @@ final: prev: { }; }; - volar = final."@volar/vue-language-server".override { + volar = final."@volar/vue-language-server".override ({ meta, ... }: { name = "volar"; - }; + meta = meta // { mainProgram = "vue-language-server"; }; + }); wavedrom-cli = prev.wavedrom-cli.override { nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ]; diff --git a/pkgs/development/ocaml-modules/type_eq/default.nix b/pkgs/development/ocaml-modules/type_eq/default.nix new file mode 100644 index 000000000000..a1426789e3db --- /dev/null +++ b/pkgs/development/ocaml-modules/type_eq/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, fetchurl +, alcotest +}: + +buildDunePackage rec { + pname = "type_eq"; + version = "0.0.1"; + + minimalOCamlVersion = "4.08.1"; + + src = fetchurl { + url = "https://github.com/skolemlabs/type_eq/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-4u/HF92Hbf9Rcv+JTAMPhYZjoKZ1cS0mBMkzU/hxx38="; + }; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + description = "Type equality proofs for OCaml 4"; + homepage = "https://github.com/skolemlabs/type_eq"; + changelog = "https://github.com/skolemlabs/type_eq/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} + diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix index 5153c500f2ba..4d19fd758997 100644 --- a/pkgs/development/php-packages/amqp/default.nix +++ b/pkgs/development/php-packages/amqp/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, rabbitmq-c, fetchFromGitHub }: let - version = "2.1.1"; + version = "2.1.2"; in buildPecl { inherit version; pname = "amqp"; @@ -10,7 +10,7 @@ in buildPecl { owner = "php-amqp"; repo = "php-amqp"; rev = "v${version}"; - sha256 = "sha256-QHiQL3INd0zQpmCOcJx7HhN770m9ql0Cs63OTOLOrNQ="; + sha256 = "sha256-jVD5dq2kgFnprj190W9hnLG+9yPLWm19AjoGBBz6v8c="; }; buildInputs = [ rabbitmq-c ]; diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index bf18c2bf184b..94724e800f58 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -1,29 +1,34 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytestCheckHook -, pytz , pythonOlder +, pytz +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "refs/tags/v${version}"; - hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; + hash = "sha256-HksiKfXhLASAgU81x7YiOXFmBLIkqJ9ldWLLY1ZbZlk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -33,7 +38,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 5f8ca91e7d41..77ebaa67b68f 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.7.3"; + version = "0.8.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-rtMR3j/DwHVgf4RYXx1Y+W/N8U5pSaLnRwnRmuLbFEY="; + hash = "sha256-SjyC/KiszQVVmctyqCn3i0DureuCtDlUhJTHC6+PQ2c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index b72d69e8fd31..87fab70a03f3 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aiorwlock"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; + hash = "sha256-TOpb7E6dA1M6JpGSmTlIIqFCKqUZvKndCReOxJD40cw="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 8236533154c8..165342fec1d9 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "9.2"; + version = "9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-x8ndLVIYAmixH4Fc1DIC1CK8ChYIPZc3b5VFdpT7JO8="; + hash = "sha256-7bCJykE+7/eA1h4L5MyH/zVPZVMt7cNLXZSWq+8mPtY="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 77978654e68f..9cc5f6105cf5 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -2,7 +2,7 @@ , SDL2 , cmake , fetchFromGitHub -, git +, fetchpatch , gym , importlib-metadata , importlib-resources @@ -11,7 +11,6 @@ , numpy , pybind11 , pytestCheckHook -, python , pythonOlder , setuptools , stdenv @@ -23,10 +22,10 @@ buildPythonPackage rec { pname = "ale-py"; version = "0.8.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { - owner = "mgbellemare"; + owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; hash = "sha256-B2AxhlzvBy1lJ3JttJjImgTjMtEUyZBv+xHU2IC7BVE="; @@ -35,6 +34,20 @@ buildPythonPackage rec { patches = [ # don't download pybind11, use local pybind11 ./cmake-pybind11.patch + ./patch-sha-check-in-setup.patch + + # The following two patches add the required `include <cstdint>` for compilation to work with GCC 13. + # See https://github.com/Farama-Foundation/Arcade-Learning-Environment/pull/503 + (fetchpatch { + name = "fix-gcc13-compilation-1"; + url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/ebd64c03cdaa3d8df7da7c62ec3ae5795105e27a.patch"; + hash = "sha256-NMz0hw8USOj88WryHRkMQNWznnP6+5aWovEYNuocQ2c="; + }) + (fetchpatch { + name = "fix-gcc13-compilation-2"; + url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/4c99c7034f17810f3ff6c27436bfc3b40d08da21.patch"; + hash = "sha256-66/bDCyMr1RsKk63T9GnFZGloLlkdr/bf5WHtWbX6VY="; + }) ]; nativeBuildInputs = [ @@ -67,7 +80,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'dynamic = ["version"]' 'version = "${version}"' substituteInPlace setup.py \ - --replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"' + --replace '@sha@' '"${version}"' ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch b/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch new file mode 100644 index 000000000000..f387346ded37 --- /dev/null +++ b/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index ff1b1c5..ce40df0 100644 +--- a/setup.py ++++ b/setup.py +@@ -141,11 +141,7 @@ def parse_version(version_file): + + version = ci_version + else: +- sha = ( +- subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here) +- .decode("ascii") +- .strip() +- ) ++ sha = @sha@ + version += f"+{sha}" + + return version diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 287bf13a5dee..3fb30ebf7255 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "tehmaze"; repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; + rev = "refs/tags/ansi-${version}"; + hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index f7a0a8ba6372..fdf38b174683 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -6,6 +6,7 @@ , distro , dirty-equals , httpx +, google-auth , sniffio , pydantic , pytest-asyncio @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.7.8"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1mpNwZJbYdKVmUeUM+PBL6vPhwe8tr2SnAP/t/MMKpI="; + hash = "sha256-1g3Bbij9HbMK+JJASe+VTBXx5jCQheXLrcnAD0qMs8g="; }; nativeBuildInputs = [ @@ -44,6 +45,10 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + vertex = [ google-auth ]; + }; + nativeCheckInputs = [ dirty-equals pytest-asyncio @@ -51,8 +56,9 @@ buildPythonPackage rec { respx ]; - disabledTests = [ - "api_resources" + disabledTestPaths = [ + # require network access + "tests/api_resources" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 7d4a4075439e..6762e4b3ad7a 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -5,15 +5,15 @@ , dnspython , fetchFromGitHub , publicsuffix2 -, pythonOlder , pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "authheaders"; - version = "0.15.3"; - format = "setuptools"; + version = "0.16.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,9 +21,13 @@ buildPythonPackage rec { owner = "ValiMail"; repo = "authentication-headers"; rev = "refs/tags/${version}"; - hash = "sha256-96fCx5uN7yegTrCN+LSjtu4u3RL+dcxV/Puyo0eziI8="; + hash = "sha256-/vxUUSWwysYQzcy2AmkF4f8R59FHRnBfFlPRpfM9e5o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ authres dnspython @@ -40,6 +44,11 @@ buildPythonPackage rec { "authheaders" ]; + disabledTests = [ + # Test fails with timeout even if the resolv.conf hack is present + "test_authenticate_dmarc_psdsub" + ]; + meta = with lib; { description = "Python library for the generation of email authentication headers"; homepage = "https://github.com/ValiMail/authentication-headers"; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index eb95a00de2a0..7c6c6b7ff7da 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.4.0"; + version = "30.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C3Qo/YvRXHy9fGa5uwEOClyzeoBs7x9JSNkHGRV2kzQ="; + hash = "sha256-7T6jS3mdsNUu5V4vGrSw8J+koI814GHsuarZ+1ohiEQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c72c54ffbdce..ddb4b6987fac 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "28.0.0"; + version = "29.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tVYFpEUV9v0OOk3CK/oPRA8+fhYl668Gqz6wa/NabNs="; + hash = "sha256-0BiuK5JCj6rqfSYD8+GWca2k5SQ19MXEHR3TQcYzgoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index a9c9da857478..7f8ab5b19a48 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "7.0.0"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GuW6x8JGdBedywum4fDAQ8rwbVU9UgQWgHrFqJ6Uz9A="; + hash = "sha256-H/SsO/DnHXSsSyejYX7BFem1GqPh20DRGecrYVkIu1E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index b760acc8c8a6..60271f7c0381 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,34 +1,33 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.0"; + fpyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI="; - extension = "zip"; + hash = "sha256-zq/BhpiZBnEQvYMMXMmLybjzLY6oQMofaTsaX1Kl+LA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + isodate ]; # no tests included @@ -42,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Security Center Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 37b01b386055..f245b50d1343 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.5"; + version = "0.22.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-u6FurFaAbkBOT2F+nTL/rGNdUhOpLq+nVKPF3ohuXEs="; + hash = "sha256-46REi+3dUY9dJrhXgKkQ1OfN6XCy1fV9cW6wk82ClOA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index e496e4927d38..d590470de27a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.25"; + version = "1.34.27"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l8uuaUto4toyW6wGbE6+iwugtf1HQl5kSsiZoXCdJw8="; + hash = "sha256-/YRnjjsSNxA0EGkOaLx6YwZBE47iat7uz9Z5iUUU2Gk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index dd6780e899dc..022663609ea5 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.26"; + version = "1.34.27"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-65EItCrdCs4ocQQr+0HToSRqHkR8tHp3EEIniopoSb8="; + hash = "sha256-6r4CRGoS6r0dCY4WN0MnW2HCxurrvtmb5bVNt+9sc2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/crontab/default.nix b/pkgs/development/python-modules/crontab/default.nix new file mode 100644 index 000000000000..fea3e9909b70 --- /dev/null +++ b/pkgs/development/python-modules/crontab/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, python-dateutil +, pytz +, setuptools +}: + +buildPythonPackage rec { + pname = "crontab"; + version = "0.23.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "josiahcarlson"; + repo = "parse-crontab"; + rev = "refs/tags/${version}"; + hash = "sha256-8vMkgBU1jIluo9+hAvk2KNM+Wn0+PvJqFNwX+JLXD+w="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + python-dateutil + pytz + ]; + + pythonImportsCheck = [ + "crontab" + ]; + + meta = with lib; { + description = "Parse and use crontab schedules in Python"; + homepage = "https://github.com/josiahcarlson/parse-crontab"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix new file mode 100644 index 000000000000..3d1bc5c20bac --- /dev/null +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, google-crc32c +, python-lzo +, pythonOlder +, setuptools +, setuptools-scm +, zstandard +}: + +buildPythonPackage rec { + pname = "dissect-btrfs"; + version = "1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.btrfs"; + rev = "refs/tags/${version}"; + hash = "sha256-3k0UUkce7bZ3mZ8Umjms4DX63QeBdRPUXpsdaK0VDyc="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + passthru.optional-dependencies = { + full = [ + python-lzo + zstandard + ]; + gcrc32 = [ + google-crc32c + ]; + }; + + # Issue with the test file handling + doCheck = false; + + pythonImportsCheck = [ + "dissect.btrfs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the BTRFS file system"; + homepage = "https://github.com/fox-it/dissect.btrfs"; + changelog = "https://github.com/fox-it/dissect.btrfs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 0f44c587c746..03284d72cc93 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { pname = "dissect-clfs"; version = "1.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix new file mode 100644 index 000000000000..1fdc2af6cc21 --- /dev/null +++ b/pkgs/development/python-modules/dissect-jffs/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dissect-jffs"; + version = "1.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.jffs"; + rev = "refs/tags/${version}"; + hash = "sha256-Rj8/WRHNl2IQ6zwvLhqEIEMzk8BH1fv7KQkw1NzoDjI="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + # Test file handling fails + doCheck = true; + + pythonImportsCheck = [ + "dissect.jffs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the JFFS2 file system"; + homepage = "https://github.com/fox-it/dissect.jffs"; + changelog = "https://github.com/fox-it/dissect.jffs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 62f4a745156c..90f82426f1c6 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -51,6 +51,11 @@ buildPythonPackage rec { hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "flow.record~=" "flow.record>=" + ''; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 2d15c4f5a720..eac1ba89fa55 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dissect-btrfs , dissect-cim , dissect-clfs , dissect-cobaltstrike @@ -8,11 +9,12 @@ , dissect-etl , dissect-eventlog , dissect-evidence +, dissect-executable , dissect-extfs , dissect-fat , dissect-ffs -, dissect-executable , dissect-hypervisor +, dissect-jffs , dissect-ntfs , dissect-ole , dissect-regf @@ -26,6 +28,7 @@ , dissect-xfs , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , setuptools , setuptools-scm }: @@ -33,7 +36,7 @@ buildPythonPackage rec { pname = "dissect"; version = "3.11"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -44,12 +47,16 @@ buildPythonPackage rec { hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm ]; propagatedBuildInputs = [ + dissect-btrfs dissect-cim dissect-clfs dissect-cobaltstrike @@ -63,6 +70,7 @@ buildPythonPackage rec { dissect-fat dissect-ffs dissect-hypervisor + dissect-jffs dissect-ntfs dissect-ole dissect-regf diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 84da4beadd79..35c2b79c438d 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Bogdanp"; repo = "dramatiq"; rev = "refs/tags/v${version}"; - hash = "sha256-uhradhLIyfHf1meAr7ChuGnvm62mX/lkQQ2Pe7hBWtY="; + hash = "sha256-gC1vWnG3zDuFT61i2VgDrP/qIwmGN5GkGv6EVxqUf4U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index d1fdd1ce8580..86f8cf2483e5 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-i9pFdGMzUypUFZKtE4k1w116r+NjfIECg1a6xw9TpG0="; + hash = "sha256-rgqSgNsqAGATzu3ZX8LWRiFJt0xTTLaF8bUNOgA3s2w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ed25519-blake2b/default.nix b/pkgs/development/python-modules/ed25519-blake2b/default.nix index 2fca4287a348..2783662ad2cf 100644 --- a/pkgs/development/python-modules/ed25519-blake2b/default.nix +++ b/pkgs/development/python-modules/ed25519-blake2b/default.nix @@ -1,20 +1,26 @@ { lib +, buildPythonPackage , fetchPypi , pythonOlder -, buildPythonPackage }: +, setuptools +}: buildPythonPackage rec { pname = "ed25519-blake2b"; - version = "1.4"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0aHLkDLsMHzpW0HGGUQP1NP87MGPIkA1zH1tx6fY70A="; + hash = "sha256-cx6fk80awaZGSVdfNRmpn/4LseTPe/X18L5ROjnfc2M="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "ed25519_blake2b" ]; @@ -22,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ed25519 public-key signatures (BLAKE2b fork)"; homepage = "https://github.com/Matoking/python-ed25519-blake2b"; + changelog = "https://github.com/Matoking/python-ed25519-blake2b/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ onny stargate01 ]; }; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 23187eb603e9..84376cdbdb19 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.11.1"; + version = "8.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nY+qZ94uVBLMPb0i0k7gEUfcR5lsE6lcbtFtGQkTKeo="; + hash = "sha256-YFsrdsAAelOest7Pw3+Zl3lV+Q/e7YMELmL3TodBKSM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix index 739cad1e1714..9a1a8a0b1dfc 100644 --- a/pkgs/development/python-modules/embedding-reader/default.nix +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "embedding-reader"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rom1504"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-51UQOqXZcI1VBQ1k6omMStI7GZXNDQ6/e3ThafpP61U="; + hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 0693e209b457..3178b959475a 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "geometric"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "leeping"; repo = "geomeTRIC"; - rev = version; - hash = "sha256-3d4z1n8+e0HgdeKLNSsHLb3XHOk09uy+gP9AwNvNITE="; + rev = "refs/tags/${version}"; + hash = "sha256-DmrKLVQrPQDzTMxqEImnvRr3Wb2R3+hxtDVCN9XUcFM="; }; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/gitlike-commands/default.nix b/pkgs/development/python-modules/gitlike-commands/default.nix index f51adf2a184a..90ac29e9b345 100644 --- a/pkgs/development/python-modules/gitlike-commands/default.nix +++ b/pkgs/development/python-modules/gitlike-commands/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pythonOlder }: @@ -19,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-VjweN4gigzCNvg6TccZx2Xw1p7SusKplxUTZjItTQc0="; }; + patches = [ + # Replace distutils, https://github.com/unixorn/gitlike-commands/pull/8 + (fetchpatch { + name = "replace-distutils.patch"; + url = "https://github.com/unixorn/gitlike-commands/commit/8a97206aff50a25ac6860032aa03925899c3d0aa.patch"; + hash = "sha256-a2utKbf9vrQlYlPcdj/+OAqWf7VkuC5kvbJ53SK52IA="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/http-sf/default.nix b/pkgs/development/python-modules/http-sf/default.nix new file mode 100644 index 000000000000..f9ebde2b2b03 --- /dev/null +++ b/pkgs/development/python-modules/http-sf/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, typing-extensions +}: + +buildPythonPackage rec { + pname = "http-sf"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mnot"; + repo = "http-sf"; + rev = "refs/tags/v${version}"; + hash = "sha256-8xK8/IVrhqMDgkxZY10QqSGswCrttc29FZLCntmSUQ4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Tests require external data (https://github.com/httpwg/structured-field-tests) + doCheck = false; + + pythonImportsCheck = [ + "http_sf" + ]; + + meta = with lib; { + description = "Module to parse and serialise HTTP structured field values"; + homepage = "https://github.com/mnot/http-sf"; + changelog = "https://github.com/mnot/http-sf/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix index 55b318ff40de..205b9c7423dd 100644 --- a/pkgs/development/python-modules/http-sfv/default.nix +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "http-sfv"; - version = "0.9.8"; - format = "pyproject"; + version = "0.9.9"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mnot"; repo = "http_sfv"; rev = "http_sfv-${version}"; - hash = "sha256-zl0Rk4QbzCVmYZ6TnVq+C+oe27Imz5fEQY9Fco5lo5s="; + hash = "sha256-xf9bGDfsEcQnFQ2b1bLRGYug+H4e5jeV/LJstQtp6Bw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 72f65940a5e3..42a44a04a9eb 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , mashumaro , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "huum"; - version = "0.7.9"; + version = "0.7.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "frwickst"; repo = "pyhuum"; rev = "refs/tags/${version}"; - hash = "sha256-wIroT1eMO9VXsPWQkpSBEVN/nR4pg2/Eo4ms81qMaew="; + hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY="; }; nativeBuildInputs = [ @@ -48,6 +47,5 @@ buildPythonPackage rec { changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 004bddfbe8ac..71012f747e47 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQ8mhTfZ+6F9EgDfBWVI6I/I3n2lIlJs+mM0OJ0MKTQ="; + hash = "sha256-JmiGhOkHUPjvikFimgpAUOc26IFVWqFBP7Xah54GNfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index c00e171772e1..ef6669110ce1 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.10"; + version = "4.0.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Rhd+uO3nDcc76SKsmfjvlDvcLfvGoxs1PEvehIo13uE="; + hash = "sha256-0a7CRxJWa8JaNiKXiCQneOSYykCIAo4vmqFWuLf9yPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 037ae3cda69f..2a297571b3f1 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -22,7 +22,8 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-O39Xe26WKAGcv6DEvwuOL8NZJBem5SYZDX1TPAY7/uA="; + hash = "sha256-xQimslz/G6nf2uYerLSaRAK5gvmfDmWTzEx/fh+nqg0="; + fetchSubmodules = true; ## for vendored `rapidfuzz-cpp` }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index dd3671ef2527..5647c2ee7909 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -15,7 +15,7 @@ , httpx }: let - version = "1.18.3"; + version = "1.19.0"; in buildPythonPackage rec { pname = "litellm"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-V4OTEZMyhXDcva7k88uTVH6vJ1EsF549ZmqUqXETsB0="; + hash = "sha256-cHGLOcOC9G6FlJfyrf+owURfGtn/gCAJuhSPt9lJS0o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index c39b24a17f31..e550285ccaac 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.31"; + version = "0.3.32"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-aZwazbDljRncB2p7qD95Cms0uQBU8tciUrXcKpsyVTM="; + hash = "sha256-xwlrMZLJKRW6iqMsDKS5BDqejADSk/qGOAnQDZ2fTPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 625779d17fe1..2715e1748051 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.5"; + version = "3.0.2"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-F2mWUpFMn2ipopa3UjvzrmNZsHtdRrUwfkuHbDYBElo="; + hash = "sha256-+aCDAzPuzhB7TvERneI9rWphv/q38jjmGEFtUcRtKcg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 52723e8560a1..2b05786997ae 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240124"; + version = "0.10.0.20240125"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z87qlGIL215R3Lqbx2f7AuY0Zhu2zpXD+tL5cxGm8Uw="; + hash = "sha256-lxyUgACsRULzQLNyU2TFrLdRzdSbQzvECTRaYQP8O04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix new file mode 100644 index 000000000000..8259a41e2e40 --- /dev/null +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, scipy +, numpy +, pydoe +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pwlf"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cjekel"; + repo = "piecewise_linear_fit_py"; + rev = "v${version}"; + hash = "sha256-gjdahulpHjBmOlKOCPF9WmrWe4jn/+0oVI4o09EX7qE="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + scipy + numpy + pydoe + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "pwlf" ]; + + meta = with lib; { + description = "Fit piecewise linear data for a specified number of line segments"; + homepage = "https://jekel.me/piecewise_linear_fit_py/"; + changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pydoe/default.nix b/pkgs/development/python-modules/pydoe/default.nix new file mode 100644 index 000000000000..e361d09ced3b --- /dev/null +++ b/pkgs/development/python-modules/pydoe/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, scipy +, numpy +}: + +buildPythonPackage rec { + pname = "pyDOE"; + version = "0.3.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-y9bxSuJtPJ9zYBMgX1PqEZGt1FZwM8Pud7fdNWVmxLY="; + extension = "zip"; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + scipy + numpy + ]; + + pythonImportsCheck = [ "pyDOE" ]; + + meta = with lib; { + description = "Design of experiments for Python"; + homepage = "https://github.com/tisimst/pyDOE"; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 7f831e1d8e47..3ee728d7ef11 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.44.0"; + version = "0.44.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-8F0mcZuGU3CiB3pGbAVReKAjvqFLMNa3EHLOOVujgAo="; + hash = "sha256-i3OQ2QOBMaiNTyq44wbnHZ2iqAXEYB16NWKWzOza1Jo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index 96bb9bca21d8..6269df577501 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.11"; + version = "0.2.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-mBTY2JU79Hk6P+oWQ+2FD0BYHL1c865EvnTUl6H+gnk="; + hash = "sha256-eepN5Urr9fp1780iy3Z4sot+hXvMCxMGodYBdRdDj9Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index eb6f056ad156..c61fcfac480b 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.6.0.1"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-Vx2ZRcm/Ob0oWB/Th7hF4ctppWoeeNiqKGjYVNsidrE="; + hash = "sha256-kMhmnIwdVix9DgijTcNf5fsm4jiqygxjOvgGNOGN4O8="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - speedup = [ + speedups = [ kasa-crypt orjson ]; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 96ba4c367033..9d5630a22360 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9za0et/W+AwrjqUVoHwk8oqLXk4eqgRON8Z4F5GSKXM="; + hash = "sha256-dh33m7wgOwUETjdNqqDKZnpTgbrYCg9/XXC296tHm4w="; }; postPatch = '' @@ -144,6 +144,7 @@ buildPythonPackage rec { # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" + "test_autoimport_code_actions_and_completions_for_notebook_document" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # pyqt5 is broken on aarch64-darwin "test_pyqt_completion" diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index e3f1b0922a6a..f0652410828c 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -1,32 +1,50 @@ -{ lib, fetchPypi, buildPythonPackage, lzo, pytestCheckHook, setuptools, wheel }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, lzo +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: buildPythonPackage rec { pname = "python-lzo"; - version = "1.15"; - format = "pyproject"; + version = "1.16"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-pXqqAMXDoFFd2fdCa6LPYBdn3BncAj2LmdShOwoye0k="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jd-boyd"; + repo = "python-lzo"; + rev = "refs/tags/v${version}"; + hash = "sha256-iXAvOCzHPvNERMkE5y4QTHi4ZieW1wrYWYScs7zyb2c="; }; + nativeBuildInputs = [ setuptools wheel ]; - buildInputs = [ lzo ]; + buildInputs = [ + lzo + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "lzo" ]; meta = with lib; { - homepage = "https://github.com/jd-boyd/python-lzo"; description = "Python bindings for the LZO data compression library"; + homepage = "https://github.com/jd-boyd/python-lzo"; + changelog = "https://github.com/jd-boyd/python-lzo/releases/tag/v${version}"; license = licenses.gpl2Only; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; }; } diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index fe6d13423bc3..1346e9b35b7a 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.39.0"; + version = "0.39.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-t+ZjLsnsLcWYNlx2eRxDhQLw3levdiCk4FUrcjtSmq8="; + hash = "sha256-iFLzrjbCwBuV9RQSHoP5LOG0PIPjiTMCpvk3wqGtMgk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index aa6eed8ec573..1661918152f1 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -5,25 +5,27 @@ , pytestCheckHook , xorgserver , imagemagick +, gobject-introspection , pulseaudio , pytest-asyncio , pytest-lazy-fixture , qtile , keyring , requests -, stravalib +, librsvg +, gtk3 }: buildPythonPackage rec { pname = "qtile-extras"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; src = fetchFromGitHub { owner = "elParaguayo"; repo = pname; rev = "v${version}"; - hash = "sha256-WI1z8vrbZiJw6fDHK27mKA+1FyZEQTMttIDNzSIX+PU="; + hash = "sha256-DJmnJcqhfCfl39SF3Ypv0PGtI4r8heaVv9JmpiCBGJo="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -32,6 +34,7 @@ buildPythonPackage rec { pytestCheckHook xorgserver imagemagick + gobject-introspection ]; checkInputs = [ pytest-asyncio @@ -40,59 +43,41 @@ buildPythonPackage rec { pulseaudio keyring requests - stravalib + # stravalib # marked as broken due to https://github.com/stravalib/stravalib/issues/379 ]; disabledTests = [ - # AttributeError: 'ImgMask' object has no attribute '_default_size'. Did you mean: 'default_size'? - # cairocffi.pixbuf.ImageLoadingError: Pixbuf error: Unrecognized image file format - "test_draw" - "test_icons" - "1-x11-GithubNotifications-kwargs3" - "1-x11-SnapCast-kwargs8" - "1-x11-TVHWidget-kwargs10" - "test_tvh_widget_not_recording" - "test_tvh_widget_recording" - "test_tvh_widget_popup" - "test_snapcast_options" - "test_snapcast_icon" - "test_snapcast_icon_colour" - "test_snapcast_http_error" - "test_syncthing_not_syncing" - "test_syncthing_is_syncing" - "test_syncthing_http_error" - "test_githubnotifications_colours" - "test_githubnotifications_logging" - "test_githubnotifications_icon" - "test_githubnotifications_reload_token" - "test_image_size_horizontal" - "test_image_size_vertical" - "test_image_size_mask" - # ValueError: Namespace Gdk not available - # AssertionError: Window never appeared... - "test_statusnotifier_menu" - # AttributeError: 'str' object has no attribute 'canonical' - "test_strava_widget_display" - "test_strava_widget_popup" # Needs a running DBUS "test_brightness_power_saving" - "test_upower_all_batteries" - "test_upower_named_battery" - "test_upower_low_battery" - "test_upower_critical_battery" - "test_upower_charging" - "test_upower_show_text" "test_global_menu" "test_mpris2_popup" + "test_statusnotifier_menu" # No network connection "test_wifiicon_internet_check" - # AssertionErrors - "test_widget_init_config" + # Image difference is outside tolerance "test_decoration_output" + # Needs github token + "test_githubnotifications_reload_token" + # AttributeError: 'NoneType' object has no attribute 'theta' + "test_image_size_horizontal" + "test_image_size_vertical" + ]; + disabledTestPaths = [ + # Needs a running DBUS + "test/widget/test_iwd.py" + "test/widget/test_upower.py" + # Marked as broken due to https://github.com/stravalib/stravalib/issues/379 + "test/widget/test_strava.py" ]; preCheck = '' export HOME=$(mktemp -d) + export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + sed -i 's#/usr/bin/sleep#sleep#' test/widget/test_snapcast.py ''; + propagatedBuildInputs = [ + gtk3 + ]; + pythonImportsCheck = [ "qtile_extras" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index b4a2cc68ab8f..ff4b3b85e9cf 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -1,23 +1,27 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , libspatialindex , numpy , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "rtree"; - version = "1.1.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "Rtree"; - inherit version; - hash = "sha256-b47lBN3l0AWyWwiq9b4LNASvOtX+zm4d3N41kIp5ipU="; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "rtree"; + rev = "refs/tags/${version}"; + hash = "sha256-RmAiyYrkUMBN/ebmo27WvFcRmYlKkywuQHLLUbluTTw="; }; postPatch = '' @@ -25,6 +29,11 @@ buildPythonPackage rec { 'find_library("spatialindex_c")' '"${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ libspatialindex ]; nativeCheckInputs = [ @@ -36,7 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "R-Tree spatial index for Python GIS"; - homepage = "https://toblerity.org/rtree/"; + homepage = "https://github.com/Toblerity/rtree"; + changelog = "https://github.com/Toblerity/rtree/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index cd66ed54be76..4b33027fb99b 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ovVMdqzMFaNL+5Bm5selbB5yNd2ldiuZB5IzC1LM+wU="; + hash = "sha256-1Dc8mE66IOOTIW7dUaPj7t5Wy+k9QkdRbSBWQ8O5MSE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 617968006843..3958ace5aacf 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -1,39 +1,69 @@ { lib +, appdirs +, argparse , buildPythonPackage -, python3 -, pythonOlder +, doit , fetchPypi , ftfy -, appdirs +, mock +, pyinstaller-versionfile +, pytestCheckHook +, python3 +, pythonOlder , requests +, pythonRelaxDepsHook +, setuptools , setuptools-scm -, types-mock +, tableauserverclient , types-appdirs +, types-mock , types-requests , types-setuptools -, argparse -, doit -, pyinstaller-versionfile -, tableauserverclient -, pytestCheckHook -, mock +, urllib3 }: buildPythonPackage rec { pname = "tabcmd"; version = "2.0.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM="; + hash = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM="; }; - propagatedBuildInputs = [ ftfy appdirs requests setuptools-scm types-mock types-appdirs argparse doit pyinstaller-versionfile types-requests types-setuptools tableauserverclient ]; + pythonRelaxDeps = [ + "tableauserverclient" + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + appdirs + argparse + doit + ftfy + pyinstaller-versionfile + requests + setuptools-scm + tableauserverclient + types-appdirs + types-mock + types-requests + types-setuptools + urllib3 + ]; - nativeCheckInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ + mock + pytestCheckHook + ]; # Remove an unneeded dependency that can't be resolved prePatch = '' @@ -58,10 +88,11 @@ buildPythonPackage rec { ''; - meta = { + meta = with lib; { description = "A command line client for working with Tableau Server."; - homepage = "https://pypi.org/project/tabcmd/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + homepage = "https://github.com/tableau/tabcmd"; + changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 76a028fe2fc0..3ddf8c9a2d15 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -1,26 +1,44 @@ { lib , buildPythonPackage -, fetchPypi , defusedxml -, requests +, fetchPypi , packaging -, requests-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, requests +, requests-mock +, setuptools +, versioneer }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.29"; - format = "setuptools"; + version = "0.30"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FVJeKt1+qL4XuxFNqhWRtCJu5yEmcP/RLeQQyXndU0c="; + hash = "sha256-MIE6V84xLEbgmTwvP6jQC0H//gBnMTO1sowL1HIMbpQ="; }; + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + setuptools + pythonRelaxDepsHook + versioneer + ]; + propagatedBuildInputs = [ defusedxml requests diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix new file mode 100644 index 000000000000..c6a563bf55e5 --- /dev/null +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, torch +, wheel +, which +, cloudpickle +, numpy +, h5py +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tensordict"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "tensordict"; + rev = "refs/tags/v${version}"; + hash = "sha256-+Osoz1632F/dEkG/o8RUqCIDok2Qc9Qdak+CCr9m26g="; + }; + + nativeBuildInputs = [ + setuptools + torch + wheel + which + ]; + + propagatedBuildInputs = [ + cloudpickle + numpy + torch + ]; + + pythonImportsCheck = [ + "tensordict" + ]; + + # We have to delete the source because otherwise it is used instead of the installed package. + preCheck = '' + rm -rf tensordict + ''; + + nativeCheckInputs = [ + h5py + pytestCheckHook + ]; + + meta = with lib; { + description = "A pytorch dedicated tensor container"; + changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; + homepage = "https://github.com/pytorch/tensordict"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix new file mode 100644 index 000000000000..bbf1fccd76ba --- /dev/null +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -0,0 +1,154 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, ninja +, setuptools +, wheel +, which +, cloudpickle +, numpy +, torch +, ale-py +, gym +, pygame +, gymnasium +, mujoco +, moviepy +, git +, hydra-core +, tensorboard +, tqdm +, wandb +, packaging +, tensordict +, imageio +, pytest-rerunfailures +, pytestCheckHook +, pyyaml +, scipy +}: + +buildPythonPackage rec { + pname = "torchrl"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "rl"; + rev = "refs/tags/v${version}"; + hash = "sha256-Y3WbSMGXS6fb4RyXk2SAKHT6RencGTZXM3tc65AQx74="; + }; + + patches = [ + (fetchpatch { # https://github.com/pytorch/rl/pull/1828 + name = "pyproject.toml-remove-unknown-properties"; + url = "https://github.com/pytorch/rl/commit/c390cf602fc79cb37d5f7bda6e44b5e9546ecda0.patch"; + hash = "sha256-cUBBvKJ8vIHprcGzMojkUxcOrrmNPIoIBfLwHXWkjOc="; + }) + ]; + + nativeBuildInputs = [ + ninja + setuptools + wheel + which + ]; + + propagatedBuildInputs = [ + cloudpickle + numpy + packaging + tensordict + torch + ]; + + passthru.optional-dependencies = { + atari = [ + ale-py + gym + pygame + ]; + gym-continuous = [ + gymnasium + mujoco + ]; + rendering = [ + moviepy + ]; + utils = [ + git + hydra-core + tensorboard + tqdm + wandb + ]; + }; + + # torchrl needs to create a folder to store datasets + preBuild = '' + export D4RL_DATASET_DIR=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "torchrl" + ]; + + # We have to delete the source because otherwise it is used instead of the installed package. + preCheck = '' + rm -rf torchrl + + export XDG_RUNTIME_DIR=$(mktemp -d) + '' + # Otherwise, tochrl will try to use unpackaged torchsnapshot. + # TODO: This should be the default from next release so remove when updating from 0.2.1 + + '' + export CKPT_BACKEND="torch" + ''; + + nativeCheckInputs = [ + gymnasium + imageio + pytest-rerunfailures + pytestCheckHook + pyyaml + scipy + ] + ++ passthru.optional-dependencies.atari + ++ passthru.optional-dependencies.gym-continuous + ++ passthru.optional-dependencies.rendering; + + disabledTests = [ + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called + "test_vecenvs_env" + + # ValueError: Can't write images with one color channel. + "test_log_video" + + # Those tests require the ALE environments (provided by unpackaged shimmy) + "test_collector_env_reset" + "test_gym" + "test_gym_fake_td" + "test_recorder" + "test_recorder_load" + "test_rollout" + "test_parallel_trans_env_check" + "test_serial_trans_env_check" + "test_single_trans_env_check" + "test_td_creation_from_spec" + "test_trans_parallel_env_check" + "test_trans_serial_env_check" + "test_transform_env" + ]; + + meta = with lib; { + description = "A modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; + homepage = "https://github.com/pytorch/rl"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 3c9af2fd7652..328dd01f8565 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.11.1"; + version = "8.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-cByrE0/sKZ0dWnuQS1KOOCHbSYF6YJchqGrdkmVp9DM="; + hash = "sha256-I2ktLhlSFeQ3f7/zcm5NKLv5Pm1R7EPkeMPREMa9bBA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 5962e0083910..8ed9bc0c1998 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240106"; + version = "0.20.0.20240125"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-A5kuyXb74IDbWI4eVqg8Xkq6XHMwIrJbsmy4Q5e5YEk="; + hash = "sha256-r3YOMR2Jrz+PtiVD6FCZ1v2dwDttGjva9mlXNnXVitg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vtjp/default.nix b/pkgs/development/python-modules/vtjp/default.nix new file mode 100644 index 000000000000..4e193ea2eb48 --- /dev/null +++ b/pkgs/development/python-modules/vtjp/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +, tabulate +}: + +buildPythonPackage rec { + pname = "vtjp"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Miicroo"; + repo = "python-vasttrafik"; + rev = "refs/tags/v${version}"; + hash = "sha256-3/toHY2PkG87J5bIMNJZHF/4mUvWaeHamMzPa1St7Xo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + tabulate + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "vasttrafik" + ]; + + meta = with lib; { + description = "A Python wrapper and cli for Västtrafik public API"; + homepage = "https://github.com/Miicroo/python-vasttrafik"; + changelog = "https://github.com/Miicroo/python-vasttrafik/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index 403ee6df52bd..cff5b329e6ca 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pythonOlder , yara @@ -8,8 +9,8 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.3.1"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,20 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-WjH27pOOBXmbj8ghr42TLTp8eAKiTq4eRTYnim56J/8="; + hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; }; + # undefined symbol: yr_finalize + # https://github.com/VirusTotal/yara-python/issues/7 + postPatch = '' + substituteInPlace setup.py \ + --replace "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']" + ''; + + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ yara ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1282eebef211..94eb10e0d103 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.69"; + version = "3.1.70"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-hA0GmCNsds/dkSJ5PZYPiz1lsaISs62jb000k17aqAM="; + hash = "sha256-6HR6Hfv8dAo3/GT1OZQmH7yq4fY9Xi8SKkGUjG9914I="; }; patches = [ diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 90ab6d3c820b..ce9e365a6579 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-JvmuJ3NNmjL69UGV/r5XOXqbznD0vA4CnhLWx05b3uY="; + hash = "sha256-l5dGWr4oYD+Ado+KdCm+EmEhrkP3rJ9npudXEL9uY4c="; }; - vendorHash = "sha256-4oRZLZv4TsdHozGJicLIxKDl1zenwjj4SbbpdVI02xI="; + vendorHash = "sha256-2/bg5RaT1ISYq5VjH5FrB7TThAb3UucAoFsPlkxaHVg="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6deca5aacf10..431f7b1773f6 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , cmake +, ninja , pkg-config , grpc , protobuf @@ -13,6 +14,9 @@ , zlib , sqlite , re2 +, lit +, python3 +, coreutils }: stdenv.mkDerivation rec { @@ -26,7 +30,15 @@ stdenv.mkDerivation rec { hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + + # Used for functional tests, which run during buildPhase. + lit + python3 + ]; buildInputs = [ grpc @@ -41,13 +53,32 @@ stdenv.mkDerivation rec { re2 ]; + cmakeFlags = [ + # Build system and generated files concatenate install prefix and + # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeBool "ENABLE_UNIT_TESTS" false) + (lib.cmakeBool "ENABLE_FUNC_TESTS" false) + ]; + patches = [ - # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... - ./no-double-relative.patch + # Fix toolchain environment variable handling and the Darwin SIP check. + ./fix-functional-tests.patch ]; + postPatch = '' + patchShebangs test/bin + + # /usr/bin/env is used in test commands and embedded scripts. + find test -name '*.sh' \ + -exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} + + ''; + + # Functional tests use loopback networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { - broken = stdenv.isDarwin; description = "Tool that generates a compilation database for clang tooling"; longDescription = '' Note: the bear command is very useful to generate compilation commands diff --git a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch new file mode 100644 index 000000000000..99d64f26d077 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch @@ -0,0 +1,32 @@ +diff --git a/test/lit.cfg b/test/lit.cfg +index 118c979..b69fecc 100644 +--- a/test/lit.cfg ++++ b/test/lit.cfg +@@ -207,13 +207,8 @@ def is_preload_disabled(): + if is_windows: + return True + elif sys.platform == 'darwin': +- command = ['csrutil', 'status'] +- pattern = re.compile(r'System Integrity Protection status:\s+enabled') +- try: +- output = subprocess.check_output(command, stderr=subprocess.STDOUT) +- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) +- except (OSError, subprocess.CalledProcessError): +- return False ++ # csrutil(8) isn't available in the Nix build sandbox. ++ return True + else: + return False + +@@ -221,6 +216,11 @@ def is_preload_disabled(): + if not is_preload_disabled(): + config.available_features.add('preload') + ++# Preserve the variables required for the Nix toolchain wrappers. ++for var, value in os.environ.items(): ++ if var.startswith('NIX_'): ++ config.environment[var] = value ++ + print(config.substitutions) + print(config.environment) + print(config.available_features) diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch deleted file mode 100644 index e8087feb1afb..000000000000 --- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/source/config.h.in b/source/config.h.in -index 6b659c2..f7bdf22 100644 ---- a/source/config.h.in -+++ b/source/config.h.in -@@ -108,8 +108,8 @@ namespace cmd { - } - - namespace wrapper { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; -- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; -+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; -+ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; - - constexpr char FLAG_VERBOSE[] = "--verbose"; - constexpr char FLAG_DESTINATION[] = "--destination"; -@@ -134,9 +134,9 @@ namespace cmd { - // And use the `libexec.so` path default value with a single path, - // that matches both. (The match can be achieved by the $LIB token - // expansion from the dynamic loader. See `man ld.so` for more.) -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - #else -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - #endif - constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; - constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 30f3c14c9d40..d437fe643b4e 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.19.0"; + version = "1.19.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-BjSe5N9rFsVL5EueCbBTcnIJM4TYd5q/1wrsANCyniU="; + hash = "sha256-kv43d2KDYwMpyutqf4M/Z4fo1A3lwdwOOyxOQwM5vik="; }; - cargoHash = "sha256-tMqk0aI+ObxlgAOa1inL8mba9ti9Gxhg9mckmyNsuv8="; + cargoHash = "sha256-G8aT44K3HAfmOH6GltbZ91xQRqy79/bimu4cUlAZEDo="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7e70d0c04afa..e554268e102a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt - ln -sT ../share/sbt/bin/sbtn-x86_64-${ + ln -sT ../share/sbt/bin/sbtn-${ + if (stdenv.hostPlatform.isAarch64) then "aarch64" else "x86_64" + }-${ if (stdenv.isDarwin) then "apple-darwin" else "pc-linux" } $out/bin/sbtn diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 34abd88623be..1a7c15d9a963 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-g/BgKkU8Me6EacDm+KFAsKq5++v/b+Par0x7lzBzHw8="; + hash = "sha256-6xeMkqsFchZxrAsE2DLaIzGU4VMwyDckm00s69wahOo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index 0fb3ae81030b..b50d22d76e78 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "3.1"; + version = "3.3"; src = fetchurl { - url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; + url = "https://eradman.com/ephemeralpg/code/${pname}-${version}.tar.gz"; + hash = "sha256-pVQrfSpwJnxCRXAUpZQZsb0Z/wlLbjdaYmhVevgHrgo="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; - homepage = "http://ephemeralpg.org/"; + homepage = "https://eradman.com/ephemeralpg/"; platforms = platforms.all; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka medv ]; }; } diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index d4077a2388ff..e1d66de4063a 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e7RBiUHMndOz1n8gWlx+4ifnueWgPu482KIAXaSEhl0="; + sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA="; }; vendorHash = "sha256-FcYPe4arb+jbxj4Tl6bRRAnkEvw0rkECIo8/zC79lOA="; diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index d403a551d3c8..67046d96e944 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-+8/xyHL+Dvm8Z5DXk1VkmFYP7Gg/YadIyc3xI9L0Jow="; + hash = "sha256-szs5tLjGCavHerQQi0Abla0kaHYQ/xN0O36Wrc1MG4Y="; }; modRoot = "./extism"; - vendorHash = "sha256-kJnYp4X4dzkpXw0j7CI3Q3GdCQrCzslZxz2/IkVPqMk="; + vendorHash = "sha256-IRqn4XmFA6vyjtgTaxYh7ndHkQYuKC1eHKNoGC7Hh+U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 8f42ed7250dc..e96315197a03 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.21"; + version = "0.16.22"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-1zdxxd27XXSDcOhQi/um7jQlLZ3x+T09N1p1JJ8qzkk="; + sha256 = "sha256-m9pdP+ADNPWzrs4VPcdwE7I3aiaBtSb3i1qpFxMIdM4="; }; vendorHash = null; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 93757b3cd8e2..30bf14f4fcf4 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.9.0"; + version = "4.10.0"; - nugetSha256 = "sha256-BB3jCsIz6Y9LjBhoEBzYLXttwLOBb4n1EpqJwImjo9A="; + nugetSha256 = "sha256-qSnPb+qjF10gzP8LSvvqnAXa0tedvOMHCrVd8zTtZl0="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index c95c33365732..9d164361de6b 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gauge"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-XWMv3H/NcEnX9+kCU6gzyrhpCtMWV3I+ZQ9Ia4XFpgY="; + hash = "sha256-9zoZKd/mubm64Pb95iUFZK622hTqm3A+U0OOX3uDtd8="; }; - vendorHash = "sha256-dTPKdDEK3xdvKUqI4fUDlUi0q0sMCw5Nfaj71IXit9M="; + vendorHash = "sha256-BQkQ6huTm3hI1MQvq2VffCrxCQyDJb/S7yxvPpfQaGI="; excludedPackages = [ "build" "man" ]; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index 5c3eb84b2d5a..851d64545d8f 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, llvmPackages_10 +, llvmPackages , fetchFromGitHub +, fetchpatch , cmake , llvm_12 , ncurses @@ -10,9 +11,9 @@ , libxml2 , python3 }: -llvmPackages_10.stdenv.mkDerivation { +llvmPackages.stdenv.mkDerivation { pname = "hobbes"; - version = "unstable-2023-06-03"; + version = "0-unstable-2023-06-03"; src = fetchFromGitHub { owner = "morganstanley"; @@ -21,6 +22,19 @@ llvmPackages_10.stdenv.mkDerivation { hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw="; }; + patches = [ + # fix build for LLVM-12+ + # https://github.com/morganstanley/hobbes/pull/452 + (fetchpatch { + name = "include-cstdint.patch"; + url = "https://github.com/morganstanley/hobbes/commit/924b71fca06c61e606792cc8db8521fb499d4237.patch"; + hash = "sha256-/VsWtTYc3LBOnm4Obgx/MOqaaWZhUc8yzmkygtNz+mY="; + }) + ]; + + # only one warning generated. try to remove on next update + env.CXXFLAGS = "-Wno-error=deprecated-copy"; + # TODO: re-enable Python tests once they work on Python 3 # currently failing with "I don't know how to decode the primitive type: b'bool'" postPatch = '' diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 904798b8d472..5932cdd9e85a 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.49"; + version = "0.0.50"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-AL0p5NbhBxgw0mJYWcGb4EeztO7ermmcm5YrO/M8TKU="; + hash = "sha256-4LGCHbd5NVp6DakE9MwyB64BaMqHgYLxGGo9IXZzjiE="; }; postPatch = '' diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 92db12ce89ac..8c0ed2e4bfd5 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.2.3"; + version = "4.2.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-+03wjNxIZr8vhvK3zfvFBwXC5WmEs5A6mydGXsmGuCI="; + sha256 = "sha256-Jhy1q+6VdLPScq882QU8dIUNNKs1i+3Mug5ycUWFp9U="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/patchelf/0.13.nix b/pkgs/development/tools/misc/patchelf/0.13.nix deleted file mode 100644 index 0111a4b065c4..000000000000 --- a/pkgs/development/tools/misc/patchelf/0.13.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, patchelf }: - -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. - -stdenv.mkDerivation rec { - pname = "patchelf"; - version = "0.13.1"; - - src = fetchurl { - url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OeiuzNdJXVTfCU0rSnwIAQ/3d3A2+q8k8o4Hd30VmOI="; - }; - - setupHook = [ ./setup-hook.sh ]; - - # fails 8 out of 24 tests, problems when loading libc.so.6 - doCheck = stdenv.name == "stdenv-linux"; - - inherit (patchelf) meta; -} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 3dcd56ef9b47..1544e737c0b9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -91,6 +91,7 @@ tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json; tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json; tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json; + tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json; tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json; tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json; tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json; @@ -102,9 +103,9 @@ tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json; tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json; tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json; + tree-sitter-wgsl = lib.importJSON ./tree-sitter-wgsl.json; tree-sitter-wing = lib.importJSON ./tree-sitter-wing.json; tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json; tree-sitter-yang = lib.importJSON ./tree-sitter-yang.json; tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json; - tree-sitter-wgsl = lib.importJSON ./tree-sitter-wgsl.json; } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json new file mode 100644 index 000000000000..240368e1e55d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/vrischmann/tree-sitter-templ", + "rev": "14d105789af342f7f0c32bff2fec1a6edec59f60", + "date": "2023-12-29T22:31:39+01:00", + "path": "/nix/store/8yixhjmhynryb79g3wff5kxgz35ncg3n-tree-sitter-templ", + "sha256": "1hr0l9ibm12ggiyk5m3h12fjgrdkfv7d2qlcfy6l6c10k4ghngf2", + "hash": "sha256-wj0LH5kgMEONd4xi0c52s+UnnQhw1DJ9fE+EumKiIMM=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 84dbeeb7c4dd..aad4a6c9a029 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -405,6 +405,10 @@ let orga = "szebniok"; repo = "tree-sitter-wgsl"; }; + "tree-sitter-templ" = { + orga = "vrischmann"; + repo = "tree-sitter-templ"; + }; }; allGrammars = diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 8dc49289f6ab..12fae7b15c38 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - sha256 = "sha256-itChRuBl5n6lo/d7F5pVth5EbtWPleBcE8ReErmfv9M="; + hash = "sha256-+k1kHiHRQER/8JTOeQdxcbsfMvS6eC74Wkd9IlLldok="; }; - cargoHash = "sha256-AWtycqlmCPISfgX47DXOE6l3jPM1gng9ALTiF87NozI="; + cargoHash = "sha256-N3niTnSSIfOVOGhcHHgTbLnpYNmM4bow7qX539P+kHQ="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 9d3e0e279c3a..60839c902e33 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.15"; + version = "0.6.16"; src = fetchCrate { inherit pname version; - hash = "sha256-yjaX4lqUj9aZPkRuiJC3yBwXvfvd+Okr87Ia2IQvxfM="; + hash = "sha256-DbZ/8tnVD9jXN9Ek7LJRF1GFy/gphexNKG7FcZeqtoE="; }; - cargoHash = "sha256-6ogeqVN2V38N7mNBjimjNv/KK2JtV4aa5AorRfYMBx8="; + cargoHash = "sha256-j7ZHq3M2JgQV72GRKOIlp+jsoc/ikYHmNLOnrZ2yA8I="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index cb2d5b036834..f80d4d2b0f02 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.1.1"; + version = "24.1.2"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-n7fpfgbDvLMMA834BUSAEYD+mXVxGGFPLlLjDxpKuSA="; + hash = "sha256-V1BQJmwLhsh36Gyg1Zrxw5MCUQcyIKlnEsYmchu8K5A="; }; - cargoHash = "sha256-lEeNIwNvq6K+xRCUTXs9Sh7o8q3u5GcBKntVMhPQqMU="; + cargoHash = "sha256-f2iJnBklzSgHqez6KSk1+ZqiY/t9iCdtsQze9PhG164="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 3f97405fb678..5cb3c4de96b1 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.3.0"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug="; + hash = "sha256-1YFTBzFr11FUfwgdGJgyF1lWvrfQ6ZPIkYAG7vySfFA="; }; - cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ="; + cargoHash = "sha256-wL1DKZ1QhBKB4Gy2rbwe4y/hR4A/wiiVqGAIcM+Om8E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 6ef87e291d2f..7623eeef02f8 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-01-15"; - cargoSha256 = "sha256-TVHMoGp7MiY8zyMbBQIbEMS4KbsqJP4WSl8snIvewCQ="; + version = "2024-01-22"; + cargoSha256 = "sha256-QH6iAZnkLGOGTrzkpj83Uib7TcO9xdnMWog4wWUEKRY="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-H3RdtMxH8moTInVmracgtF8bgFpaEE3zYoSkuv7PBs0="; + sha256 = "sha256-ZATChFWHToTZQFLlzrzDUX8fjEbMHHBIyPaZU1JGmjI="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index fddf3b1d6881..8c62e2f90d60 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.25.2"; + version = "2.26.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-IAtOlWIs1BScr569s8Y8A+m1CzzGrSXX/CaqkXubZfA="; + sha256 = "sha256-9Qwonp2tGmaffYj5Vv09+Z3YcbFSFmeS/zc7PXjmrk4="; }; doCheck = false; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-oydBeEOFTmDibUZZSwe7WMcU5eDshsDogPRlxrrx1i8="; + cargoHash = "sha256-t1Gqis4Gd6Zdkka8u/tCRM5xmm3z85OqZIkINm9jNyc="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 3d80a27d59ad..6142ff4c170e 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.131.2"; + version = "1.137.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-6IjVROKxDiLod8XWWndnxHQGnk8DJc1sjzJxLWDkRL0="; + hash = "sha256-C7J1hXRsWlzVvvKjj0IlgWC/BtVsJOvFnPm7c+ioxCA="; }; - vendorHash = "sha256-/hfFydNHDK6shCC4iIkdP8r1ZO9niMIWZ/Ypj/DGj+c="; + vendorHash = "sha256-p026yk50DfzUZX7TTFpDhvGHiD/XUhbxlHQz383pRZk="; ldflags = [ "-s" diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/development/tools/trunk-io/default.nix index 78b5247a4911..0428b8489547 100644 --- a/pkgs/development/tools/trunk-io/default.nix +++ b/pkgs/development/tools/trunk-io/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "trunk-io"; - version = "1.2.7"; + version = "1.3.0"; src = fetchurl { url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; - hash = "sha256-i2m+6Y6gvkHYwzESJv0DkLcHkXqz+g4e43TV6u1UTj8="; + hash = "sha256-v9WJb9oIs5k2ZIX80L83dRtEarTiVsXBtXBta0sP++A="; }; dontUnpack = true; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index da414797c2bc..bb9cda866e7f 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "7.10.0"; + version = "7.11.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-VXvs4Z5cOt+lJ1JReApynpz/TufJgIVaO3dszS3Gvb4="; + hash = "sha256-tXYqAAzxAFQGREkNGgBrHLp7ukRDMtr0bPYW7hOEniY="; }; - npmDepsHash = "sha256-ovLVWOrQ//aJPJqzCJQS+/Tnn4Z75OR69e7ACevKWCA="; + npmDepsHash = "sha256-uKAEWe28zUgE7Fv00sGXD5dKje/pHh22yJlYtk+7tN8="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix index 3051c80f473b..b82f45692ee1 100644 --- a/pkgs/development/web/protege-distribution/default.nix +++ b/pkgs/development/web/protege-distribution/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nessdoor ]; license = with licenses; [ asl20 bsd2 epl10 lgpl3 ]; platforms = platforms.linux; + mainProgram = "run-protege"; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index bdfbfe4d7f2b..6be1d6700fc4 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "naev"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "naev"; repo = "naev"; rev = "v${version}"; - sha256 = "sha256-G6FsZnRWNTFjsIpQsxYcZhlyjhMUaalNlmLpYGQar0E="; + sha256 = "sha256-2n7i5qCFdpjBpjeMv6aCd0zyD4c60FciHmSafbArnms="; fetchSubmodules = true; }; diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 9a14fef9fab1..a05085aeb5eb 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.39.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-EoywWavbCuoWeA5wknteRb8NH0T6Ef8h6zQhkXb9bL4="; + hash = "sha256-whCCGV0hMKR5kpmS6jefvzvAQaa65B4V4bYkP4HQkIQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index d528e5be1807..ec6905e2d130 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - hash = "sha256-BUphJqIZkxhPGsiK9ubG3oL9ak2ekFze8chdK28qX3o="; + hash = "sha256-nyYzG0O7tZwo77r7QwenVgaTffZ3ELEyUrkZmdvwm/w="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index ecb34c373b74..d1cd6ff0cdfb 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-JyMogqyntSm2IDXzsOIjcUkf2YwG2oXKpqPpdx/eMNI="; + hash = "sha256-IfceH4OSlL0J9O7ZF3vYzvoRM/NFlevC6LChH5+p9CY="; }; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 67231acccf78..86f9007f4653 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,31 +8,31 @@ "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.1": { - "version": "6.1.74", - "hash": "sha256:08i0pgmmdnrmlha6ncl6if39rqg44c9dqyggf0swxlmfkzbx3yxp" + "version": "6.1.75", + "hash": "sha256:0mis14ll6xmhw71vfpw1aahi5z207qysha7x316fq4qc6c899lbc" }, "5.15": { - "version": "5.15.147", - "hash": "sha256:1m7wznqiakarpar4a0nbwxql0hkvds0s79zx3r1xn0fj4mbfdhan" + "version": "5.15.148", + "hash": "sha256:1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4" }, "5.10": { - "version": "5.10.208", - "hash": "sha256:0vpvy47cmcinhs76cjl2n81zrlhbqgpi4v29izn2hzsl15x189ch" + "version": "5.10.209", + "hash": "sha256:1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4" }, "5.4": { - "version": "5.4.267", - "hash": "sha256:0hqw8ww7y9mjrh1wgdkiwk8llxpf4lxwmsmzxm8j4l615kpqvlj2" + "version": "5.4.268", + "hash": "sha256:081695lgkdwlrp6gpp6pyflgh76zax1w52shys4s9zjnrfkarj5g" }, "4.19": { - "version": "4.19.305", - "hash": "sha256:1s6srmhd3visqchshg566c7gq5wnxr3m74854kxksqhhfif450ns" + "version": "4.19.306", + "hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr" }, "6.6": { - "version": "6.6.13", - "hash": "sha256:1g60hblf4mywq3rivkqmz2n7a9arinxwh4g4n4x4xb8ysiyrxf48" + "version": "6.6.14", + "hash": "sha256:110mz8fjlg1j9wnhhq2ik5alayhf61adajd8jqmcsqprncnnpsgv" }, "6.7": { - "version": "6.7.1", - "hash": "sha256:1hv8mma3i6zhjix5k2g12jmajqy29c1xjfjkllmj18l6irbgmkqy" + "version": "6.7.2", + "hash": "sha256:0wd6pxh7wy9bzjzwd0rdsdnghpr53qbs722fhg07bi19m8dy8kf3" } } diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch deleted file mode 100644 index 16715992d35f..000000000000 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 84f8699..dce9033 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then - AC_SUBST(db2xman) - fi - AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) --AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) -+AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) - --if test "x$db2xman" = "xdocbook2man"; then -+if test "x$db2xman" = "no-no-no"; then - docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" - else - docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/os-specific/linux/mdevctl/default.nix index ce4ea250827b..80c3c1316d85 100644 --- a/pkgs/os-specific/linux/mdevctl/default.nix +++ b/pkgs/os-specific/linux/mdevctl/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "mdevctl"; - version = "1.3.0"; + version = "1.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-4K4NW3DOTtzZJ7Gg0mnRPr88YeqEjTtKX+C4P8i923E="; + hash = "sha256-0X/3DWNDPOgSNNTqcj44sd7DNGFt+uGBjkc876dSgU8="; }; - cargoHash = "sha256-hCqNy32uPLsKfUJqiG2DRcXfqdvlp4bCutQmt+FieXc="; + cargoHash = "sha256-TmumQBWuH5fJOe2qzcDtEGbmCs2G9Gfl8mH7xifzRGc="; nativeBuildInputs = [ docutils diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3eab03b91769..98ba2ca98e83 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -45,28 +45,32 @@ rec { patchFlags = [ "-p1" "-d" "kernel" ]; patches = []; + + brokenOpen = kernel.kernelAtLeast "6.7"; }); beta = selectHighestVersion latest (generic { - version = "545.23.06"; - sha256_64bit = "sha256-QTnTKAGfcvKvKHik0BgAemV3PrRqRlM3B9jjZeupCC8="; - sha256_aarch64 = "sha256-qkVP6AiXNoRTqgqPvs/AfErEq8BTQw25rtJ6GS06JTM="; - openSha256 = "sha256-m7D5LZdhFCZYAIbhrgZ0pN2z19LsU3I3Q7qsKX7Z6mM="; - settingsSha256 = "sha256-+X6gDeU8Qlvprb05aB2quM55y0zEcBXtb65e3Rq9gKg="; - persistencedSha256 = "sha256-RQJAIwPqOUI5FB3uf0/Y4K/iwFfoLpU1/+BOK/KF5VA="; + version = "550.40.07"; + sha256_64bit = "sha256-KYk2xye37v7ZW7h+uNJM/u8fNf7KyGTZjiaU03dJpK0="; + sha256_aarch64 = "sha256-AV7KgRXYaQGBFl7zuRcfnTGr8rS5n13nGUIe3mJTXb4="; + openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; + settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs="; + persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; }); # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.22"; + version = "535.43.23"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-emam5bfYJeFi1+Z0Z1//luaY1JTKcQNYUP8GmG9480Q="; - openSha256 = "sha256-8Nz6LfEdAsm7d6Leqs+ikN0BpOPkLCcd7bckK0MOIFU="; + sha256_64bit = "sha256-lnCiXkkRpKBVjvRSnJ5W8k4Mix6qMw1Lo2S0VjdexzI="; + openSha256 = "sha256-i74x94a4HCkqIqwInFgqZEFagVlMNZ1/OIztcTR1ReA="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; + + brokenOpen = kernel.kernelAtLeast "6.7"; }; # data center driver compatible with current default cudaPackages diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 44ed90a3bb21..2cbc1846362b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -60,7 +60,6 @@ with lib; -assert useSettings -> !libsOnly; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; assert useSettings -> settingsSha256 != null; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 241f33f1e00a..8660313a7189 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -24,7 +24,13 @@ stdenv.mkDerivation rec { url = "https://github.com/linux-pam/linux-pam/commit/77bd338125cde583ecdfb9fd69619bcd2baf15c2.patch"; hash = "sha256-tlc9RcLZpEH315NFD4sdN9yOco8qhC6+bszl4OHm+AI="; }) - ]; + ] + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "missing-termio.patch"; + url = "https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a.patch"; + hash = "sha256-b6n8f16ETSNj5h+5/Yhn32XMfVO8xEnZRRhw+nuLP/8="; + }) + ; # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 postPatch = if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform then '' diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 15f54fb360a4..7a86a58ffa12 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202311"; + version = "202401"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-lWE7Gz/+LLMr3UyqfwBWEwpSvtdjMgdxVqc9hrZAYfk="; + hash = "sha256-S4E9q4pdF9pT0ehKkeOMbJEFlTV9zB15BZA0R+cjVi8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index c8af2563d622..8f829a59998e 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -11,12 +11,12 @@ let pname = "uhk-agent"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-0kNcpdYktgzIPVvfSitJ5aIuhJvCEcbubumHhW00QUE="; + sha256 = "sha256-jkIuXKTm8imq1U7kbQhK7LkEeI2qz0Gu7rWuDn6Ex+c="; }; appimageContents = appimageTools.extract { @@ -39,6 +39,10 @@ stdenvNoCC.mkDerivation { libusb1 ]; + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch deleted file mode 100644 index 95a74748189d..000000000000 --- a/pkgs/servers/code-server/playwright.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -+++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -@@ -14,6 +14,4 @@ - * limitations under the License. - */ - --const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); -- --installDefaultBrowsersForNpmInstall(); -+process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 8b2db14048ae..a58a3bb717e1 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.24.1"; + version = "2.24.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-3GdpM5BIH6+NME+/Zig0c7pYFWuWZywT6goD9JT6gZI="; + sha256 = "sha256-1ArG7CneJRY9y6rYaVjNU6L6RsUgVvjpwt07Rd+WGrE="; }; patches = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 26e4dc094950..abfb8c7b9417 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5073,7 +5073,8 @@ psutil-home-assistant python-kasa sqlalchemy - ]; # missing inputs: python-kasa.optional-dependencies.speedups + ] + ++ python-kasa.optional-dependencies.speedups; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected "tplink_omada" = ps: with ps; [ @@ -5256,7 +5257,8 @@ "valve" = ps: with ps; [ ]; "vasttrafik" = ps: with ps; [ - ]; # missing inputs: vtjp + vtjp + ]; "velbus" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -6400,6 +6402,7 @@ "tomorrowio" "toon" "totalconnect" + "tplink" "tplink_omada" "traccar" "trace" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ee1375c5044a..17e142b6ab43 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -322,6 +322,16 @@ let }; }); + python-kasa = super.python-kasa.overridePythonAttrs (oldAttrs: rec { + version = "0.5.4"; + src = fetchFromGitHub { + owner = "python-kasa"; + repo = "python-kasa"; + rev = "refs/tags/${version}"; + hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + }; + }); + python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { version = "0.38.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index 01f1415d0af8..f4903b2f31f7 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , rustPlatform +, cmake , pkg-config , protobuf , elfutils @@ -9,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.19.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IuS7NmlTNmHHnnSZ+YIbV6BnxJW2xprOQ5mkz5FuJEQ="; + sha256 = "sha256-mQtIjfXDcEy5HfZbWauL0NQLPneGq9EJt/yB8zMuhSU="; }; - cargoHash = "sha256-yeb+4lgRDssjkEx6bYfGIbn4DJGpZZ/JDmuwFjQ+U+8="; + cargoHash = "sha256-XCDU6cXw+Wf5MR6m+HCI8/VFRRylMywktZbd5k7Lcwo="; nativeBuildInputs = [ + cmake pkg-config protobuf ]; diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 3e3bf55c757e..1d5e334f2d07 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -9,11 +9,11 @@ let }; in fetch_librusty_v8 { - version = "0.60.1"; + version = "0.74.3"; shas = { - x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; - aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; - x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; - aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; + x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; + aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; + x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; + aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index b2f17aab5036..027235986c5e 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-SMh1jHD64OtmqBtNcBbFh4MYWs+FAVlKHMCCSMmbKHU="; + sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; }; separateDebugInfo = true; - cargoHash = "sha256-3FlAbfqketgWuddCqmV1oz/XLgwcCUQZoFh/jWzledE="; + cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 11264a637983..1b1ac3c62420 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw="; + hash = "sha256-ZF5mBjq+IhSQrQ1dUfHlfyUMK2dkpZ5gu9djPkUYvRQ="; }; - vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0="; + vendorHash = "sha256-q5MFAvFCrr24b1VO0Z03C08CGd+0pUerXZEKiu4r7cE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index f3598304b89c..1b12f29bb942 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus-pve-exporter"; - version = "2.3.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM="; + sha256 = "sha256-ruJGp/juRxFJwnd0A7/qWgeJHFg9oIKekjWIe3kiUa4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 42db8a165a55..177537588d63 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.56.0"; + version = "1.57.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-7tnl8iItGegfRXLF3f+tmNxgJWkai6n8EOP00zyqyYs="; + sha256 = "sha256-M5Mv2gAQMR0j2zIX6OwePA9w7OtjJ0i2mR9I4BvUcXI="; }; - vendorHash = "sha256-r+VJ2+4F3BQ0tmNTVHDOxKaKAPSIvgu7ZcQZ6BXt2kA="; + vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index 7ecad55000ab..eb4c607b7804 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.4.5"; + version = "1.8.4"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-DcxwwUNpnMeK8A3LuyfrWAMCng0yIcX9bKxNGY0uDSo="; + hash = "sha256-CMZim7FSTzjUaViVFq5OABOAUX3Aee+I3/HQhNIdIVM="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1b7620eb5f86..6538c3f2cb62 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,14 +43,14 @@ let }; in { nextcloud26 = generic { - version = "26.0.10"; - hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw="; + version = "26.0.11"; + hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.5"; - hash = "sha256-O1NMmOdrf+2Mo5NMrUGbEK9YViWfMTvsIs06e/pu+WE="; + version = "27.1.6"; + hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; packages = nextcloud27Packages; }; diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index a666da35f4ca..db126863fe04 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { jinja2 pyicu datrie + pyosmium ])) # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 6864556fd55d..1fdf6d8fdba2 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-gInJS7JpvEbmOuZecB4xjff2d7TnjcVV+8mPOmy5Oyo="; + hash = "sha256-ia9N2jZlFW0Gu5YDfwh023zorMyWWL/KggeBRvCD1W4="; }; - cargoHash = "sha256-c5SQysjO821pfGhnyB4aGOZuwrHaN502PfkA1gBPtY4="; + cargoHash = "sha256-RHT6+zrY4SjoC/hgoMRal+cG8Ruip/6v7oVtKvR8doU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 0735e6d85f25..705c5b935bfb 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.18"; + version = "0.15.19"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-tmQgihbE4Ga2NXKwTQTaMP2ZKyL9G1zTojHG2mwFn0o="; + hash = "sha256-9TSu27s/rnO48zEhBzaHaU3pHyIJ0LVZC8LBRhn0PNM="; }; - cargoHash = "sha256-93I9HcGCnli8gK7BkS4h4pecmN/yRpwbjFzqlMLMbM0="; + cargoHash = "sha256-h9igqV9YqMqRhqwsKYIji8WAVmcPQfErcPPm0PcDwss="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix index 252783cce47c..c1a96e66013c 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix @@ -1,11 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/246470544 +# +# …which used nixpkgs revision dd5621df6dcb90122b50da5ec31c411a0de3e538 +# to instantiate: +# +# /nix/store/g480ass2vjmakaq03z7k2j95xnxh206a-stdenv-bootstrap-tools.drv +# +# …and then built: +# +# /nix/store/95lm0y33dayag4542s8bi83s31bw68dr-stdenv-bootstrap-tools +# { busybox = import <nix/fetchurl.nix> { - url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox"; - sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g"; + url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/busybox"; + sha256 = "sha256-WuOaun7U5enbOy8SuuCo6G1fbGwsO16jhy/oM8K0lAs="; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz"; - sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl"; + url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/bootstrap-tools.tar.xz"; + hash = "sha256-ZY9IMOmx1VOn6uoFDpdJbTnPX59TEkrVCzWNtjQ8/QE="; }; } diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index b4da2de5c5b8..bd233db4cd50 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -154,7 +154,7 @@ let pkgs.pkgsMusl.pkgsCross.gnu64.hello # Two web browsers -- exercises almost the entire packageset - pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser + pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5 pkgs.pkgsCross.aarch64-multiplatform.firefox # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859 diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 116c8a118b94..79fc6358ed29 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I+2KAj12iURPRBu2DoQysGcoBz2jooEw8JkB/sJAkkA="; + sha256 = "sha256-AGpR587vz1t5z/J09n4/XvFPgbwb66wRTfSVOTCWeSU="; }; - vendorHash = "sha256-aPOWlXaZjmmj/iQqvlFSVFLQwQsWQ9q8yTElw5KBNIw="; + vendorHash = "sha256-yw/hl82RQPjZB0SsVr4OPDUsFH2TY6i4RpVE7wd4fwk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index a84c916a1408..84aa4f4ce477 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.81.0"; + version = "0.81.1"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Me2UIyBJ/TFP6M7zqQvJ/NDYoiOWop8Lkh8e1KbD9eU="; + hash = "sha256-vzE2Slj69kJbXHNKM9mCBwPkbOqG3DkVa6y4DmfBdn0="; }; vendorHash = "sha256-IDKJaWnQsOtghpCh7UyO6RzWgSZS0S0jdF5hVV7xVbs="; diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index 52747f7477fd..14b89311df1a 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MriFrYE8d4m6RgeaErunyAfKna8xhtUAnHyIwsVvK/o="; + sha256 = "sha256-7/5NcrS5VR3APhv5LEpd4U0+E4PwM9cU9bb1q6UDfoI="; }; vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY="; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index ab93f4233d8f..34500447b875 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "genimage"; - version = "16"; + version = "17"; src = fetchurl { url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; - sha256 = "sha256-hp+WYtO3eMabHR/nDfZY4cnpCu2iart1P2/lXosMbnM="; + sha256 = "sha256-qHVuNWeg1NgsNrCMzB4IglC5AG1WcMaysBQYXm7GBnE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/stratisd/Cargo.lock b/pkgs/tools/filesystems/stratisd/Cargo.lock index 1406bc0aea3f..ddca983aa1cb 100644 --- a/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -413,17 +413,6 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" @@ -676,9 +665,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -837,12 +826,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] -name = "loopdev" -version = "0.4.0" -source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" +name = "loopdev-3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "378e7ca4e85e592564e6a96c362303972b5c7860367014383aadc10a8704fc38" dependencies = [ "bindgen", - "errno 0.2.8", + "errno", "libc", ] @@ -862,6 +852,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -900,12 +899,24 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.7.1", "pin-utils", "static_assertions", ] [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.0", + "cfg-if 1.0.0", + "libc", + "memoffset 0.9.0", +] + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1010,9 +1021,9 @@ dependencies = [ [[package]] name = "pretty-hex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" +checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "proc-macro2" @@ -1154,7 +1165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", - "errno 0.3.1", + "errno", "io-lifetimes", "libc", "linux-raw-sys", @@ -1229,9 +1240,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -1269,7 +1280,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.6.3" +version = "3.6.4" dependencies = [ "assert_cmd", "assert_matches", @@ -1287,7 +1298,7 @@ dependencies = [ "env_logger", "futures", "iocuddle", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "libblkid-rs", "libc", @@ -1296,8 +1307,8 @@ dependencies = [ "libmount", "libudev", "log", - "loopdev", - "nix 0.26.2", + "loopdev-3", + "nix 0.27.1", "pkg-config", "predicates", "pretty-hex", diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 84a066e838e5..d299a1dc93ff 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , cargo , rustc @@ -28,38 +27,19 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-Wu3SkuHyMCBape+pMymQntXRtdMIlF5wz75kKxaZlms="; + hash = "sha256-0zSMFjAzTtTmpSCqlIq5GXk3/AhlhtECFZXmo6xcjWA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "loopdev-0.4.0" = "sha256-YS0hqxphxbbImT/mn/XBzkgabK2kbIym5VqG3XDVAx8="; - }; }; - patches = [ - # Can be removed with the next release after v. 3.6.3 - (fetchpatch { - name = "remove-unused-imports.patch"; - url = "https://github.com/stratis-storage/stratisd/commit/78440de6e6ed8eab5ddd25dbdfb7804d0698f2a2.patch"; - hash = "sha256-RW2nyAWaoIbqrgbhCApQsMXkJWtWoOWL3VO7fIImJgY="; - }) - - # Can be removed with the next release after v. 3.6.3 - (fetchpatch { - name = "flag-import-not-used-in-build-as-test-only.patch"; - url = "https://github.com/stratis-storage/stratisd/commit/0d1c67f71338d0ee6c1e6aa06f7fd6264ce9a4c5.patch"; - hash = "sha256-6Nb8izUqYUirjy0dTFhITxoM/AKoChoc0w6Qm9K6+7I="; - }) - ]; - postPatch = '' substituteInPlace udev/61-stratisd.rules \ --replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ @@ -116,10 +96,10 @@ stdenv.mkDerivation rec { # remove files for supporting dracut postInstall = '' mkdir -p "$initrd/bin" - cp "dracut/90stratis/stratis-rootfs-setup" "$initrd/bin" + cp "$out/lib/dracut/modules.d/90stratis/stratis-rootfs-setup" "$initrd/bin" mkdir -p "$initrd/lib/systemd/system" - substitute "dracut/90stratis/stratisd-min.service" "$initrd/lib/systemd/system/stratisd-min.service" \ - --replace /usr "$out" \ + substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \ + "$initrd/lib/systemd/system/stratisd-min.service" \ --replace mkdir "${coreutils}/bin/mkdir" mkdir -p "$initrd/lib/udev/rules.d" cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d" @@ -127,7 +107,9 @@ stdenv.mkDerivation rec { rm -r "$out/lib/systemd/system-generators" ''; - passthru.tests = nixosTests.stratis; + passthru.tests = nixosTests.stratis // { + inherit (nixosTests.installer-systemd-stage-1) stratisRoot; + }; meta = with lib; { description = "Easy to use local storage management for Linux"; diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index 7cbe2ee8626c..b054351bf9ab 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -1,13 +1,13 @@ { lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lsix"; version = "1.8.2"; src = fetchFromGitHub { owner = "hackerb9"; - repo = pname; - rev = version; + repo = "lsix"; + rev = finalAttrs.version; sha256 = "sha256-xlOlAfZonSo/RERt5WxPqMvppVrY5/Yhh7SgCCsYDQE="; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { postFixup = '' wrapProgram $out/bin/lsix \ - --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ (imagemagick.override { ghostscriptSupport = true;}) ]} ''; meta = with lib; { @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/hackerb9/lsix"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ kidonng ]; + maintainers = with maintainers; [ justinlime kidonng ]; mainProgram = "lsix"; }; -} +}) diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 2379e3c8188e..5811cbba25e1 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -8,6 +8,9 @@ , libjpeg , libsixel , openslide +, poppler +, librsvg +, cairo , pkg-config , stb , qoi @@ -16,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timg"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${finalAttrs.version}"; - hash = "sha256-u52ipc3I57ldKXjmXqFuIXIYIrs5c9TSvgs1HfIu44U="; + hash = "sha256-rTqToWgCPQeRYnMUmhPd/lJPX6L9PstFs1NczyecaB0="; }; buildInputs = [ @@ -33,6 +36,9 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libsixel openslide + poppler + librsvg + cairo qoi.dev stb ]; diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/tools/misc/bkt/default.nix index 61926352ce33..beef0b8412ca 100644 --- a/pkgs/tools/misc/bkt/default.nix +++ b/pkgs/tools/misc/bkt/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "bkt"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dimo414"; repo = pname; rev = version; - sha256 = "sha256-CMCO1afTWhXlWpy9D7txqI1FHxGDgdVdkKtyei6oFJU="; + sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU="; }; - cargoHash = "sha256-T4JT8GzKqsQQfe3zfst6gNEvdY7zs2h2H3s6slaRhYY="; + cargoHash = "sha256-Pl+a+ZpxaguRloH8R7x4FmYpTwTUwFrYy7AS/5K3L+8="; meta = { description = "A subprocess caching utility"; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c1279a69ccf7..24e25e584d4b 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -129,10 +129,8 @@ stdenv.mkDerivation rec { # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 - # On aarch64+musl, test-init.sh fails due to a segfault in diff. doCheck = (!isCross) && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - && !(stdenv.hostPlatform.libc == "musl" && stdenv.hostPlatform.isAarch64) && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 1fa0f479d0da..89bf35430496 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -6,6 +6,7 @@ , platformio , esptool , git +, iputils }: let @@ -74,10 +75,11 @@ python.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - # platformio is used in esphomeyaml/platformio_api.py - # esptool is used in esphomeyaml/__main__.py - # git is used in esphomeyaml/writer.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + # platformio is used in esphome/platformio_api.py + # esptool is used in esphome/__main__.py + # git is used in esphome/writer.py + # iputils is used in esphome/dashboard/status/ping.py + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git iputils ]}" "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 1f7a27e61914..eb24bcd2f9a3 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-pHDlMeFsC99RuTCSbQT+2LbQ7SACeTWfwP56D/AUb3g="; + hash = "sha256-+p85f2cH+syRpnSozc++jPT4Hbn/kGkVsUv3L5Na8+s="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/lavat/default.nix b/pkgs/tools/misc/lavat/default.nix index f582157777b7..6cd38f6f34a1 100644 --- a/pkgs/tools/misc/lavat/default.nix +++ b/pkgs/tools/misc/lavat/default.nix @@ -4,7 +4,7 @@ , }: let - version = "2.0.0"; + version = "2.1.0"; in stdenv.mkDerivation { pname = "lavat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "AngelJumbo"; repo = "lavat"; rev = "v${version}"; - hash = "sha256-xDjqKhwoaqCqo7tkpcEe2MBEpVTJUOpKtu7Fi9aPOPo="; + hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk="; }; installPhase = '' diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 5d30ffbae4be..d196de07f648 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20231222"; + version = "20240122"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GUZt3G+pu9e+GIb1QEEprxJEjxLs07lWLpha2oTam6o="; + sha256 = "sha256-hZaIy7VkHNe2sWsrlgviSqTjfmVcyP/NivlxzX1bRJ8="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index 0989a37454ca..0b8f6dbe5a9f 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -12,13 +12,13 @@ let }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "shim"; - version = "15.7"; + version = "15.8"; src = fetchFromGitHub { owner = "rhboot"; repo = pname; rev = version; - hash = "sha256-CfUuq0anbXlCVo9r9NIb76oJzDqaPMIhL9cmXK1iqXo="; + hash = "sha256-xnr9HBfYP035C7p2YTRZasx5SF4a2ZkOl9IpsVduNm4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 060232d8c2f7..7f15497c5c7d 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.72.1"; + version = "1.72.2"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-ZkJ1+o4xWQX63/2hdhnE5hyVrZIn1O2kmaiZ1853X/8="; + hash = "sha256-FaxDxiZFVG3067yJLG/yM7kr4/jIthePxuGs3fnGlmw="; }; - vendorHash = "sha256-IczwqqCQeTpXiDSJxX8ErmO4Ap+coIRAQTmRoDNtdXs="; + vendorHash = "sha256-/ndTY5baStRfW7asRvM7EpgqE5xdXEa5+v6o1fpHE9M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 01391d024fe0..3b632348f263 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "14.0.0"; + version = "14.0.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-sZUJMbFQiGw1Qqdtv+yExSnmaKd02+qIEgE3SHKYP6s="; + hash = "sha256-opTMV+OH8PR9SxBWj1o8xSngK0QdindDcXyd6TRjdvI="; }; - cargoHash = "sha256-XRVxPjvQT0XfhMMa+M4yLtTIpUl6Mtq9eM9wG2pkug8="; + cargoHash = "sha256-pgYrUZAxoyllQp1HuVhbLR3za+Gx0l8Z2/Zq/KCOKZg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index 7c4d185a7b68..deddb3306440 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.2.45"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-wSvVmKqucvg7Gs4H1o9i/d8f2I1g52Vq2Z8F7FwaOR0="; + sha256 = "sha256-mgvs3/gseLnFtAciW5txtYqo+8DyyQC7y/tN1kDqcb4="; }; - cargoHash = "sha256-Gje7Sqe51IMzblydU0s1qXqfIIIQvt0EYMChVbK295s="; + cargoHash = "sha256-lSyJqGWlk3ldgAkyebuyUDLp8mJdwnw8ee6ZHQXU2Y4="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 37f36e5dd43f..669814c5fb39 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - hash = "sha256-JsgAdLjDQQkLyLFoZCVG2jZ8vQDaGUPtPmHYAcwADQg"; + hash = "sha256-77RGS4B5Jwb/J5eOG2A7sdfAU7PnRaxqz5nogpOnj70="; }; - cargoHash = "sha256-IE9c57rj8EANyj4KmbyagafJyMovzHOhp0PFCQBzqdA="; + cargoHash = "sha256-3D8jyHFrhb3y4yeYtO1GqSyb5wlqUydf/4clsbLjJVE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 368189abe15d..49e4df298bc7 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , nixosTests , pkg-config , systemd @@ -114,6 +115,14 @@ stdenv.mkDerivation rec { -i configs/Makefile ''; + patches = [ + (fetchpatch { + name = "ignoring-return-value.patch"; + url = "https://github.com/libreswan/libreswan/commit/ba5bad09f55959872022fa506d5ac06eafe3a314.diff"; + hash = "sha256-xJ8rZWoRtJixamGY8sjOS+63Lw3RX7620HlRWYfvSxc="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "INITSYSTEM=systemd" diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index 812d3bb5068d..8e50188ec814 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mubeng"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-AxgvZdsJX16sZi4g8LnfceKuw/wBwvj6uoF/5zKldBk="; + hash = "sha256-MdTgYhHjgDFplh+wcb9QTwzwMZSmF2kqMmu1x8WmOyQ="; }; vendorHash = "sha256-kOLeaEKtpI3l0qLphRTnm27Ms63ID4LJ6VkUHJzGAcc="; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index be6a95f4e928..a17ecad26066 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -1,4 +1,11 @@ -{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkg-config }: +{ lib +, fetchFromGitHub +, libpcap +, libseccomp +, pkg-config +, rustPlatform +, stdenv +}: rustPlatform.buildRustPackage rec { pname = "sniffglue"; @@ -15,13 +22,17 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpcap libseccomp ]; + buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + libseccomp + ]; meta = with lib; { description = "Secure multithreaded packet sniffer"; homepage = "https://github.com/kpcyrd/sniffglue"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 0a8426c38a72..5b1aebe0e980 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cnspec"; - version = "10.0.1"; + version = "10.0.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-CzTHEOQ6QTL5M6lS8BgRhf3OXBC/Pa+HabsRrlxQGcU="; + hash = "sha256-YdOzHMC2dP8OCDn1T+nE7k5dL3KHpLHFAGKuQAnu6l0="; }; proxyVendor = true; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index e399974b4c6e..b7cae61ad2c7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.11"; + version = "5.1.15"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY="; + hash = "sha256-balyAdQO8aZ9wGYerPUDxgBWGG7Ya2eIyo6UX62M4SI="; }; postPatch = '' diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 78ba5e06e4b9..9f0906f4c8f1 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "wallarm"; - repo = pname; + repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-fBmn+p5uVGnI4lyL12cX4S8eda79k2Y0RPQG9iZQs2Q="; + hash = "sha256-G/1X7kq5n04dYoluvlIswOCE/BvhgZwyXCbPrKIE/SY="; }; vendorHash = null; @@ -22,6 +22,8 @@ buildGoModule rec { doCheck = false; ldflags = [ + "-w" + "-s" "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/security/isolate/default.nix b/pkgs/tools/security/isolate/default.nix index ae975dc78ae9..4aa592029600 100644 --- a/pkgs/tools/security/isolate/default.nix +++ b/pkgs/tools/security/isolate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "isolate"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${version}"; - hash = "sha256-fuv9HOw0XkRBRjwAp4b6LpoB5p7a+yo66AcT3B0yQUw="; + hash = "sha256-xY2omzqIJYElLtzj4byy/QG4pW4erCxc+cD2X9nA2jM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index 15d8f4529907..2cc9a05e3d15 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-4ZCb8BXrKGXJ8d06fxAuFkGRxcK7PwuPFuCBc9EIXZY="; + hash = "sha256-NNVHEV8qnPv+xXFzPsh1V+fSOQZxpADCRPIUsak5M5M="; }; - vendorHash = "sha256-olDtsLoslxOsbAq60RnLp9MGZOt17/BPo9E9SgWOqoQ="; + vendorHash = "sha256-x6cb19rKJXm+EIxJeykhpFmUYOPb/VljzCOVjorP5MQ="; doCheck = false; # tests want to talk to oauth2c.us.authz.cloudentity.io diff --git a/pkgs/tools/security/psudohash/default.nix b/pkgs/tools/security/psudohash/default.nix index d5be9f9a772b..7a42d1900db3 100644 --- a/pkgs/tools/security/psudohash/default.nix +++ b/pkgs/tools/security/psudohash/default.nix @@ -1,8 +1,7 @@ -{ - lib, - fetchFromGitHub, - stdenv, - python3 +{ lib +, stdenv +, fetchFromGitHub +, python3 }: stdenv.mkDerivation rec { @@ -12,11 +11,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "t3l3machus"; repo = "psudohash"; + # https://github.com/t3l3machus/psudohash/issues/8 rev = "2d586dec8b5836546ae54b924eb59952a7ee393c"; hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18="; }; - buildInputs = [ python3 ]; + buildInputs = [ + python3 + ]; installPhase = '' runHook preInstall @@ -36,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/t3l3machus/psudohash"; license = licenses.mit; maintainers = with maintainers; [ exploitoverload ]; + mainProgram = "psudohash"; }; } diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 8ab38a9a44d2..5feccbb2d8be 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.1.9"; + version = "2.1.10"; pyproject = true; src = fetchFromGitHub { owner = "alterakey"; repo = "trueseeing"; rev = "refs/tags/v${version}"; - hash = "sha256-g5OqdnPtGGV4wBwPRAjH3lweguwlfVcgpNLlq54OHKA="; + hash = "sha256-q7hUsBmTRPizmNWueFtFDc5t7rd1evMrBj3oX1Q2VfM="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix index 776a53cdc72c..ab093d9e553b 100644 --- a/pkgs/tools/system/zps/default.nix +++ b/pkgs/tools/system/zps/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zps"; - version = "1.2.9"; + version = "2.0.0"; src = fetchFromGitHub { owner = "orhun"; repo = "zps"; rev = version; - hash = "sha256-+evCYiTiH8tRmhvsse+49WlKGRP5XQtep7wGoCySvJ4="; + hash = "sha256-t+y+m9cwngVlX5o7FQTI4FMj10bN0euH51DmAnOAvPc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock index 8ed4cdce974e..7ce1050dfbdd 100644 --- a/pkgs/tools/system/zram-generator/Cargo.lock +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -192,9 +192,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 35e0fb5e6b96..040f363fa55d 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - doCheck = !(stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl); + doCheck = true; meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; diff --git a/pkgs/tools/text/gawk/fix-typos-corrected-in-libharu-2.4.4.patch b/pkgs/tools/text/gawk/fix-typos-corrected-in-libharu-2.4.4.patch new file mode 100644 index 000000000000..6b4a416a718c --- /dev/null +++ b/pkgs/tools/text/gawk/fix-typos-corrected-in-libharu-2.4.4.patch @@ -0,0 +1,62 @@ +diff --git a/haru/pdf.c b/haru/pdf.c +index d16f573..3129427 100644 +--- a/haru/pdf.c ++++ b/haru/pdf.c +@@ -105,7 +105,7 @@ static awk_scalar_t HPDF_CS_PATTERN_node; + /* LineCap */ + static awk_scalar_t HPDF_BUTT_END_node; + static awk_scalar_t HPDF_ROUND_END_node; +-static awk_scalar_t HPDF_PROJECTING_SCUARE_END_node; ++static awk_scalar_t HPDF_PROJECTING_SQUARE_END_node; + + /* _LineJoin */ + static awk_scalar_t HPDF_MITER_JOIN_node; +@@ -248,7 +248,7 @@ static awk_scalar_t HPDF_ENCODER_UNKNOWN_node; + /* ByteType */ + static awk_scalar_t HPDF_BYTE_TYPE_SINGLE_node; + static awk_scalar_t HPDF_BYTE_TYPE_LEAD_node; +-static awk_scalar_t HPDF_BYTE_TYPE_TRIAL_node; ++static awk_scalar_t HPDF_BYTE_TYPE_TRAIL_node; + static awk_scalar_t HPDF_BYTE_TYPE_UNKNOWN_node; + + /* TextAlignment */ +@@ -308,7 +308,7 @@ static const struct varinit varinit[] = { + ENTRY(HPDF_CS_PATTERN, 1) + ENTRY(HPDF_BUTT_END, 1) + ENTRY(HPDF_ROUND_END, 1) +- ENTRY(HPDF_PROJECTING_SCUARE_END, 1) ++ ENTRY(HPDF_PROJECTING_SQUARE_END, 1) + ENTRY(HPDF_MITER_JOIN, 1) + ENTRY(HPDF_ROUND_JOIN, 1) + ENTRY(HPDF_BEVEL_JOIN, 1) +@@ -417,7 +417,7 @@ static const struct varinit varinit[] = { + ENTRY(HPDF_ENCODER_UNKNOWN, 1) + ENTRY(HPDF_BYTE_TYPE_SINGLE, 1) + ENTRY(HPDF_BYTE_TYPE_LEAD, 1) +- ENTRY(HPDF_BYTE_TYPE_TRIAL, 1) ++ ENTRY(HPDF_BYTE_TYPE_TRAIL, 1) + ENTRY(HPDF_BYTE_TYPE_UNKNOWN, 1) + ENTRY(HPDF_TALIGN_LEFT, 1) + ENTRY(HPDF_TALIGN_RIGHT, 1) +diff --git a/haru/pdf.h b/haru/pdf.h +index a4ef39a..07cf168 100644 +--- a/haru/pdf.h ++++ b/haru/pdf.h +@@ -86,7 +86,7 @@ + + #define DEFAULT_HPDF_BUTT_END HPDF_BUTT_END + #define DEFAULT_HPDF_ROUND_END HPDF_ROUND_END +-#define DEFAULT_HPDF_PROJECTING_SCUARE_END HPDF_PROJECTING_SCUARE_END ++#define DEFAULT_HPDF_PROJECTING_SQUARE_END HPDF_PROJECTING_SQUARE_END + + /* _LineJoin */ + #define DEFAULT_HPDF_MITER_JOIN HPDF_MITER_JOIN +@@ -229,7 +229,7 @@ + /* ByteType */ + #define DEFAULT_HPDF_BYTE_TYPE_SINGLE HPDF_BYTE_TYPE_SINGLE + #define DEFAULT_HPDF_BYTE_TYPE_LEAD HPDF_BYTE_TYPE_LEAD +-#define DEFAULT_HPDF_BYTE_TYPE_TRIAL HPDF_BYTE_TYPE_TRIAL ++#define DEFAULT_HPDF_BYTE_TYPE_TRAIL HPDF_BYTE_TYPE_TRAIL + #define DEFAULT_HPDF_BYTE_TYPE_UNKNOWN HPDF_BYTE_TYPE_UNKNOWN + + /* TextAlignment */ diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 9a25407d7116..be50b93a7e2f 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -5,7 +5,7 @@ let buildExtension = lib.makeOverridable - ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }: + ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true, patches ? [ ] }: let is_extension = gawkextlib != null; in stdenv.mkDerivation rec { pname = "gawkextlib-${name}"; @@ -17,6 +17,8 @@ let sha256 = "sha256-0p3CrQ3TBl7UcveZytK/9rkAzn69RRM2GwY2eCeqlkg="; }; + inherit patches; + postPatch = '' cd ${name} ''; @@ -83,12 +85,16 @@ let name = "gd"; extraBuildInputs = [ gd ]; }; - # Build has been broken: https://github.com/NixOS/nixpkgs/issues/191072 - # haru = buildExtension { - # inherit gawkextlib; - # name = "haru"; - # extraBuildInputs = [ libharu ]; - # }; + haru = buildExtension { + inherit gawkextlib; + name = "haru"; + extraBuildInputs = [ libharu ]; + patches = [ + # Renames references to two identifiers with typos that libharu fixed in 2.4.4 + # https://github.com/libharu/libharu/commit/88271b73c68c521a49a15e3555ef00395aa40810 + ./fix-typos-corrected-in-libharu-2.4.4.patch + ]; + }; json = buildExtension { inherit gawkextlib; name = "json"; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 412467deacca..54e1e303fd4c 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mawk"; - version = "1.3.4-20230525"; + version = "1.3.4-20240123"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; - sha256 = "sha256-VjnRS7kSQ3Oz1/lX0rklrYrZZW1GISw/I9vKgQzJJp8="; + sha256 = "sha256-qOMZqDdEsfH7aYjfoYnWGIf4ZukUDMmknrADsrBlXog="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 09d6929d862a..f1fd15b1fb96 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "miller"; - version = "6.10.0"; + version = "6.11.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-q807J1VWzfdxz4/KAGGCDQ8Bb4T8wwRRiiIEl6M37Co="; + sha256 = "sha256-MmQBj3ANiObyTsAW55Bh9p94Pu+ynySaxHjHjpBacno="; }; outputs = [ "out" "man" ]; - vendorHash = "sha256-S8Ew7PaPhdf2QY6BYXTeLF64tn+PBSfNJhAhH9uTOvo="; + vendorHash = "sha256-K9B++jinB8iRWb96Lha/gM8/3vPQNd4LoZggGXh7VD4="; postInstall = '' mkdir -p $man/share/man/man1 diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/tools/text/rsbkb/default.nix index 1510a63b050f..32b8f4387b4e 100644 --- a/pkgs/tools/text/rsbkb/default.nix +++ b/pkgs/tools/text/rsbkb/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rsbkb"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "trou"; repo = "rsbkb"; rev = "release-${version}"; - hash = "sha256-+plf7BoYpEFPRsGKNrvLF8TAU3Z7nyx6Td6uRBoNGiE="; + hash = "sha256-SGV7ovaOVnOFlCSyxKrd4Tg8Ak71BzvLgEvCneHhx0w="; }; - cargoHash = "sha256-HyosR/5tZCRU2CNnnGITEuESW30Zq3s33UFNcLmEWIA="; + cargoHash = "sha256-UC9i1rPdQ4YLQoMQYXyL0j6EUhMwyKuD+vk4z5XLLAk="; # Setup symlinks for all the utilities, # busybox style diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a859b7e861e1..796bc920e574 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -795,6 +795,7 @@ mapAliases ({ parity = openethereum; # Added 2020-08-01 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 + patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 @@ -841,6 +842,7 @@ mapAliases ({ pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 PlistCpp = plistcpp; # Added 2024-01-05 + pocket-updater-utility = pupdate; # Added 2024-01-25 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66db08ac74b1..0bab3ff8b0e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,8 +2014,6 @@ with pkgs; pferd = callPackage ../tools/misc/pferd { }; - pocket-updater-utility = callPackage ../tools/games/pocket-updater-utility { }; - polygon-cli = callPackage ../tools/networking/polygon-cli { }; pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; @@ -16676,6 +16674,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ @@ -16683,6 +16682,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # .libcxxabi does not build with gcc13 })); llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ @@ -19738,14 +19738,7 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then - patchelf_0_13 - else - patchelfStable; - patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { - patchelf = patchelfStable; - }; - patchelfStable = callPackage ../development/tools/misc/patchelf { }; + patchelf = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); @@ -20047,10 +20040,6 @@ with pkgs; sigrok-cli = callPackage ../development/tools/sigrok-cli { }; - silicon = callPackage ../tools/misc/silicon { - inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security; - }; - simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; slimerjs = callPackage ../development/tools/slimerjs { }; @@ -30669,8 +30658,6 @@ with pkgs; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm - stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv; openexr = openexr_3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; @@ -32143,8 +32130,6 @@ with pkgs; mi2ly = callPackage ../applications/audio/mi2ly { }; - moe = callPackage ../applications/editors/moe { }; - molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { }; @@ -35544,8 +35529,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - sunvox = callPackage ../applications/audio/sunvox { }; - supersonic-wayland = supersonic.override { waylandSupport = true; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d27972bdf98..7141f1d35fe0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,10 +65,6 @@ in { llvmPackages = null; }; - ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { - llvmPackages = pkgs.llvmPackages_9; - }; - ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix { llvmPackages = pkgs.llvmPackages_12; }; @@ -363,12 +359,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc8102Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8102Binary; - ghc = bh.compiler.ghc8102Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc8107Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107Binary; ghc = bh.compiler.ghc8107Binary; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 64cfb8aa5166..7b3aa1c57abd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -957,7 +957,7 @@ let linol-lwt = callPackage ../development/ocaml-modules/linol/lwt.nix { }; llvm = callPackage ../development/ocaml-modules/llvm { - libllvm = pkgs.llvmPackages_10.libllvm; + libllvm = pkgs.llvmPackages.libllvm; }; lo = callPackage ../development/ocaml-modules/lo { }; @@ -1799,6 +1799,8 @@ let twt = callPackage ../development/ocaml-modules/twt { }; + type_eq = callPackage ../development/ocaml-modules/type_eq { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b386432808eb..e48f85ef1392 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2440,6 +2440,8 @@ self: super: with self; { cronsim = callPackage ../development/python-modules/cronsim { }; + crontab = callPackage ../development/python-modules/crontab { }; + crossplane = callPackage ../development/python-modules/crossplane { }; crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { }; @@ -2902,6 +2904,8 @@ self: super: with self; { dissect = callPackage ../development/python-modules/dissect { }; + dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { }; + dissect-cim = callPackage ../development/python-modules/dissect-cim { }; dissect-clfs = callPackage ../development/python-modules/dissect-clfs { }; @@ -2928,6 +2932,8 @@ self: super: with self; { dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { }; + dissect-jffs = callPackage ../development/python-modules/dissect-jffs { }; + dissect-ntfs = callPackage ../development/python-modules/dissect-ntfs { }; dissect-ole = callPackage ../development/python-modules/dissect-ole { }; @@ -5296,6 +5302,8 @@ self: super: with self; { http-parser = callPackage ../development/python-modules/http-parser { }; + http-sf = callPackage ../development/python-modules/http-sf { }; + http-sfv = callPackage ../development/python-modules/http-sfv { }; httpretty = callPackage ../development/python-modules/httpretty { }; @@ -9994,6 +10002,8 @@ self: super: with self; { pweave = callPackage ../development/python-modules/pweave { }; + pwlf = callPackage ../development/python-modules/pwlf { }; + pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; @@ -10348,6 +10358,8 @@ self: super: with self; { pydoods = callPackage ../development/python-modules/pydoods { }; + pydoe = callPackage ../development/python-modules/pydoe { }; + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; @@ -14144,6 +14156,8 @@ self: super: with self; { tensorboardx = callPackage ../development/python-modules/tensorboardx { }; + tensordict = callPackage ../development/python-modules/tensordict { }; + tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { inherit (pkgs.config) cudaSupport; }; @@ -14548,6 +14562,8 @@ self: super: with self; { torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; + torchrl = callPackage ../development/python-modules/torchrl { }; + torchsde = callPackage ../development/python-modules/torchsde { }; torchvision = callPackage ../development/python-modules/torchvision { }; @@ -15952,6 +15968,8 @@ self: super: with self; { vt-py = callPackage ../development/python-modules/vt-py { }; + vtjp = callPackage ../development/python-modules/vtjp { }; + vtk = toPythonModule (pkgs.vtk_9.override { inherit python; enablePython = true; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 18b0a19a7e46..435e17da15e0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -49,8 +49,7 @@ let # ``` # { # ghc810 = "ghc810"; - # ghc8102Binary = "ghc8102Binary"; - # ghc8102BinaryMinimal = "ghc8102BinaryMinimal"; + # ghc8107Binary = "ghc8107Binary"; # ghc8107 = "ghc8107"; # ghc924 = "ghc924"; # ... @@ -385,7 +384,6 @@ let { # remove musl ghc865Binary since it is known to be broken and # causes an evaluation error on darwin. - # TODO: remove ghc865Binary altogether and use ghc8102Binary ghc865Binary = {}; ghcjs = {}; @@ -647,7 +645,6 @@ let ]; }; constituents = accumulateDerivations [ - jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b257f2411c7d..a8f1e69b361f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -220,7 +220,7 @@ let }; }; in { - inherit (bootstrap) dist test; + inherit (bootstrap) build dist test; } else if hasSuffix "-darwin" config then let @@ -229,7 +229,7 @@ let }; in { # Lightweight distribution and test - inherit (bootstrap) dist test; + inherit (bootstrap) build dist test; # Test a full stdenv bootstrap from the bootstrap tools definition # TODO: Re-enable once the new bootstrap-tools are in place. #inherit (bootstrap.test-pkgs) stdenv; |