diff options
Diffstat (limited to 'pkgs')
431 files changed, 5308 insertions, 3032 deletions
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index ce29a587d232c..32e5cec9dd028 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://milkytracker.org"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ zoomulator ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index d02ca3d747ebd..5b2cbe031c67d 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.59.0"; + version = "3.60.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0llvn0khl07ni34jvb3a1r6rnkf0ljizhpqrs5bdishfhpwyhm0j"; + sha256 = "18w6qqmxzn8psiacybryxailm826f3j1wgiv0c03fbdsy6kr5f7l"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 2824832ef604b..8e9e269abc975 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -4,6 +4,7 @@ , boost , curl , fetchFromGitHub +, fetchpatch , ffmpeg , lame , libev @@ -26,6 +27,16 @@ stdenv.mkDerivation rec { sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35"; }; + patches = [ + # Fix pending upstream inclusion for ncuurses-6.3 support: + # https://github.com/clangen/musikcube/pull/474 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; + sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 29a244f19d7aa..d9df34c41f78f 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "07qqs5q64zaxl3b2091vjihqb35fm0136cm4zibrgpx21akmbvr2"; + sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo="; }; - cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0"; + cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index b24c2eebcf7a8..b18f2b52f94c7 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -37,6 +37,6 @@ buildGoModule rec { homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ panaeon legendofmiracles ]; + maintainers = with maintainers; [ panaeon lom ]; }; } diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix new file mode 100644 index 0000000000000..492610db27858 --- /dev/null +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -0,0 +1,34 @@ +{ lib, mkDerivation, fetchFromGitLab +, cmake, pkg-config +, alsa-lib, pipewire +}: + +mkDerivation rec { + pname = "qpwgraph"; + version = "0.0.9"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "rncbc"; + repo = "qpwgraph"; + rev = "v${version}"; + sha256 = "WC2SB6gisRSZxG9WZtMVBzwkEJtPEGZRmezElLAG0ns="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ alsa-lib pipewire ]; + + meta = with lib; { + description = "Qt graph manager for PipeWire, similar to QjackCtl."; + longDescription = '' + qpwgraph is a graph manager dedicated for PipeWire, + using the Qt C++ framework, based and pretty much like + the same of QjackCtl. + ''; + homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ kanashimia ]; + }; +} diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index ba193f70194d8..bf74dd64f9268 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20210525"; + version = "20211116"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "06ybkbqry7f7lmzgwb9s7ipafshl5gdj98lcjsjkcbnywj8r9b3h"; + sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz"; }; configureFlags = [ "--enable-dependency-tracking" ] @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; + enableParallelBuilding = true; + meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix deleted file mode 100644 index 12680336e0e81..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* - -# Updating - -To update the list of packages from Org (ELPA), - -1. Run `./update-org`. -2. Check for evaluation errors: - env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages -3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` - -*/ - -{ lib }: - -self: let - - generateOrg = lib.makeOverridable ({ - generated ? ./org-generated.nix - }: let - - imported = import generated { - inherit (self) callPackage; - }; - - super = imported; - - overrides = { - }; - - in super // overrides); - -in generateOrg { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c9..052364c803c1a 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/ nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix - curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org deleted file mode 100755 index 2119a1672287f..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell --show-trace ./emacs2nix.nix -i bash - -exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 6a55e7c8e3968..b44fc98722e90 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk"; + sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888="; }; patches = [ diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index bf0d80d1f07dd..e721457f2df02 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -177,7 +177,7 @@ let assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; wrapNeovimUnstable neovim (res // { - wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs; + wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs; wrapRc = (configure != {}); }); in diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index d94f3239f4bb3..2a0d60ce5a796 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -3,6 +3,7 @@ , bundlerEnv, ruby , nodejs , nodePackages +, python3 , python3Packages , callPackage }: @@ -17,7 +18,7 @@ let , wrapperArgs ? [] , manifestRc ? null , withPython2 ? false - , withPython3 ? true, python3Env ? null + , withPython3 ? true, python3Env ? python3 , withNodeJs ? false , rubyEnv ? null , vimAlias ? false @@ -59,7 +60,7 @@ let --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython3 '' - makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH + makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index a24666741e143..cdfacaf92ede6 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,13 +19,15 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs="; + sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; }; + outputs = [ "out" "dev" "info" "lib" "man" ]; + postPatch = '' patchShebangs . ''; @@ -46,7 +48,9 @@ in stdenv.mkDerivation rec { ++ lib.optional textStylingSupport gettext ++ lib.optional (!isCross) dejagnu; - configureFlags = lib.optionals guiSupport [ + configureFlags = [ + "--datadir=${placeholder "lib"}/share" + ] ++ lib.optionals guiSupport [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-tkinclude=${tk.dev}/include" @@ -57,6 +61,10 @@ in stdenv.mkDerivation rec { doCheck = !isCross; checkInputs = lib.optionals (!isCross) [ dejagnu ]; + postInstall = '' + moveToOutput share/emacs "$out" + ''; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4f62ccecbaf57..0ec81c785b4b8 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -56,14 +56,14 @@ let six ]; in mkDerivation rec { - version = "3.16.13"; + version = "3.16.14"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "13irzs89lknfxf2y7j931bh0zmqgiwifdbbzvwn8yxxr21gd68ac"; + sha256 = "sha256-3FUGSBdlhJhhpTPtYuzKOznsC7PJV3kRL9Il2Yryi1Q="; }; passthru = { @@ -123,6 +123,6 @@ in mkDerivation rec { homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir ]; + maintainers = with lib.maintainers; [ lsix sikmir erictapen ]; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5e2e3b58dbaf2..c05342a2e10dd 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "15.8.4"; + version = "15.8.7"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616"; + sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 11a9382c94c8b..c9472e9a15dda 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -144,9 +144,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - # on Darwin, - # test-eevl.c:64:36: error: initializer element is not a compile-time constant - doCheck = !stdenv.isDarwin; + doCheck = true; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 3529f827b4a7e..df570008b0f76 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "http://pulkomandy.tk/projects/GrafX2"; license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ lib.maintainers.zoomulator ]; + maintainers = []; }; } diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 787aace163b83..45b3c55637710 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "463"; + version = "464"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-GT5aIMskOVn4eAd4612YYA8uAQC8tuJzpEHNhc7pMuc="; + sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index db777b3bd77dd..30a056738975e 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -47,7 +47,8 @@ python3.pkgs.buildPythonApplication rec { runHook preInstall substituteInPlace mime/*.desktop \ - --replace "Exec=mcomix" "Exec=mcomix3" + --replace "Exec=mcomix" "Exec=mcomix3" \ + --replace "Icon=mcomix" "Icon=${pname}" ${python3.executable} installer.py --srcdir=mcomix --target=$libdir mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 66804fc3110b7..c2704cbf265b6 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -11,7 +11,7 @@ let in buildDotnetPackage rec { baseName = "Pinta"; - version = "1.6"; + version = "1.7.1"; outputFiles = [ "bin/*" ]; buildInputs = [ gtksharp mono-addins gettext ]; @@ -21,7 +21,7 @@ buildDotnetPackage rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "0vgswy981c7ys4q7js5k85sky7bz8v32wsfq3br4j41vg92pw97d"; + sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc="; }; # Remove version information from nodes <Reference Include="... Version=... "> @@ -74,6 +74,8 @@ buildDotnetPackage rec { --replace _Comment Comment \ --replace _GenericName GenericName \ --replace _X-GNOME-FullName X-GNOME-FullName + substitute xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml \ + --replace _p p xbuild /target:CompileTranslations Pinta.Install.proj xbuild /target:Install Pinta.Install.proj diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index f2cdfa2990e96..3c408ff5fc811 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { description = "Use your tablet as graphic tablet/touch screen on your computer"; homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index bae763972d126..d88bc71348c81 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -47,6 +47,6 @@ buildDotnetModule rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; platforms = dotnetCorePackages.aspnetcore_5_0.meta.platforms; - maintainers = with maintainers; [ SuperSandro2000 legendofmiracles ]; + maintainers = with maintainers; [ SuperSandro2000 lom ]; }; } diff --git a/pkgs/applications/misc/cfm/default.nix b/pkgs/applications/misc/cfm/default.nix index 50442f62b65ed..4e56f376c8069 100644 --- a/pkgs/applications/misc/cfm/default.nix +++ b/pkgs/applications/misc/cfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple and fast TUI file manager with no dependencies"; license = licenses.mpl20; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; homepage = "https://github.com/willeccles/cfm"; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index ae5dd170eb924..c0bedb728aa62 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { patches = [ ./lua-header.patch ]; preBuild = "cd dozenal"; buildInputs = [ ncurses hdate lua5_2 ]; + + # Parallel builds fail due to no dependencies between subdirs. + # As a result some subdirs are atempted to build twice: + # ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory + # Let's disable parallelism until it's fixed upstream: + # https://gitlab.com/dgoodmaniii/dozenal/-/issues/8 + enableParallelBuilding = false; + # I remove gdozdc, as I didn't figure all it's dependency yet. postInstall = "rm $out/bin/gdozdc"; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 698a9b7c3b5f0..4f0f98ba3afcd 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw"; + sha256 = "LGLo+K0FxQQ3hrPYwvjApcOnNliZ5j0T6yEtcxZAFOU="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 8c111ae6aa428..f29c471d04b0e 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, vala_0_52 +, vala , meson , ninja , pkg-config @@ -30,14 +31,27 @@ stdenv.mkDerivation rec { sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo="; }; + patches = [ + # Adhere to GLib.Object naming conventions for properties + # https://github.com/bleakgrey/tootle/pull/339 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tootle/0001-Adhere-to-GLib.Object-naming-conventions-for-propert.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5"; + sha256 = "sha256-B62PhMRkU8P3jmnIUq1bYWztLtO2oNcDsXnAYbJGpso="; + }) + # Use reason_phrase instead of get_phrase + # https://github.com/bleakgrey/tootle/pull/336 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5"; + sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config python3 - # Does not build with vala 0.54 - # https://github.com/bleakgrey/tootle/issues/337 - vala_0_52 + vala wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4e7149ec1ee5f..2a105527c1026 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4710.4", - "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", - "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", + "version": "98.0.4736.0", + "sha256": "1bakzvzx0604k20p16lxmbl0s8za6fy4akng35c1kzf350jznq7n", + "sha256bin64": "09adpl6b43fzlms081c1bs3vrlwrm3kq0mfcqff4q33i0wb5wl25", "deps": { "gn": { - "version": "2021-11-16", + "version": "2021-11-24", "url": "https://gn.googlesource.com/gn", - "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" + "rev": "b79031308cc878488202beb99883ec1f2efd9a6d", + "sha256": "1fdn48y0nvs2qm67qvp1i75d9278ddi5v3bpxgjf28zrh9yragwd" } } }, diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index dafcc0e63a886..ae4a649724b3a 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -7,17 +7,18 @@ , libressl , ncurses , autoreconfHook +, buildPackages }: stdenv.mkDerivation rec { pname = "telescope"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-AdbFJfoicQUgJ9kesIWZ9ygttyjjDeC0UHRI98GwoZ8="; + sha256 = "sha256-r2+jvmnW9EeQf/2X2cOxnOa+HGuGHV6YMftT2MxbSYQ="; }; nativeBuildInputs = [ @@ -32,6 +33,10 @@ stdenv.mkDerivation rec { ncurses ]; + configureFlags = [ + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" + ]; + meta = with lib; { description = "Telescope is a w3m-like browser for Gemini"; homepage = "https://telescope.omarpolo.com/"; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 38b6467857b81..e70344f93994c 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.6"; - commit = "a346cf933e10d872eae26bff8e58c5e7ac40db25"; + version = "2.1.7"; + commit = "a408e299ffa743213df3aa9135bf7945644ec936"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-8DeVO7Wr1bFZXTp2kaEPizDwNU5ZsA1fykccaDUivh8="; + sha256 = "sha256-c6WUqD7x8/P+W64fWs4cw1RiUFepevIJCPpWSzNfIMc="; }; vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 871ab8b934565..ce3d24facbd80 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.24.15"; + version = "0.25.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; + sha256 = "sha256-CFXPo8dpefrrBxCGpcGtZfLdfMYCBL/eQhHqZggK/yA="; }; ldflags = [ @@ -17,14 +17,16 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; + vendorSha256 = "sha256-v4cd+f2GSE2ad0wWrW9x6/U6RREhFV83wVNFUMfWaA4="; - doCheck = false; + preCheck = "export HOME=$(mktemp -d)"; + + doCheck = true; meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; license = licenses.asl20; - maintainers = with maintainers; [ Gonzih markus1189 ]; + maintainers = with maintainers; [ Gonzih markus1189 bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index af8e04667b7fb..774efb044af1f 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +}: buildGoModule rec { pname = "kubeval"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; - rev = version; - sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0="; + rev = "v${version}"; + sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg="; }; - vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4="; + vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03d2797fe3912..e2f181d02abe3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -259,6 +259,15 @@ "vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c", "version": "3.6.0" }, + "dhall": { + "owner": "awakesecurity", + "provider-source-address": "registry.terraform.io/awakesecurity/dhall", + "repo": "terraform-provider-dhall", + "rev": "v0.0.1", + "sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa", + "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", + "version": "0.0.1" + }, "digitalocean": { "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", @@ -371,10 +380,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.18.0", - "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "rev": "v4.18.2", + "sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7", "vendorSha256": null, - "version": "4.18.0" + "version": "4.18.2" }, "gitlab": { "owner": "gitlabhq", @@ -572,10 +581,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.6.1", - "sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g", + "rev": "v2.7.0", + "sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi", "vendorSha256": null, - "version": "2.6.1" + "version": "2.7.0" }, "launchdarkly": { "owner": "terraform-providers", @@ -699,10 +708,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.15", - "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", - "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", - "version": "1.4.15" + "rev": "v1.4.16", + "sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw", + "vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j", + "version": "1.4.16" }, "ns1": { "owner": "terraform-providers", @@ -1120,10 +1129,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.0.0", - "sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z", + "rev": "v3.0.1", + "sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4", "vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx", - "version": "3.0.0" + "version": "3.0.1" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index ecef3650683e8..d373316b19ff8 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,26 +2,23 @@ buildGoModule rec { pname = "velero"; - # When updating, change the commit underneath - version = "1.7.0"; - commit = "9e52260568430ecb77ac38a677ce74267a8c2176"; + version = "1.7.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-n5Rk+Fyb6yAI5sRZi+WE1KyQZyGryZSP4yd/gmmsQxw="; + sha256 = "sha256-Jz3Tp5FqpmPuBscRB0KleQxtCvB43qmeLZNtGPnjuL0="; }; ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" ]; - vendorSha256 = "sha256-qsRbwLKNnuQRIsx0+sfOfR2OQ0+el0vptxz7mMew7zY="; + vendorSha256 = "sha256-fX9FeoIkxxSi3dl5W2MZLz5vN1VHkPNpTBGRxGP5Qx8="; excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" "v1" "v1beta1" ]; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 5d24f589abca1..4edc97a0640d2 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI="; + sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 235955ac14e53..d00efd5ac872b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.4", + "version": "1.9.5", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 6d47eb9fe7118..7697c0d5b9a4c 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.4", - "desktopSrcHash": "sTY55DWeEKV3Ma5DTr4W6K6BjrE019aY8LRk/5f8pPM=", + "version": "1.9.5", + "desktopSrcHash": "8x3TBu0zSNEVWp+ULydule8bPSd01pMkCZHdJbQf82U=", "desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298", - "webHash": "141iz2jcvwyv3fpi63ddi697qzkk6jg100d0lz6iam98m8m35g24" + "webHash": "04pabvvb3l88gp866fkbjngl9r20s300pvw7qykynl0ps8fjms0l" } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 20e5898133819..fef5c11ae8f6b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.24.0"; # Please backport all updates to the stable channel. + version = "5.25.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy"; + sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch index 73325791fc2bb..d3bac6af08d2a 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -1,26 +1,24 @@ -From bade623bb98c957d9a274df75b58296beb8ae6a7 Mon Sep 17 00:00:00 2001 -From: Marvin Dostal <maffinmaffinmaffinmaffin@gmail.com> -Date: Sun, 17 Oct 2021 21:26:51 +0200 +From 54255deceaaaf118e9daadc3dd9f517c33bdd658 Mon Sep 17 00:00:00 2001 +From: Ilan Joselevich <personal@ilanjoselevich.com> +Date: Tue, 30 Nov 2021 22:50:43 +0200 Subject: [PATCH] When creating the autostart entry, do not use an absolute - path --- src/common/utility_unix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp -index 010408395..16964c64f 100644 +index 887213f09..c66468306 100644 --- a/src/common/utility_unix.cpp +++ b/src/common/utility_unix.cpp -@@ -83,7 +83,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, - ts << QLatin1String("[Desktop Entry]") << endl - << QLatin1String("Name=") << guiName << endl - << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl -- << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl +@@ -88,7 +88,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, + ts << QLatin1String("[Desktop Entry]\n") + << QLatin1String("Name=") << guiName << QLatin1Char('\n') + << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n") +- << QLatin1String("Exec=\"") << executablePath << "\" --background\n" + << QLatin1String("Exec=") << "nextcloud --background" << endl - << QLatin1String("Terminal=") << "false" << endl - << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl - << QLatin1String("Categories=") << QLatin1String("Network") << endl + << QLatin1String("Terminal=") << "false\n" + << QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n') + << QLatin1String("Categories=") << QLatin1String("Network\n") -- -2.31.1 - +2.33.1 diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 071f5adfd497e..97a86055f3999 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.6"; + version = "3.4.0"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-HhFm8rIsDaV4QmvHplbj49gf1vYCZyBl8WH5bvRHT7I="; + sha256 = "sha256-+b+DJwbYegbeoQmcdBg5Y7rJmKwPjz2XRUroP55ZO+g="; }; patches = [ diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 0220b12bd4b87..6d037e56ea44f 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c"; + sha256 = "sha256-ovg+oMlt3XzOxG9w/5Li3awMyRdIt1/JnIFfZktftkw="; }; - cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3"; + cargoSha256 = "sha256-0CA0HwFI86VfSyBNn0nlC1n4BVgOc9BLh1it7ReT8+Y="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 70e144cb05caa..4deada8d7b3bc 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/sdushantha/tmpmail"; description = "A temporary email right from your terminal written in POSIX sh "; license = licenses.mit; - maintainers = [ maintainers.legendofmiracles ]; + maintainers = [ maintainers.lom ]; }; } diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d92af80701b1a..61aafb63b5dbc 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "3"; + minor = "4"; patch = "0"; } }: let - sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo="; + sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk="; featuresInfo = { # Needed always basic = { @@ -79,6 +79,9 @@ let native = [ doxygen ]; cmakeEnableFlag = "DOXYGEN"; }; + man-pages = { + cmakeEnableFlag = "MANPAGES"; + }; python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ @@ -269,11 +272,6 @@ stdenv.mkDerivation rec { patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch - (fetchpatch { - # https://github.com/gnuradio/gnuradio/pull/5225 - url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch"; - sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc="; - }) ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 572efa3fac6c5..d18fca6f91bb8 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -14,9 +14,13 @@ , rtl-sdr , hackrf , pulseaudioSupport ? true, libpulseaudio +, portaudioSupport ? false, portaudio }: assert pulseaudioSupport -> libpulseaudio != null; +assert portaudioSupport -> portaudio != null; +# audio backends are mutually exclusive +assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; @@ -49,7 +53,20 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [ thrift gnuradio3_8Minimal.unwrapped.python.pkgs.thrift - ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; + ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals portaudioSupport [ portaudio ]; + + cmakeFlags = + let + audioBackend = + if pulseaudioSupport + then "Pulseaudio" + else if portaudioSupport + then "Portaudio" + else "Gr-audio"; + in [ + "-DLINUX_AUDIO_BACKEND=${audioBackend}" + ]; postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 6b76c2de4b05f..3f21987661cf9 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c7e76b6ad9235..b7b9fbeb14d39 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-cD31YFBnKvEPyBQils6qJxNKagDoIi8/Znfxj/Gsa0M="; + sha256 = "sha256-n+fGYLzQAGS8828hr7XE9qiTMyg99L+W7VRjd9aEkrQ="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index 2e44113f40ef5..4dace9e63b42f 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-vRJlNtg2JabBAUaX91Y04z8MdyxEnreBAlIHn7VB+u4="; + sha256 = "sha256-W1mXTfxD7/gHJhao6qqbNcyM3t2cfrUYiBYPJi/O1RI="; }; buildInputs = [ zlib libdeflate isa-l ]; diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index e0b122778d1b8..10bfb633f4afc 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper , eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext -, withGui ? true }: +, withGui ? true, less }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0.2"; + version = "unstable-2021-11-25"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; - rev = version; - sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3"; + rev = "994498557037c9e4f7ba67f255820ef84ea899d9"; + sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8="; fetchSubmodules = true; }; @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { substituteInPlace ./run_tests \ --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + + substituteInPlace ./build \ + --replace '"less -RX "' '"${less}/bin/less -RX "' ''; configurePhase = '' diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index cbcd452033ca0..fe73f4f4d6e2e 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2020.11.24"; + version = "2021.11.12"; src = fetchFromGitHub { - owner = "yosyshq"; - repo = "abc"; - rev = "4f5f73d18b137930fb3048c0b385c82fa078db38"; - sha256 = "0z1kp223kix7i4r7mbj2bzawkdzc55nsgc41m85dmbajl9fsj1m0"; + owner = "yosyshq"; + repo = "abc"; + rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; + hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 16db7384df17a..02082663516e5 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,7 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null -, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses , buildIde ? true , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null @@ -45,6 +45,7 @@ let "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; + "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -62,10 +63,11 @@ let '' else ""; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ + { case = range "8.14" "8.14"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } - ] ocamlPackages_4_10; + ] ocamlPackages_4_12; ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.13") ocamlPackages.num diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 87bd1e2e63705..b9bf480f7e6da 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "symbiyosys"; - version = "2021.09.13"; + version = "2021.11.30"; src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "SymbiYosys"; - rev = "15278f13467bea24a7300e23ebc5555b9261facf"; - sha256 = "sha256-gp9F4MaGgD6XfD7AjuB/LmMVcxFurqWHEiXPeyzlQzk="; + owner = "YosysHQ"; + repo = "SymbiYosys"; + rev = "b409b1179e36d2a3fff66c85b7d4e271769a2d9e"; + hash = "sha256-S7of2upntiMkSdh4kf1RsrjriS31Eh8iEcVvG36isQg="; }; buildInputs = [ ]; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 10301f062e571..af88263889773 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -90,7 +90,16 @@ stdenv.mkDerivation rec { cd Installer # don't restrict PATH, that has already been done sed -i -e 's/^PATH=/# PATH=/' MathInstaller - sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller + + # Fix the installation script as follows: + # 1. Adjust the shebang + # 2. Use the wrapper in the desktop items + substituteInPlace MathInstaller \ + --replace "/bin/bash" "/bin/sh" \ + --replace "Executables/Mathematica" "../../bin/mathematica" + + # Install the desktop items + export XDG_DATA_HOME="$out/share" echo "=== Running MathInstaller ===" ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 3f295b416fb04..8bad09f178802 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,24 +1,30 @@ -{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook -, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ lib +, stdenv +, fetchurl +, fetchpatch +, texinfo +, perl +, python3 +, makeWrapper +, autoreconfHook +, rlwrap ? null +, tk ? null +, gnuplot ? null +, lisp-compiler }: let - name = "maxima"; - version = "5.45.0"; - - lisp-compiler = if ecl-fasl then ecl else sbcl; - - searchPath = - lib.makeBinPath - (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); + # Allow to remove some executables from the $PATH of the wrapped binary + searchPath = lib.makeBinPath + (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in -stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; +stdenv.mkDerivation rec { + pname = "maxima"; + version = "5.45.1"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng="; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; }; nativeBuildInputs = [ @@ -49,7 +55,7 @@ stdenv.mkDerivation ({ ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' - + (lib.optionalString ecl-fasl '' + + (lib.optionalString (lisp-compiler.pname == "ecl") '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; @@ -67,12 +73,13 @@ stdenv.mkDerivation ({ sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; }) - # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca + # see https://trac.sagemath.org/ticket/13364#comment:93 (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - ] ++ lib.optionals ecl-fasl [ + ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; @@ -97,13 +104,13 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; passthru = { - ecl = ecl; + inherit lisp-compiler; }; - meta = { + meta = with lib; { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Maxima is a fairly complete computer algebra system written in @@ -111,7 +118,7 @@ stdenv.mkDerivation ({ DOE-MACSYMA and licensed under the GPL. Its abilities include symbolic integration, 3D plotting, and an ODE solver. ''; - - platforms = lib.platforms.unix; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.unix; }; -}) +} diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index b7821db1f9a71..e9dae55fbae3d 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -15,7 +15,7 @@ let sagelib = self.callPackage ./sagelib.nix { inherit flint arb; inherit sage-src env-locations pynac singular; - ecl = maxima-ecl.ecl; + inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -48,9 +48,8 @@ let # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { inherit pari_data; - inherit singular maxima-ecl; + inherit singular maxima; inherit three; - ecl = maxima-ecl.ecl; cysignals = python3.pkgs.cysignals; mathjax = nodePackages.mathjax; }; @@ -61,22 +60,21 @@ let sagelib = python3.pkgs.sagelib; sage_docbuild = python3.pkgs.sage_docbuild; inherit env-locations; - inherit python3 singular palp flint pynac pythonEnv maxima-ecl; - ecl = maxima-ecl.ecl; + inherit python3 singular palp flint pynac pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; # The documentation for sage, building it takes a lot of ram. sagedoc = callPackage ./sagedoc.nix { inherit sage-with-env; - inherit python3 maxima-ecl; + inherit python3 maxima; }; # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. sage-with-env = callPackage ./sage-with-env.nix { inherit python3 pythonEnv; inherit sage-env; - inherit pynac singular maxima-ecl; + inherit pynac singular maxima; inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -118,8 +116,8 @@ let singular = pkgs.singular.override { inherit flint; }; - maxima-ecl = pkgs.maxima-ecl.override { - ecl = pkgs.ecl.override { + maxima = pkgs.maxima.override { + lisp-compiler = pkgs.ecl.override { # "echo syntax error | ecl > /dev/full 2>&1" segfaults in # ECL. We apply a patch to fix it (write_error.patch), but it # only works if threads are disabled. sage 9.2 tests this diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index b1ad0aad9c761..45a4799d1a031 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -2,13 +2,12 @@ , pari_data , pari , singular -, maxima-ecl +, maxima , conway_polynomials , graphs , elliptic_curves , polytopes_db , gap -, ecl , combinatorial_designs , jmol , mathjax @@ -30,14 +29,14 @@ writeTextFile rec { export SINGULAR_SO='${singular}/lib/libSingular.so' export GAP_SO='${gap}/lib/libgap.so' export SINGULAR_EXECUTABLE='${singular}/bin/Singular' - export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas' - export MAXIMA_PREFIX="${maxima-ecl}" + export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas' + export MAXIMA_PREFIX="${maxima}" export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials' export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' export GAP_ROOT_DIR='${gap}/share/gap/build-dir' - export ECLDIR='${ecl}/lib/ecl-${ecl.version}/' + export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index fd67076c97de4..ae0b9f7453b5e 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -15,8 +15,7 @@ , pkg-config , pari , gap -, ecl -, maxima-ecl +, maxima , singular , fflas-ffpack , givaro @@ -77,8 +76,8 @@ let pkg-config pari gap - ecl - maxima-ecl + maxima.lisp-compiler + maxima singular giac palp diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index f204d97961b65..b74ec4007e626 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -9,7 +9,7 @@ , singular , gap , giac -, maxima-ecl +, maxima , pari , gmp , gfan @@ -42,7 +42,7 @@ let pari gmp gfan - maxima-ecl + maxima eclib flintqs ntl diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 76bbc90773b44..6016b3baeb485 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,7 +1,7 @@ { stdenv , sage-with-env , python3 -, maxima-ecl +, maxima , tachyon , jmol , cddlib @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ sage-with-env.env.lib python3 - maxima-ecl + maxima tachyon jmol cddlib diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index b9c98ed64d010..a884ad8899d4d 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -10,7 +10,7 @@ , cypari2 , cysignals , cython -, ecl +, lisp-compiler , eclib , ecm , flint @@ -74,7 +74,7 @@ buildPythonPackage rec { jupyter_core pkg-config pip # needed to query installed packages - ecl + lisp-compiler ]; buildInputs = [ @@ -92,7 +92,7 @@ buildPythonPackage rec { arb brial cliquer - ecl + lisp-compiler eclib ecm fflas-ffpack diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 57e4a6f1d3363..76d2c782b4d4a 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchFromGitHub -, wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome }: +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, cmake +, gettext +, maxima +, wxGTK +, gnome +}: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "21.05.2"; + version = "21.11.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA="; + sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk="; }; - buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; + buildInputs = [ + wxGTK + maxima + # So it won't embed svg files into headers. + gnome.adwaita-icon-theme + ]; - nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; + nativeBuildInputs = [ + wrapGAppsHook + cmake + gettext + ]; preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) @@ -25,6 +41,7 @@ stdenv.mkDerivation rec { description = "Cross platform GUI for the computer algebra system Maxima"; license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; + maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 17484ea31398a..ab9d08f6db5d8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/czexUqpdsFQAteZ75ur2SFibrtZWffHpPBEPlLQXSY="; + sha256 = "sha256-l6MwBxPWIL5oEaq9c0HJZumZf17WzZymZtytyWZOwWE="; }; - vendorSha256 = "sha256-slMl5dCyyVNBgDbpYECfYUbpJJ7sWuSGSutYR3rTzj0="; + vendorSha256 = "sha256-ONeeFZbD5RJXWiXejUt5VKzGl0pz+3Hn73/Y5a+gJRw="; nativeBuildInputs = [ installShellFiles ]; @@ -45,6 +45,7 @@ buildGoModule rec { meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; + changelog = "https://github.com/cli/cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix deleted file mode 100644 index f5e964d3ca9a3..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pythonPackages }: - -stdenv.mkDerivation rec { - pname = "git-filter-repo"; - version = "2.33.0"; - - src = fetchurl { - url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk="; - }; - - buildInputs = [ pythonPackages.python ]; - - dontBuild = true; - - installPhase = '' - install -Dm755 -t $out/bin git-filter-repo - install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 - ''; - - meta = with lib; { - homepage = "https://github.com/newren/git-filter-repo"; - description = "Quickly rewrite git repository history (filter-branch replacement)"; - license = licenses.mit; - inherit (pythonPackages.python.meta) platforms; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix index 2b7f265019698..b8743b7ea9022 100644 --- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "git-quickfix"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "siedentop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY="; + sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q="; + cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 61d5225621b24..634d82a6045d1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.33.1"; + version = "2.34.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-4FSm5sKwiL0b/19h7ZulqpHJo81QlTmktBxd3wIgHy8="; + sha256 = "07s1c9lzlm4kpbb5lmxy0869phg7037pv4faz5hlqyb5csrbjv7x"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 89a4038801163..a92c6b5d52716 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -11,20 +11,19 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.1.0"; + version = "8.1.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-yC7MGTVxD8xEutlleH3WKRnendnv0KijhUwQ00wwJYQ"; + sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-SP+LCsxjl5YNOu4rDZOiDIqkynGE+iiLJtxi8tFugKM="; + sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8="; }; aarch64-darwin = srcs.x86_64-darwin; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 004560bff9958..e6a8ca5ae2d07 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.4.2", - "repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2", - "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw", + "version": "14.5.1", + "repo_hash": "0c9ih7dr5lgvdhij75bpcj9vlyljnprzbv0k90k4rjajfyd0lhad", + "yarn_hash": "081c06ds723mv95ivpnlh3ida2ra3brrm1lzfh2pmlg5wz9vi1cs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.4.2-ee", + "rev": "v14.5.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.4.2", - "GITLAB_PAGES_VERSION": "1.46.0", - "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.4.2" + "GITALY_SERVER_VERSION": "14.5.1", + "GITLAB_PAGES_VERSION": "1.48.0", + "GITLAB_SHELL_VERSION": "13.22.1", + "GITLAB_WORKHORSE_VERSION": "14.5.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 662252527f9d3..6568c0c3cbf42 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 1.1' +gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.4.1' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 05e75a524139f..b5c5ec672b372 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -121,7 +121,7 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (2.1.0) + pg_query (2.1.1) google-protobuf (>= 3.17.1) proc_to_ast (0.1.0) coderay @@ -184,7 +184,7 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - rugged (1.1.0) + rugged (1.2.0) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -234,7 +234,7 @@ DEPENDENCIES rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 1.1) + rugged (~> 1.2) sentry-raven (~> 3.0) timecop diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 41e5908c629d3..48bf8246adf0e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -4,6 +4,18 @@ , libgit2, openssl, zlib, pcre, http-parser }: let + # git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0. + # It needs a specific commit in between those two releases. + libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec { + version = "1.2.0"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; + sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; + }; + }); + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -21,7 +33,7 @@ let }; }; - version = "14.4.2"; + version = "14.5.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -33,10 +45,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo="; + sha256 = "sha256-AWY/jUIytK/8nrCH2EMrzQ9e0dc9VpZFkO7NhrrqoGg="; }; - vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; + vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; passthru = { inherit rubyEnv; @@ -46,7 +58,7 @@ buildGoModule { tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 4aad9394cd6e6..0fa91679adb2a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx"; + sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -830,10 +830,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2ffc52f3b12c3..f1df035ca2833 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.21.1"; + version = "13.22.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-FBkxJLl58ZbqM1P4LohsozGiKg38gQwVGOV9AAjVE0M="; + sha256 = "sha256-uqdKiBZ290mG0JNi17EjimfES6bN3q1hF6LXs3URTZ8="; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index eaae6eacf44fc..da56de942032e 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 = "14.4.2"; + version = "14.5.1"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0713560ead891..8e781a9a86266 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.1' -gem 'bootsnap', '~> 1.4.6' +gem 'bootsnap', '~> 1.9.1', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,14 +17,14 @@ gem 'default_value_for', '~> 3.4.0' # Supported DBs gem 'pg', '~> 1.1' -gem 'rugged', '~> 1.1' +gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' gem 'faraday', '~> 1.0' gem 'marginalia', '~> 1.10.0' # Authorization -gem 'declarative_policy', '~> 1.0.0' +gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.7.2' @@ -38,6 +38,7 @@ gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' +gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' gem 'omniauth-gitlab', '~> 1.0.2' @@ -129,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false +gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -186,6 +187,7 @@ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false + gem 'sd_notify', '~> 0.1.0', require: false end # State machine @@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' -gem 'gemojione', '~> 3.3' +gem 'tanuki_emoji', '~> 0.5' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' @@ -341,13 +343,15 @@ group :development do gem 'lefthook', '~> 0.7.0', require: false gem 'solargraph', '~> 0.43', require: false - gem 'letter_opener_web', '~> 1.4.1' + gem 'letter_opener_web', '~> 2.0.0' # Better errors handler gem 'better_errors', '~> 2.9.0' # thin instead webrick gem 'thin', '~> 1.8.0' + + gem 'sprite-factory', '~> 1.7' end group :development, :test do @@ -372,7 +376,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.3.0', require: false + gem 'gitlab-styles', '~> 6.4.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -396,7 +400,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.3.0', require: false + gem 'gitlab-dangerfiles', '~> 2.5.0', require: false end group :development, :test, :coverage do @@ -474,7 +478,7 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.3.0.pre.rc2' +gem 'gitaly', '~> 14.4.0.pre.rc43' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -535,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'sd_notify' +gem 'ipynbdiff', '0.3.7' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 8a135d809ba17..75ca996d5c427 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -141,7 +141,7 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.4.6) + bootsnap (1.9.1) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -215,7 +215,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.3.1) + danger (8.4.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -237,7 +237,7 @@ GEM html-pipeline declarative (0.0.20) declarative-option (0.1.0) - declarative_policy (1.0.0) + declarative_policy (1.1.0) default_value_for (3.4.0) activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) @@ -429,8 +429,6 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) - gemojione (3.3.0) - json get_process_mem (0.2.5) ffi (~> 1.0) gettext (3.3.6) @@ -445,7 +443,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.3.0.pre.rc2) + gitaly (14.4.0.pre.rc43) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -453,7 +451,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.3.0) + gitlab-dangerfiles (2.5.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) gitlab-experiment (0.6.4) @@ -485,7 +483,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (6.3.0) + gitlab-styles (6.4.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-performance (~> 1.9.2) @@ -635,6 +633,9 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) + ipynbdiff (0.3.7) + diffy (= 3.3.0) + json (= 2.5.1) jaeger-client (1.1.0) opentracing (~> 0.3) thrift @@ -692,10 +693,11 @@ GEM lefthook (0.7.5) letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.4.1) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) + letter_opener_web (2.0.0) + actionmailer (>= 5.2) + letter_opener (~> 1.7) + railties (>= 5.2) + rexml libyajl2 (1.2.0) license_finder (6.0.0) bundler @@ -832,6 +834,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) + omniauth-dingtalk-oauth2 (1.0.0) + omniauth-oauth2 (~> 1.7.1) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -852,7 +856,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.7.1) + omniauth-oauth2 (1.7.2) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) @@ -1122,7 +1126,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (2.0.0) - rugged (1.1.0) + rugged (1.2.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1148,7 +1152,7 @@ GEM addressable (>= 2.3.5) faraday (> 0.8, < 2.0) scientist (1.6.0) - sd_notify (0.1.1) + sd_notify (0.1.0) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1210,6 +1214,7 @@ GEM spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) + sprite-factory (1.7.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -1240,6 +1245,7 @@ GEM sys-filesystem (1.1.9) ffi sysexits (1.2.0) + tanuki_emoji (0.5.0) temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -1393,7 +1399,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.4.6) + bootsnap (~> 1.9.1) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1410,7 +1416,7 @@ DEPENDENCIES crystalball (~> 0.7.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) - declarative_policy (~> 1.0.0) + declarative_policy (~> 1.1.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks @@ -1448,14 +1454,13 @@ DEPENDENCIES fog-rackspace (~> 0.1.1) fugit (~> 1.2.1) fuubar (~> 2.2.0) - gemojione (~> 3.3) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.3.0.pre.rc2) + gitaly (~> 14.4.0.pre.rc43) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.3.0) + gitlab-dangerfiles (~> 2.5.0) gitlab-experiment (~> 0.6.4) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.21.1) @@ -1465,7 +1470,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.8.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 6.3.0) + gitlab-styles (~> 6.4.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1495,6 +1500,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) + ipynbdiff (= 0.3.7) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1506,7 +1512,7 @@ DEPENDENCIES kramdown (~> 2.3.1) kubeclient (~> 4.9.2) lefthook (~> 0.7.0) - letter_opener_web (~> 1.4.1) + letter_opener_web (~> 2.0.0) license_finder (~> 6.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1535,6 +1541,7 @@ DEPENDENCIES omniauth-azure-activedirectory-v2 (~> 1.0) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) + omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.4) omniauth-gitlab (~> 1.0.2) @@ -1596,10 +1603,10 @@ DEPENDENCIES ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) - rugged (~> 1.1) + rugged (~> 1.2) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - sd_notify + sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.1) @@ -1616,11 +1623,13 @@ DEPENDENCIES spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) + sprite-factory (~> 1.7) sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) + tanuki_emoji (~> 0.5) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 2c1f53c0b3ac5..6c6a26f3d266c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -557,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz62p9vc7lcrmzhiz4pf7myww086mq287cw3jjj7fyc7jhmamw0"; + sha256 = "1ndjra3h86dq28njm2swmaw6n3vsywrycrf7i5iy9l8hrhfhv4x2"; type = "gem"; }; - version = "1.4.6"; + version = "1.9.1"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -931,10 +931,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l"; + sha256 = "1f9p7sdj542cbn352qz58m4n26kamv6vbnxzpc06j0pxi50z3i0v"; type = "gem"; }; - version = "8.3.1"; + version = "8.4.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1007,10 +1007,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k2wl0jr0jq64gy7ibb1ipm2dzqil7y66vyffwx81g7sqchh7xh6"; + sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; default_value_for = { dependencies = ["activerecord"]; @@ -1838,17 +1838,6 @@ }; version = "3.0.1"; }; - gemojione = { - dependencies = ["json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; - type = "gem"; - }; - version = "3.3.0"; - }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "unicorn"]; @@ -1910,10 +1899,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197db842msm326ib8r3gqlavf5d11r4cd9jg4wjnyar3ccyr9dn7"; + sha256 = "022amhic8rs09qmp3hy1zz5inxbxnrvg8j82bq4l2s8ml9hqfs3a"; type = "gem"; }; - version = "14.3.0.pre.rc2"; + version = "14.4.0.pre.rc43"; }; github-markup = { groups = ["default"]; @@ -1953,10 +1942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw"; + sha256 = "1488s24c9fm55z2a2pbry2fjx72fzgzv0y48krgldvf0qy43l0kz"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store" "scientist"]; @@ -2059,10 +2048,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxg5j9405r5xvwnswhm2r7pg9pn6pqg675pxz6f8d3sxy5z963p"; + sha256 = "16d90sd0x6qfkhgfjysswwrzk82zs82xs9azn9w287irpzdkvj7f"; type = "gem"; }; - version = "6.3.0"; + version = "6.4.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2589,6 +2578,17 @@ }; version = "0.8.3"; }; + ipynbdiff = { + dependencies = ["diffy" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18337bzcwssmnyg2wf3za50z0zh2b1sh17wgaapavd1ffr24svkx"; + type = "gem"; + }; + version = "0.3.7"; + }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2826,15 +2826,15 @@ version = "1.7.0"; }; letter_opener_web = { - dependencies = ["actionmailer" "letter_opener" "railties"]; + dependencies = ["actionmailer" "letter_opener" "railties" "rexml"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kgz2n0cyw3m8ipvijlikb6bldmzhnq451b9d7w5l74gw2fhqckg"; + sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik"; type = "gem"; }; - version = "1.4.1"; + version = "2.0.0"; }; libyajl2 = { groups = ["default"]; @@ -3489,6 +3489,17 @@ }; version = "1.1.4"; }; + omniauth-dingtalk-oauth2 = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + type = "gem"; + }; + version = "1.0.0"; + }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3572,10 +3583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319"; + sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -4778,10 +4789,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; safe_yaml = { groups = ["default" "test"]; @@ -4881,14 +4892,14 @@ version = "1.6.0"; }; sd_notify = { - groups = ["default"]; + groups = ["puma"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; + sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.0"; }; securecompare = { groups = ["default"]; @@ -5144,6 +5155,16 @@ }; version = "1.0.4"; }; + sprite-factory = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm"; + type = "gem"; + }; + version = "1.7.1"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default" "development" "test"]; @@ -5291,6 +5312,16 @@ }; version = "1.2.0"; }; + tanuki_emoji = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws"; + type = "gem"; + }; + version = "0.5.0"; + }; temple = { groups = ["default" "development" "test"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index c8b4efc2478e8..bee10e49f4b4e 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -143,7 +143,6 @@ def update_rubyenv(): f.write(repo.get_file('Gemfile.lock', rev)) with open(rubyenv_dir / 'Gemfile', 'w') as f: original = repo.get_file('Gemfile', rev) - original += "\ngem 'sd_notify'\n" f.write(re.sub(r".*mail-smtp_pool.*", "", original)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b80712fd96da1..61e938b093b3f 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.60"; + version = "0.64"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-tT8F3Kx7Rcjd/tWjIXXNWygYlkMddWwrttpjnYLnBdo="; + sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq"; }; nativeBuildInputs = [ pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installCheckPhase = '' runHook preInstallCheck - test "$($out/bin/got --version)" = '${pname} "${version}"' + test "$($out/bin/got --version)" = '${pname} ${version}' runHook postInstallCheck ''; diff --git a/pkgs/applications/video/giph/default.nix b/pkgs/applications/video/giph/default.nix index 431f267e4c87e..3255544ff8b3c 100644 --- a/pkgs/applications/video/giph/default.nix +++ b/pkgs/applications/video/giph/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/giph"; description = "Simple gif recorder"; license = licenses.mit; - maintainers = [ maintainers.legendofmiracles ]; + maintainers = [ maintainers.lom ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index a4f6255fae85b..498fcb530a41f 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/rushmj/mpv-video-cutter"; # repo doesn't have a license license = licenses.unfree; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 2a6d2a20c44e0..c18790c1b887e 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,19 +1,15 @@ { lib, buildPythonApplication, fetchFromGitHub, pyyaml }: buildPythonApplication rec { - version = "0.2.0pre-2021-05-18"; + version = "0.1.8"; pname = "podman-compose"; # "This project is still under development." -- README.md - # - # As of May 2021, the latest release (0.1.5) has fewer than half of all - # commits. This project seems to have no release management, so the last - # commit is the best one until proven otherwise. src = fetchFromGitHub { repo = "podman-compose"; owner = "containers"; - rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe"; - sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp"; + rev = version; + sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304="; }; propagatedBuildInputs = [ pyyaml ]; @@ -21,7 +17,7 @@ buildPythonApplication rec { meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4a31c657cdcd..5c22b16492396 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -228,8 +228,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - chmod a+x -- $out/libexec/emit-kvm-warnings + install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ $out/bin/qemu-kvm \ diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e8d78c5bb4a13..4d6fb0ef4afa2 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-y5Xm1osNIPK4fWDyOjv3B7fT6HzuDdSqQ4D49IGlfrw="; + sha256 = "sha256-f/94tcB7XU0IJpvSZ6xemUOQ+TMyHlTv1rfIZoMVPOQ="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index a987c6c2e0e5d..e593a95a15193 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "ElKowars wacky widgets"; homepage = "https://github.com/elkowar/eww"; license = licenses.mit; - maintainers = with maintainers; [ figsoda legendofmiracles ]; + maintainers = with maintainers; [ figsoda lom ]; broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 0617e85723987..5c2db7d47a537 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.20"; + version = "4.20.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI="; + sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93"; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index dcfa5ec593d1d..7958db9171221 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -867,13 +867,13 @@ rec { }; closureRoots = lib.optionals includeStorePaths /* normally true */ ( - [ baseJson ] ++ contentsList + [ baseJson customisationLayer ] ); overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); # These derivations are only created as implementation details of docker-tools, # so they'll be excluded from the created images. - unnecessaryDrvs = [ baseJson overallClosure ]; + unnecessaryDrvs = [ baseJson overallClosure customisationLayer ]; conf = runCommand "${baseName}-conf.json" { diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 141c2ba0ea454..bef0c5848693f 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -350,6 +350,9 @@ rec { # This removes sharing of busybox and is not recommended. We do this # to make the example suitable as a test case with working binaries. cp -r ${pkgs.pkgsStatic.busybox}/* . + + # This is a "build" dependency that will not appear in the image + ${pkgs.hello}/bin/hello ''; }; @@ -504,6 +507,11 @@ rec { fakeRootCommands = '' mkdir -p ./home/jane chown 1000 ./home/jane + ln -s ${pkgs.hello.overrideAttrs (o: { + # A unique `hello` to make sure that it isn't included via another mechanism by accident. + configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-"; + doCheck = false; + })} ./hello ''; }; diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index c1b0db895bc10..73eff9c272529 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -2,33 +2,33 @@ source $stdenv/setup set -x -if ! [ -f "$cacheDB" ]; then - echo "Creating cache DB $cacheDB" - mtn --db "$cacheDB" db init +if ! [ -f "$cacheDB" ]; then + echo "Creating cache DB $cacheDB" + mtn --db "$cacheDB" db init fi header "getting revision $selector"; done=; for source in $dbs; do - if mtn pull --db "$cacheDB" "$source" "${branch}"; then - revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)"; - if [ -n "$revision" ]; then - if mtn --db "$cacheDB" au get_revision "$revision"; then - echo "found revision $revision" - done=1; - else - echo "revision $revision does not exist"; - fi - else - echo "selector $selector does not match any revision"; - fi - else - echo "pulling branch $branch wasn't successful"; - fi; - if test -n "$done"; then - break; - fi; + if mtn pull --db "$cacheDB" "$source" "${branch}"; then + revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)"; + if [ -n "$revision" ]; then + if mtn --db "$cacheDB" au get_revision "$revision"; then + echo "found revision $revision" + done=1; + else + echo "revision $revision does not exist"; + fi + else + echo "selector $selector does not match any revision"; + fi + else + echo "pulling branch $branch wasn't successful"; + fi; + if test -n "$done"; then + break; + fi; done; stopNest; @@ -36,10 +36,10 @@ stopNest; header "checking out the revision $revision"; if test -n "$done"; then - mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}" + mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}" else - echo "Needed revision still not found. Exiting"; - exit 1; + echo "Needed revision still not found. Exiting"; + exit 1; fi; stopNest diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index f7c7429eb0b3e..a5a4427166889 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -13,9 +13,9 @@ if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then fi if (( ${#role_suffixes[@]} > 0 )); then - # replace env var with nix-modified one + # replace env var with nix-modified one PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@" else - # pkg-config isn't a bonafied dependency so ignore setup hook entirely - exec @prog@ "$@" + # pkg-config isn't a bonafied dependency so ignore setup hook entirely + exec @prog@ "$@" fi diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh index 4bf7c0ff1af48..825da1bde962c 100644 --- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh +++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh @@ -71,9 +71,9 @@ _shortenPerlShebang() { print } ' "$program" > "$temp" || die - # Preserve the mode of the original file - cp --preserve=mode --attributes-only "$program" "$temp" - mv "$temp" "$program" + # Preserve the mode of the original file + cp --preserve=mode --attributes-only "$program" "$temp" + mv "$temp" "$program" # Measure the new shebang line length and make sure it's okay. We subtract # one to account for the trailing newline that "head" included in its diff --git a/pkgs/data/fonts/iosevka/update-bin.sh b/pkgs/data/fonts/iosevka/update-bin.sh index a402f152d8a13..68f93f1f26e69 100755 --- a/pkgs/data/fonts/iosevka/update-bin.sh +++ b/pkgs/data/fonts/iosevka/update-bin.sh @@ -10,19 +10,19 @@ oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersi version=$(echo "$release" | jq -r .tag_name | tr -d v) if test "$oldVersion" = "$version"; then - echo "New version same as old version, nothing to do." >&2 - exit 0 + echo "New version same as old version, nothing to do." >&2 + exit 0 fi sed -i "s/$oldVersion/$version/" bin.nix { - echo '# This file was autogenerated. DO NOT EDIT!' - echo '{' - for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do - printf ' %s = "%s";\n' \ - $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \ - $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") - done - echo '}' + echo '# This file was autogenerated. DO NOT EDIT!' + echo '{' + for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do + printf ' %s = "%s";\n' \ + $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \ + $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") + done + echo '}' } >variants.nix diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 743bcba54de21..69e18beec32db 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20200710"; + version = "20211106"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "0rlrmgimvs9rrj64g5jn04jgyi7wmn2dnsk7ckmxk6p8cdfjd0hx"; + sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 1bcfab57b4a99..7254e8bc21399 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja , gtk3 -, breeze-icons -, gnome -, pantheon +, adwaita-icon-theme , hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "pop-icon-theme"; - version = "2020-03-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "pop-os"; repo = "icon-theme"; - rev = "11f18cb48455b47b6535018f1968777100471be1"; - sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + rev = "9998b20b78f3ff65ecbf2253bb863d1e669abe74"; + sha256 = "0lwdmaxs9xj4bm21ldh64bzyb6iz5d5k1256iwvyjp725l7686cl"; }; nativeBuildInputs = [ @@ -27,9 +26,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons - gnome.adwaita-icon-theme - pantheon.elementary-icon-theme + adwaita-icon-theme hicolor-icon-theme ]; @@ -39,7 +36,7 @@ stdenv.mkDerivation rec { description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; homepage = "https://github.com/pop-os/icon-theme"; license = with licenses; [ cc-by-sa-40 gpl3 ]; - platforms = platforms.unix; + platforms = platforms.linux; # hash mismatch on darwin due to file names differing only in case maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh index 683b2e8606b8b..0bb61d863ecea 100644 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -5,13 +5,13 @@ cd $out/share/GeoIP # Iterate over all environment variable names beginning with "src": for var in "${!src@}"; do - # Store the value of the variable with name $var in $src: - eval src="\$$var" + # Store the value of the variable with name $var in $src: + eval src="\$$var" - # Copy $src to current directory, removing Nix hash from the filename: - dest="${src##*/}" - dest="${dest#*-}" - cp "$src" "$dest" + # Copy $src to current directory, removing Nix hash from the filename: + dest="${src##*/}" + dest="${dest#*-}" + cp "$src" "$dest" done gzip -dv *.gz diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index afdf478fea03e..722c3cbc41e58 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20201129"; + version = "20211130"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU="; + sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8"; }; dontBuild = true; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 4507e3c2f151a..886a173b2d891 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-09-24"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15"; + sha256 = "10fgz09h25cmnvz0bzx5qadv7cqnl1bdd6hj7w0rcbsws4c2j17q"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f9e3463f2fdc6..da79f68638b9d 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -11,30 +12,20 @@ stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20200916"; + version = "20210322"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; + sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl"; }; - nativeBuildInputs = [ - meson - ninja - sassc - ]; + nativeBuildInputs = [ meson ninja sassc ]; - buildInputs = [ - gnome.gnome-themes-extra - gdk-pixbuf - librsvg - ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index ec17be3261d8a..022e1dd81b2fd 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-06-30"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1"; - sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky"; + rev = "6615e4510485c5dc0b379746acc40f538d987c86"; + sha256 = "16h03x2m4j4hfwp7pdmw1navcy5q7di38jvigfgf263wajyxbznr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index ab76e0c64fd18..bf5ae4ebbb1a5 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -22,8 +22,16 @@ stdenv.mkDerivation rec { moveToOutput "bin/orbit2-config" "$dev" ''; + # Parallel build fails due to missing internal library dependency: + # libtool --tag=CC --mode=link gcc ... -o orbit-name-server-2 ... + # ld: cannot find libname-server-2.a: No such file or directory + # It happens because orbit-name-server-2 should have libname-server-2.a + # in _DEPENDENCIES but does not. Instead of fixing it and regenerating + # Makefile.in let's just disable parallel build. + enableParallelBuilding = false; + meta = with lib; { - homepage = "https://projects.gnome.org/ORBit2/"; + homepage = "https://developer-old.gnome.org/ORBit2/"; description = "A CORBA 2.4-compliant Object Request Broker"; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index 50fb1c3de569b..2afb65d528e10 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee, vala_0_40 }: +, wrapGAppsHook, libgee, vala }: let pname = "caribou"; @@ -21,6 +21,11 @@ in stdenv.mkDerivation rec { url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) + # Stop patching the generated GIR, fixes build with latest vala + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/c52ce71c49dc8d6109a58d16cc8d491d7bd1d781.patch"; + sha256 = "sha256-jbF1Ygp8Q0ENN/5aEpROuK5zkufIfn6cGW8dncl7ET4="; + }) (fetchurl { name = "fix-build-modern-vala.patch"; url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch"; @@ -33,7 +38,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 553d51de14d4c..a08af5734e471 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -14,6 +14,7 @@ "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix new file mode 100644 index 0000000000000..759deb98b19db --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pop-shell"; + version = "unstable-2021-11-30"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "shell"; + rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3"; + sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk="; + }; + + nativeBuildInputs = [ glib nodePackages.typescript gjs ]; + + buildInputs = [ gjs ]; + + patches = [ + ./fix-gjs.patch + ]; + + makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; + + passthru = { + extensionUuid = "pop-shell@system76.com"; + extensionPortalSlug = "pop-shell"; + }; + + meta = with lib; { + description = "Keyboard-driven layer for GNOME Shell"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.genofire ]; + homepage = "https://github.com/pop-os/shell"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch new file mode 100644 index 0000000000000..e1e6fb7a839ae --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -0,0 +1,67 @@ +diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts +index 9522499..9911530 100644 +--- a/src/color_dialog/src/main.ts ++++ b/src/color_dialog/src/main.ts +@@ -1,4 +1,4 @@ +-#!/usr/bin/gjs ++#!/usr/bin/env gjs + + imports.gi.versions.Gtk = '3.0'; + +@@ -84,4 +84,4 @@ function launch_color_dialog() { + + Gtk.init(null); + +-launch_color_dialog() +\ No newline at end of file ++launch_color_dialog() +diff --git a/src/extension.ts b/src/extension.ts +index 7417c46..00d5829 100644 +--- a/src/extension.ts ++++ b/src/extension.ts +@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> { + return true + } + +- const ipc = utils.async_process_ipc(["gjs", path]) ++ const ipc = utils.async_process_ipc([path]) + + if (ipc) { + const generator = (stdout: any, res: any) => { +diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts +index f298ec7..87a6bc4 100644 +--- a/src/floating_exceptions/src/main.ts ++++ b/src/floating_exceptions/src/main.ts +@@ -1,4 +1,4 @@ +-#!/usr/bin/gjs ++#!/usr/bin/env gjs + + imports.gi.versions.Gtk = '3.0' + +@@ -329,4 +329,4 @@ function main() { + Gtk.main() + } + +-main() +\ No newline at end of file ++main() +diff --git a/src/panel_settings.ts b/src/panel_settings.ts +index 83ff56c..1bc1e98 100644 +--- a/src/panel_settings.ts ++++ b/src/panel_settings.ts +@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) { + color_selector_item.add_child(color_button); + color_button.connect('button-press-event', () => { + let path = Me.dir.get_path() + "/color_dialog/main.js"; +- let resp = GLib.spawn_command_line_async(`gjs ${path}`); ++ let resp = GLib.spawn_command_line_async(path); + if (!resp) { + + return null; +@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) { + }); + + return color_selector_item; +-} +\ No newline at end of file ++} diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 66afe1271cae5..39bd77038281c 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -30,92 +30,92 @@ postInstall() { # add the current package to the paths local tmp="$out/lib/GNUstep/Applications" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" fi tmp="$out/lib/GNUstep/Applications" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" fi tmp="$out/lib/GNUstep/WebApplications" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" fi tmp="$out/bin" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" fi tmp="$out/sbin" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" fi tmp="$out/lib/GNUstep" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" fi tmp="$out/include" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then - if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then - export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" - else - export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" - fi + if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then + export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" + else + export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" + fi fi tmp="$out/lib" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" fi tmp="$out/share/GNUstep/Documentation" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" fi tmp="$out/share/man" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" fi tmp="$out/share/info" if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" fi - + # write the config file echo GNUSTEP_MAKEFILES=$GNUSTEP_MAKEFILES >> $conf if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS" + echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS" fi if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf + echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf + echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then - echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf + echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then - echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf + echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then - echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf + echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then - echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf + echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then - echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf + echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf + echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf + echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf fi if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf + echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf fi - + for i in $out/bin/*; do - echo "wrapping $(basename $i)" - wrapGSMake "$i" "$out/share/.GNUstep.conf" + echo "wrapping $(basename $i)" + wrapGSMake "$i" "$out/share/.GNUstep.conf" done } diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index b2b90f1e5222d..177a381100a64 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -20,58 +20,58 @@ addEnvVars() { local filename for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do - if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then - export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename" - fi + if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then + export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename" + fi done local tmp="$1/lib/GNUstep/Applications" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" fi tmp="$1/lib/GNUstep/Applications" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" fi tmp="$1/lib/GNUstep/WebApplications" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" fi tmp="$1/bin" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" fi tmp="$1/sbin" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" fi tmp="$1/lib/GNUstep" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" fi tmp="$1/include" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then - if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then - export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" - else - export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" - fi + if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then + export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" + else + export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" + fi fi tmp="$1/lib" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" fi tmp="$1/share/GNUstep/Documentation" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" fi tmp="$1/share/man" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" fi tmp="$1/share/info" if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" fi } addEnvHooks "$targetOffset" addEnvVars diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 41f71ec2f907e..23ae5e4e87896 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -7,7 +7,7 @@ , keybinder3 , pkg-config , python3Packages -, vala_0_48 +, vala , wafHook , wrapGAppsHook , xfce @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gobject-introspection pkg-config python3Packages.wrapPython - vala_0_48 + vala wafHook wrapGAppsHook ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index baba34212fdc2..0b67e9468294e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40 , gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,7 +12,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; }; - nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; + # Does not build with vala 0.48 or later + # Upstream has no activity for a while + # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible + # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. + # public virtual signal bool remote_event (string name, GLib.Value value); + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 5896e9488268b..9d2ded48a3773 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,7 +28,8 @@ let ]; in stdenv.mkDerivation { - inherit (s) name version; + inherit (s) version; + pname = s.baseName; inherit nativeBuildInputs propagatedBuildInputs; src = fetchurl { diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 5be64bebcd4db..40b57223fa1da 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages # build-tools , bootPkgs @@ -130,11 +130,29 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ @@ -143,6 +161,14 @@ let ]; in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + stdenv.mkDerivation (rec { version = "8.10.7"; pname = "${targetPrefix}ghc${variantSuffix}"; @@ -207,20 +233,17 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" - '' + lib.optionalString (targetCC.isClang || (useLLVM && stdenv.targetPlatform.isDarwin)) (let - # LLVM backend on Darwin needs clang, if we are already using clang, might as well set the environment variable. - # See also https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - clang = if targetCC.isClang then targetCC else llvmPackages.clang; - in '' - export CLANG="${clang}/bin/${clang.targetPrefix}clang" - '') + '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index ffa2c473eec6a..3ce47a20bad88 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages # build-tools , bootPkgs @@ -142,7 +142,7 @@ let # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ @@ -151,6 +151,14 @@ let ]; in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + stdenv.mkDerivation (rec { version = "8.8.4"; pname = "${targetPrefix}ghc${variantSuffix}"; @@ -217,15 +225,12 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" - '' + lib.optionalString (targetCC.isClang || (useLLVM && stdenv.targetPlatform.isDarwin)) (let - # LLVM backend on Darwin needs clang, if we are already using clang, might as well set the environment variable. - # See also https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - clang = if targetCC.isClang then targetCC else llvmPackages.clang; - in '' - export CLANG="${clang}/bin/${clang.targetPrefix}clang" - '') + '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index d377328692cb2..3f13fe1b9e1b9 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages # build-tools , bootPkgs @@ -125,11 +125,29 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ @@ -138,6 +156,14 @@ let ]; in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + stdenv.mkDerivation (rec { version = "9.0.1"; pname = "${targetPrefix}ghc${variantSuffix}"; @@ -173,20 +199,17 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" - '' + lib.optionalString (targetCC.isClang || (useLLVM && stdenv.targetPlatform.isDarwin)) (let - # LLVM backend on Darwin needs clang, if we are already using clang, might as well set the environment variable. - # See also https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - clang = if targetCC.isClang then targetCC else llvmPackages.clang; - in '' - export CLANG="${clang}/bin/${clang.targetPrefix}clang" - '') + '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 20062358db507..77d741a4f2b83 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages # build-tools , bootPkgs @@ -126,10 +126,29 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ @@ -138,6 +157,14 @@ let ]; in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + stdenv.mkDerivation (rec { version = "9.2.1"; pname = "${targetPrefix}ghc${variantSuffix}"; @@ -173,20 +200,17 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" - '' + lib.optionalString (targetCC.isClang || (useLLVM && stdenv.targetPlatform.isDarwin)) (let - # LLVM backend on Darwin needs clang, if we are already using clang, might as well set the environment variable. - # See also https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - clang = if targetCC.isClang then targetCC else llvmPackages.clang; - in '' - export CLANG="${clang}/bin/${clang.targetPrefix}clang" - '') + '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 537b735b4a219..9a5767446158e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages # build-tools , bootPkgs @@ -139,11 +139,29 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ @@ -152,6 +170,14 @@ let ]; in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + stdenv.mkDerivation (rec { inherit version; inherit (src) rev; @@ -187,20 +213,17 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" - '' + lib.optionalString (targetCC.isClang || (useLLVM && stdenv.targetPlatform.isDarwin)) (let - # LLVM backend on Darwin needs clang, if we are already using clang, might as well set the environment variable. - # See also https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - clang = if targetCC.isClang then targetCC else llvmPackages.clang; - in '' - export CLANG="${clang}/bin/${clang.targetPrefix}clang" - '') + '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' # otherwise haddock fails when generating the compiler docs export LANG=C.UTF-8 diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index ed5ea00c4b9ab..dad133337e85b 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.9"; + version = "1.16.10"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-ChzH/XvSBEj3Hr7WTYRhOIUNUJmxjPXMEKT8RRYNjD0="; + sha256 = "sha256-qQVHIBFYXkA9ANKkHefO0puIhDCdc0gqMH9on9DzILU="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 4604b1fdea727..68ba3ed3a920a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -8,43 +8,43 @@ function extract case "$1" in *.tar.xz) - xz -dc $1 | tar "$tarflags" - ;; - *) - printf "Make sure you give a iPhoneOS9.2.sdk.tar.xz file \n" ;; + xz -dc $1 | tar "$tarflags" - ;; + *) + printf "Make sure you give a iPhoneOS9.2.sdk.tar.xz file \n" ;; esac } function verify_arch { case "$1" in - # Our good arches. - armv7|arm64) ;; - *) - local - acc="armv7 | arm64" - error_message=$( - printf '%s is not an acceptable arch. Try one of %s' "$1" "$acc" - ) - printf "$error_message\n" - exit + # Our good arches. + armv7|arm64) ;; + *) + local + acc="armv7 | arm64" + error_message=$( + printf '%s is not an acceptable arch. Try one of %s' "$1" "$acc" + ) + printf "$error_message\n" + exit esac } function verify_sdk_version { sdk_version=$(basename "$1" | grep -P -o "[0-9].[0-9]+") case "$sdk_version" in - # Make sure the SDK is correct. - [5-9].[0-9]) ;; - *) - printf 'No iPhone SDK version in file name\n' + # Make sure the SDK is correct. + [5-9].[0-9]) ;; + *) + printf 'No iPhone SDK version in file name\n' esac } function do_build { if [ $# -lt 2 ]; then - printf "usage: $0 iPhoneOS.sdk.tar* <target cpu>\n" 1>&2 - printf "i.e. $0 /path/to/iPhoneOS.sdk.tar.xz armv7\n" 1>&2 - exit 1 + printf "usage: $0 iPhoneOS.sdk.tar* <target cpu>\n" 1>&2 + printf "i.e. $0 /path/to/iPhoneOS.sdk.tar.xz armv7\n" 1>&2 + exit 1 fi mkdir -p $out @@ -54,7 +54,7 @@ function do_build { pushd "$cctools_port"/usage_examples/ios_toolchain &> /dev/null export LC_ALL=C - + local triple='%s-apple-darwin11' target_dir="$PWD/target" @@ -75,12 +75,12 @@ function do_build { extract "$1" local sys_lib=$( - find $sdk_dir -name libSystem.dylib -o -name libSystem.tbd | head -n1 - ) + find $sdk_dir -name libSystem.dylib -o -name libSystem.tbd | head -n1 + ) if [ -z "$sys_lib" ]; then - printf "SDK should contain libSystem{.dylib,.tbd}\n" 1>&2 - exit 1 + printf "SDK should contain libSystem{.dylib,.tbd}\n" 1>&2 + exit 1 fi local sys_root=$(readlink -f "$(dirname $sys_lib)/../..") @@ -96,18 +96,18 @@ function do_build { printf "int main(){return 0;}" | clang -xc -O2 -o "$target_dir"/bin/dsymutil - clang -O2 -std=c99 $alt_wrapper \ - -DTARGET_CPU=$(printf '"%s"' "$2") \ - -DNIX_APPLE_HDRS=$( - printf '"%s"' "-I$out/$sdk/usr/include" - ) \ - -DNIX_APPLE_FRAMEWORKS=$( - printf '"%s"' "$out/$sdk/System/Library/Frameworks" - ) \ - -DNIX_APPLE_PRIV_FRAMEWORKS=$( - printf '"%s"' "$out/$sdk/System/Library/PrivateFrameworks" - ) \ - -DOS_VER_MIN=$(printf '"%s"' "7.1") \ - -o "$target_dir/bin/$triple-clang" + -DTARGET_CPU=$(printf '"%s"' "$2") \ + -DNIX_APPLE_HDRS=$( + printf '"%s"' "-I$out/$sdk/usr/include" + ) \ + -DNIX_APPLE_FRAMEWORKS=$( + printf '"%s"' "$out/$sdk/System/Library/Frameworks" + ) \ + -DNIX_APPLE_PRIV_FRAMEWORKS=$( + printf '"%s"' "$out/$sdk/System/Library/PrivateFrameworks" + ) \ + -DOS_VER_MIN=$(printf '"%s"' "7.1") \ + -o "$target_dir/bin/$triple-clang" pushd "$target_dir"/bin &>/dev/null @@ -141,8 +141,8 @@ function do_build { local me=`whoami` for d in bin libexec SDK; do - chown -R $me:$me target/$d - cp -R target/$d $out + chown -R $me:$me target/$d + cp -R target/$d $out done # Crucial piece diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 5743681ae7f03..abd2235189e7c 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing."; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/julia/1.0-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix index dfda8da9e4de9..0743fe3fdd72a 100644 --- a/pkgs/development/compilers/julia/1.0-bin.nix +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -1,43 +1,43 @@ -{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }: +{ autoPatchelfHook, fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.0.5"; + version = "1.7.0"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx"; + sha256 = "0h0d9kfg00vglg2qmcx0k8c2gzn445i0xbsfw6wy1idf72kg76bj"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create symlinks to allow us to share patches + # releases. Thus we temporarily create a symlink to allow us to share patches # with source releases. prePatch = '' - ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib ln -s share/julia/test ''; patches = [ # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch + ./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch ]; postPatch = '' # Revert symlink hack. - rm stdlib test + rm test + + # Julia fails to pick up our Certification Authority root certificates, but + # it provides its own so we can simply disable the test. Patching in the + # dynamic path to ours require us to rebuild the Julia system image. + substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ + --replace '@test ca_roots_path() != bundled_ca_roots()' \ + '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - buildInputs = [ makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' runHook preInstall cp -r . $out - # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is - # only necessary on v1.0.x and a cleaner solution is welcome, but after - # staring at `strace` for a few hours this is as clean as I could make it. - wrapProgram $out/bin/julia \ - --suffix LD_LIBRARY_PATH : $out/lib runHook postInstall ''; @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { dontStrip = true; doInstallCheck = true; - installCheckInputs = [ openssl ]; preInstallCheck = '' # Some tests require read/write access to $HOME. export HOME="$TMPDIR" @@ -62,19 +61,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing"; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ninjin raskin ]; platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - # Built with libgit2 v0.27.2: - # https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version - # https://nvd.nist.gov/vuln/detail/CVE-2020-12278 - "CVE-2020-12278" - # https://nvd.nist.gov/vuln/detail/CVE-2020-12279 - "CVE-2020-12279" - ]; }; } diff --git a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch b/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch deleted file mode 100644 index 0de1f7c010d39..0000000000000 --- a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp <pontus@stenetorp.se> -Date: Mon, 15 Mar 2021 05:55:18 +0000 -Subject: [PATCH 2/3] nix: Skip tests that require network access - -Necessary as the Nix build sandbox does not permit network access. ---- - stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++----------------- - test/file.jl | 4 ++-- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl -index 6145f87616..9cc7a001e5 100644 ---- a/stdlib/Sockets/test/runtests.jl -+++ b/stdlib/Sockets/test/runtests.jl -@@ -151,33 +151,33 @@ defaultport = rand(2000:4000) - end - - @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin -- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1" -- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1" -- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1" -- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1" -- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1" -+ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1" -+ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1" -+ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1" -+ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -+ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1" - end - - @testset "getnameinfo on some valid IP addresses" begin - @test !isempty(getnameinfo(ip"::")::String) -- @test !isempty(getnameinfo(ip"0.0.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.255")::String) -- @test !isempty(getnameinfo(ip"10.1.255.1")::String) -- @test !isempty(getnameinfo(ip"255.255.255.255")::String) -- @test !isempty(getnameinfo(ip"255.255.255.0")::String) -- @test !isempty(getnameinfo(ip"192.168.0.1")::String) -- @test !isempty(getnameinfo(ip"::1")::String) -+ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String) -+ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String) -+ @test_skip !isempty(getnameinfo(ip"::1")::String) - end - - @testset "getaddrinfo" begin -- let localhost = getnameinfo(ip"127.0.0.1")::String -- @test !isempty(localhost) && localhost != "127.0.0.1" -- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -- @test try -+ let localhost = getnameinfo(ip"::")::String -+ @test_skip !isempty(localhost) && localhost != "127.0.0.1" -+ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -+ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -+ @test_skip try - getaddrinfo(localhost, IPv6)::IPv6 != ip"::" - catch ex - isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost -diff --git a/test/file.jl b/test/file.jl -index e86476f975..579276f82c 100644 ---- a/test/file.jl -+++ b/test/file.jl -@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER) - else - @test_throws ErrorException symlink(file, "ba\0d") - end --@test_throws ArgumentError download("good", "ba\0d") --@test_throws ArgumentError download("ba\0d", "good") -+@test_skip @test_throws ArgumentError download("good", "ba\0d") -+@test_skip @test_throws ArgumentError download("ba\0d", "good") - - ################### - # walkdir # --- -2.29.3 - diff --git a/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch new file mode 100644 index 0000000000000..243a9cfd76aee --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch @@ -0,0 +1,30 @@ +From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp <pontus@stenetorp.se> +Date: Thu, 8 Apr 2021 04:37:44 +0000 +Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox + +Disabled by default due to lack of networking in the Nix sandbox. This +greatly speeds up the build process on a multi-core system. +--- + test/runtests.jl | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..2f8c19fa32 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ if net_on || haskey(ENV, "NIX_BUILD_CORES") ++ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS ++ n = min(x, Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end +-- +2.29.3 + diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 4e590dba4337d..30a2d016d67c7 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -73,6 +73,20 @@ in stdenv.mkDerivation (rec { sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk"; stripLen = 1; }) + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) + (fetchpatch { + name = "dfaemitter-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/0841916e87a39e3c223c986e8da31e4a9a1432e3.patch"; + sha256 = "1kckghvsngs51mqm82asy0s9vr19h8aqbw43a0w44mccqw6bzrwf"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index f0148850dbe8a..81ac4cb1ed080 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -65,6 +65,26 @@ in stdenv.mkDerivation (rec { sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; stripLen = 1; }) + # gcc-11 compat upstream patch + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1.patch"; + sha256 = "sha256:0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk"; + stripLen = 1; + }) + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) + (fetchpatch { + name = "dfaemitter-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/0841916e87a39e3c223c986e8da31e4a9a1432e3.patch"; + sha256 = "1kckghvsngs51mqm82asy0s9vr19h8aqbw43a0w44mccqw6bzrwf"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 78c2831a2f35f..a775af3031b7f 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -44,6 +44,8 @@ let ]; postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 13be739671438..6c87366ea315e 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -244,7 +244,12 @@ let inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; + else ( + # libcxx >= 13 does not build on gcc9 + if stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10" + then pkgs.gcc10Stdenv + else stdenv + ); }; libcxxabi = callPackage ./libcxxabi { diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index 6388cd65fbf47..fa99e275a6231 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -66,6 +66,14 @@ stdenv.mkDerivation ({ # stripLen = 1; #}) ./gnu-install-dirs.patch + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 0907c89561717..5925fab104fa2 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -64,6 +64,14 @@ stdenv.mkDerivation ({ sha256 = "0fxgrxmfnjx17w3lcq19rk68b2xksh1bynz3ina784kma7hp4wdb"; }) ./gnu-install-dirs.patch + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 4a9b4f5182056..e4410bedf9170 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -68,6 +68,14 @@ in stdenv.mkDerivation ({ sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; }) ./gnu-install-dirs.patch + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 83b779b56d827..8bb2293f81899 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -71,6 +71,14 @@ in stdenv.mkDerivation ({ sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk"; stripLen = 1; }) + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 570795824ee58..f8c474775e48c 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -69,6 +69,14 @@ in stdenv.mkDerivation (rec { sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk"; stripLen = 1; }) + + # Fix invalid std::string(nullptr) for GCC 12 + (fetchpatch { + name = "nvptx-gcc-12.patch"; + url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; + sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 78c2831a2f35f..a775af3031b7f 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -44,6 +44,8 @@ let ]; postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 07d301187a8e2..ed64d9e6a66d8 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.09.27"; + version = "2021.11.24"; # tagged as 0.1, but we'll keep tracking HEAD srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "9d8d3bdbc48133ff7758c9c5293e5904bc6e5ba7"; - sha256 = "sha256-5Axo8qX2+ATqQ170QqfhRwYfCRQLCKBW1kc89x9XljE="; + rev = "fd2d4a8f999947ece42f791e19ddc4c2d8b823f2"; + sha256 = "sha256-bGh3svJeVRJO0rTnSYoTndeQrTENx6j9t+GCGX4RX4k="; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index 1d6776303bf0d..1d6776303bf0d 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix new file mode 100644 index 0000000000000..813702a2fbfd3 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +let + # Details from https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk + # Note that the latest build may differ by platform + dist = { + x86_64-darwin = { + arch = "x64"; + zuluVersion = "17.30.15"; + jdkVersion = "17.0.1"; + sha256 = "sha256-CdZP5XY3O0MUQigRvIQC+7dwAXaCKw4eK/L/imytEOs="; + }; + + aarch64-darwin = { + arch = "aarch64"; + zuluVersion = "17.30.19"; + jdkVersion = "17.0.1"; + sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM="; + }; + }."${stdenv.hostPlatform.system}"; + + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + pname = "zulu${dist.zuluVersion}-ca-jdk"; + version = dist.jdkVersion; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + inherit (dist) sha256; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + + passthru = { + home = jdk; + }; + + meta = import ./meta.nix lib; + }; +in +jdk diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 32c9e6f2290ac..76f13ec689919 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -28,18 +28,8 @@ let # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.40" = ./disable-graphviz-0.40.12.patch; - # NOTE: the openembedded-core project doesn't have a patch for 0.44.1 - # We've reverted the addition of the "--disable-valadoc" option - # and then applied the following patch. - # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch - "0.44" = ./disable-graphviz-0.44.3.patch; - - "0.46" = ./disable-graphviz-0.46.1.patch; - "0.48" = ./disable-graphviz-0.46.1.patch; - "0.50" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; "0.54" = ./disable-graphviz-0.46.1.patch; @@ -113,24 +103,14 @@ in rec { sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7"; }; - vala_0_46 = generic { - version = "0.46.13"; - sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs"; - }; - vala_0_48 = generic { - version = "0.48.19"; - sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; - }; - - vala_0_50 = generic { - version = "0.50.10"; - sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; + version = "0.48.20"; + sha256 = "sha256-RrHIF/dIUfvMOV/E+eoRlQLPh7kzPMllbhzczAvTN24="; }; vala_0_52 = generic { - version = "0.52.7"; - sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o="; + version = "0.52.8"; + sha256 = "sha256-d3t9HLVnFewyJUXQEw5/9Y2eem0b2WtuKX6eYOgRh5M="; }; vala_0_54 = generic { diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch b/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch deleted file mode 100644 index fc971c26492b1..0000000000000 --- a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f70234759..b3d6c3833 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,19 +13,9 @@ SUBDIRS = \ - doc \ - gobject-introspection \ - vapigen \ -- $(NULL) -- --if ENABLE_VALADOC --SUBDIRS += \ - libvaladoc \ - valadoc \ - $(NULL) --endif -- --DISTCHECK_CONFIGURE_FLAGS = \ -- --enable-valadoc \ -- --enable-unversioned \ -- $(NULL) - - if ENABLE_UNVERSIONED - aclocaldir = $(datadir)/aclocal -diff --git a/configure.ac b/configure.ac -index 504db13aa..622397747 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -157,10 +157,11 @@ AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - - AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) --AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) --if test x$enable_valadoc = xyes; then -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then - PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) - AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" - cgraph_tmp_LIBADD="$LIBADD" - cgraph_tmp_CFLAGS="$CFLAGS" - LIBADD="$LIBADD $LIBGVC_LIBS" -@@ -198,8 +199,8 @@ if test x$enable_valadoc = xyes; then - LIBADD="$cgraph_tmp_LIBADD" - CFLAGS="$cgraph_tmp_CFLAGS" - fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") --AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) - AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index d2684a0e0..b343c7c10 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -6,16 +6,11 @@ SUBDIRS = \ - - dist_man_MANS = \ - valac.1 \ -+ valadoc.1 \ - vala-gen-introspect.1 \ - vapigen.1 \ - $(NULL) - --if ENABLE_VALADOC --dist_man_MANS += \ -- valadoc.1 \ -- $(NULL) --endif -- - EXTRA_DIST = \ - valac.h2m \ - valadoc.h2m \ -@@ -24,11 +19,7 @@ EXTRA_DIST = \ - $(NULL) - - if HAVE_HELP2MAN --if ENABLE_VALADOC - manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 --else --manpages: valac.1 vala-gen-introspect.1 vapigen.1 --endif - @rm $^ - $(MAKE) $(AM_MAKEFLAGS) $^ - -@@ -37,13 +28,11 @@ valac.1: - --include $(srcdir)/valac.h2m \ - --libtool --no-info \ - --output=$@ --if ENABLE_VALADOC - valadoc.1: - $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ - --include $(srcdir)/valadoc.h2m \ - --libtool --no-info \ - --output=$@ --endif - vala-gen-introspect.1: - $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ - --include $(srcdir)/vala-gen-introspect.h2m \ -@@ -60,15 +49,12 @@ endif - if ENABLE_UNVERSIONED - install-data-hook: - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 --if ENABLE_VALADOC - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 --endif - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 - endif - - --if ENABLE_VALADOC - COMMON_VALADOCFLAGS = \ - --force \ - --verbose \ -@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen - @touch $@ - - internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc --endif - - clean-local: - rm -rf $(builddir)/internal-apis -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am -index 7456fb836..107338e91 100644 ---- a/libvaladoc/Makefile.am -+++ b/libvaladoc/Makefile.am -@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala -index 46578c28f..f6ce7097c 100644 ---- a/libvaladoc/html/basicdoclet.vala -+++ b/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala -index 5aa4afdea..e79b0b8f5 100644 ---- a/libvaladoc/html/htmlmarkupwriter.vala -+++ b/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public unowned MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public unowned MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 56e0dc3b57d6c..4101f06a3480f 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.10+1"; + version = "0.11+52"; src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "yosys"; - rev = "7a7df9a3b4996b17bb774377483b15de49aa3d9b"; - sha256 = "sha256-gi/Q6loIQ75NTbS9b/Q8sdrl9NGBDae2+AAGHVYB0WI="; + owner = "YosysHQ"; + repo = "yosys"; + rev = "2be110cb0ba645f95f62ee01b6a6fa46a85d5b26"; + hash = "sha256-A1QKu6SbtpJJPF8/LA5SMUP3/+n5giM6rOYdc6vkl90="; }; enableParallelBuilding = true; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 253b710048d48..9757b3e43c8ba 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -106,6 +106,15 @@ compcert.overrideAttrs (o: }) ]; } + { cases = [ (isEq "8.14") "3.10" ]; + out = [ + # Support for Coq 8.14.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch"; + sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94"; + }) + ]; + } ] []; } ) diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index d738041d5d233..127d630752fe2 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,12 +6,13 @@ with lib; mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.12" "8.13"; out = "8.12"; } + { case = range "8.12" "8.14"; out = "8.14.1"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } ] null; + release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7"; release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; release."8.8".sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index e6d5e11fcc5f5..f563d1728744c 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = switch coq.coq-version [ { case = "8.14"; out = "1.3-8.14"; } - { case = "8.13"; out = "1.2.4+coq8.13"; } + { case = "8.13"; out = "1.3-8.13"; } { case = "8.12"; out = "1.2.4+coq8.12"; } { case = "8.11"; out = "1.2.4+coq8.11"; } { case = "8.10"; out = "1.2.1+coq8.10-2"; } @@ -44,6 +44,8 @@ with lib; mkCoqDerivation { release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; + release."1.3-8.13".rev = "v1.3-8.13"; + release."1.3-8.13".sha256 = "1jwjbkkkk4bwf6pz4zzz8fy5bb17aqyf4smkja59rgj9ya6nrdhg"; release."1.3-8.14".rev = "v1.3-8.14"; release."1.3-8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv"; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index f70cdcc9322a5..301e5975c5763 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -28,7 +28,6 @@ in inherit version release; defaultVersion = with versions; switch coq.version [ - { case = isEq "8.14"; out = "8.14+rc1+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.11"; out = "8.11.0+0.11.1"; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 87d1cef585707..3fee8b0e07fad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -54,6 +54,10 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # We can remove this once fakedata version gets to 1.0.1 as the test suite + # works fine there. + fakedata = dontCheck super.fakedata; + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -1338,7 +1342,7 @@ self: super: { graphql-engine = overrideCabal (drv: { patches = [ ./patches/graphql-engine-mapkeys.patch ]; doHaddock = false; - version = "2.0.9"; + version = "2.0.10"; }) (super.graphql-engine.overrideScope (self: super: { immortal = self.immortal_0_2_2_1; resource-pool = self.hasura-resource-pool; @@ -2110,9 +2114,7 @@ EOT brick = self.brick_0_64_2; }; - # Needs matching xmonad version - xmonad-contrib_0_17_0 = super.xmonad-contrib_0_17_0.override { - xmonad = self.xmonad_0_17_0; - }; + # build newer version for `pkgs.shellcheck` + ShellCheck_0_8_0 = doDistribute super.ShellCheck_0_8_0; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index fd16757e52227..15e7b1ca03584 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1352,7 +1352,6 @@ broken-packages: - fadno-braids - failable-list - failure-detector - - fakedata - fake-type - faktory - f-algebra-gen diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 454e9eecb5e45..2da294cb523b1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1084,7 +1084,6 @@ dont-distribute-packages: - extract-dependencies - extrapolate - factual-api - - fakedata-quickcheck - falling-turnip - fallingblocks - family-tree @@ -1514,7 +1513,6 @@ dont-distribute-packages: - heavy-logger-instances - hecc - hedgehog-checkers-lens - - hedgehog-fakedata - hedgehog-gen-json - hedis-pile - heist-aeson diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0dff5a18fa652..df3c42b5de3ee 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -223,6 +223,17 @@ self: super: builtins.intersectAttrs super { # Nix-specific workaround xmonad = appendPatch ./patches/xmonad-nix.patch (dontCheck super.xmonad); + xmonad_0_17_0 = doDistribute (appendPatch ./patches/xmonad_0_17_0-nix.patch (super.xmonad_0_17_0)); + + # Need matching xmonad version + xmonad-contrib_0_17_0 = doDistribute (super.xmonad-contrib_0_17_0.override { + xmonad = self.xmonad_0_17_0; + }); + + xmonad-extras_0_17_0 = doDistribute (super.xmonad-extras_0_17_0.override { + xmonad = self.xmonad_0_17_0; + xmonad-contrib = self.xmonad-contrib_0_17_0; + }); # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw @@ -1012,4 +1023,15 @@ self: super: builtins.intersectAttrs super { fi '' + (drv.postConfigure or ""); }) super.procex; + + # Apply a patch which hardcodes the store path of graphviz instead of using + # whatever graphviz is in PATH. + graphviz = overrideCabal (drv: { + patches = [ + (pkgs.substituteAll { + src = ./patches/graphviz-hardcode-graphviz-store-path.patch; + inherit (pkgs) graphviz; + }) + ] ++ (drv.patches or []); + }) super.graphviz; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8eed7e083d60d..6b8cc59e479e5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -91106,8 +91106,6 @@ self: { ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fakedata_1_0_1" = callPackage @@ -91144,7 +91142,6 @@ self: { description = "Library for producing fake data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fakedata-parser" = callPackage @@ -91172,7 +91169,6 @@ self: { ]; description = "Fake a -> Gen a"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "fakefs" = callPackage @@ -128890,7 +128886,6 @@ self: { testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedgehog-fn" = callPackage diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index d84c804272dbe..f19b6241f267c 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -121,7 +121,10 @@ rec { /* doDistribute enables the distribution of binaries for the package via hydra. */ - doDistribute = overrideCabal (drv: { hydraPlatforms = drv.platforms or ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }); + doDistribute = overrideCabal (drv: { + # lib.platforms.all is the default value for platforms (since GHC can cross-compile) + hydraPlatforms = drv.platforms or lib.platforms.all; + }); /* dontDistribute disables the distribution of binaries for the package via hydra. */ diff --git a/pkgs/development/haskell-modules/patches/graphviz-hardcode-graphviz-store-path.patch b/pkgs/development/haskell-modules/patches/graphviz-hardcode-graphviz-store-path.patch new file mode 100644 index 0000000000000..f0331e3a2b60b --- /dev/null +++ b/pkgs/development/haskell-modules/patches/graphviz-hardcode-graphviz-store-path.patch @@ -0,0 +1,40 @@ +diff --git a/Data/GraphViz/Commands.hs b/Data/GraphViz/Commands.hs +index 20e7dbe..514c29d 100644 +--- a/Data/GraphViz/Commands.hs ++++ b/Data/GraphViz/Commands.hs +@@ -63,14 +63,14 @@ import System.IO (Handle, hPutStrLn, hSetBinaryMode, stderr) + -- ----------------------------------------------------------------------------- + + showCmd :: GraphvizCommand -> String +-showCmd Dot = "dot" +-showCmd Neato = "neato" +-showCmd TwoPi = "twopi" +-showCmd Circo = "circo" +-showCmd Fdp = "fdp" +-showCmd Sfdp = "sfdp" +-showCmd Osage = "osage" +-showCmd Patchwork = "patchwork" ++showCmd Dot = "@graphviz@/bin/dot" ++showCmd Neato = "@graphviz@/bin/neato" ++showCmd TwoPi = "@graphviz@/bin/twopi" ++showCmd Circo = "@graphviz@/bin/circo" ++showCmd Fdp = "@graphviz@/bin/fdp" ++showCmd Sfdp = "@graphviz@/bin/sfdp" ++showCmd Osage = "@graphviz@/bin/osage" ++showCmd Patchwork = "@graphviz@/bin/patchwork" + + -- | The default command for directed graphs. + dirCommand :: GraphvizCommand +@@ -312,8 +312,11 @@ runGraphvizCanvas' d = runGraphvizCanvas (commandFor d) d + + -- | Is the Graphviz suite of tools installed? This is determined by + -- whether @dot@ is available in the @PATH@. ++-- ++-- Note: With nixpkgs, this will always return 'True' as graphviz' ++-- store paths are hardcoded instead of looking at @PATH@. + isGraphvizInstalled :: IO Bool +-isGraphvizInstalled = liftM isJust . findExecutable $ showCmd Dot ++isGraphvizInstalled = pure True -- :) + + -- | If Graphviz does not seem to be available, print the provided + -- error message and then exit fatally. diff --git a/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch b/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch new file mode 100644 index 0000000000000..e313aed69063a --- /dev/null +++ b/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch @@ -0,0 +1,34 @@ +diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs +index 46a0939..92af53d 100644 +--- a/src/XMonad/Core.hs ++++ b/src/XMonad/Core.hs +@@ -46,6 +46,7 @@ import Data.Traversable (for) + import Data.Time.Clock (UTCTime) + import Data.Default.Class + import Data.List (isInfixOf) ++import System.Environment (lookupEnv) + import System.FilePath + import System.IO + import System.Info +@@ -458,7 +459,8 @@ xfork x = io . forkProcess . finally nullStdin $ do + -- | Use @xmessage@ to show information to the user. + xmessage :: MonadIO m => String -> m () + xmessage msg = void . xfork $ do +- executeFile "xmessage" True ++ xmessageBin <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") ++ executeFile xmessageBin True + [ "-default", "okay" + , "-xrm", "*international:true" + , "-xrm", "*fontSet:-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-fixed-*-*-*-*-18-*-*-*-*-*-*-*,-*-*-*-*-*-*-18-*-*-*-*-*-*-*" +@@ -654,8 +656,9 @@ compile dirs method = + bracket (openFile (errFileName dirs) WriteMode) hClose $ \err -> do + let run = runProc (cfgDir dirs) err + case method of +- CompileGhc -> +- run "ghc" ghcArgs ++ CompileGhc -> do ++ ghc <- fromMaybe "ghc" <$> (lookupEnv "NIX_GHC") ++ run ghc ghcArgs + CompileStackGhc stackYaml -> + run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&. + run "stack" ("ghc" : "--stack-yaml" : stackYaml : "--" : ghcArgs) diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/development/interpreters/asmrepl/Gemfile new file mode 100644 index 0000000000000..0b617ffb90b2c --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'asmrepl' +end diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/development/interpreters/asmrepl/Gemfile.lock new file mode 100644 index 0000000000000..f845e91b6c90f --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/Gemfile.lock @@ -0,0 +1,18 @@ +GEM + specs: + +GEM + remote: https://rubygems.org/ + specs: + asmrepl (1.0.3) + fisk (~> 2) + fisk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + asmrepl! + +BUNDLED WITH + 2.2.24 diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/development/interpreters/asmrepl/default.nix new file mode 100644 index 0000000000000..a046a3c601758 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "asmrepl"; + gemdir = ./.; + exes = [ "asmrepl" ]; + + passthru.updateScript = bundlerUpdateScript "asmrepl"; + + meta = with lib; { + description = "A REPL for x86-64 assembly language"; + homepage = "https://github.com/tenderlove/asmrepl"; + license = licenses.asl20; + maintainers = with maintainers; [ lom ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/development/interpreters/asmrepl/gemset.nix new file mode 100644 index 0000000000000..a7af8d50c6859 --- /dev/null +++ b/pkgs/development/interpreters/asmrepl/gemset.nix @@ -0,0 +1,23 @@ +{ + asmrepl = { + dependencies = ["fisk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10d0zvkhk3ja48vvx28hfsqfrzfl66vdpmk3gcgb5viy174c72v6"; + type = "gem"; + }; + version = "1.0.3"; + }; + fisk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mq2a7hjs9xfg514ci0xw90c33rzq1y58ywpnmhp7w767ll6wldd"; + type = "gem"; + }; + version = "2.3.0"; + }; +} diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 3b7f611f2c9b4..7b1080fb0f8a6 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.6.7"; + version = "0.6.8"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-e5Mq2fPYqsPEENVGO+gBz9K79KcKOykdDtItjcXU/DI="; + sha256 = "sha256-GIJXXWJZ77n2FBOLKqRSlueo63JMxo0a49dDhneO6oo="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 81200a94aae9c..97cae4089256c 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE="; + sha256 = "sha256-sD/eykXoeJq43o3xyFx2VIoH+xZrMmb6vZKVt4CO7B4="; }; - cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs="; + cargoSha256 = "sha256-eySdhzavm9NGv2xjgdq/C2iv6lxdulhgYNs9ehnSzKQ="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index de0c927567d14..cf4339c69ac49 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,33 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }: +{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv }: rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; + sha256 = "sha256-+4014p+4QJ7nytFHHszAOYQHXLYXqR+Cip+vHxsH9l8="; }; - cargoPatches = [ - # NOTE: remove on next update - # update dependencies to resolve incompatibility with rust 1.56 - (fetchpatch { - name = "update-wasmtime.patch"; - url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch"; - sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k="; - }) - ]; - - cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM="; + cargoSha256 = "sha256-RnaAiumTP4cW2eHUbnwyPdgJQLK65gqDI/NP2SOrO4E="; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "An Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; + changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/RELEASES.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; broken = stdenv.isDarwin; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix deleted file mode 100644 index fe51d154956a1..0000000000000 --- a/pkgs/development/interpreters/lush/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL -, blas, libbfd, intltool, gettext, zlib, libSM}: - -stdenv.mkDerivation rec { - baseName = "lush"; - version = "2.0.1"; - name = "${baseName}-${version}"; - - src = fetchurl { - url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; - sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; - }; - - buildInputs = [ - libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd - intltool gettext zlib - ]; - - hardeningDisable = [ "pic" ]; - - NIX_LDFLAGS=" -lz "; - - meta = { - description = "Lisp Universal SHell"; - license = lib.licenses.gpl2Plus ; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream deleted file mode 100644 index 8a8b08fcd68ab..0000000000000 --- a/pkgs/development/interpreters/lush/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/lush/files/lush2/ -version_link '[.]tar[.]gz/download$' -SF_redirect -minimize_overwrite diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b6010cf32d101..7ab397bfc191b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -252,18 +252,18 @@ let in { ruby_2_7 = generic { - version = rubyVersion "2" "7" "4" ""; + version = rubyVersion "2" "7" "5" ""; sha256 = { - src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"; - git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p"; + src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97"; + git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh"; }; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "2" ""; + version = rubyVersion "3" "0" "3" ""; sha256 = { - src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah"; - git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r"; + src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im"; + git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3ea358c349a34..31a9a9f1c08db 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,12 +1,12 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.4" = ops useRailsExpress [ + "2.7.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.2" = ops useRailsExpress [ + "3.0.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fdc8f7c21f181..6358df1a555cd 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; + maintainers = with maintainers; [ hjones2199 ]; }; preConfigure = optionalString useMpi '' diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index bdfd00009dc5d..ecf9793b91f6c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -1,16 +1,16 @@ findGdkPixbufLoaders() { - # choose the longest loaders.cache - local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" - if [[ -f "$loadersCache" ]]; then - if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then - if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then - export GDK_PIXBUF_MODULE_FILE="$loadersCache" - fi - else - export GDK_PIXBUF_MODULE_FILE="$loadersCache" - fi - fi + # choose the longest loaders.cache + local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + if [[ -f "$loadersCache" ]]; then + if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then + if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then + export GDK_PIXBUF_MODULE_FILE="$loadersCache" + fi + else + export GDK_PIXBUF_MODULE_FILE="$loadersCache" + fi + fi } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index ce870581f5e94..50e26b4c1327a 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, m4, cxx ? true }: let self = stdenv.mkDerivation rec { - name = "gmp-4.3.2"; + pname = "gmp"; + version = "4.3.2"; src = fetchurl { - url = "mirror://gnu/gmp/${name}.tar.bz2"; + url = "mirror://gnu/gmp/gmp-${version}.tar.bz2"; sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; }; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index ea6a7ee42310a..aa3704eb0b58c 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -6,10 +6,11 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - name = "gmp-5.1.3"; + pname = "gmp"; + version = "5.1.3"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ]; sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m"; }; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 6228b6aaab9e4..59bc98aa559f2 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -12,10 +12,11 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - name = "gmp-6.2.1"; + pname = "gmp"; + version = "6.2.1"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ]; sha256 = "0z2ddfiwgi0xbf65z4fg4hqqzlhv0cc6hdcswf3c6n21xdmk5sga"; }; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ace18afdeed8d..0d39abe1ac3ca 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -51,8 +51,10 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = - lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" - ++ [ + lib.optionals stdenv.isLinux [ + "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + "--with-default-trust-store-pkcs11=pkcs11:" + ] ++ [ "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index ffe85538684d3..59bfb4492783a 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/googletest"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; + maintainers = with maintainers; [ ivan-tkatchev ]; }; } diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 506a626e7c869..187e2cf908e21 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation { patchShebangs utils/ ''; + strictDeps = true; + buildInputs = [ # IPA and signing gnutls - openssl boost # gstreamer integration @@ -46,6 +47,8 @@ stdenv.mkDerivation { # lttng tracing lttng-ust + + gtest ]; nativeBuildInputs = [ @@ -57,9 +60,9 @@ stdenv.mkDerivation { python3Packages.pyyaml python3Packages.ply python3Packages.sphinx - gtest graphviz doxygen + openssl ]; mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 81d033f136d11..e418e3a4e9339 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-T49E9pGetJqO5qj014efioZtlHM9ZAxH9WzwVmk85XM="; + hash = "sha256-yW6MXDb7kiI24akJrEPHeb4bI8jEldBcPYx+5+dwJR0="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jAL8siaMonTMYE88kK7E6RQesPahCLr082dHJovmoo0="; + hash = "sha256-76TraZCJhppPhkdQfAf1XqOoK7RS+VoYIp2keTn4es4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 666135f91bb98..63015fdf6cb36 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,10 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages -, autoreconfHook, pkg-config, gettext +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, autoreconfHook +, pkg-config +, gettext , libusb1 , libtool , libexif , libgphoto2 , libjpeg +, curl +, libxml2 +, gd }: stdenv.mkDerivation rec { @@ -24,12 +32,16 @@ stdenv.mkDerivation rec { autoreconfHook gettext libtool + pkg-config ]; buildInputs = [ libjpeg libtool # for libltdl libusb1 + curl + libxml2 + gd ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. @@ -37,17 +49,20 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postInstall = let - executablePrefix = if stdenv.buildPlatform == stdenv.hostPlatform then - "$out" - else - buildPackages.libgphoto2; - in '' - mkdir -p $out/lib/udev/rules.d - ${executablePrefix}/lib/libgphoto2/print-camera-list \ - udev-rules version 175 group camera \ - >$out/lib/udev/rules.d/40-gphoto2.rules - ''; + postInstall = + let + executablePrefix = + if stdenv.buildPlatform == stdenv.hostPlatform then + "$out" + else + buildPackages.libgphoto2; + in + '' + mkdir -p $out/lib/udev/rules.d + ${executablePrefix}/lib/libgphoto2/print-camera-list \ + udev-rules version 175 group camera \ + >$out/lib/udev/rules.d/40-gphoto2.rules + ''; meta = { homepage = "http://www.gphoto.org/proj/libgphoto2/"; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 4ac20cf29cb4a..aadc3d92b597f 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libnetfilter_log"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; - sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; + sha256 = "1spy9xs41v76kid5ana8n126f3mvgq6fjibbfbj4kn0larbhix73"; }; buildInputs = [ libmnl ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 276ee52ed54d9..2c351181ee22b 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "1xblq1cbcxhr6qmjpy98i1qdza148idgz99vbhjc7s4vzvfizc4h"; + sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m"; }; nativeBuildInputs = [ pkg-config ]; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz ajs124 ]; }; } diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/development/libraries/libudev-zero/default.nix new file mode 100644 index 0000000000000..9b154f34205e6 --- /dev/null +++ b/pkgs/development/libraries/libudev-zero/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "libudev-zero"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "illiliti"; + repo = "libudev-zero"; + rev = version; + sha256 = "0mln7iwyz7lxz8dx7bx7b47j6yws1dvfq35qsdcwg3wwmd4ngsz6"; + }; + + patches = [ + # Fix static. + # https://github.com/illiliti/libudev-zero/pull/48 + (fetchpatch { + url = "https://github.com/illiliti/libudev-zero/commit/505c61819b371a1802e054fe2601e64f2dc6d79e.patch"; + sha256 = "0y06rgjv73dd7fi3a0dlabcc8ryk3yhbsyrrhnnn3v36y1wz6m0g"; + }) + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + # Just let the installPhase build stuff, because there's no + # non-install target that builds everything anyway. + dontBuild = true; + + installTargets = lib.optionals stdenv.hostPlatform.isStatic "install-static"; + + meta = with lib; { + homepage = "https://github.com/illiliti/libudev-zero"; + description = "Daemonless replacement for libudev"; + maintainers = with maintainers; [ qyliss shamilton ]; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 90ea1947cb54c..cd615ed81fe97 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20210917"; + version = "20211114"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-bwMgNK3DhhWjijush27265Q1UoZOw7T17fKsaR6IV14="; + sha256 = "sha256-izxG2mx+D83s78eL19ERUaLrw9FPjlJRcFZw3+xzLDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 046d630888c45..5ed5ef1fc3732 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" + # needed for tests to link + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" @@ -27,10 +29,6 @@ stdenv.mkDerivation rec { "-DDISABLE_LXC=0" ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd) - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix new file mode 100644 index 0000000000000..098336dfbd126 --- /dev/null +++ b/pkgs/development/libraries/lzlib/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, texinfo }: + +stdenv.mkDerivation rec { + pname = "lzlib"; + version = "1.10"; + outputs = [ "out" "info" ]; + + nativeBuildInputs = [ texinfo ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-HWq3gApbQ+Vv0gYH/Sz9qeVQNQ3JX1vrakzhT4W0EEM="; + }; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 05935e65ea04e..a5d41d48629f7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.2.5"; + version = "21.2.6"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fxcdf4qs4vmyjcns7jv62w4jy3gr383ar5b7mr77nb0nxgmhjcf"; + sha256 = "0m69h3f9fr66h6xjxfc485zfdci6kl8j24ab0kx5k23f7kcj4zhy"; }; # TODO: diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ad212e1b1d78f..4a69ad54c4e49 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.72"; + version = "3.73"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "bqYKn/ET5JPqKrJfQep1qfvRCveQPyb3A9rIaAcy0C4="; + sha256 = "1rfqjq02rfv0ycdmvic51pi093rg33zb8kpqkvddf44vv9l3lvan"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix new file mode 100644 index 0000000000000..e9b0b95d1af80 --- /dev/null +++ b/pkgs/development/libraries/okapi/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, rustPlatform, fetchurl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "okapi"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; + sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k="; + }; + + cargoVendorDir = "vendor"; + doCheck = false; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + cp -r include $out + ''; + + meta = with lib; { + description = "Okapi Library"; + longDescription = '' + Collection of tools that support workflows for working + with authentic data and identity management + ''; + homepage = "https://github.com/trinsic-id/okapi"; + license = licenses.asl20; + maintainers = with maintainers; [ tmarkovski ]; + }; +} diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 4ddc01ee6b2bf..34a3788d78602 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--with-trust-paths=/etc/ssl/trust-source:/etc/ssl/certs/ca-certificates.crt" + "--with-trust-paths=${lib.concatStringsSep ":" [ + "/etc/ssl/trust-source" # p11-kit trust source + "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... + "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + ]}" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index 92c225f90ccdf..6e263dcebfde7 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -7,7 +7,7 @@ set -xe BASE_URL="https://lhapdfsets.web.cern.ch/lhapdfsets/current/" for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -e "s/.*<a href=\"\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | sort -u`; do - echo -n " \"${pdf_set%.tar.gz}\" = \"" - nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' - echo "\";" + echo -n " \"${pdf_set%.tar.gz}\" = \"" + nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' + echo "\";" done diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index f8159417378c0..9bd57e7ae97ba 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; }; + patches = [ + # Pull upstream fix for gcc-11 + (fetchurl { + url = "https://github.com/KDE/qca/commit/32275f1a74c161d2fed8c056b2dd9555687a22f2.patch"; + sha256 = "sha256-SUH2eyzP2vH/ZjYcX8ybwiqhoTm/QjuEpTKjb2iH1No="; + }) + ]; + buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index e38c384009c9a..9f9545e52f3b1 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = licenses.mit; - maintainers = [ maintainers.xbreak ]; + maintainers = with maintainers; [ xbreak hjones2199 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 3c7e91e81886b..e820d80e7a4ea 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -1,12 +1,12 @@ addSlibPath () { if test -f "$1/lib/slib/slibcat" then - export SCHEME_LIBRARY_PATH="$1/lib/slib/" - echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'" + export SCHEME_LIBRARY_PATH="$1/lib/slib/" + echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'" - # This is needed so that `(load-from-path "slib/guile.init")' works. - export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH" - echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'" + # This is needed so that `(load-from-path "slib/guile.init")' works. + export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH" + echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'" fi } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 71209295b9fdb..797db5b69b0c3 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch"; sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al"; }) + # Re-enable RTTI, without which other applications can't subclass + # snappy::Source (this breaks Ceph, as one example) + # https://tracker.ceph.com/issues/53060 + # https://build.opensuse.org/package/show/openSUSE:Factory/snappy + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; + sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; + }) ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index ec20f68b6f48c..862547043ed8c 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchurl , fetchFromGitHub -, fetchpatch , ncurses , python3 , cunit @@ -24,6 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg="; }; + patches = [ + # Backport of upstream patch for ncurses-6.3 support. + # Will be in next release after 21.10. + ./ncurses-6.3.patch + ]; + nativeBuildInputs = [ python3 ]; @@ -36,6 +41,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; + enableParallelBuilding = true; + configureFlags = [ "--with-dpdk=${dpdk}" ]; NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. diff --git a/pkgs/development/libraries/spdk/ncurses-6.3.patch b/pkgs/development/libraries/spdk/ncurses-6.3.patch new file mode 100644 index 0000000000000..174c9b6435ef3 --- /dev/null +++ b/pkgs/development/libraries/spdk/ncurses-6.3.patch @@ -0,0 +1,48 @@ +Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300 +--- a/app/spdk_top/spdk_top.c ++++ b/app/spdk_top/spdk_top.c +@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali +- mvwprintw(win, row, col, tmp_str); ++ mvwprintw(win, row, col, "%s", tmp_str); +@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64, ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d", +@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); +@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); +@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); +@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); +@@ -2111 +2111 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time); ++ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time); +@@ -2118 +2118 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time); ++ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time); +@@ -2124 +2124 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); ++ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); +@@ -2137 +2137 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); ++ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); +@@ -2214 +2214 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, ++ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s", +@@ -2216 +2216 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name); ++ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name); +@@ -2231 +2231 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period); ++ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period); +@@ -2264 +2264 @@ print_bottom_error_message(char *msg) +- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg); ++ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg); +@@ -2434 +2434 @@ show_stats(pthread_t *data_thread) +- mvprintw(g_max_row - 1, 1, current_page_str); ++ mvprintw(g_max_row - 1, 1, "%s", current_page_str); diff --git a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch b/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch deleted file mode 100644 index 9cc6d89ce50e9..0000000000000 --- a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch +++ /dev/null @@ -1,17 +0,0 @@ -1. dpdk built with meson generates rte_build_config.h rather than rte_config.h. -2. dpdk configured with libbsd requires that dependents link with libbsd. - ---- a/lib/env_dpdk/env.mk -+++ b/lib/env_dpdk/env.mk -@@ -140,6 +140,9 @@ endif - --ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h)) --ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h)) -+ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_build_config.h)) -+ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_build_config.h)) - ENV_LINKER_ARGS += -lnuma - endif -+ifneq (,$(shell grep -e "define RTE_USE_LIBBSD 1" $(DPDK_INC_DIR)/rte_build_config.h)) -+ENV_LINKER_ARGS += -lbsd -+endif - endif diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 828920c5acccc..d6fec46b449ea 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -18,59 +18,59 @@ fi export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" declare -a NIX_LISP_FINAL_PARAMETERS; case "$NIX_LISP" in - sbcl) - NIX_LISP_LOAD_FILE="--load" - NIX_LISP_EXEC_CODE="--eval" + sbcl) + NIX_LISP_LOAD_FILE="--load" + NIX_LISP_EXEC_CODE="--eval" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='--non-interactive' - NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FINAL_PARAMETERS= NIX_LISP_FASL_TYPE="fasl" - ;; - ecl) - NIX_LISP_LOAD_FILE="-load" - NIX_LISP_EXEC_CODE="-eval" + ;; + ecl) + NIX_LISP_LOAD_FILE="-load" + NIX_LISP_EXEC_CODE="-eval" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='--nodebug' - NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FINAL_PARAMETERS= NIX_LISP_FASL_TYPE="fas" - ;; - clisp) - NIX_LISP_LOAD_FILE="-c -l" - NIX_LISP_EXEC_CODE="-x" + ;; + clisp) + NIX_LISP_LOAD_FILE="-c -l" + NIX_LISP_EXEC_CODE="-x" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='-on-error exit' - NIX_LISP_FINAL_PARAMETERS="-repl" + NIX_LISP_FINAL_PARAMETERS="-repl" NIX_LISP_FASL_TYPE="fas" - ;; - lx86cl64) - NIX_LISP_LOAD_FILE="-l" - NIX_LISP_EXEC_CODE="-e" + ;; + lx86cl64) + NIX_LISP_LOAD_FILE="-l" + NIX_LISP_EXEC_CODE="-e" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='-b' - NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FINAL_PARAMETERS= NIX_LISP_FASL_TYPE="lx64fsl" - ;; - lx86cl) - NIX_LISP_LOAD_FILE="-l" - NIX_LISP_EXEC_CODE="-e" + ;; + lx86cl) + NIX_LISP_LOAD_FILE="-l" + NIX_LISP_EXEC_CODE="-e" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='-b' - NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FINAL_PARAMETERS= NIX_LISP_FASL_TYPE="lx32fsl" - ;; - abcl) - NIX_LISP_LOAD_FILE="--load" - NIX_LISP_EXEC_CODE="--eval" + ;; + abcl) + NIX_LISP_LOAD_FILE="--load" + NIX_LISP_EXEC_CODE="--eval" NIX_LISP_QUIT="(quit)" NIX_LISP_NODEBUG='' - NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FINAL_PARAMETERS= NIX_LISP_FASL_TYPE="abcl" - ;; + ;; esac NIX_LISP_ASDF_REGISTRY_CODE=" @@ -127,8 +127,8 @@ eval "$NIX_LISP_PRELAUNCH_HOOK" if [ -z "$NIX_LISP_SKIP_CODE" ]; then "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ - $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ - $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ - ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ - "$@" + $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ + $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ + ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ + "$@" fi diff --git a/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh b/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh index 6c240d15c76e3..bdb5981bf4fb3 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/asdf-description.sh @@ -11,6 +11,6 @@ name="$1" sbcl --noinform --load "$NIX_QUICKLISP_DIR"/setup.lisp --eval "(ql:quickload :$name)" \ - --eval "(format t \"~a~%\" (or (asdf::system-description (asdf::find-system \"$name\")) \"\"))" \ - --eval '(quit)' --script | + --eval "(format t \"~a~%\" (or (asdf::system-description (asdf::find-system \"$name\")) \"\"))" \ + --eval '(quit)' --script | tee /dev/stderr | tail -n 1 diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index d2d846b78f2bb..f8bae8997272c 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -122,8 +122,8 @@ url="${ql_src##* }" with (import <nixpkgs> {}); fetchdarcs { url=''$url''; - rev=''$version''; - sha256=''0000000000000000000000000000000000000000000000000000000000000000''; + rev=''$version''; + sha256=''0000000000000000000000000000000000000000000000000000000000000000''; }" | nix-instantiate - | tail -n 1 | xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 | sed -e 's/.* instead has .//;s/[^0-9a-z].*//') @@ -149,7 +149,7 @@ url="${ql_src##* }" } if [ "$ql_src" = '{"error":"Not Found"}' ]; then - echo "# $name: not found" + echo "# $name: not found" else cat << EOF | grep -Ev '^[ ]+$' diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix index ba9d1d5bf9f46..d5d8e693ab41a 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -32,8 +32,8 @@ mkDerivation { version = "1.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "0ky23f700pmzb6anx44xzh6dixixmn7kq1ypj0yy4kqiqzqdb2dg"; - rev = "7c35ffb36561214390d0d545d418746f29a29ba4"; + sha256 = "04ns40wk1760pxi18pyqzgrk8h28mw6402zkjc1g52ny6afchs05"; + rev = "8be851c2a1326b2caada13a3c43becd2e848db6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0bf6a87b513e7..b964da3cd3fe0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -2,6 +2,7 @@ "@angular/cli" , "@antora/cli" , "@antora/site-generator-default" +, "@astrojs/language-server" , "@bitwarden/cli" , "@commitlint/cli" , "@commitlint/config-conventional" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 15354da9127ed..bd18e97f1a6d5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -634,13 +634,13 @@ let sha512 = "eFUU2RHkgMW0X1lHVVOWJYlaDTwCX2LduQQLfehAfID5VhAjNnBhGZ/r0zk3FSQfFn6enJ2aXyRCiZ829bYVeA=="; }; }; - "@babel/parser-7.13.13" = { + "@babel/parser-7.16.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.13"; + version = "7.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz"; - sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz"; + sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; }; }; "@babel/parser-7.16.4" = { @@ -1507,15 +1507,6 @@ let sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; }; }; - "@babel/types-7.13.12" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz"; - sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; - }; - }; "@babel/types-7.16.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -6430,6 +6421,15 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; + "@ts-morph/common-0.11.1" = { + name = "_at_ts-morph_slash_common"; + packageName = "@ts-morph/common"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ts-morph/common/-/common-0.11.1.tgz"; + sha512 = "7hWZS0NRpEsNV8vWJzg7FEz6V8MaLNeJOmwmghqUXTpzk16V1LLZhdo+4QvE/+zv4cVci0OviuJFnqhEfoV3+g=="; + }; + }; "@turist/fetch-7.1.7" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; @@ -12424,13 +12424,13 @@ let sha512 = "dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg=="; }; }; - "babel-plugin-styled-components-2.0.1" = { + "babel-plugin-styled-components-2.0.2" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.1.tgz"; - sha512 = "U3wmORxerYBiqcRCo6thItIosEIga3F+ph0jJPkiOZJjyhpZyUZFQV9XvrZ2CbBIihJ3rDBC/itQ+Wx3VHMauw=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz"; + sha512 = "7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -13504,13 +13504,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bipf-1.5.3" = { + "bipf-1.5.4" = { name = "bipf"; packageName = "bipf"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/bipf/-/bipf-1.5.3.tgz"; - sha512 = "ocfAogBEeS1kb/mpPGnWR0hXKRmQdZ7sCGthVu42lfjXlud5K0LYKuTD9RAWu8qrTCq8TRIjJaK7jYwFbm/vOA=="; + url = "https://registry.npmjs.org/bipf/-/bipf-1.5.4.tgz"; + sha512 = "/bQfGxhC9D0plJPFamZBL5d4q41d/lh1g+uFglrO5TA09ka/BE3oDE2YAZSPYzqdeq4LyM6uKJaGPhd6athgYg=="; }; }; "bit-field-1.5.3" = { @@ -13549,6 +13549,15 @@ let sha512 = "KYx81rVE4LDbZcHfE375NCX4CDeZuz7HECZm/KAmqKMY2jpD3ZcUnI7Fm+QX5EMF/xmtzzfrNL/BNxo8o0iOQg=="; }; }; + "bitcoinjs-lib-6.0.1" = { + name = "bitcoinjs-lib"; + packageName = "bitcoinjs-lib"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.1.tgz"; + sha512 = "x/7D4jDj/MMkmO6t3p2CSDXTqpwZ/jRsRiJDmaiXabrR9XRo7jwby8HRn7EyK1h24rKFFI7vI0ay4czl6bDOZQ=="; + }; + }; "bitfield-0.1.0" = { name = "bitfield"; packageName = "bitfield"; @@ -15818,22 +15827,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.44" = { + "cdk8s-1.1.47" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.44"; + version = "1.1.47"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.44.tgz"; - sha512 = "VrUKxNd646yb2K3OZRAodofVr+H938/dRT+cVWKAWDS1LL/mXYn44Ucmfn5TYHeBBzYnPoOvHEY2MZu81jXvQQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.47.tgz"; + sha512 = "gKIjIJ/VUuR3IAwgAWd14h+HDKt1kgrwjQAKutxHfVcAo/3GCKoOaTpaR7IBvV82Y5DWsqePAdZr1vXOYMiAng=="; }; }; - "cdk8s-plus-22-1.0.0-beta.50" = { + "cdk8s-plus-22-1.0.0-beta.53" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.50"; + version = "1.0.0-beta.53"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.50.tgz"; - sha512 = "ImMIKLWdirqD8U4bOLI/wO4tjhp19vWIZS/hii7y6WTwRuBVbt+2KW4VrT1QqXBhswCMJS7fTH2h9AmSJtcjfw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.53.tgz"; + sha512 = "ljeSvdbzr+vcfZOPUXvxhwZ8ZvvlO6Y25XFGzmraPYeZNcDb+LkCpCj2tV1l6ziIuMs/rAtakGYlkx2FJVekUw=="; }; }; "cdktf-0.7.0" = { @@ -15854,15 +15863,6 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "cert-info-1.5.1" = { - name = "cert-info"; - packageName = "cert-info"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cert-info/-/cert-info-1.5.1.tgz"; - sha512 = "eoQC/yAgW3gKTKxjzyClvi+UzuY97YCjcl+lSqbsGIy7HeGaWxCPOQFivhUYm27hgsBMhsJJFya3kGvK6PMIcQ=="; - }; - }; "chacha20-universal-1.0.4" = { name = "chacha20-universal"; packageName = "chacha20-universal"; @@ -17411,6 +17411,15 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; + "code-block-writer-10.1.1" = { + name = "code-block-writer"; + packageName = "code-block-writer"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/code-block-writer/-/code-block-writer-10.1.1.tgz"; + sha512 = "67ueh2IRGst/51p0n6FvPrnRjAGHY5F8xdjkgrYE7DDzpJe6qA07RYQ9VcoUeo5ATOjSOiWpSL3SWBRRbempMw=="; + }; + }; "code-excerpt-3.0.0" = { name = "code-excerpt"; packageName = "code-excerpt"; @@ -20103,13 +20112,13 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "csv-parse-4.16.3" = { + "csv-parse-5.0.3" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.16.3"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz"; - sha512 = "cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.0.3.tgz"; + sha512 = "86R0WU4aEEF/1fPZKxP3NmDAYC4Ce1t9iFgKPZogG5Lvk4m9WZQkCEsDANktG29jppejwclTtEOzubN2ieCJqw=="; }; }; "csv-parser-1.12.1" = { @@ -21561,6 +21570,15 @@ let sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; + "debug-4.3.3" = { + name = "debug"; + packageName = "debug"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + }; + }; "debug-fabulous-1.1.0" = { name = "debug-fabulous"; packageName = "debug-fabulous"; @@ -31681,13 +31699,13 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-parser-js-0.5.4" = { + "http-parser-js-0.5.5" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.4.tgz"; - sha512 = "Qn1yyi10ipcylSSqlTFsj7bhimACWbFm5w5JNMxhLKfcJAeWFBc+/VBv4mu5qlWSKr0cjXqtwM6HISZkESUILA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"; + sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; }; }; "http-proxy-1.18.1" = { @@ -35912,13 +35930,13 @@ let sha512 = "EyGFTMcSiLw03aCcDmN8tjwIJ2+XbW7LZJiq8VkyHoKdMz6urHKtYGZTNDns9iNH2/WxfjFRt+d3S9tYi2AfRw=="; }; }; - "jsii-srcmak-0.1.410" = { + "jsii-srcmak-0.1.413" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.410"; + version = "0.1.413"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.410.tgz"; - sha512 = "RsCx4PUtTmUpwcebqwmbqxAGiOvzN1nBz0sm/C3SVD8h0h4W70tyXaj82NkQmi6saEextqahbw9lUZ1UrrwSeg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.413.tgz"; + sha512 = "q4qD7M0MUGuMG4dq7qkoEyfhYlX/erNmLFeRBfrufjucftEKdNlK22xcAfj0ykh6GWsHh19Ri5NC5D5b5wtGIA=="; }; }; "json-bigint-1.0.0" = { @@ -36209,13 +36227,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.62" = { + "json2jsii-0.2.65" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.62"; + version = "0.2.65"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.62.tgz"; - sha512 = "PrTHo9cC2AKrP0zdSsBPNd+yf6+6tfpcDofmugtx5Wuocj5F6SwqZn5iqWz4T/uV2e6FygEZV0Wr67QP7mW1PA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.65.tgz"; + sha512 = "3GPN4V+los5IjHx1q70rZIg+qU6q9/ffoEAhX8RLF37KYPuEG4pOpixQN+XwyOXlgAHScsP4LFc/535xziTD6g=="; }; }; "json3-3.2.6" = { @@ -37676,6 +37694,15 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; + "lightning-5.1.0" = { + name = "lightning"; + packageName = "lightning"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-5.1.0.tgz"; + sha512 = "atn40qRDGYr6H1i/OGTth/7JzmB650ZBao4ktLv1TPslPPRmdrJ7kvlP0O2ormXEl8aiBewNoreSEDC4Co9crw=="; + }; + }; "lilconfig-2.0.4" = { name = "lilconfig"; packageName = "lilconfig"; @@ -37856,6 +37883,15 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; + "ln-service-53.1.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.1.1.tgz"; + sha512 = "xwgQrw1Lj7qsarKps13QQOzZtL3KXgov7yFN6CmbgLhAJ7iZ8HehoqJVTTtJuQRPAXjwNUjTTMZXCdJvr7JPyw=="; + }; + }; "ln-sync-3.0.1" = { name = "ln-sync"; packageName = "ln-sync"; @@ -42564,13 +42600,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.3.7" = { + "mobx-6.3.8" = { name = "mobx"; packageName = "mobx"; - version = "6.3.7"; + version = "6.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.7.tgz"; - sha512 = "X7yU7eOEyxIBk4gjIi2UIilwdw48gXh0kcZ5ex3Rc+COJsJmJ4SNpf42uYea3aUqb1hedTv5xzJrq5Q55p0P5g=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.8.tgz"; + sha512 = "RfG2y766P1o9u9xrQht/HBXEoUPIr4B3Gjri3reLW/TuHm3I/3TfBBS0OaeMbw19RIF0AymqjDNlJgakN4ZK7g=="; }; }; "mobx-react-7.2.1" = { @@ -48876,13 +48912,13 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; - "pkg-fetch-3.2.4" = { + "pkg-fetch-3.2.5" = { name = "pkg-fetch"; packageName = "pkg-fetch"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.4.tgz"; - sha512 = "ewUD26GP86/8+Fu93zrb30CpJjKOtT4maSgm4SwTX9Ujy1pfdUdv+1PubsY9tTJES0iBYItAtqbfkf7Wu5LV9w=="; + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.5.tgz"; + sha512 = "jPtyX2VTbG+9yaeGsJEBT+3qVN8qfxxfn7n2lmcx1FDSPsr8jwXDRf6BeCNBV+M5aEQmmtpMeKs7ZILQ9YlSPA=="; }; }; "pkg-up-2.0.0" = { @@ -49300,13 +49336,13 @@ let sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; }; }; - "postcss-8.4.3" = { + "postcss-8.4.4" = { name = "postcss"; packageName = "postcss"; - version = "8.4.3"; + version = "8.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.3.tgz"; - sha512 = "d5gVKo8ekrircqHOQNvSQk8dhGOuAfu1iP6dzfAlnAmcu7EBJ9cFuZG8B1KZK362aaEO3L1H+WM3ny9xQ29tFw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"; + sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; }; }; "postcss-calc-7.0.5" = { @@ -50218,15 +50254,6 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; - "prebuild-install-6.0.1" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz"; - sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; - }; - }; "prebuild-install-6.1.4" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -56815,13 +56842,13 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; - "safe-stable-stringify-2.2.0" = { + "safe-stable-stringify-2.3.0" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.2.0.tgz"; - sha512 = "C6AuMdYPuPV/P1leplHNu0lgc2LAElq/g3TdoksDCIVtBhr78o/CH03bt/9SKqugFbKU9CUjsNlCu0fjtQzQUw=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.0.tgz"; + sha512 = "VFlmNrvZ44a0QnRY2yfEIUhbMh8BjTFWf2mRG/8mCEAKTfQYV8xxfn6P+00OLej0gznC5C+hfgcEF7AGrN5Stw=="; }; }; "safer-buffer-2.1.2" = { @@ -60091,13 +60118,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.138" = { + "sscaff-1.2.141" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.138"; + version = "1.2.141"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.138.tgz"; - sha512 = "EaiWFpkSocWogZzsD2q7T4tCQfM3roLyCHPqaCKxxYsLrlSLplRWdtq6HUQoucG90pzud9P2lfX0fvQkkz0A3A=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.141.tgz"; + sha512 = "6ZsCtDrfu+0fN7rR0IHToIJkHujfisN40lSD34Nj3bkSfaIE3xsjYNVtDXN/cXhU8ZCncWLws5txKIE8urRYQQ=="; }; }; "ssh-config-1.1.6" = { @@ -64178,6 +64205,15 @@ let sha512 = "DEQrfv6l7IvN2jlzc/VTdZJYsWUnQNCsueYjMkC/iXoEoi5fNan6MjeDqkvhfzbmHgdz9UxDUluX3V5HdjTydQ=="; }; }; + "ts-morph-12.2.0" = { + name = "ts-morph"; + packageName = "ts-morph"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-morph/-/ts-morph-12.2.0.tgz"; + sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; + }; + }; "ts-node-8.9.1" = { name = "ts-node"; packageName = "ts-node"; @@ -67959,6 +67995,15 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; + "vscode-emmet-helper-2.1.2" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; + sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; + }; + }; "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -67977,6 +68022,15 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; + "vscode-html-languageservice-3.2.0" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz"; + sha512 = "aLWIoWkvb5HYTVE0kI9/u3P0ZAJGrYOSAAE6L0wqB9radKRtbJNrF9+BjSUFyCgBdNBE/GFExo35LoknQDJrfw=="; + }; + }; "vscode-html-languageservice-4.1.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -71899,6 +71953,78 @@ in bypassCache = true; reconstructLock = true; }; + "@astrojs/language-server" = nodeEnv.buildNodePackage { + name = "_at_astrojs_slash_language-server"; + packageName = "@astrojs/language-server"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.1.tgz"; + sha512 = "em6H0HxGIgziVHjK2D+/XHihglQAp0d/c1T359OwT+2ydqGR1WthCvI3O+BLYgqHoPgk/27gtZs4kokTAZOGPA=="; + }; + dependencies = [ + sources."@emmetio/abbreviation-2.2.2" + sources."@emmetio/css-abbreviation-2.1.4" + sources."@emmetio/scanner-1.0.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@ts-morph/common-0.11.1" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."code-block-writer-10.1.1" + sources."concat-map-0.0.1" + sources."emmet-2.3.4" + sources."fast-glob-3.2.7" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."jsonc-parser-2.3.1" + sources."lodash-4.17.21" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."minimatch-3.0.4" + sources."mkdirp-1.0.4" + sources."path-browserify-1.0.1" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."source-map-0.7.3" + sources."to-regex-range-5.0.1" + sources."ts-morph-12.2.0" + sources."typescript-4.5.2" + sources."vscode-css-languageservice-5.1.8" + (sources."vscode-emmet-helper-2.1.2" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) + (sources."vscode-html-languageservice-3.2.0" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-nls-5.0.0" + sources."vscode-uri-3.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; @@ -71940,7 +72066,7 @@ in ]; }) sources."data-urls-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decimal.js-10.3.1" sources."deep-is-0.1.4" sources."define-lazy-prop-2.0.0" @@ -72473,7 +72599,7 @@ in sources."hypercore-promisifier-1.1.0" (sources."hypercore-protocol-8.0.7" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -72680,7 +72806,7 @@ in sources."strip-json-comments-2.0.1" (sources."subcommand-2.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -72941,7 +73067,7 @@ in sources."create-hmac-1.1.7" sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" @@ -73732,7 +73858,7 @@ in sources."color-name-1.1.4" sources."commander-6.2.1" sources."cross-spawn-4.0.2" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."defaults-1.0.3" sources."deprecation-2.3.1" sources."esprima-4.0.1" @@ -74582,7 +74708,7 @@ in sources."cssfilter-0.0.10" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -75695,7 +75821,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."cuss-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -76145,7 +76271,7 @@ in sources."commander-8.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ejs-3.1.6" sources."electron-to-chromium-1.4.4" sources."ensure-posix-path-1.1.1" @@ -76398,7 +76524,7 @@ in sources."css-select-4.1.3" sources."css-what-5.1.0" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" @@ -76642,7 +76768,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" sources."crypto-random-string-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -76984,10 +77110,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.12.0"; + version = "11.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.12.0.tgz"; - sha512 = "wb6LDwuSA5UGHb7yIRZK3YAk9odlPkV5e4qwswwlKTOj0BV2gawClTsJ1uE27WIWFIu7OQaoB1TxUiL1jKQueQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.12.1.tgz"; + sha512 = "4Rp1kKiAaycYGGnDHoYN34KrvF2rcMnUTsb5YcW9D35wrvjWAkXKQU3tZWU3RrtNUhIklkeaOQayuO8fk5ANww=="; }; dependencies = [ sources."@alexbosworth/fiat-1.0.0" @@ -77073,13 +77199,17 @@ in sources."bip66-1.1.5" sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-6.0.0" + sources."bitcoinjs-lib-6.0.1" sources."bl-4.1.0" sources."bluebird-3.7.2" sources."bn.js-5.2.0" sources."body-parser-1.19.0" sources."bolt01-1.2.3" - sources."bolt03-1.2.12" + (sources."bolt03-1.2.12" // { + dependencies = [ + sources."bitcoinjs-lib-6.0.0" + ]; + }) sources."bolt07-1.7.4" sources."bolt09-0.2.0" (sources."boxen-5.1.2" // { @@ -77116,7 +77246,6 @@ in ]; }) sources."cbor-8.1.0" - sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -77170,7 +77299,7 @@ in sources."create-hmac-1.1.7" sources."crypto-js-4.1.1" sources."crypto-random-string-2.0.0" - sources."csv-parse-4.16.3" + sources."csv-parse-5.0.3" sources."cycle-1.0.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -77221,7 +77350,12 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."global-dirs-3.0.0" - sources."goldengate-10.4.2" + (sources."goldengate-10.4.2" // { + dependencies = [ + sources."bitcoinjs-lib-6.0.0" + sources."ln-service-52.16.0" + ]; + }) sources."got-9.6.0" sources."graceful-fs-4.2.8" (sources."has-ansi-2.0.0" // { @@ -77268,7 +77402,11 @@ in sources."tmp-0.0.33" ]; }) - sources."invoices-2.0.2" + (sources."invoices-2.0.2" // { + dependencies = [ + sources."bitcoinjs-lib-6.0.0" + ]; + }) sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -77303,6 +77441,7 @@ in (sources."lightning-4.14.3" // { dependencies = [ sources."@types/node-16.11.7" + sources."bitcoinjs-lib-6.0.0" (sources."invoices-2.0.1" // { dependencies = [ (sources."bitcoinjs-lib-5.2.0" // { @@ -77314,12 +77453,25 @@ in }) ]; }) - sources."ln-accounting-5.0.5" - sources."ln-service-52.16.0" + (sources."ln-accounting-5.0.5" // { + dependencies = [ + sources."bitcoinjs-lib-6.0.0" + sources."ln-service-52.16.0" + ]; + }) + (sources."ln-service-53.1.1" // { + dependencies = [ + sources."@grpc/proto-loader-0.6.7" + sources."lightning-5.1.0" + sources."type-fest-2.6.0" + sources."ws-8.3.0" + ]; + }) (sources."ln-sync-3.0.1" // { dependencies = [ sources."@types/node-16.11.7" sources."bech32-1.1.4" + sources."bitcoinjs-lib-6.0.0" (sources."invoices-2.0.1" // { dependencies = [ sources."bech32-2.0.0" @@ -77338,7 +77490,11 @@ in }) ]; }) - sources."ln-telegram-3.4.2" + (sources."ln-telegram-3.4.2" // { + dependencies = [ + sources."ln-service-52.16.0" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -77424,14 +77580,22 @@ in sources."semver-6.3.0" ]; }) - sources."paid-services-3.1.2" + (sources."paid-services-3.1.2" // { + dependencies = [ + sources."ln-service-52.16.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."prettyjson-1.2.1" - sources."probing-2.0.1" + (sources."probing-2.0.1" // { + dependencies = [ + sources."ln-service-52.16.0" + ]; + }) sources."process-nextick-args-2.0.1" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" @@ -77522,7 +77686,7 @@ in }) (sources."telegraf-4.4.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -77791,7 +77955,7 @@ in sources."commander-6.2.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -78666,7 +78830,7 @@ in ]; }) sources."dashdash-1.14.1" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -79074,7 +79238,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" ]; }) sources."castv2-client-1.2.0" @@ -79838,7 +80002,7 @@ in sources."pseudomap-1.0.2" (sources."puppeteer-1.20.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -80031,10 +80195,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.39"; + version = "1.0.41"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.39.tgz"; - sha512 = "OS6Rfk0OptHpl0MGKLGbLkqG5rY5kmaY3X5I6oUUULhCqMC9up04u21D0+9o2DG+DcwgrI5JulY3AydOVcD5Dw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.41.tgz"; + sha512 = "UBHotWsAEqWx9GrY7Fd0tSstKo6vKcufGbi+oB1O6RRSOAZK2i8oNq1CokpNzNNI9pYwYXN4jgWvfr0GfrVE6w=="; }; dependencies = [ sources."@jsii/check-node-1.46.0" @@ -80049,8 +80213,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.1" sources."case-1.6.3" - sources."cdk8s-1.1.44" - sources."cdk8s-plus-22-1.0.0-beta.50" + sources."cdk8s-1.1.47" + sources."cdk8s-plus-22-1.0.0-beta.53" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -80065,7 +80229,7 @@ in sources."commonmark-0.30.0" sources."constructs-3.3.161" sources."date-format-3.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" @@ -80143,14 +80307,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.410" // { + (sources."jsii-srcmak-0.1.413" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.62" + sources."json2jsii-0.2.65" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -80188,7 +80352,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.138" + sources."sscaff-1.2.141" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -80543,7 +80707,7 @@ in sources."external-editor-3.1.0" (sources."extract-zip-2.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."get-stream-5.2.0" sources."ms-2.1.2" ]; @@ -80701,7 +80865,7 @@ in sources."log-symbols-4.1.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -80834,7 +80998,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.138" + sources."sscaff-1.2.141" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -80845,7 +81009,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -81091,7 +81255,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."cycle-1.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decode-uri-component-0.2.0" sources."encoding-0.1.13" sources."escape-string-regexp-1.0.5" @@ -81591,7 +81755,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -81923,7 +82087,7 @@ in sources."cross-spawn-7.0.3" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -82987,7 +83151,7 @@ in sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -83457,7 +83621,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" @@ -84453,7 +84617,7 @@ in sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-3.3.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" @@ -85906,7 +86070,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -86702,7 +86866,7 @@ in sources."csscolorparser-1.0.3" sources."csstype-3.0.10" sources."debounce-1.2.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" @@ -87175,10 +87339,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.13.0.tgz"; - sha512 = "ye07E+B6IpwUx3eBvZ9Ug0dVloNDzefTWlxkYnP+kB2nB17tjU07wiWzy2FamWIXIlL6THBtY74ZmvoVQ3Bn7w=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.14.0.tgz"; + sha512 = "nR5VV/KqlsbrkkOrk+NlnDwVOfHviMHC3zYhD1I2Tko6xXuw6t/zqo3xbbvHoCTECqoWeIOGseECObMP6hFeug=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -87585,7 +87749,7 @@ in }) sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -88158,7 +88322,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -89230,7 +89394,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -89830,7 +89994,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -90125,7 +90289,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."enquirer-2.3.6" @@ -90254,7 +90418,7 @@ in sources."concat-map-0.0.1" sources."core_d-3.2.0" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" @@ -90947,7 +91111,7 @@ in sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -92695,7 +92859,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."convert-to-spaces-1.0.2" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -93072,7 +93236,7 @@ in }) sources."csv-stream-0.2.0" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.4" @@ -93564,7 +93728,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" @@ -95448,7 +95612,7 @@ in sources."crypto-random-string-2.0.0" sources."css-select-4.1.3" sources."css-what-5.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decode-named-character-reference-1.0.0" sources."decode-uri-component-0.2.0" @@ -96124,7 +96288,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deprecation-2.3.1" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -96300,7 +96464,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."lodash-4.17.21" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -96332,7 +96496,7 @@ in sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -96711,7 +96875,7 @@ in sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-3.0.1" sources."debounce-fn-4.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -97372,7 +97536,7 @@ in sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-3.3.0" sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" @@ -97908,7 +98072,7 @@ in sources."cross-undici-fetch-0.0.26" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -99643,7 +99807,7 @@ in sources."css-what-2.1.3" sources."cycle-1.0.3" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" @@ -100502,7 +100666,7 @@ in sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" @@ -103002,7 +103166,7 @@ in ]; }) sources."debounce-fn-3.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" @@ -103221,7 +103385,7 @@ in sources."encodeurl-1.0.2" (sources."engine.io-6.1.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -103257,7 +103421,7 @@ in sources."lodash-4.17.21" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -103288,14 +103452,14 @@ in sources."setprototypeof-1.1.1" (sources."socket.io-4.4.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -103304,7 +103468,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -103484,7 +103648,7 @@ in sources."whatwg-url-8.7.0" ]; }) - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decimal.js-10.3.1" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" @@ -104615,7 +104779,7 @@ in sources."dargs-7.0.0" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."debuglog-1.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -105332,7 +105496,7 @@ in sources."depd-1.1.2" ]; }) - sources."http-parser-js-0.5.4" + sources."http-parser-js-0.5.5" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -106454,7 +106618,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -108603,7 +108767,7 @@ in sources."color-support-1.1.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."delegates-1.0.0" sources."depd-1.1.2" sources."emoji-regex-8.0.0" @@ -109132,7 +109296,7 @@ in sources."acorn-walk-8.2.0" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -109294,7 +109458,7 @@ in sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -109330,7 +109494,7 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.6" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -109358,7 +109522,7 @@ in (sources."mqtt-4.2.8" // { dependencies = [ sources."concat-stream-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -109366,7 +109530,7 @@ in }) (sources."mqtt-packet-6.10.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -110453,7 +110617,7 @@ in sources."configstore-5.0.1" sources."console-control-strings-1.1.0" sources."crypto-random-string-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" @@ -111311,7 +111475,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.24" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" (sources."defaults-1.0.3" // { @@ -113048,15 +113212,15 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.4.1"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.4.1.tgz"; - sha512 = "iJs3W6MCgeZ4MrH7iZtX6HTqsNzoh2U9rGILL3eOLbQFV43U8WPAzrqRK7cBQGuHx38UXxcGT6G/2yDl/GveRg=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.5.1.tgz"; + sha512 = "3IiUgwYRQBfXcmdBakjqttRrhpruZ1h/UCobtra2IN4S29eJhgxr39Dd8EZxUikgSLUH3v/eUWO3ZInSmlSXpw=="; }; dependencies = [ sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/parser-7.13.13" - sources."@babel/types-7.13.12" + sources."@babel/parser-7.16.2" + sources."@babel/types-7.16.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -113083,7 +113247,7 @@ in sources."color-name-1.1.4" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -113136,7 +113300,6 @@ in sources."isarray-1.0.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -113156,7 +113319,6 @@ in ]; }) sources."node-fetch-2.6.6" - sources."noop-logger-0.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -113166,8 +113328,8 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - sources."pkg-fetch-3.2.4" - sources."prebuild-install-6.0.1" + sources."pkg-fetch-3.2.5" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -113202,14 +113364,13 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.1.0" + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-pm-runs-1.0.0" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" @@ -113311,7 +113472,7 @@ in sources."culvert-0.1.2" sources."data-uri-to-buffer-3.0.1" sources."dayjs-1.8.36" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."degenerator-3.0.1" sources."depd-1.1.2" @@ -113511,10 +113672,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.3"; + version = "8.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.3.tgz"; - sha512 = "d5gVKo8ekrircqHOQNvSQk8dhGOuAfu1iP6dzfAlnAmcu7EBJ9cFuZG8B1KZK362aaEO3L1H+WM3ny9xQ29tFw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"; + sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; }; dependencies = [ sources."nanoid-3.1.30" @@ -114253,7 +114414,7 @@ in sources."colors-1.4.0" sources."commander-5.1.0" sources."compare-versions-3.6.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" @@ -115152,7 +115313,7 @@ in ]; }) sources."cyclist-1.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { @@ -115481,7 +115642,7 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.5.4" + sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."https-browserify-1.0.0" @@ -116528,7 +116689,7 @@ in ]; }) sources."data-urls-3.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decimal.js-10.3.1" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" @@ -116648,7 +116809,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-2.0.1" + sources."babel-plugin-styled-components-2.0.2" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -116700,7 +116861,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decko-1.2.0" sources."des.js-1.0.1" (sources."diffie-hellman-5.0.3" // { @@ -116780,7 +116941,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.3.7" + sources."mobx-6.3.8" sources."mobx-react-7.2.1" sources."mobx-react-lite-3.2.2" sources."ms-2.1.2" @@ -117552,7 +117713,7 @@ in sources."d3-timer-3.0.1" sources."d3-transition-3.0.1" sources."d3-zoom-3.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-4.0.0" sources."deep-is-0.1.4" sources."delaunator-5.0.0" @@ -117694,6 +117855,11 @@ in (sources."mocha-9.1.3" // { dependencies = [ sources."argparse-2.0.1" + (sources."debug-4.3.2" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."glob-7.1.7" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" @@ -117869,7 +118035,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.3" + sources."postcss-8.4.4" sources."source-map-js-1.0.1" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -117910,7 +118076,7 @@ in sources."core-util-is-1.0.3" sources."crc-0.2.0" sources."crypto-0.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."events.node-0.4.9" (sources."everyauth-0.4.5" // { dependencies = [ @@ -118170,7 +118336,7 @@ in sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -118265,7 +118431,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -118606,7 +118772,7 @@ in sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -118856,7 +119022,7 @@ in sources."simple-get-2.8.1" (sources."simple-git-2.47.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -118916,7 +119082,7 @@ in sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."figures-2.0.0" sources."inquirer-6.5.2" sources."is-fullwidth-code-point-2.0.0" @@ -119716,7 +119882,7 @@ in sources."component-emitter-1.3.0" sources."cookie-0.4.1" sources."cors-2.8.5" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."engine.io-6.1.0" sources."engine.io-parser-5.0.2" sources."mime-db-1.51.0" @@ -119973,7 +120139,7 @@ in sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" - sources."bipf-1.5.3" + sources."bipf-1.5.4" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -120047,7 +120213,7 @@ in sources."cpu-percentage-1.0.3" sources."crc-3.6.0" sources."cross-spawn-6.0.5" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -121751,7 +121917,7 @@ in sources."concat-map-0.0.1" sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -121843,7 +122009,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.0" - sources."postcss-8.4.3" + sources."postcss-8.4.4" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -122806,7 +122972,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -123053,7 +123219,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."crypt-0.0.2" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" sources."define-properties-1.1.3" @@ -123375,7 +123541,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -124111,7 +124277,7 @@ in sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -124204,7 +124370,7 @@ in (sources."engine.io-4.1.1" // { dependencies = [ sources."cookie-0.4.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -124260,7 +124426,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -124457,14 +124623,14 @@ in sources."smart-buffer-4.2.0" (sources."socket.io-3.1.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.1.0" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -125227,7 +125393,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-5.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -125298,7 +125464,7 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.6" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -125375,14 +125541,14 @@ in sources."snapsvg-0.5.1" (sources."socket.io-4.1.3" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -125635,7 +125801,7 @@ in sources."d3-time-2.1.1" sources."d3-time-format-3.0.0" sources."d3-timer-2.0.0" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-4.2.1" sources."delaunator-4.0.1" sources."delegates-1.0.0" @@ -125976,7 +126142,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" @@ -127186,7 +127352,7 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ignore-4.0.6" sources."ms-2.1.2" ]; @@ -127194,7 +127360,7 @@ in (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" @@ -127867,7 +128033,7 @@ in sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -127970,7 +128136,7 @@ in sources."whatwg-url-8.7.0" ]; }) - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decimal.js-10.3.1" sources."decompress-response-4.2.1" sources."deep-is-0.1.4" @@ -128138,13 +128304,13 @@ in sources."@devicefarmer/adbkit-monkey-1.0.1" (sources."@eslint/eslintrc-1.0.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) (sources."@humanwhocodes/config-array-0.6.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -128281,7 +128447,7 @@ in (sources."eslint-8.3.0" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" sources."strip-ansi-6.0.1" ]; @@ -128568,7 +128734,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" - sources."safe-stable-stringify-2.2.0" + sources."safe-stable-stringify-2.3.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-7.3.5" @@ -128972,7 +129138,7 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.5.4" + sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.1" sources."human-signals-2.1.0" @@ -129095,13 +129261,13 @@ in sources."sockjs-0.3.21" (sources."spdy-4.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129242,26 +129408,26 @@ in sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) (sources."bittorrent-lsd-1.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.4" (sources."bittorrent-protocol-3.4.3" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.18.3" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -129283,7 +129449,7 @@ in sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129382,7 +129548,7 @@ in sources."lru-3.1.0" (sources."lt_donthave-1.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129449,7 +129615,7 @@ in sources."record-cache-1.1.1" (sources."render-media-4.1.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129466,14 +129632,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.11.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.1.0" (sources."simple-websocket-9.1.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129498,7 +129664,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.4.7" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129513,7 +129679,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129525,7 +129691,7 @@ in sources."vlc-command-1.2.0" (sources."webtorrent-1.5.8" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -129766,13 +129932,13 @@ in sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) (sources."agentkeepalive-4.1.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -129992,14 +130158,14 @@ in sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -130261,7 +130427,7 @@ in sources."p-timeout-2.0.1" (sources."p-transform-1.3.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -130403,7 +130569,7 @@ in sources."socks-2.6.1" (sources."socks-proxy-agent-6.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -130584,7 +130750,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" (sources."figures-3.2.0" // { diff --git a/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh b/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh index 98c01508fd5a3..2e3509d68c12c 100755 --- a/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh +++ b/pkgs/development/perl-modules/expression-generator/filtered-requirements.sh @@ -3,13 +3,13 @@ source lib-cache.sh; print_reqs() { - module_name="$1"; + module_name="$1"; - ./requirements.sh "$1"| while read; do - if let "$(./source-download-link.sh "${REPLY}" | wc -c)" && [ perl != "$REPLY" ]; then - echo "$REPLY"; - fi; - done; + ./requirements.sh "$1"| while read; do + if let "$(./source-download-link.sh "${REPLY}" | wc -c)" && [ perl != "$REPLY" ]; then + echo "$REPLY"; + fi; + done; } module_name="$1"; diff --git a/pkgs/development/perl-modules/expression-generator/full-requirements.sh b/pkgs/development/perl-modules/expression-generator/full-requirements.sh index 29ed83668ed55..91218f36f609b 100755 --- a/pkgs/development/perl-modules/expression-generator/full-requirements.sh +++ b/pkgs/development/perl-modules/expression-generator/full-requirements.sh @@ -3,19 +3,19 @@ source lib-cache.sh; print_requirements () { - module_name="$1"; + module_name="$1"; - ./requirements.sh "$module_name" | while read; do - echo "$REPLY"; - print_reqs_cache "$REPLY"; - done | sort | uniq + ./requirements.sh "$module_name" | while read; do + echo "$REPLY"; + print_reqs_cache "$REPLY"; + done | sort | uniq }; print_reqs_cache () { - module_name="$1"; - module_basename="${module_name//::/-}"; - - cached_output print_requirements "$module_basename" "$module_name" "full.deps"; + module_name="$1"; + module_basename="${module_name//::/-}"; + + cached_output print_requirements "$module_basename" "$module_name" "full.deps"; }; print_reqs_cache "$@"; diff --git a/pkgs/development/perl-modules/expression-generator/grab-url.sh b/pkgs/development/perl-modules/expression-generator/grab-url.sh index 809cf87fcebf1..8935cad8cefe3 100755 --- a/pkgs/development/perl-modules/expression-generator/grab-url.sh +++ b/pkgs/development/perl-modules/expression-generator/grab-url.sh @@ -3,13 +3,13 @@ source lib-cache.sh get_file() { - url="$1"; + url="$1"; - if [ -n "$url" ]; then - curl "$1"; - else - echo -n; - fi; + if [ -n "$url" ]; then + curl "$1"; + else + echo -n; + fi; } url="$1"; @@ -17,4 +17,3 @@ name="$2"; name=${name:-$(basename "$url")} cached_output get_file "${name%%.*}" "$url" "${name#*.}" - diff --git a/pkgs/development/perl-modules/expression-generator/lib-cache.sh b/pkgs/development/perl-modules/expression-generator/lib-cache.sh index 7473e2d1c15ed..65095144bcd68 100644 --- a/pkgs/development/perl-modules/expression-generator/lib-cache.sh +++ b/pkgs/development/perl-modules/expression-generator/lib-cache.sh @@ -4,16 +4,15 @@ # Third argument: argument to command # Fourth argument: cache type cached_output () { - cmd="$1"; - basename="$2"; - arg="$3"; - ext="$4"; - - if ! [ -e "cache-${ext//./-}/${basename}.${ext}" ]; then - mkdir -p "cache-${ext//./-}"; - $cmd $arg > "cache-${ext//./-}/${basename}.${ext}"; - fi; + cmd="$1"; + basename="$2"; + arg="$3"; + ext="$4"; - cat "cache-${ext//./-}/${basename}.${ext}"; -} + if ! [ -e "cache-${ext//./-}/${basename}.${ext}" ]; then + mkdir -p "cache-${ext//./-}"; + $cmd $arg > "cache-${ext//./-}/${basename}.${ext}"; + fi; + cat "cache-${ext//./-}/${basename}.${ext}"; +} diff --git a/pkgs/development/perl-modules/expression-generator/requirements.sh b/pkgs/development/perl-modules/expression-generator/requirements.sh index 60ee68d99adaf..19b24c55a8eed 100755 --- a/pkgs/development/perl-modules/expression-generator/requirements.sh +++ b/pkgs/development/perl-modules/expression-generator/requirements.sh @@ -6,12 +6,12 @@ module_name="$1"; module_basename="${1//::/-}"; print_requirements () { - module_name="$1"; - - ./retrieve-meta-yaml.sh "$module_name" | - sed -re '1,/^requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@'; - ./retrieve-meta-yaml.sh "$module_name" | - sed -re '1,/^build_requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@'; + module_name="$1"; + + ./retrieve-meta-yaml.sh "$module_name" | + sed -re '1,/^requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@'; + ./retrieve-meta-yaml.sh "$module_name" | + sed -re '1,/^build_requires:/d; /^[a-z]/,$d; s@^\s*@@; s@:\s.*@@'; }; cached_output print_requirements "$module_basename" "$module_name" "direct.deps"; diff --git a/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh b/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh index a9cf0d94e0d3f..c8ec5df11b7dd 100755 --- a/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh +++ b/pkgs/development/perl-modules/expression-generator/retrieve-file-link.sh @@ -6,9 +6,9 @@ file_name="$2"; version_regexp="${module_basename}(-[0-9.a-z]+){0,1}"; author_regexp="[A-Z0-9]+"; -./retrieve-modulepage.sh "$module_basename" | - egrep "[<]a href=\"[a-z0-9/]*/(${author_regexp}/){0,1}${version_regexp}/${file_name}" | - sed -re "s@.*href=\"@@; s@\".*@@" | - sed -re 's@^/@http://search.cpan.org/@'; +./retrieve-modulepage.sh "$module_basename" | + egrep "[<]a href=\"[a-z0-9/]*/(${author_regexp}/){0,1}${version_regexp}/${file_name}" | + sed -re "s@.*href=\"@@; s@\".*@@" | + sed -re 's@^/@http://search.cpan.org/@'; echo "$link_line"; diff --git a/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh b/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh index 2c85d45691f09..3b162ebe693fe 100755 --- a/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh +++ b/pkgs/development/perl-modules/expression-generator/retrieve-meta-yaml.sh @@ -3,11 +3,11 @@ source lib-cache.sh; print_meta_yaml () { - module_name="$1"; - module_basename="${module_name//::/-}"; + module_name="$1"; + module_basename="${module_name//::/-}"; - ./grab-url.sh "$(./retrieve-file-link.sh "$module_basename" "META.yml")" \ - "${module_basename}.meta.yml"; + ./grab-url.sh "$(./retrieve-file-link.sh "$module_basename" "META.yml")" \ + "${module_basename}.meta.yml"; }; module_name="$1"; diff --git a/pkgs/development/perl-modules/expression-generator/source-download-link.sh b/pkgs/development/perl-modules/expression-generator/source-download-link.sh index 575f47629c26b..779d131961f07 100755 --- a/pkgs/development/perl-modules/expression-generator/source-download-link.sh +++ b/pkgs/development/perl-modules/expression-generator/source-download-link.sh @@ -6,12 +6,12 @@ module_name="$1"; module_basename="${module_name//::/-}"; write_link() { - module_basename="$1"; + module_basename="$1"; - ./retrieve-modulepage.sh "$module_basename" | - grep -A 2 "This Release" | - grep href | - sed -re 's/.*href="//; s/".*//; s@^/@http://search.cpan.org/@'; + ./retrieve-modulepage.sh "$module_basename" | + grep -A 2 "This Release" | + grep href | + sed -re 's/.*href="//; s/".*//; s@^/@http://search.cpan.org/@'; } cached_output write_link "$module_basename" "$module_basename" src.link; diff --git a/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh b/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh index cfe1506640b31..9f5cdb9142eb2 100755 --- a/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh +++ b/pkgs/development/perl-modules/expression-generator/write-nix-expression.sh @@ -5,16 +5,16 @@ cd $(dirname $0); source lib-cache.sh; print_expression () { - module_name="$1"; - module_basename="${module_name//::/-}"; - module_compressedname="perl${module_name//::/}"; - sourcelink="$(./source-download-link.sh "${module_name}")"; - version_name="${sourcelink%.tar.*}"; - version_name="${version_name##*/}"; - dependencies="$(./filtered-requirements.sh "$module_name" | sed -e 's/^/perl/; s/:://g' | xargs)"; - source_hash=$(nix-prefetch-url "$sourcelink" 2>/dev/null); - - cat <<EOF + module_name="$1"; + module_basename="${module_name//::/-}"; + module_compressedname="perl${module_name//::/}"; + sourcelink="$(./source-download-link.sh "${module_name}")"; + version_name="${sourcelink%.tar.*}"; + version_name="${version_name##*/}"; + dependencies="$(./filtered-requirements.sh "$module_name" | sed -e 's/^/perl/; s/:://g' | xargs)"; + source_hash=$(nix-prefetch-url "$sourcelink" 2>/dev/null); + + cat <<EOF ${module_compressedname} = import ../development/perl-modules/generic perl { name = "${version_name}"; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index bc7fba543efcb..9797d8ebe76b2 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc="; + sha256 = "sha256-U+2R/TlMwRj+FEuO1aOox7dt3RXlDjazjoG7IfN8um8="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 18364bdce6919..ed270cddd9814 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # makes http request to another server + "testEnviron" + ]; + pythonImportsCheck = [ "aiohttp_wsgi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix new file mode 100644 index 0000000000000..49b5f683a6b40 --- /dev/null +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -0,0 +1,80 @@ +{ lib +, fetchPypi +, buildPythonPackage +, six +, pythonOlder +, allure-python-commons +, pytest +, pytestCheckHook +, pytest-check +, pytest-flakes +, pytest-lazy-fixture +, pytest-rerunfailures +, pytest-xdist +, pyhamcrest +, mock +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-pytest"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "18ys5gi64jlfya6a7shj5lqhwc6cplwgyq3s2n5mg5x513g0yqi0"; + }; + + buildInputs = [ + pytest + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_pytest" ]; + + propagatedBuildInputs = [ + allure-python-commons + six + ]; + + checkInputs = [ + pyhamcrest + mock + pytestCheckHook + pytest-check + pytest-flakes + pytest-lazy-fixture + pytest-rerunfailures + pytest-xdist + ]; + + pytestFlagsArray = [ + "--basetemp" + "$(mktemp -d)" + "--alluredir" + "$(mktemp -d allure-results.XXXXXXX)" + "-W" + "ignore::pytest.PytestExperimentalApiWarning" + "-p" + "pytester" + ]; + + # we are skipping some of the integration tests for now + disabledTests = [ + "test_pytest_check" + "test_pytest_check_example" + "test_select_by_testcase_id_test" + ]; + + meta = with lib; { + description = "Allure pytest integration. It's developed as pytest plugin and distributed via pypi"; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix new file mode 100644 index 0000000000000..3c43e698b8e72 --- /dev/null +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, attrs +, pluggy +, six +, pyhamcrest +, setuptools-scm +, python +}: + +buildPythonPackage rec { + pname = "allure-python-commons-test"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rn8ccxxrm27skv3avdiw56zc4fk2h7nrk3jamqmx6fnvmshiz5f"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ attrs pluggy six pyhamcrest ]; + + checkPhase = '' + ${python.interpreter} -m doctest ./src/container.py + ${python.interpreter} -m doctest ./src/report.py + ${python.interpreter} -m doctest ./src/label.py + ${python.interpreter} -m doctest ./src/result.py + ''; + + pythonImportsCheck = [ "allure_commons_test" ]; + + meta = with lib; { + description = "Just pack of hamcrest matchers for validation result in allure2 json format"; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix new file mode 100644 index 0000000000000..56eb0bbf55ed4 --- /dev/null +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, attrs +, pluggy +, six +, allure-python-commons-test +, setuptools-scm +, python +}: + +buildPythonPackage rec { + pname = "allure-python-commons"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "17alymsivw8fs89j6phbqgrbprasw8kj72kxa5y8qpn3xa5d4f62"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ attrs pluggy six allure-python-commons-test ]; + + checkPhase = '' + ${python.interpreter} -m doctest ./src/utils.py + ${python.interpreter} -m doctest ./src/mapping.py + ''; + + pythonImportsCheck = [ "allure" "allure_commons" ]; + + meta = with lib; { + description = "Common engine for all modules. It is useful for make integration with your homemade frameworks"; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2f69f21961667..0fb339507448f 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -44,14 +44,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA="; + sha256 = "sha256-UMPJZUtfcUTiL0Ha+p1M09yhLwaCuBLpam4KUgtYvnw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1b67568f3cd8c..8cf1acc783eb1 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak="; + sha256 = "sha256-ZWu9Kk/d6Qz9IEDUkuaB0f5cZV0HnZAaEDnYSoiKMDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 9962ebdc491f9..8a5d1181ac860 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "5.2.1"; + version = "5.3.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1krKWcjYllQdN5uSBbISa4UQiKqwosLKsZ/3SxhM3xw="; + sha256 = "sha256-LlaJQ6uZ9kdN8mK8NYCNiwVXVKprMgRknVeIRzO6zi4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 0f86c103c27de..53851ded566d9 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.0.1a11"; + version = "0.0.1a12"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - sha256 = "0fwk1pgphpgj0lazjy40ii08xq2qi6bvrfc30rwfj52yff1s9akn"; + hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index bdbdeb3062074..e07ae115fcb40 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10651"; + version = "9.0.10689"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w="; + sha256 = "sha256-kye8muKTm79lVhOBJeHnI4apJBsUVtNtGYpNiykXFDs="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index c60122ff18021..f1152da2d1d47 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; + sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index c91af48b9e9e8..bc92fed9a6aee 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -4,13 +4,15 @@ , fetchFromGitHub , pbr , requests +, pycryptodome +, pyjwt , pytestCheckHook , requests-mock }: buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.8.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +21,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-sox24UpuIK5SP0IWVxa/NiyR5IrTzXe0SVTCd4FB6mo="; + hash = "sha256-/AkQ7hEjzgL4/ruXqTdchh+N8PY5q3ILNKKo43EOGg4="; }; nativeBuildInputs = [ @@ -30,6 +32,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests + pycryptodome + pyjwt ]; checkInputs = [ diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index aa1e3d1d86486..db5d0166f552d 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27, numpy, cython, zlib, six +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six , python-lzo, nose }: buildPythonPackage rec { pname = "bx-python"; - version = "0.8.11"; - disabled = isPy27; + version = "0.8.12"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm"; + sha256 = "sha256-bOoD2dY6Zf4HRMqZcGSot1owu/5VEkF6wpuMTzVUlFU="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 95b2a39a68277..f5016d1fe7f8b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg="; + sha256 = "sha256-s3h+SnqCi29B0/BwUHp08x7n4tej+u5aI4exGpeKbxc="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 25e7b8751b521..df3bd33e9961f 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10651"; + version = "9.0.10689"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk="; + sha256 = "sha256-sZVdDEs+9UqPHWiCxrZpHp3UiB1hX8dTZxR3TXrIsTQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 6dbb3f91d1e8e..2a5dc7efcdf8a 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw="; + sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index ed3e70e3ab2e9..bf2ed3628675a 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "aarch64-linux" = "-shared -o attach_linux_arm64.so"; "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; @@ -87,6 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/debugpy"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 18a6808a21ef7..7b524ea863648 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "v${version}"; - sha256 = "1dy3mhj60xlqy7f65zh80sqn6qywsp697r6yy3jcl5wmwizzhybr"; + sha256 = "sha256-ly0gixl1cPHa03h44zXT8d1/NqrEBnQS6JmuuGj5Rk4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 1bfc96ff72176..58e271b10dc54 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.25.1"; + version = "0.25.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-+GgA7ma27dah8G/ITsy84jZHpktJHnGSMjzMfAvvuJg="; + sha256 = "sha256-WkLwiQNwueksPpuQ5aMBsenKyzUid1fbeOqEDAhfjkA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 458363713db23..48833d77e8bfd 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -6,6 +6,7 @@ , requests , beautifulsoup4 , mypy +, types-requests }: buildPythonPackage rec { @@ -26,14 +27,17 @@ buildPythonPackage rec { beautifulsoup4 ]; - checkInputs = [ mypy ]; + checkInputs = [ + mypy + types-requests + ]; checkPhase = '' echo -e "\x1b[32m## run mypy\x1b[0m" mypy hydracheck ''; - meta = with lib;{ + meta = with lib; { description = "check hydra for the build status of a package"; homepage = "https://github.com/nix-community/hydra-check"; license = licenses.mit; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 158f101167e2f..e13f73616775a 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,16 +10,20 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.8.1"; + version = "4.8.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "sha256-8oSz4RJWrR5dA6uGuyzNb1M5aI/xek15eg/n3zJvI7E="; + sha256 = "sha256-db3sFMOX9ShyTBv9lwnWYLM6TS53OHozWPILhIu15fs="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ toml @@ -30,7 +34,10 @@ buildPythonPackage rec { # Cyclic dependencies due to pyflakefs doCheck = false; - pythonImportsCheck = [ "importlib_metadata" ]; + + pythonImportsCheck = [ + "importlib_metadata" + ]; meta = with lib; { description = "Read metadata from Python packages"; diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 1d0c7f1e7c167..2137a0f3f055d 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -8,15 +8,12 @@ buildPythonPackage rec { pname = "jupyterhub-systemdspawner"; - version = "0.15.0"; + version = "0.15"; src = fetchFromGitHub { owner = "jupyterhub"; repo = "systemdspawner"; - # Corresponds to 0.15.0 - # Upstream didn't tag the latest release: - # https://github.com/jupyterhub/systemdspawner/issues/89 - rev = "7d7cf42db76d9cfa5a4bc42fff14943877ac570b"; + rev = "v${version}"; sha256 = "sha256-EUCA+CKCeYr+cLVrqTqe3Q32JkbqeALL6tfOnlVHk8Q="; }; diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix new file mode 100644 index 0000000000000..8c85da5ef4c2b --- /dev/null +++ b/pkgs/development/python-modules/keyboard/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "keyboard"; + version = "0.13.5"; + + src = fetchFromGitHub { + owner = "boppreh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM="; + }; + + pythonImportsCheck = [ "keyboard" ]; + + # Specific OS tests are being run for other OS, like + # winmouse on Linux, which provides the following error: + # AttributeError: module 'ctypes' has no attribute 'WinDLL' + doCheck = false; + + meta = with lib; { + description = "Hook and simulate keyboard events on Windows and Linux"; + homepage = "https://github.com/boppreh/keyboard"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index da3c36f6ce04f..3df049c1cec60 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "18.20.0"; + version = "20.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "v${version}"; - sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1"; + sha256 = "sha256-zZb5jEQEluY1dfa7UegW+P7MV86ESqOey7kkC74ETlM="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 754ed78cff708..58670c49a90b9 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.0.1"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk="; + sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; }; propagatedBuildInputs = [ @@ -28,11 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3" - ''; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6826298699e1c..c31773ad65e03 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -15,12 +15,14 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.40"; + version = "1.2.43"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "be8464037d0c8085350065b38e7a7b028db15f2524764dec0e3548ea5b53500f"; + sha256 = "sha256-nGbULY/QJUv3sk8vYXvh/fhkab/vB3lGGhXRTjt8anI="; }; propagatedBuildInputs = [ @@ -35,18 +37,13 @@ buildPythonPackage rec { timeago ]; - postPatch = '' - # https://github.com/meshtastic/Meshtastic-python/pull/87 - substituteInPlace setup.py \ - --replace 'with open("README.md", "r") as fh:' "" \ - --replace "long_description = fh.read()" "" \ - --replace "long_description=long_description," 'long_description="",' - ''; - # Project only provides PyPI releases which don't contain the tests # https://github.com/meshtastic/Meshtastic-python/issues/86 doCheck = false; - pythonImportsCheck = [ "meshtastic" ]; + + pythonImportsCheck = [ + "meshtastic" + ]; meta = with lib; { description = "Python API for talking to Meshtastic devices"; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 426d0e6942d65..b26086f00ae08 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.12"; + version = "1.20.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0EqIMSQEvev8sZ1XLgxPD68xlgPtlRTW/yBPyrekFQ="; + sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index dbbcb30ffcecc..99580e2de37d6 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,28 +1,63 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, buildPythonPackage , mypy-extensions +, python +, pythonOlder +, typed-ast , typing-extensions +, tomli +, types-typed-ast }: + buildPythonPackage rec { pname = "mypy"; - version = "0.812"; - disabled = !isPy3k; + version = "unstable-2021-11-14"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "069i9qnfanp7dn8df1vspnqb0flvsszzn22v00vj08nzlnd061yd"; + src = fetchFromGitHub { + owner = "python"; + repo = "mypy"; + rev = "053a1beb94ee4e5b3260725594315d1b6776e42f"; + sha256 = "sha256-q2ntj3y3GgXrw4v+yMvcqWFv4y/6YwunIj3bNzU9CH0="; }; - propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; + patches = [ + # FIXME: Remove patch after upstream has decided the proper solution. + # https://github.com/python/mypy/pull/11143 + (fetchpatch { + url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch"; + sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "tomli>=1.1.0,<1.2.0" "tomli" + ''; + + buildInputs = [ + types-typed-ast + ]; + + propagatedBuildInputs = [ + mypy-extensions + tomli + typed-ast + typing-extensions + ]; # Tests not included in pip package. doCheck = false; pythonImportsCheck = [ "mypy" - "mypy.types" "mypy.api" "mypy.fastparse" "mypy.report" + "mypy.types" "mypyc" "mypyc.analysis" ]; @@ -32,10 +67,13 @@ buildPythonPackage rec { # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; + # when testing reduce optimisation level to drastically reduce build time + MYPYC_OPT_LEVEL = 1; + meta = with lib; { description = "Optional static typing for Python"; - homepage = "http://www.mypy-lang.org"; - license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 ]; + homepage = "http://www.mypy-lang.org"; + license = licenses.mit; + maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 5992a6815d8e4..e62fa4230fff4 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; }; - propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; + propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; - homepage = "http://www.mypy-lang.org"; - license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 ]; + homepage = "http://www.mypy-lang.org"; + license = licenses.mit; + maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6119ee384229c..fef5dfb163bdf 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , python , buildPythonPackage , gfortran @@ -72,10 +73,6 @@ in buildPythonPackage rec { ln -s ${cfg} site.cfg ''; - # Workaround flakey compiler feature detection - # https://github.com/numpy/numpy/issues/19624 - hardeningDisable = [ "strictoverflow" ]; - enableParallelBuilding = true; checkInputs = [ diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix new file mode 100644 index 0000000000000..6a7d5cfeb6e01 --- /dev/null +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "open-meteo"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-open-meteo"; + rev = "v${version}"; + sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + aresponses + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" \ + --replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"' + ''; + + pythonImportsCheck = [ + "open_meteo" + ]; + + meta = with lib; { + description = "Python client for the Open-Meteo API"; + homepage = "https://github.com/frenck/python-open-meteo"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 917cb8895780b..476a2433ee077 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; - doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture + doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture pytestFlagsArray = [ "--skip-slow" diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 7739c33f7ca28..384544f828661 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,47 +1,47 @@ { lib -, fetchPypi , buildPythonPackage -, pythonOlder -, aspy-yaml -, cached-property , cfgv +, fetchPypi , identify , importlib-metadata , importlib-resources , nodeenv , python -, six +, pythonOlder +, pyyaml , toml , virtualenv }: buildPythonPackage rec { pname = "pre-commit"; - version = "2.15.0"; + version = "2.16.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac="; + sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U="; }; patches = [ - ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ - aspy-yaml - cached-property cfgv identify nodeenv - six + pyyaml toml virtualenv - ] ++ lib.optional (pythonOlder "3.8") importlib-metadata - ++ lib.optional (pythonOlder "3.7") importlib-resources; + ] ++ lib.optional (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optional (pythonOlder "3.7") [ + importlib-resources + ]; # slow and impure doCheck = false; @@ -55,7 +55,9 @@ buildPythonPackage rec { --subst-var-by nodeenv ${nodeenv} ''; - pythonImportsCheck = [ "pre_commit" ]; + pythonImportsCheck = [ + "pre_commit" + ]; meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch deleted file mode 100644 index 4c1b6421e0905..0000000000000 --- a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 299144e..6d12543 100755 ---- a/pre_commit/resources/hook-tmpl -+++ b/pre_commit/resources/hook-tmpl -@@ -25,8 +25,8 @@ ARGS.append('--') - ARGS.extend(sys.argv[1:]) - - DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' --if os.access(INSTALL_PYTHON, os.X_OK): -- CMD = [INSTALL_PYTHON, '-mpre_commit'] -+if os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ CMD = ['@pre-commit@/bin/pre-commit'] - elif which('pre-commit'): - CMD = ['pre-commit'] - else: diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 9c74f0a5ea6a7..c47cdaa02b701 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let + zero_or_one = cond: if cond then 1 else 0; + _arrow-cpp = arrow-cpp.override { python3 = python; }; in @@ -18,9 +20,9 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_DATASET = true; - PYARROW_WITH_FLIGHT = _arrow-cpp.enableFlight; - PYARROW_WITH_PARQUET = true; + PYARROW_WITH_DATASET = zero_or_one true; + PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; + PYARROW_WITH_PARQUET = zero_or_one true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index a7d13bb32a2f7..e1d7ddff298df 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -20,10 +20,16 @@ buildPythonPackage rec { sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; }; + disabledTests = [ + "test_multiple_workspaces" + ]; + checkInputs = [ pytestCheckHook mock ]; propagatedBuildInputs = [ mypy python-lsp-server ]; + pythonImportsCheck = [ "pylsp_mypy" ]; + meta = with lib; { homepage = "https://github.com/Richardk2n/pylsp-mypy"; description = "Mypy plugin for the Python LSP Server"; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index d2e227c1b175d..af3c2c9b6514f 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -14,17 +14,18 @@ , responses , restfly , semver +, typing-extensions }: buildPythonPackage rec { pname = "pytenable"; - version = "1.3.3"; + version = "1.4.2"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq"; + sha256 = "sha256-qljoJ+nYFVS5VHr/M4mITtO9Czuyb4HLzVjhprhyJIs="; }; propagatedBuildInputs = [ @@ -40,6 +41,7 @@ buildPythonPackage rec { requests requests-pkcs12 restfly + typing-extensions ]; checkInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 5f3ff50d1a8d8..b98c445818875 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "21.10.0"; + version = "21.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; + sha256 = "sha256-H3cM+4YA6obYbo7qm7BhLlQxW4DKV6A3X0ZKsXWPDBs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix index 7ba39341516ee..6626f0b77b3c6 100644 --- a/pkgs/development/python-modules/python-pidfile/default.nix +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python context manager for managing pid files"; homepage = "https://github.com/mosquito/python-pidfile"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index d054a0c8e8f70..388611595a6d9 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10651"; + version = "9.0.10689"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4="; + sha256 = "sha256-BP0yRsp0I6QNN6lCpF6MwBw/BXTXCsNbmzfpKNMS0fQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 4f0dd38c67c9e..0bdde93a159dd 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.1"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rlDquNKWnmP8d3pxmFfViDN++8x59h6bGXBJv//q/dk="; + sha256 = "sha256-bw/NvB4YkdAfm8YyWlLPC4Z0GH9Ez9M9yIjgubiyskw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 97f2e5a6afc24..1ec7301dabd12 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -4,7 +4,7 @@ , fetchzip , cmake , boost -, catch +, catch2 , inchi , cairo , eigen @@ -75,7 +75,7 @@ buildPythonPackage rec { buildInputs = [ boost - catch + catch2 inchi eigen cairo @@ -107,7 +107,7 @@ buildPythonPackage rec { ''; cmakeFlags = [ - "-DCATCH_DIR=${catch}/include/catch" + "-DCATCH_DIR=${catch2}/include/catch2" "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index bb84ba6b21c79..99367f97b8dd3 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.1"; + version = "6.9.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-u7qakmJ9pKV1zonILEvMHxzMF6EaY+ZJUfh5s3TTH5w="; + sha256 = "sha256-eqmYuVW912E8hiVReLAoclmNDc2+gOIcUo9lRUx9AwM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 66fa42e740130..429ebc9e0d616 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.11"; + version = "1.5.12"; src = fetchPypi { inherit pname version; - sha256 = "196021f0eff1699853675ee80e13bc856c9f1a088d93a0ac023651d2a3f62cf5"; + sha256 = "sha256-9FplToUd4CIkYZ88+Lat+joniZzRZDOfifH5z4sH8RM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index a2e58322cea3e..d560b5e89c2a7 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1"; + sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-tailscale"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 19a0fe6135e5c..c593e1e4cb19a 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "tomli"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; outputs = [ @@ -19,9 +19,14 @@ buildPythonPackage rec { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-30AQ9MQmclcjl1d83mIoxFXzaJn1OFKQlVxayqC5NxY="; + sha256 = "sha256-oDjpNzWxTaCC1+WyBKrkR6kp90ZomcZQfyW+xKddDoM="; }; + patches = [ + # required for mypy + ./fix-backwards-compatibility-load.patch + ]; + nativeBuildInputs = [ flit-core ]; postInstall = '' diff --git a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch b/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch new file mode 100644 index 0000000000000..edfc2f3834956 --- /dev/null +++ b/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch @@ -0,0 +1,21 @@ +diff --git a/tomli/_parser.py b/tomli/_parser.py +index 89e81c3..6fb1bfd 100644 +--- a/tomli/_parser.py ++++ b/tomli/_parser.py +@@ -1,6 +1,6 @@ + import string + from types import MappingProxyType +-from typing import Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple ++from typing import IO, Union, Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple + import warnings + + from tomli._re import ( +@@ -48,7 +48,7 @@ class TOMLDecodeError(ValueError): + """An error raised if a document is not valid TOML.""" + + +-def load(fp: BinaryIO, *, parse_float: ParseFloat = float) -> Dict[str, Any]: ++def load(fp: Union[IO, BinaryIO], *, parse_float: ParseFloat = float) -> Dict[str, Any]: + """Parse TOML from a binary file object.""" + s_bytes = fp.read() + try: diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index bcf4910b0d44a..cc1ddbf70123b 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.11.4"; + version = "2021.11.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-iggxKefrVZP4ljf8jGRrCAq0/xQLsr54L42KkdjBqgI="; + sha256 = "sha256-6hyeU0jigQZsZtdb4E8/iD8YfQeNOKm6IK1CHBizZQs="; }; propagatedBuildInputs = [ @@ -28,15 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - export PYTHONPATH="total_connect_client:$PYTHONPATH" - ''; - - disabledTests = [ - # Tests require network access - "tests_request" - ]; - pythonImportsCheck = [ "total_connect_client" ]; diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 313e408ca50d4..6bbb68c28f5a2 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.7"; + version = "2.7.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI="; + sha256 = "sha256-3Ho8iw//X+eB7B/Q9TJGeoxAYjUJ96qsI1T3WYqZOpM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index d5c190e1c41f2..05ef879b3e41c 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,15 +1,16 @@ { buildPythonPackage, fetchFromGitHub, lib, pythonOlder, pytest }: + buildPythonPackage rec { pname = "typed-ast"; - version = "1.4.3"; + version = "1.5.0"; + disabled = pythonOlder "3.3"; + src = fetchFromGitHub { owner = "python"; repo = "typed_ast"; rev = version; - sha256 = "16mn9snwik5n2ib65sw2xcaqdm02j8ps21zgjxf8kyy7qnx2mx4w"; + sha256 = "sha256-z3l5gMG1Jp6EI7SnGn5ABVXVBi+bK///iJBqEWn4d+s="; }; - # Only works with Python 3.3 and newer; - disabled = pythonOlder "3.3"; pythonImportsCheck = [ "typed_ast" @@ -21,6 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + checkPhase = '' runHook preCheck @@ -32,9 +34,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { homepage = "https://github.com/python/typed_ast"; description = "Python 2 and 3 ast modules with type comment support"; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix new file mode 100644 index 0000000000000..7c2c7f66a246b --- /dev/null +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-typed-ast"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2Op5y/vFIL6Nm8jeSHL0SzQtvbwJFmfi8hsDu9eWkVA="; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "typed_ast-stubs" ]; + + meta = with lib; { + description = "Typing stubs for typed-ast"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index b7b7fbc327385..9d5f15a3e1b10 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.2.0"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client providing RDW vehicle information"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-vehicle"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 4cd6fb1128cdb..2f950ecd6c44b 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -10,7 +10,11 @@ , pygments , numpy , scipy -, scikit-learn }: +, scikit-learn +, spdlog +, fmt +, rapidjson +}: buildPythonPackage rec { pname = "vowpalwabbit"; @@ -31,8 +35,15 @@ buildPythonPackage rec { pygments python.pkgs.boost zlib.dev + spdlog + fmt + rapidjson ]; + # As we disable configure via cmake, pass explicit global options to enable + # spdlog and fmt packages + setupPyGlobalFlags = [ "--cmake-options=\"-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON\"" ]; + propagatedBuildInputs = [ numpy scikit-learn diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index fcd2c2452fe67..9c5fb0fc22763 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw="; + sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 79300180948d9..7927a797656b9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -39,16 +39,6 @@ let doCheck = false; }); - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "0.6.2"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - sha256 = "10cmp2aqbnbiyrsq5r9p7ppghqj3zyg612d2dldk6m85li3jr500"; - }; - }); - }; }; in @@ -56,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.606"; + version = "2.0.625"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0="; + sha256 = "sha256-Q2GaLHciqgsvnYAFdq6839OHcpxWM2m/H10CPmBj2vg="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index d708f92a0bfe9..9bd7a4c8daf4f 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.61.2"; + version = "0.61.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8wC3IX6BhpCEsj9SiWPpxgboIJsKjMlrIHKqiJbMp+8="; + sha256 = "sha256-hMLUdUZz7IUTldiJQLKwq0AJdpQqTTzuorfzaUR+ao8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 341aba8e00b5f..6e736df235f06 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: +{ lib, stdenv, fetchurl, fetchpatch +, autoreconfHook, perl +, gdb, cctools, xnu, bootstrap_cmds +}: stdenv.mkDerivation rec { pname = "valgrind"; @@ -9,16 +12,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-AIWaoTp3Lt33giIl9LRu4NOa++Bx0yd42k2ZmECB9/U="; }; + patches = [ + # Fix tests on Musl. + # https://bugs.kde.org/show_bug.cgi?id=445300 + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=143535"; + sha256 = "036zyk30rixjvpylw3c7n171n4gpn6zcp7h6ya2dz4h5r478l9i6"; + }) + ]; + outputs = [ "out" "dev" "man" "doc" ]; - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ "pie" "stackprotector" ]; # GDB is needed to provide a sane default for `--db-command'. # Perl is needed for `callgrind_{annotate,control}'. buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; # Perl is also a native build input. - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl ]; enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 8710d390dea0a..ebb4bb5f36c32 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -3,6 +3,7 @@ , coursier , autoPatchelfHook , installShellFiles +, makeWrapper , jre , lib , zlib @@ -10,76 +11,83 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.9"; + version = "1.4.11"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4"; + sha256 = "CoF/1nggjaL17SWmWDcKicfgoyqpOSZUse8f+3TgD0E="; }; bloop-bash = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; - sha256 = "1ldxlqv353gvhdn4yq7z506ywvnjv6fjsi8wigwhzg89876pwsys"; + sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; }; bloop-fish = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "1pa8h81l2498q8dbd83fzipr99myjwxpy8xdgzhvqzdmfv6aa4m0"; + sha256 = "oBKlzHa1fbzhf60jfzuXvqaUb/xuoLYawigRQQOCSN0="; }; bloop-zsh = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; - sha256 = "1xzg0qfkjdmzm3mvg82mc4iia8cl7b6vbl8ng4ir2xsz00zjrlsq"; + sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; }; bloop-coursier = stdenv.mkDerivation rec { name = "${pname}-coursier-${version}"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" - else throw "unsupported platform"; + else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + else throw "unsupported platform"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall + export COURSIER_CACHE=$(pwd) export COURSIER_JVM_CACHE=$(pwd) mkdir channel ln -s ${bloop-coursier-channel} channel/bloop.json - ${coursier}/bin/cs install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop + ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop + + # Only keeping the binary, we'll wrap it ourselves + # This guarantees the output of this fixed-output derivation doesn't have references to itself + install -D -m 0755 .bloop.aux $out - # Remove binary part of the coursier launcher script to make derivation output hash stable - sed -i '5,$ d' $out/bloop - ''; + runHook postInstall + ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i" - else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2" - else throw "unsupported platform"; + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0c02n779z4l7blzla5820bzfhblbp5nlizx9f8wns4miwnph357f" + else if stdenv.isDarwin && stdenv.isx86_64 then "1gy5k9ii86rxyv2v9if4n1clvmb1hi4ym32mp6miwgcjla10sv30" + else throw "unsupported platform"; }; dontUnpack = true; - nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + nativeBuildInputs = [ autoPatchelfHook installShellFiles makeWrapper ]; buildInputs = [ stdenv.cc.cc.lib zlib ]; propagatedBuildInputs = [ jre ]; installPhase = '' + runHook preInstall + export COURSIER_CACHE=$(pwd) export COURSIER_JVM_CACHE=$(pwd) - mkdir -p $out/bin - cp ${bloop-coursier}/bloop $out/bloop - cp ${bloop-coursier}/.bloop.aux $out/.bloop.aux - ln -s $out/bloop $out/bin/bloop + install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped - # patch the bloop launcher so that it works when symlinked - sed "s|\$(dirname \"\$0\")|$out|" -i $out/bloop + makeWrapper $out/.bloop-wrapped $out/bin/bloop \ + --set CS_NATIVE_LAUNCHER true \ + --set IS_CS_INSTALLED_LAUNCHER true #Install completions installShellCompletion --name bloop --bash ${bloop-bash} installShellCompletion --name _bloop --zsh ${bloop-zsh} installShellCompletion --name bloop.fish --fish ${bloop-fish} + + runHook postInstall ''; meta = with lib; { @@ -87,6 +95,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ tomahna ]; + maintainers = with maintainers; [ kubukoz tomahna ]; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 308a006ecba69..0c154079ff4e8 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -89,9 +89,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.3"; + version = "7.3.1"; nativeVersion = "0.22-milestone-21"; - sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy"; + sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws"; defaultJava = jdk17; }; diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 7d7e084a79ff6..33f9811ab8364 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.0.8"; + version = "0.0.9"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "14bf1zwvfq86vh00qlf8jf4sb82p9jakrmwqhnv9p0x13lq56xm5"; + sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "01dhcj6q9c87aqpz8vy1kwaa1qqq9bh43rkx2sabhnfrzj4vypjr"; + sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4="; }; }; in @@ -22,10 +22,10 @@ stdenv.mkDerivation { let asset = assets."${stdenv.hostPlatform.system}" or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); in - fetchurl { - url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}"; - sha256 = asset.sha256; - }; + fetchurl { + url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}"; + sha256 = asset.sha256; + }; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/tools/build-managers/tup/setup-hook.sh b/pkgs/development/tools/build-managers/tup/setup-hook.sh index 5bf64ae59d35d..b7962c80d4692 100644 --- a/pkgs/development/tools/build-managers/tup/setup-hook.sh +++ b/pkgs/development/tools/build-managers/tup/setup-hook.sh @@ -1,27 +1,27 @@ #!/bin/sh tupConfigurePhase() { - runHook preConfigure - - echo -n CONFIG_TUP_ARCH= >> tup.config - case "$system" in - "i686-*") echo i386 >> tup.config;; - "x86_64-*") echo x86_64 >> tup.config;; - "powerpc-*") echo powerpc >> tup.config;; - "powerpc64-*") echo powerpc64 >> tup.config;; - "ia64-*") echo ia64 >> tup.config;; - "alpha-*") echo alpha >> tup.config;; - "sparc-*") echo sparc >> tup.config;; - "aarch64-*") echo arm64 >> tup.config;; - "arm*") echo arm >> tup.config;; - esac - - echo "${tupConfig-}" >> tup.config - - tup init - tup generate tupBuild.sh - - runHook postConfigure + runHook preConfigure + + echo -n CONFIG_TUP_ARCH= >> tup.config + case "$system" in + "i686-*") echo i386 >> tup.config;; + "x86_64-*") echo x86_64 >> tup.config;; + "powerpc-*") echo powerpc >> tup.config;; + "powerpc64-*") echo powerpc64 >> tup.config;; + "ia64-*") echo ia64 >> tup.config;; + "alpha-*") echo alpha >> tup.config;; + "sparc-*") echo sparc >> tup.config;; + "aarch64-*") echo arm64 >> tup.config;; + "arm*") echo arm >> tup.config;; + esac + + echo "${tupConfig-}" >> tup.config + + tup init + tup generate tupBuild.sh + + runHook postConfigure } if [ -z "${dontUseTupConfigure-}" -a -z "${configurePhase-}" ]; then @@ -30,13 +30,13 @@ fi tupBuildPhase() { - runHook preBuild + runHook preBuild - pushd . - . tupBuild.sh - popd + pushd . + . tupBuild.sh + popd - runHook postBuild + runHook postBuild } if [ -z "${dontUseTupBuild-}" -a -z "${buildPhase-}" ]; then diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 439350c3abc28..6cea8fcc2ea84 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -21,6 +21,11 @@ wafConfigurePhase() { echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "waf: enabled parallel building" + fi + runHook postConfigure } diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index ba829f2c41dfd..bfc00fb6e3d35 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -34,6 +34,6 @@ in stdenv.mkDerivation { meta = unwrapped.meta // { description = "Standalone command line tools for C++ development"; - maintainers = with lib.maintainers; [ aherrmann ]; + maintainers = with lib.maintainers; [ patryk27 ]; }; } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index df6a5e0f90ef7..206b4d7272660 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2021.10.19"; + version = "2021.12.01"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; + sha256 = "sha256-AH2MAz++jjBNHWAsUOWkfdzyWzGfmcDBNKcJp4xbPxQ="; }; extraNativeImageBuildArgs = [ @@ -18,6 +18,7 @@ buildGraalvmNativeImage rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; + changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 559aeb18c267c..26d3377b22ff1 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.8.1"; + version = "0.8.2"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I="; + sha256 = "sha256-0FlXHUjoeZ7XfmOSlY30b13i2t/4vyWwhDKXquXKaJE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix new file mode 100644 index 0000000000000..4950dca5add15 --- /dev/null +++ b/pkgs/development/tools/datree/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "datree"; + version = "0.14.49"; + + src = fetchFromGitHub { + owner = "datreeio"; + repo = "datree"; + rev = version; + sha256 = "0m126jjklkwiwzg44xkii9gx0pmhqm7xdj0hblsrp09jnym7rjns"; + }; + + vendorSha256 = "0msgq7bmy424bcyx23srjs7w2bck4b7zad8mi8l3j20ajya3amaa"; + + ldflags = [ + "-s" + "-w" + "-X github.com/datreeio/datree/cmd.CliVersion=${version}" + ]; + + doCheck = true; + + meta = with lib; { + description = "CLI tool to ensure K8s manifests and Helm charts follow best practices as well as your organization’s policies"; + homepage = "https://datree.io/"; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.jceb ]; + }; +} diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 1cd5d9caf2829..c6cc57e14c5c9 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.24"; + version = "0.6.2"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-d4TCuFj7nbQDxTLCStrGj698iUYTH0mCqoCZeeOGNIE="; + sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4="; }; - vendorSha256 = "sha256-3o+jizVVHcPZ6nNT2nCF8fLDynnFccI2Y50kbXp2qAI="; + vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 425d79219c8d0..835641001034b 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -10,14 +10,14 @@ in buildGoModule rec { pname = "faas-cli"; # When updating version change rev. - version = "0.13.15"; - rev = "b562392b12a78a11bcff9c6fca5a47146ea2ba0a"; + version = "0.14.1"; + rev = "d94600d2d2be52a66e0a15c219634f3bcac27318"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "15kjxn0p8nz8147vsm9q5q6wr2w5ssybvn247kynj2n7139iva2f"; + sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr"; }; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 2d1cdfc546b28..d72befbaa15c6 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -2,17 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "gir"; - version = "unstable-2021-05-05"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { owner = "gtk-rs"; repo = "gir"; - rev = "c148542ce89b0bf7cbb9f5ef4179c96a45d022df"; - sha256 = "0vy366ipwnn0cpp14l1v5g3dpnsr3hd8mjp3333lp0946igfqsy5"; - leaveDotGit = true; # required for build.rs + rev = "a69abbe5ee1a745e554cac9433c65d2ac26a7688"; + sha256 = "16ygy1bcbcj69x6ss72g9n62qlsd1bacr5hz91f8whw6qm9am46m"; }; - cargoSha256 = "11as1v88zf0f7l2ngllg5zqycvd05nb4vrsyl1dlarjvbq7fhvv8"; + cargoSha256 = "14srs2369yryqpkklmfp64fyqxrhf91b2bjy0068nx2myr25m624"; + + postPatch = '' + rm build.rs + sed -i '/build = "build\.rs"/d' Cargo.toml + echo "pub const VERSION: &str = \"$version\";" > src/gir_version.rs + ''; meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 70e127e9000d4..00529c265ee3d 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -1,23 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gosec"; - version = "2.9.1"; - - subPackages = [ "cmd/gosec" ]; + version = "2.9.3"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; + sha256 = "sha256-WjHNiFfa0YXuRq/FfWcamBwAVqRqLv9Qf+vy74rsCS4="; }; - vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; + vendorSha256 = "sha256-X2qxoq6bCQJH0B/jq670WWuTkDEurFI+Zx/5bcvXtVY="; + + subPackages = [ + "cmd/gosec" + ]; doCheck = false; - ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X main.GitTag=${src.rev}" + "-X main.BuildDate=unknown" + ]; meta = with lib; { homepage = "https://github.com/securego/gosec"; diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix new file mode 100644 index 0000000000000..47eab1abd8ef9 --- /dev/null +++ b/pkgs/development/tools/hostess/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "hostess"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "cbednarski"; + repo = pname; + rev = "v${version}"; + sha256 = "1izszf60nsa6pyxx3kd8qdrz3h47ylm17r9hzh9wk37f61pmm42j"; + }; + + subPackages = [ "." ]; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with lib; { + description = "An idempotent command-line utility for managing your /etc/hosts* file."; + license = licenses.mit; + maintainers = with maintainers; [ edlimerkaj ]; + }; +} diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/development/tools/jtc/default.nix index 947dee9ee3c0b..947f26664f4d1 100644 --- a/pkgs/development/tools/jtc/default.nix +++ b/pkgs/development/tools/jtc/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "jtc"; - version = "1.75d"; + version = "1.76"; src = fetchFromGitHub { owner = "ldn-softdev"; repo = pname; rev = version; - sha256 = "0vgb5hcgml0vmdal494231jq6dlr0qgssqhnrgsvqqjapy8xhnpw"; + sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU="; }; buildPhase = '' runHook preBuild - $CXX -o jtc -Wall -std=gnu++14 -Ofast jtc.cpp + $CXX -o jtc -Wall -std=gnu++14 -Ofast -pthread -lpthread jtc.cpp runHook postBuild ''; diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix new file mode 100644 index 0000000000000..510cd1f60f300 --- /dev/null +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }: + +stdenv.mkDerivation rec { + pname = "kotlin-language-server"; + version = "1.1.2"; + src = fetchurl { + url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; + sha256 = "d8850ee2be8c49e5e642c4a41f52304098ae0bcce009e4d91531a9aeecd64916"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib + mkdir -p $out/bin + cp -r lib/* $out/lib + cp -r bin/* $out/bin + ''; + + nativeBuildInputs = [ unzip gradle ]; + buildInputs = [ openjdk11 gradle ]; + + meta = { + description = "kotlin language server"; + longDescription = '' + About Kotlin code completion, linting and more for any editor/IDE + using the Language Server Protocol Topics''; + homepage = "https://github.com/fwcd/kotlin-language-server"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 96a98222caaa2..81bb656bdc577 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.0"; + version = "0.43.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "0vrfxmqnwwgij8hrcbzp3j0vg90w55r6kw4zhqmjsnnsg29gc82s"; + sha256 = "1qcalpimgsm5s3xhssrnanryra4dp2if9y4647aimydwvfhi05df"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 2c09f925d3d8b..d24d4b66d66c9 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { rm tests/test_conf_parser_save.sh ''; - enableParallelBuilding = true; + # test suite is not thread safe + enableParallelBuilding = false; nativeBuildInputs = [ texinfo help2man ]; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 7c7549e3844c2..8a36c52e7ae31 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.10.0"; + version = "13.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "13s8v9s2f284fnh47xdyc75gq2i9pndl39q8v4wl7v7lwri2hv8r"; + sha256 = "4da976f3d114e4ba6ba06cbe660ce1393230f4519c4df15b90bc1840f00e4195"; }; passthru = { diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 7e5490fcc3d42..0b73355863c08 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.14"; + version = "5.15"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kBvubbXhfeutRTDdn/tNyalsSmVu2+HDFBt8swexHnM="; + sha256 = "sha256-68rCLylzNSlNxlRCXLw84BM0O+zm2iaZ467Iau6Nctw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 5554ce1635021..831360cd858d6 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,11 +15,12 @@ }: let - merlinVersion = "4.3.1"; + merlinVersion = "4.4"; hashes = { - "4.3.1-411" = "0lhxkd1wa8k3fkcnhvzlahx3g519cdi5h7lgs60khqqm8nfvfcr5"; - "4.3.1-412" = "0ah2zbj1hhrrfxp4nhfh47jsbkvm0b30dr7ikjpmvb13wa8h20sr"; + "4.4-411" = "sha256:0chx28098mmnjbnaz5wgzsn82rh1w9dhzqmsykb412cq13msl1q4"; + "4.4-412" = "sha256:18xjpsiz7xbgjdnsxfc52l7yfh22harj0birlph4xm42d14pkn0n"; + "4.4-413" = "sha256:1ilmh2gqpwgr51w2ba8r0s5zkj75h00wkw4az61ssvivn9jxr7k0"; }; ocamlVersionShorthand = lib.concatStrings @@ -37,7 +38,7 @@ buildDunePackage { inherit version; src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; sha256 = hashes."${version}"; }; @@ -47,10 +48,12 @@ buildDunePackage { dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) + ] ++ lib.optional (!lib.versionAtLeast ocaml.version "4.12") # This fixes the test-suite on macOS # See https://github.com/ocaml/merlin/pull/1399 + # Fixed in 4.4 for OCaml ≥ 4.12 ./test.patch - ]; + ; useDune2 = true; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 040109da3adbd..d508b9f73d0af 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; + sha256 = "sha256-082rFxC/p68X8g58I7Q7Of70ymq7VsLhkQpcqVx0u/A="; }; - cargoSha256 = "sha256-/0pxEQFhovPRI4Knv5xq6+PHRuGN6+tF8CdK5X30LKI="; + cargoSha256 = "sha256-1yTH5FvalzBD13FXh/X1jmZhVyWU3thrjNSsrHUfBNE="; nativeBuildInputs = [ pkg-config ]; @@ -24,6 +24,12 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@localhost.localnet ''; + # Exclude some tests that don't work in sandbox: + # - favorites_default_to_git_if_not_defined: requires network access to github.com + # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant. + checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ] + ++ lib.optionals stdenv.isDarwin [ "--skip git::should_canonicalize" ]; + meta = with lib; { description = "cargo, make me a project"; homepage = "https://github.com/ashleygwilliams/cargo-generate"; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index a59a124317b94..d5652c82ec7ff 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wipe"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mihai-dinculescu"; repo = "cargo-wipe"; rev = "v${version}"; - sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; + sha256 = "sha256-AlmXq2jbU8mQ23Q64a8QiKXwiWkIfr98vAoq7FLImhA="; }; - cargoSha256 = "sha256-EoXgsWg1Rh7C+fIqvefkLdck4Yj3kox2ZAU3kn6nH8Q="; + cargoSha256 = "sha256-vsN4cM4Q9LX1ZgAA5x7PupOTh0IcjI65xzuCPjy8YOs="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 6f9cb007b9041..2626de0f84baf 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1 +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1 , libiconv, AppKit, IOKit }: rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.0"; + version = "0.3.1"; - src = fetchFromGitHub { - owner = "knurling-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "0qlpvy62wqc8k9sww6pbiqv0yrjwpnai1vgrijw5285qpvrdsdw2"; + src = fetchCrate { + inherit pname version; + sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; }; - cargoSha256 = "10ybgzvv2iy5bjmmw48gmgvsx6rfqclsysyfbhd820dg2lshgi44"; + cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index cf767515082e4..e85b596607b1c 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, haskellPackages, haskell, pandoc }: +{ stdenv, lib, ShellCheck, haskell, pandoc }: # this wraps around the haskell package # and puts the documentation into place @@ -15,13 +15,13 @@ let }; in drv' // { meta = meta' // overrideFn meta'; }; - bin = haskell.lib.compose.justStaticExecutables haskellPackages.ShellCheck; + bin = haskell.lib.compose.justStaticExecutables ShellCheck; shellcheck = stdenv.mkDerivation { pname = "shellcheck"; version = bin.version; - inherit (haskellPackages.ShellCheck) meta src; + inherit (ShellCheck) meta src; nativeBuildInputs = [ pandoc ]; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index d8916ce3e9a8a..85cdb9d53b45a 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }: - +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }: +let + target = if stdenv.isDarwin then "macOS" else "Linux"; +in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; version = "2.5.1"; @@ -17,12 +19,32 @@ stdenv.mkDerivation rec { makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Foundation + ]; + preBuild = '' cd 3rd/luamake + '' + + lib.optionalString stdenv.isDarwin '' + # Needed for the test + export HOME=/var/empty + # This package uses the program clang for C and C++ files. The language + # is selected via the command line argument -std, but this do not work + # in combination with the nixpkgs clang wrapper. Therefor we have to + # find all c++ compiler statements and replace $cc (which expands to + # clang) with clang++. + sed -i compile/ninja/macos.ninja \ + -e '/c++/s,$cc,clang++,' \ + -e '/test.lua/s,= .*,= true,' \ + -e '/ldl/s,$cc,clang++,' + sed -i scripts/compiler/gcc.lua \ + -e '/cxx_/s,$cc,clang++,' ''; ninjaFlags = [ - "-fcompile/ninja/linux.ninja" + "-fcompile/ninja/${lib.toLower target}.ninja" ]; postBuild = '' @@ -33,15 +55,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server - install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.* + install -Dt "$out"/share/lua-language-server/bin/${target} bin/${target}/lua-language-server + install -m644 -t "$out"/share/lua-language-server/bin/${target} bin/${target}/*.* install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua cp -r locale meta script "$out"/share/lua-language-server # necessary for --version to work: install -m644 -t "$out"/share/lua-language-server changelog.md - makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \ + makeWrapper "$out"/share/lua-language-server/bin/${target}/lua-language-server \ $out/bin/lua-language-server \ --add-flags "-E $out/share/lua-language-server/main.lua \ --logpath='~/.cache/sumneko_lua/log' \ @@ -55,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; maintainers = with maintainers; [ mjlbach ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index a922ae751e23b..6eada3412b3f9 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.tw"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju legendofmiracles ]; + maintainers = with maintainers; [ sirseruju lom ]; mainProgram = "DDNet"; }; } diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh index e36badc4199e5..0ef9a40c7a5d7 100755 --- a/pkgs/games/dwarf-fortress/update.sh +++ b/pkgs/games/dwarf-fortress/update.sh @@ -3,13 +3,13 @@ # systems to generate hashes for systems='linux linux32 osx osx32 - win win_s win32 win32_s + win win_s win32 win32_s legacy legacy_s legacy32 legacy32_s' if [ $# -eq 0 ]; then versions="$(curl http://www.bay12games.com/dwarves/ \ - | grep 'DWARF FORTRESS CLASSIC ' \ - | sed 's/.*DWARF FORTRESS CLASSIC \([0-9.]*\) .*/\1/')" + | grep 'DWARF FORTRESS CLASSIC ' \ + | sed 's/.*DWARF FORTRESS CLASSIC \([0-9.]*\) .*/\1/')" else versions="$@" fi @@ -18,23 +18,23 @@ tmp1="$(mktemp)" tmp2="$(mktemp)" for version in $versions; do for system in $systems; do - echo -n $version,$system, - ver=$(echo $version | sed -e s,^0\.,, | tr . _) - if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then - ext=zip - else - ext=tar.bz2 - fi - nix-prefetch-url \ - http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext} + echo -n $version,$system, + ver=$(echo $version | sed -e s,^0\.,, | tr . _) + if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then + ext=zip + else + ext=tar.bz2 + fi + nix-prefetch-url \ + http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext} done done | jq --slurp --raw-input \ - 'split("\n") | .[:-1] | map(split(",")) | + 'split("\n") | .[:-1] | map(split(",")) | map({ "version": .[0], "platform": .[1], "sha256": .[2] }) | - group_by(.version) | - map(map({"version": .version, (.platform): .sha256}) | add | - {(.version): .} | map_values(del(.version))) | add' \ - > "$tmp1" + group_by(.version) | + map(map({"version": .version, (.platform): .sha256}) | add | + {(.version): .} | map_values(del(.version))) | add' \ + > "$tmp1" # Append $tmp1 to game.json. There should be a better way to handle # this but all other attempts failed for me. diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 2304acf446dfe..5d7506ba160ba 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.17.1"; + version = "1.18"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar"; + url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar"; # sha1 because that comes from mojang via api - sha1 = "a16d67e5807f57fc4e550299cf20226194497dc2"; + sha1 = "3cf24a8694aca6267883b17d934efacc5e44440d"; }; preferLocalBuild = true; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 25c6b4ddec092..7a1da6f6398c0 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c + sed -i -e 's#"libcurl.so.4"#"${curl.out}/lib/libcurl.so.4"#' code/client/cl_curl.h ''; installPhase = '' diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 23396ebf978d9..8128a67ebeeec 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Your filesystem as a dungeon"; homepage = "https://github.com/facundoolano/rpg-cli"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 1e43674d2a4a9..7373779c9e5aa 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchzip, SDL2, SDL2_image, SDL2_mixer -, zlib, makeWrapper +{ lib +, stdenv +, fetchzip +, SDL2 +, SDL2_image +, SDL2_mixer +, zlib +, makeWrapper +, copyDesktopItems +, makeDesktopItem }: stdenv.mkDerivation rec { @@ -13,26 +21,47 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper + copyDesktopItems ]; buildInputs = [ - SDL2 SDL2_mixer SDL2_image + SDL2 + SDL2_mixer + SDL2_image zlib ]; sourceRoot = "source/src"; + enableParallelBuilding = true; + + desktopItems = [ + (makeDesktopItem { + name = "sauerbraten"; + exec = "sauerbraten_client %u"; + icon = "sauerbraten"; + desktopName = "Sauerbraten"; + comment = "FPS that uses an improved version of the Cube engine"; + categories = "Application;Game;ActionGame;"; + }) + ]; + installPhase = '' - mkdir -p $out/bin $out/share/sauerbraten $out/share/doc/sauerbraten - cp -rv "../docs/"* $out/share/doc/sauerbraten/ - cp -v sauer_client sauer_server $out/share/sauerbraten/ - cp -rv ../packages ../data $out/share/sauerbraten/ + runHook preInstall + + mkdir -p $out/bin $out/share/icon/ $out/share/sauerbraten $out/share/doc/sauerbraten + cp -r "../docs/"* $out/share/doc/sauerbraten/ + cp sauer_client sauer_server $out/share/sauerbraten/ + cp -r ../packages ../data $out/share/sauerbraten/ + ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \ --run "cd $out/share/sauerbraten" makeWrapper $out/share/sauerbraten/sauer_client $out/bin/sauerbraten_client \ --run "cd $out/share/sauerbraten" \ - --add-flags "-q\''${HOME}" + --add-flags "-q\''${HOME}/.config/sauerbraten" + + runHook postInstall ''; meta = with lib; { @@ -42,9 +71,8 @@ stdenv.mkDerivation rec { hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data - []; - license = "freeware"; # as an aggregate - data files have different licenses - # code is under zlib license + [ ]; + license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license platforms = platforms.linux; }; } diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 968f529421d6a..66e17b1752ea8 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "Rust TUI client for steamcmd"; homepage = "https://github.com/dmadisetti/steam-tui"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; # steam only supports that platform platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 7307fc6070095..485a6c0504179 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Simple command-line tool to send text and files to discord"; homepage = "https://github.com/somebody1234/cliscord"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; mainProgram = "cliscord"; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/misc/emulators/dolphin-emu/primehack.nix new file mode 100644 index 0000000000000..90510d645226f --- /dev/null +++ b/pkgs/misc/emulators/dolphin-emu/primehack.nix @@ -0,0 +1,151 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, wrapQtAppsHook +, qtbase +, bluez +, ffmpeg +, libao +, libGLU +, libGL +, pcre +, gettext +, libXrandr +, libusb1 +, lzo +, libpthreadstubs +, libXext +, libXxf86vm +, libXinerama +, libSM +, libXdmcp +, readline +, openal +, udev +, libevdev +, portaudio +, curl +, alsa-lib +, miniupnpc +, enet +, mbedtls +, soundtouch +, sfml +, fmt +, vulkan-loader +, libpulseaudio + +# - Inputs used for Darwin +, CoreBluetooth +, ForceFeedback +, IOKit +, OpenGL +, libpng +, hidapi +}: + +stdenv.mkDerivation rec { + pname = "dolphin-emu-primehack"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "shiiion"; + repo = "dolphin"; + rev = version; + sha256 = "011qghswgh9l7k993lfn1hrwhgyrv9m33smgspsjq50jww6r27fl"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; + + buildInputs = [ + curl + ffmpeg + libao + libGLU + libGL + pcre + gettext + libpthreadstubs + libpulseaudio + libXrandr + libXext + libXxf86vm + libXinerama + libSM + readline + openal + libXdmcp + lzo + portaudio + libusb1 + libpng + hidapi + miniupnpc + enet + mbedtls + soundtouch + sfml + fmt + qtbase + ] ++ lib.optionals stdenv.isLinux [ + bluez + udev + libevdev + alsa-lib + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + CoreBluetooth + OpenGL + ForceFeedback + IOKit + ]; + + cmakeFlags = [ + "-DUSE_SHARED_ENET=ON" + "-DENABLE_LTO=ON" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + ]; + + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" + ]; + + # - Allow Dolphin to use nix-provided libraries instead of building them + postPatch = '' + substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' + substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' + ''; + + postInstall = '' + mv $out/bin/dolphin-emu $out/bin/dolphin-emu-primehack + mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui + mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop + mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png + substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + ''; + + meta = with lib; { + homepage = "https://github.com/shiiion/dolphin"; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ MP2E ashkitten Madouura ]; + # x86_32 is an unsupported platform. + # Enable generic build if you really want a JIT-less binary. + broken = stdenv.isDarwin; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index e087db6f8d2e9..6eb489e1f8bd5 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -26,6 +26,6 @@ python3Packages.buildPythonPackage rec { description = "A terminal-based presentation tool with colors and effects."; homepage = "https://github.com/vinayak-mehta/present"; license = licenses.asl20; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a3cc3136dbf3c..994665f9bf09d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-11-28"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "f92674de63d82accbed4f4a853925ec1d75e8cff"; - sha256 = "0njyhpn29z5s6xx25flk0pf53ifpdwznasdryi0bnri25pfv29hq"; + rev = "ab68f4f07b0f382f61b14b67599a59b1f6fead87"; + sha256 = "1jlav2mbsizwnkkgp1v15sw765q24kc5sss34y16hdxsap6113vd"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "d98ee14f18c7e117f8221aea83c51d713a080076"; - sha256 = "05azpx3q49j9c2qli0n15dby0xn88pfij36xfsnwy2wrbs5c2k0d"; + rev = "1607b4c100f9c466fc0208e936421a0202025457"; + sha256 = "1rx1ggy54j71pp5ihv8zb3wqq69b26v65q1snv6hlabar02hrl1r"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-28"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f56b751e3b04b3146f90f892047fb63623eb6ca6"; - sha256 = "0lxz0xir8zy7p5bs5z6vf9nxy91n6pxjqvf5iql7yfhc9hhaasf4"; + rev = "d034dcc738c8fd2217199e5db76066223ab8750c"; + sha256 = "1s97snn5g5bd3sfqj5n2a76f0r9d3ywi0q08xbxv6y3p83c1dn10"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -605,12 +605,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2021-11-22"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "e5aa12620b6cae9ba5ce27aed2c47a99b81f004f"; - sha256 = "03zjy4xwzm1898pabz0gzydc5zlcnsprkqlk0aavz0aw21mmywkh"; + rev = "29ca81a6f0f288e6311b3377d9d9684d22eac2ec"; + sha256 = "0yzh0jdys1bn1c2mqm410c0ndyyyxpmigzdrkhnkv78b16vjyhq6"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -689,12 +689,12 @@ final: prev: cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; - version = "2021-09-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "3fec8a57d6d230c81d24c03dd80e97c62d4eda63"; - sha256 = "018lzqxdcw78ckqm16jn0wh3pv9pjl6abcj1q2svfalmim0h6a87"; + rev = "580d07d32242d542e365d2732eddd2dbb7374aff"; + sha256 = "1d6j1ddfb9xijsljskb04s3kan3sg8lmbv1qal5hmhrwi8x65dwg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; @@ -713,12 +713,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "4fe14cf56288200614950fe57525ac6340f49d5a"; - sha256 = "1f48pnmwnr93frggpqd0m6vnpkj1frn3vnnp5ljwi86mlc4p4ag4"; + rev = "e30d3fdee650a07330654efab1951b2f1b91435e"; + sha256 = "1sf79aqq41qbz69b29yzyn27qb9x8spyqxpay8fgzhn8jfkapvxv"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -737,12 +737,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-11-28"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "d52a25de3417139d5b0e1624f15c60df0565c75f"; - sha256 = "1vx0zb41c39k7ba6slkic8w9f91l5070yzja6l14pyngq55h5mdw"; + rev = "e03ad3d788b0d76293b3a7601e0abf988d6d3859"; + sha256 = "13kkgvlnzjh57ynpyj1vw1dgs4zf4y2cq4c1mf3g51782qgf0kxp"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1002,12 +1002,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-11-25"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "d7c6daa59a0d5940f85f110d8e59fdf9b0cef5d1"; - sha256 = "14j1fc1c43lpj24gflw1b594n601al8clkcpjpql7rl3dbmh3dc9"; + rev = "5106ae2d3c93d37173ccb3b917bebb9845e3d3e6"; + sha256 = "1svhj1n17y70ns9d0hc9a3dvxb1nmpii5vgificgpwqfmkws4dak"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1170,12 +1170,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-28"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b1de088782d8ad225728fcb79cfa889f8ff3edf9"; - sha256 = "1cjlf1yqdd1il0wjbhmgflqp761ybkpbaaw318564b8hvmxknwxk"; + rev = "cdfb2df434ff57a00f2f3f90dc5c6e11c2bd3079"; + sha256 = "0f7wwn3x579qm0klq4h2hmmvh5srb1fvsgmcnhm2il4j2mgdhykh"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1362,12 +1362,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2021-11-06"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "feb1269a56628accc1ec74f4d5e0ea91b80fe9f9"; - sha256 = "0nnbj538vd99rb4cjfs6xxx6c1n7aflpw92zkz9if1xhfw4jqfzc"; + rev = "e9db6ec1c53797eea0571f4374bee79bcca5db40"; + sha256 = "0hlbr4dvh8irif6xa24dwj0l1wx8djfx72dq1wx4y16af4wgkkfv"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1640,12 +1640,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-11-26"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "f92d27b22bd5bfa47903ac91de5077263ce816ea"; - sha256 = "03yawkbh6fxm9wf5nfj2wblcdwxjs4gjcqrp96k9xyjf58ggrlsi"; + rev = "2c0f5af509a9e0f42430c0b561ab7e49aec84f72"; + sha256 = "16ap4kdb5gghnn6x9fiafphpr7gvkq5baiba0vzxiv8h2la0jhw1"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1712,12 +1712,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f2c8e3d2a72f3763e3ea9c620a118e73e2146fb1"; - sha256 = "08v10j0hirqcj2r2fcw8b04v8bpwj1kp887pq8vs5f57ncqzl8x7"; + rev = "80be959e1840b0a49dda09775610cc3c366b8f3c"; + sha256 = "136akfkblxc4myyb7l6gs8zszrgn2is8b0692v16xbql3i4d708n"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2219,12 +2219,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree.nvim"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "62d2be7e0bf5a594a547efa1ab962c930f448e2d"; - sha256 = "1k1bz9hvbqxankfr038fbmxrmjr1zcnn3j7mchzcj4pfx5x3ny3g"; + rev = "508a33853b9cc14c67cc042d2f4876d6db636b68"; + sha256 = "0n1mn3fnmxddgj0j4041ia2fnnhsfknl4ks88llabg8k0kcxvzmi"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2243,24 +2243,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-11-15"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "003ee482a25118cdac73faea8bd35df0399e8f8f"; - sha256 = "0zpy1cpviia9l4z3b87534arnxfja48bjhqqb88mxjzm9gkc4rbf"; + rev = "a11e5fa14bbb438f59a3744bff53a3ad78eecd71"; + sha256 = "0s17alrjqbdyk7jxg6jyb4xwmr9741a2r3306ywx6qsl9pk3n0p2"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-19"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "95845ef39ce0a98f68cdfdcf7dd586c5e965acc7"; - sha256 = "0hzzwsc9y8z71d82j2sbhhl5vxp1xmd8ki0km746jcigfaaagdll"; + rev = "9678750f209671551c335c4f22658a6554c2f439"; + sha256 = "1i8xlj40a80p3s7pkxqqdxpfz0330akfqd7q2rr4gakqc927aqgy"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2327,12 +2327,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-11-17"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "817bae89f75c8f061f7c0198ce392dca5d16ac94"; - sha256 = "0pxz7mrl4fsdi6pyk7zizxb7g3a11n8s36ndg3l9qsbihfxiqk5y"; + rev = "308fb0fc4810ddd29209d2840cd92c68a5bd005e"; + sha256 = "0nlww4f8v5w05qz44pw3hdapkfm22gp12733pp634r1hi6ga0kdj"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2387,24 +2387,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "a25c5294013d58e4fde6b72d94a5f77e3330f0cc"; - sha256 = "0k4baphl8x6fy8hqidr7g8mw6w1cjhwsgjmsd9v72a9ikl4z22vq"; + rev = "fb27ccbd20cc1eda04e181f22c722977bdf9c934"; + sha256 = "0hi99gjirhfcv3l8jay0ay3qk9w2mhv06y6afxvx0jk64wr8mr1q"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-11-22"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c69b98d5defbe998627be2175e2ce7707fd73dc0"; - sha256 = "0wha77kmci0923qin5k6ximmfs8pf6viz22h5yl7abc3wi294vzb"; + rev = "8efd28ff057c24b8179e0ace9e12f57141a7f6b0"; + sha256 = "0kqal8ddxam5hiczf6pakmx1dxk2zbf32l2hk27jcscj0q7npxc7"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2627,12 +2627,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-20"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "caf7f61e94525bbd97e32f118efd6c0722430616"; - sha256 = "1gdnw6scph18ihkiscyh51lbdaj5m6hlq5wggammpzi7pj2gqmar"; + rev = "0f8df7e43f0cae4c44e0e8383436ad602f333419"; + sha256 = "13jqcl54ijdzk3r17fmr2zzzjxn1njwfhipaaxyk7p6qqi1hphgj"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-25"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "5d23a7a83b1a8ccdbf1b27927172d5fdcbdf0dd5"; - sha256 = "0p6f8wwiniin1ah1ds2c5n9pq6qmy6hk0f10iil4bim5ng08yvwn"; + rev = "0283251541b44508cf80a25be660d1a856cbe9de"; + sha256 = "16nvzgx6h11br4v5vw1sjm0lv84727xlxrfs9zc54whxhs4bscd8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3240,12 +3240,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e63b58600f91681f744fc180ae13ce2800b5e29a"; - sha256 = "1sc7v2g1dfw5sls8iddi10w5ba2n7j24k77abarw7y6rwfmnzlrh"; + rev = "f40a378f969de864289399334017c98875100799"; + sha256 = "002wwfyiydr9r240c1x9zxs1dgym4zkwv0zk7pm6ivc67287avp9"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3828,12 +3828,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-11-23"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "3e4d6d427b6353dcf3569ba02abdcf4c6f532621"; - sha256 = "1gr0476ibsdp3n31xab3wkmfff09f1zgicyizjnbck7lbin1v3xi"; + rev = "0f203f0b7964170f0dd2610ccb2307dc03d6dffd"; + sha256 = "1qsr5i2zc7ika9v6b16771lxbyaajciabmyc0n96c4fzgc584h3a"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4008,12 +4008,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-11-07"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "c9265653e7fbf70326d671b37c7c89e4fa2b8093"; - sha256 = "0cn8gxzk9l4nmfxr97xrcz8sd0vrzv827mw499nlpai1z8xqj318"; + rev = "d96e7e3fa955ef89788f4d6e14cdff07a162cf15"; + sha256 = "0fn3ijhyjdvy4aq12hwgg5mpmh2vfd848bycz0gpifkigmhb1dwj"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -4056,12 +4056,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-26"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b07ce47f02c7b12ad65bfb4da215c6380228a959"; - sha256 = "0j9iawg8hv1aqd68k7n22hm6rs0ia862vxvkq3y10b0xiagcvfyr"; + rev = "357b9a1afedd0d708b48fc1f39fffb92a73840a3"; + sha256 = "0lfhfri2507mkp8d6klwkhkxi2mdzjywkx910pbc0lmzcvfsprna"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4128,12 +4128,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-11-27"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d82e784a36160028b245576213100c888be503f0"; - sha256 = "1y0g2y9fbxy5bq1wp8g36irsjhhvkbkcj6nfmbiaichizsl5zmz8"; + rev = "eb044199ce46ff597da6efc7d3e4d3bf7e7b17aa"; + sha256 = "14viwfxiazqc8k1zrabqhwv3yxv1ycvcwk7ql2gpnxp3fak3rp8g"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4164,12 +4164,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-27"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "092fb66b6ddb4b12b9b542d105d7af40e4fbd9f2"; - sha256 = "0fa4y4zyrg6amsfjivs9zb9wlh1zlcjmh7va8mbghccmi72lpl92"; + rev = "a61c36a639a1662a5d27b1a88086b9c91d7d49a8"; + sha256 = "0a8b9i7sg71hw25r3k1g7niajp3x4qivb33i14gi991p87mdnmfq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4248,12 +4248,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-11-27"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "052f3424daba36984f506de80532121b01e07ff5"; - sha256 = "076qrh2jskqfbpr31bmp9l3l855659p4j6yd4mmzm71xwv020049"; + rev = "a5183531c2b29199a8a0ad0187697ee7c9cdcee2"; + sha256 = "0hvj2jknbr87fg14hnm28l3gpccpgkhf7czsjvi5qjqi1bi3s12j"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4308,24 +4308,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b9bbef6204bbb143d45fd457a07f211cb38f9679"; - sha256 = "19r828px9ix31ai0ydxqi7ymp4cpabk23ligglnki4pc34bhw55q"; + rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8"; + sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-11-22"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8aa60ec837eb40689ff1f67e050bd8662202d5be"; - sha256 = "1vjjn1kh4gflp1r97ix7rs4frlk8w9z0k0vfyif0pzl24f8dsvxq"; + rev = "2e2a5f041cb5a9acf3e6ae61735b32fa877ae69e"; + sha256 = "0swrx2ipcxd01df0aplm3066mvy2ad9mj07cybgz4g1qh5f7mpim"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4354,6 +4354,18 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; + nvim-jqx = buildVimPluginFrom2Nix { + pname = "nvim-jqx"; + version = "2021-11-25"; + src = fetchFromGitHub { + owner = "gennaro-tedesco"; + repo = "nvim-jqx"; + rev = "433040c73b68796e2ebed049075b8c46d2222ac2"; + sha256 = "1dh4yb6rr593nx8kbhskpbb50l211b9z47rvhxd1n07d31bc0lmc"; + }; + meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; + }; + nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; version = "2021-11-13"; @@ -4392,12 +4404,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d9aa848da3905e0f8153e546d7b630d3d13e0435"; - sha256 = "16j5xk75vbi7gdw822dc1xr0a3wlr5b1fimm8d8h5naydx5fvpfc"; + rev = "622b155fb608d5366658de12a08b3050f5ca5772"; + sha256 = "0sadswm4bywsr4vznknqpdzq00jb5zdk1b3gv2g5m938y417pim7"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4414,6 +4426,30 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-metals = buildVimPluginFrom2Nix { + pname = "nvim-metals"; + version = "2021-11-29"; + src = fetchFromGitHub { + owner = "scalameta"; + repo = "nvim-metals"; + rev = "25d148b6b03c7aeea917f296a5c2a60829810eb3"; + sha256 = "1b7h5h6n1b2mpqnqpkmha689bpy6k85w40s65c2v7cbj7zn92ycw"; + }; + meta.homepage = "https://github.com/scalameta/nvim-metals/"; + }; + + nvim-neoclip-lua = buildVimPluginFrom2Nix { + pname = "nvim-neoclip.lua"; + version = "2021-11-06"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-neoclip.lua"; + rev = "cb4eff8bb7bb4bbb3d1629178a7dc62322773e05"; + sha256 = "1szwg804gajq84icl39gsmbqkaxh3yffdb50wh0pcgj86b4w5hda"; + }; + meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; + }; + nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; version = "2021-10-25"; @@ -4428,12 +4464,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "9ac4202ed3c5afa92498b83dd28dcde19576ab1f"; - sha256 = "0ic4vicm7a63h7gs4w4fz2fg4clkd4q1zag7kdklwg7qyrdnacn9"; + rev = "36012703049bc7be9d4de97cb96c6d17ccf978cd"; + sha256 = "0gv3czqrcbbyvcvhz3lb0xzyc2agxf20wgc0mxwsvcn9339ymzmw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4452,12 +4488,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-10-09"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fb35d9d7b52985baac5d77ec52d6b6b35403fb8a"; - sha256 = "013gmwrcanvsa95jgl4xd5agci7j05w9yvqayns83gxbsbl7bsjs"; + rev = "b962a67f6bb5ac7c415003748f2088b522ca4390"; + sha256 = "1krj8jjd5x0f5bfzhhasxisp6kxf0jq5nilx5ik4fl6az3p5q2za"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4512,12 +4548,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-09-17"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "47cfda2c6711077625c90902d7722238a8294982"; - sha256 = "14di7qm37m176r0qsbb0vmc3csya72rd5bszm6yk7lby8izfnqxa"; + rev = "8d1547f0bcd0831876678eeb238c3ba9a528189b"; + sha256 = "141ns7ap27v1ybly2jbpp4qi1p1m1g9cfja545iyb1x1936wzcya"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4560,12 +4596,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-11-26"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "380561ee746eac6791d148c6de459f4d92b2fa33"; - sha256 = "08sy36gd3bdz3s69dxlck2a8952cn0gdvb3i3dppm0skjz8d353f"; + rev = "6311b7eeebad214747018a95896f53f0c2485ef0"; + sha256 = "0ndb3hmyr0vrg25178rpbwby7zzjfda5bw63ix5d9b77zk6896ab"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -4704,12 +4740,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-25"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "4ea622fb56fc0df026e12c768f761bb832bba02d"; - sha256 = "0684q3h3arzcm4m33gxskc96jc5g6y4kdqzzh75hxq0bilfdvy63"; + rev = "d644c85b0193a76c86fe591e378329987f984661"; + sha256 = "19rw1n01qlfil6i2c0m1md12dql6caplx7apqxbgnwxbbawc4ps1"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4776,12 +4812,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-11-03"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "7f62848f3a92eac61ae61def5f59ddb5e2cc6823"; - sha256 = "1sgrwm271pnvw9anl1y8x94bz0w7qvi3bdiqh1wpwvsqic73frq3"; + rev = "db3c3e3379613443d94e677a6ac3f61278e36e47"; + sha256 = "0zn6a11j2fp8lmc6kkkmi5nmz4xmrnrymdxpzrxmq8a5iw9cg2bg"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5329,12 +5365,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-19"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a522e1d4affddefd824daefcfe42a7e2cab6626f"; - sha256 = "1h5q33b6bgmj9zf7fm5kbx95gp49jcn8af9rm5jn5bc0b3l7nzls"; + rev = "cdf9fd7a8cb41ad89e8f7dcccdd4a79d186f1f54"; + sha256 = "18irbz0lcg6a8iv7qpyzjssk7j7fvw57jwn9c4w59k5h53yhz0kq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5546,12 +5582,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-11-11"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "30dd4ae6f844ab0f53ba93eea61068f87886eb03"; - sha256 = "0hwcar6c6n3fvli9pmx1ycvk4128f47hl07c7y7hxzy2rks7s3j8"; + rev = "563280b529405e86464ce0554872f7dc6b6c3f92"; + sha256 = "0syhr5a8jmzv1bv9zpmbqzblpgva6cxgnxkifpd9xvsy63dd0q96"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5679,12 +5715,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-11-17"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "3d86afaa61aa45ca8d849494d9f8ceb5fc424353"; - sha256 = "16wx3wgmrslpsm1h5fskik2lkas390fj2gjz3vwii4c5mz2ijr9m"; + rev = "fca1c02b29d5f54f063122270f3e5ea8777ca958"; + sha256 = "0a5rra4al18m3f175awz118gilg3cqx8i3k1mr0657n5hvkxbs9d"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6051,6 +6087,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; + telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { + pname = "telescope-lsp-handlers.nvim"; + version = "2021-09-07"; + src = fetchFromGitHub { + owner = "gbrlsnchs"; + repo = "telescope-lsp-handlers.nvim"; + rev = "d6d5983b0131ee2c386ca9e349f6621e12d971cb"; + sha256 = "1x51mlj1c3cwmcjqssh89049q91423jxm3rv8s25pcw493zb2x6b"; + }; + meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/"; + }; + telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; version = "2021-11-20"; @@ -6075,6 +6123,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { + pname = "telescope-vim-bookmarks.nvim"; + version = "2021-08-12"; + src = fetchFromGitHub { + owner = "tom-anders"; + repo = "telescope-vim-bookmarks.nvim"; + rev = "b7a436eba6102c2bc73f49766a12e79d24ab8fb5"; + sha256 = "0lak83b8y963hv61z2yfi1nyaapvq2hnhpcx7bc6h8v4jzyjis0n"; + }; + meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; + }; + telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z.nvim"; version = "2021-10-10"; @@ -6089,12 +6149,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ed4adba6d0083a14cabf5837f2511b2617a45593"; - sha256 = "1ippixq77irl2dslnf4if31v59ij6ycij0bbl6q1ghpvkqkryd81"; + rev = "ef245548a858690fa8f2db1f1a0eaf41b93a6ef6"; + sha256 = "1fsbd4cjc13f1mylpg7i4rdsqj2y4ib2kzph91xnnjf6zsi6bmp0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6246,12 +6306,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2021-10-22"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2981e4bd0919305675d8d665f9a20281bb33ed06"; - sha256 = "15kv5g1srqsayryf3x469sl2bgaq69ni31imp7yi7dfvmzlxf6q1"; + rev = "3cbf86cf045ea19253f9c8614863e22beb531868"; + sha256 = "0b5r1nsb9gllg75gqr27jj8ksmd42lzfv6alk60fqw6l98avvzr3"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -6448,6 +6508,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; + venn-nvim = buildVimPluginFrom2Nix { + pname = "venn.nvim"; + version = "2021-10-19"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "venn.nvim"; + rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f"; + sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06"; + }; + meta.homepage = "https://github.com/jbyuki/venn.nvim/"; + }; + verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; version = "2021-01-16"; @@ -6462,12 +6534,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-11-17"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "31c80d4f77056e89cabd9ea3e617feea076499f8"; - sha256 = "0p64fr5l5khs4p7d677zkjq6j81mxkh5aailzk9jr82q5sskv3wf"; + rev = "a737e93a97254681473313a606c66cc810291a87"; + sha256 = "0b59rhngw1xwv0pccwsql7gyrmj55b7c4bkighqkk3kd0mbqy4qh"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -6978,12 +7050,12 @@ final: prev: vim-buffergator = buildVimPluginFrom2Nix { pname = "vim-buffergator"; - version = "2018-05-02"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "jeetsukumaran"; repo = "vim-buffergator"; - rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; - sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; + rev = "0514af606a3b41bbe82c33875179b53300a3cb86"; + sha256 = "1g1g2agj9dzgrk6ccr4ampyrsqjs4j6gqmvv75avq7q068glglzz"; }; meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; @@ -7458,12 +7530,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-11-25"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "9d8b2327bc7054fcc81fcdc6e8e94639a63f9b25"; - sha256 = "1hwcp6kz7hb0fawdb59ppg852zw2hjvmx9l9mh92b0zq72h7rq9w"; + rev = "f2ae53daaab394dfe3ffe5a0d8a80420f46d81c7"; + sha256 = "1yrmxpy9dfzgrjqfzzprz2layrcz45a2hf9yzxd3q76gr5qmf1kx"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -7938,12 +8010,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-11-26"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "ca5c6d07d23573c7ed0ef85d891c86d45545a6fc"; - sha256 = "18f1i10r8hqldl0d00p102niwn0pz7dfbnwx0hyhhjrv109pcjv3"; + rev = "56285b71871e16e214480042c729b12d193f3537"; + sha256 = "1z9gp8ljrh1vwwq461h2kdf4bgg7nkjpi5nd3y7g3f850glph293"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -8672,12 +8744,12 @@ final: prev: vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2021-09-24"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "dd5243a34e97c15e1a128b6ec440a0368e583900"; - sha256 = "0kn4w2i83fwhjcpmj1zym9hr4lvl27vcl0f1cz3n3lv3jhr7g7zg"; + rev = "fd2f0017fbc50f214db2f57c207c34cda3aa1522"; + sha256 = "1z9bmcx13py56phr8djdnykw3a933chhv6ypcfigkjp6cyqkj1mc"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; @@ -8732,12 +8804,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-11-02"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "0c8a35d899202f7a7d94aefd290f3c7a1590e9c5"; - sha256 = "02h2z8j1w083hjvgafxrclz0a1r2q4lrsc56yllswpk8yq1x30pb"; + rev = "a91419ea0ace6f791a43e0697946599fe7a9ae60"; + sha256 = "0rs3f8nfw8qyhl61y56qv7k96l0wprybx56bdbhqpjzan0ir3ci6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8841,12 +8913,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "2c3227b3de50d248ad6c8900b3e12f1dd21994ac"; - sha256 = "129bqyg611swh9rhahvfybc9n0wdrgkknk0b2bx1zx634078n9x8"; + rev = "ef044ee012baa01d6f4ad79a04eeb5edb5bc7d84"; + sha256 = "19hfg4ihx36rs14mcmr60s6mk1v28db2aba2w44cnisq4mm6y4qy"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9753,12 +9825,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "17eb132421e7e4915a2b9b67c1034ee4581fb13a"; - sha256 = "1cvm31iaqlmwvyrx3lb3gkky70zsn3h1b1z1vicr96sn0hqp903q"; + rev = "cfe8b70e4f404e3bbb9d4e97e082a4294a5762a4"; + sha256 = "0mcx85knnfmyjz0lbz6zbrv6gry8d9bp2z21af7riz93g7zi01z7"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10426,12 +10498,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-11-12"; + version = "2021-12-01"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c"; - sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v"; + rev = "109fd94dcb15a37a21735ac458071ab2dfacd4f3"; + sha256 = "1s1xk9wvcznj2sffdfkwr599jypyrsjmqs93lgxiq224sj2161j9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10486,12 +10558,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-11-28"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "30738e5101a3070e622c33c7ca2a026c5cf1a7ad"; - sha256 = "0lxv56668rbd104l0q8pzf2wlwffzvp2w4zxis790p2rivqaaasf"; + rev = "f925585c8cd6d062b62ba94cd0a4d9bc1d61844c"; + sha256 = "0mz721biz6yqipy5c3ab1aqmacs1kn5glv10jlj0sdmzwjziqrgi"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10906,12 +10978,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-11-24"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "93ccc361334c4de1095a9a2b59d3a212d227e3e0"; - sha256 = "079pg4nabj6q7kkv3wv73998zvyhwsqfkn8c12y84h664l460265"; + rev = "49ad167416e58bdfadc181e3cc225683c8a82851"; + sha256 = "0hqc0jpgm1z9qm25fzk5ygjr6467jw9bf9iigv78g505qp4g3l8z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10919,12 +10991,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-24"; + version = "2021-11-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d9e05f5e8010ce43670d19655058a6dc8cad300e"; - sha256 = "1a79qsyv7j269vlnm0b81x07p8c5dwxwyq7bqal3cm0ifsmy78w7"; + rev = "3e079a1a35235847c6d767df5709fc246a2f05f8"; + sha256 = "04zrll1lk93yxcalygdp1iry85jp5jrsplkh40d50kgz4mkl5nf2"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 768b58e850e76..a5ce61897f89f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -483,6 +483,10 @@ self: super: { dependencies = with self; [ popfix ]; }); + nvim-metals = super.nvim-metals.overrideAttrs (old: { + dontBuild = true; + }); + nvim-spectre = super.nvim-spectre.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e964a19cf41d6..b2a4aed1fcca1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,6 @@ 907th/vim-auto-save aca/completion-tabnine +AckslD/nvim-neoclip.lua@main AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main ahmedkhalf/lsp-rooter.nvim@main @@ -179,9 +180,11 @@ fruit-in/brainfuck-vim fruit-in/vim-nong-theme fsharp/vim-fsharp garbas/vim-snipmate +gbrlsnchs/telescope-lsp-handlers.nvim@trunk gcmt/taboo.vim gcmt/wildfire.vim gelguy/wilder.nvim +gennaro-tedesco/nvim-jqx gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon @@ -272,6 +275,7 @@ jaredgorski/SpaceCamp jasonccox/vim-wayland-clipboard jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher +jbyuki/venn.nvim@main jc-doyle/cmp-pandoc-references jceb/vim-hier jceb/vim-orgmode @@ -558,8 +562,8 @@ nvim-telescope/telescope-z.nvim@main nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter-refactor -nvim-treesitter/nvim-treesitter-textobjects@0.5-compat -nvim-treesitter/nvim-treesitter@0.5-compat +nvim-treesitter/nvim-treesitter-textobjects +nvim-treesitter/nvim-treesitter nvim-treesitter/playground oberblastmeister/neuron.nvim oberblastmeister/termwrapper.nvim @@ -680,6 +684,7 @@ sakhnik/nvim-gdb saltstack/salt-vim samoshkin/vim-mergetool sbdchd/neoformat +scalameta/nvim-metals@main sdiehl/vim-ormolu sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github @@ -774,6 +779,7 @@ tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events +tom-anders/telescope-vim-bookmarks.nvim@main tomasiser/vim-code-dark tomasr/molokai tomlion/vim-solidity diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 25a8495c5a9f3..c71d373e1e169 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -921,8 +921,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "5.5.5"; - sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs="; + version = "5.10.1"; + sha256 = "sha256-LkWWgyh4khPyUgekVeO8ZzPK+1gTrS8d9Yz6/kHomr8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 13bc877ea8fc9..cc483cd66ad63 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { description = "A simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; mainProgram = "wiki-tui"; }; } diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index c3d8928c7ba45..52cf0a3ec037c 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "2.9"; - inherit (libsepol) se_release se_url; + version = "3.3"; + inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9"; + url = "${se_url}/${version}/checkpolicy-${version}.tar.gz"; + sha256 = "118l8c2vvnnckbd269saslr7adv6rdavr5rv0z5vh2m1lgglxj15"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e6c43c0aa6e43..71f6da0d13b1b 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -112,7 +112,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.1"; + version = "1.7.2"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw="; + sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; }; patches = [ @@ -142,6 +142,9 @@ let # Tests detect fwupd is installed when prefix is /usr. ./fix-install-detection.patch + + # EFI capsule is located in fwupd-efi now. + ./efi-app-path.patch ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch new file mode 100644 index 0000000000000..c2502502a40c3 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 4330512e..e53b70ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -403,7 +403,7 @@ endif + if build_standalone and get_option('plugin_uefi_capsule') + efiboot = dependency('efiboot') + +- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') + conf.set_quoted('EFI_APP_LOCATION', efi_app_location) + + if host_cpu == 'x86' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e492bb1ba5607..9ddb4ef38001d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -41,6 +41,7 @@ let (whenAtLeast "5.2" yes) ]; DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); + BPF_LSM = whenAtLeast "5.7" (option yes); DEBUG_KERNEL = yes; DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index a822f5d108050..8ff8b30809b74 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.3-zen1"; + modDirVersion = "5.15.5-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-GleOhTKLhnhepAlR+TkiCYcgEe5KfVvDKTPWP7/D8wQ="; + sha256 = "sha256-sEt6h29GY18+45jHheRd69eCw+EAzn/CVUK5XRqdZcA="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index f2ebcbdcc1cf6..5debfd2ef2c8c 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-L23Ba+slJW/ALj8AepwByrrHgYMY5/Jh+AoD0p4qryI="; + sha256 = "sha256-p9wUDC7r6+ElbheNkTkZW4eMNAvPbvpUyQjTjCE34ck="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Upstream mirror of libbpf"; homepage = "https://github.com/libbpf/libbpf"; license = with licenses; [ lgpl21 /* or */ bsd2 ]; - maintainers = with maintainers; [ thoughtpolice vcunat ]; + maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index fcea787ed79c1..1e0a294516297 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -9,14 +9,14 @@ with lib; stdenv.mkDerivation rec { pname = "libselinux"; - version = "3.0"; - inherit (libsepol) se_release se_url; + version = "3.3"; + inherit (libsepol) se_url; outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; src = fetchurl { - url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if"; + url = "${se_url}/${version}/libselinux-${version}.tar.gz"; + sha256 = "0mvh793g7fg6wb6zqhkdyrv80x6k84ypqwi8ii89c91xcckyxzdc"; }; nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ]; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 0f9f26c8c5b01..d828c38be1d98 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -6,12 +6,12 @@ with lib; stdenv.mkDerivation rec { pname = "libsemanage"; - version = "2.9"; - inherit (libsepol) se_release se_url; + version = "3.3"; + inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5"; + url = "${se_url}/${version}/libsemanage-${version}.tar.gz"; + sha256 = "1s3wb66l47blc15s6lkqs11j9l8pycdqqbb03x3vpfrlz9dfrl44"; }; outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index e90c089420964..c1df217944c7d 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,31 +2,16 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.0"; - se_release = "20191204"; + version = "3.3"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { - url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "0ygb6dh5lng91xs6xiqf5v0nxa68qmjc787p0s5h9w89364f2yjv"; + url = "${se_url}/${version}/libsepol-${version}.tar.gz"; + sha256 = "12r39ygn7aa1kz52wibfr4520m0cp75hlrn3i6rnjqa6p0zdz5rd"; }; - patches = [ - # upstream build fix against -fno-common compilers like >=gcc-10 - (fetchpatch { - url = "https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c.patch"; - sha256 = "0aybv4kzbhx8xq6s82dsh4ib76k59qzh2bgxmk44iq5cjnqn5rd6"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0.patch"; - sha256 = "1mphwdlj4d6mwmsp5xkpf6ci4rxhgbi3fm79d08h4jbzxaf4wny4"; - stripLen = 1; - }) - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace src/Makefile --replace 'all: $(LIBA) $(LIBSO)' 'all: $(LIBA)' sed -i $'/^\t.*LIBSO/d' src/Makefile @@ -46,7 +31,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - passthru = { inherit se_release se_url; }; + passthru = { inherit se_url; }; meta = with lib; { description = "SELinux binary policy manipulation library"; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index d5129ca7f73ac..ee29180a8d9d8 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl, kernel }: -stdenv.mkDerivation { +let + srcs = import (./srcs.nix) { inherit fetchurl; }; +in +stdenv.mkDerivation rec { pname = "mxu11x0"; - version = "1.4-${kernel.version}"; - src = fetchurl { - url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz"; - sha256 = "1hz9ygabbp8pv49k1j4qcsr0v3zw9xy0bh1akqgxp5v29gbdgxjl"; - }; + src = if lib.versionAtLeast kernel.version "5.0" then srcs.mxu11x0_5.src else srcs.mxu11x0_4.src; + mxu_version = if lib.versionAtLeast kernel.version "5.0" then srcs.mxu11x0_5.version else srcs.mxu11x0_4.version; + + version = mxu_version + "-${kernel.version}"; preBuild = '' sed -i -e "s/\$(uname -r).*/${kernel.modDirVersion}/g" driver/mxconf @@ -33,6 +35,8 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.4"; + # broken due to API change in write_room() > v5.14-rc1 + # https://github.com/torvalds/linux/commit/94cc7aeaf6c0cff0b8aeb7cb3579cee46b923560 + broken = kernel.kernelAtLeast "5.14"; }; } diff --git a/pkgs/os-specific/linux/mxu11x0/srcs.nix b/pkgs/os-specific/linux/mxu11x0/srcs.nix new file mode 100644 index 0000000000000..5c4e9137c6a6e --- /dev/null +++ b/pkgs/os-specific/linux/mxu11x0/srcs.nix @@ -0,0 +1,18 @@ +{ fetchurl }: + +{ + mxu11x0_4 = { + version = "4.1"; + src = fetchurl { + url = "https://www.moxa.com/getmedia/b152d8c2-b9d6-4bc7-b0f4-420633b4bc2d/moxa-uport-1100-series-linux-kernel-4.x-driver-v4.1.tgz"; + sha256 = "sha256-sbq5M5FQjrrORtSS07PQHf+MAZArxFcUDN5wszBwbnc="; + }; + }; + mxu11x0_5 = { + version = "5.1"; + src = fetchurl { + url = "https://www.moxa.com/getmedia/57dfa4c1-8a2a-4da6-84c1-a36944ead74d/moxa-uport-1100-series-linux-kernel-5.x-driver-v5.1.tgz"; + sha256 = "sha256-pdFIiD5naSDdYwRz8ww8Mg8z1gDOfZ/OeO6Q5n+kjDQ="; + }; + }; +} diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index ebca6b2623c6e..0b6291226bc84 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1x25zs2czmn14mmq1nqi4zibsvh04vqjbx5lxj42nylnmxym9gsq"; + sha256 = "08x4xw0s5sap3q7jfr91v7mrkxrydi4dvsckw85ims0qb1ibmviw"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-json" + "--with-cli=readline" # TODO: maybe switch to editline ] ++ optional (!withDebugSymbols) "--disable-debug" ++ optional (!withPython) "--disable-python" ++ optional withPython "--enable-python" @@ -45,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://netfilter.org/projects/nftables/"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ]; + maintainers = with maintainers; [ izorkin ajs124 ]; }; } diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 7e2ff29325a81..c066dd4c4c5c5 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "2.9"; - inherit (libsepol) se_release se_url; + version = "3.3"; + inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65"; + url = "${se_url}/${version}/policycoreutils-${version}.tar.gz"; + sha256 = "0y0hl32b2ks7r0fhbx3k2j1gqqms5aplyasjs3fz50caxl6096a1"; }; postPatch = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "SBINDIR=$(out)/sbin" + "SBINDIR=$(out)/bin" "ETCDIR=$(out)/etc" "BASHCOMPLETIONDIR=$out/share/bash-completion/completions" "LOCALEDIR=$(out)/share/locale" diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index b6394b3e1f6c8..c50f4ffccd0bb 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "selinux-python"; - version = "2.9"; + version = "3.3"; - inherit (libsepol) se_release se_url; + inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz"; - sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n"; + url = "${se_url}/${version}/selinux-python-${version}.tar.gz"; + sha256 = "1v244hpb45my303793xa4kcn7qnxjgxn4ja7rdn9k1q361hi1nca"; }; strictDeps = true; @@ -49,4 +49,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index a10588bacf113..0d2843d216a46 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -9,12 +9,12 @@ with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-sandbox"; - version = "2.9"; - inherit (policycoreutils) se_release se_url; + version = "3.3"; + inherit (policycoreutils) se_url; src = fetchurl { - url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz"; - sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481"; + url = "${se_url}/${version}/selinux-sandbox-${version}.tar.gz"; + sha256 = "0rw8pxfqhl6ww4w31fbf4hi3zilh1n3b1rfjm7ra76mm78wfyylj"; }; nativeBuildInputs = [ wrapPython ]; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index b76e715dbc26a..5c8d83c3f82a3 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "2.9"; + version = "3.3"; - inherit (libsepol) se_release se_url; + inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; - sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0"; + url = "${se_url}/${version}/${pname}-${version}.tar.gz"; + sha256 = "0qvhl40a6jlm8p719nnlw2ghlxbh8lxbcsd59azxp884bxgfr61h"; }; buildInputs = [ libsepol ]; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix deleted file mode 100644 index f7ef1cb9c3a74..0000000000000 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, libsepol, python }: - -stdenv.mkDerivation rec { - pname = "sepolgen"; - version = "1.2.2"; - inherit (libsepol) se_release se_url; - - src = fetchurl { - url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz"; - sha256 = "09139kspr41zgksayi4dh982p8080lrfl96p4dld51nknbpaigdy"; - }; - - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("PYTHONLIBDIR=lib/${python.libPrefix}/site-packages") - ''; - - meta = with lib; { - inherit (libsepol.meta) homepage platforms maintainers; - description = "SELinux policy generation library"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh index a7c3bc9758b12..2889adc186860 100755 --- a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh +++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh @@ -33,12 +33,12 @@ is_ignored_file() { - case "$1" in - skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh) - return 0 - ;; - esac - return 1 + case "$1" in + skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh) + return 0 + ;; + esac + return 1 } VERSION=$(@coreutils@/bin/basename $0)" ver. 19-04" @@ -75,35 +75,35 @@ while [ $# -gt 0 ]; do if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then if [ -d "${SERVICEDIR}" ]; then cd ${SERVICEDIR} - for SERVICE in * ; do - case "${SERVICE}" in - functions | halt | killall | single| linuxconf| kudzu) - ;; - *) - if ! is_ignored_file "${SERVICE}" \ - && [ -x "${SERVICEDIR}/${SERVICE}" ]; then - out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1) - retval=$? - if echo "$out" | egrep -iq "usage:"; then - #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2 - echo " [ ? ] $SERVICE" 1>&2 - continue - else - if [ "$retval" = "0" -a -n "$out" ]; then - #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running" - echo " [ + ] $SERVICE" - continue - else - #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running" - echo " [ - ] $SERVICE" - continue - fi - fi - #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status - fi - ;; - esac - done + for SERVICE in * ; do + case "${SERVICE}" in + functions | halt | killall | single| linuxconf| kudzu) + ;; + *) + if ! is_ignored_file "${SERVICE}" \ + && [ -x "${SERVICEDIR}/${SERVICE}" ]; then + out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1) + retval=$? + if echo "$out" | egrep -iq "usage:"; then + #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2 + echo " [ ? ] $SERVICE" 1>&2 + continue + else + if [ "$retval" = "0" -a -n "$out" ]; then + #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running" + echo " [ + ] $SERVICE" + continue + else + #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running" + echo " [ - ] $SERVICE" + continue + fi + fi + #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status + fi + ;; + esac + done else systemctl $sctl_args list-units fi diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 842a525353d4e..9d547d2007eca 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy -, fetchpatch , withGraphics ? false }: @@ -9,22 +8,15 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6"; + sha256 = "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5"; }; - patches = [ - (fetchpatch { # included in 4.4.0 - url = "https://github.com/SELinuxProject/setools/commit/f1b4a5d375be05fbccedb258c940d771bff8e524.diff"; - sha256 = "1r38s6i4i6bdr2zdp5wcg1yifpf3pd018c73a511mgynyg7d11xy"; - }) - ]; - nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/os-specific/linux/xsos/default.nix new file mode 100644 index 0000000000000..56516aee8b7b8 --- /dev/null +++ b/pkgs/os-specific/linux/xsos/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, installShellFiles +, dmidecode +, ethtool +, pciutils +, multipath-tools +, iproute2 +, sysvinit +}: +let + binPath = [ + iproute2 + dmidecode + ethtool + pciutils + multipath-tools + iproute2 + sysvinit + ]; +in + +stdenv.mkDerivation rec { + pname = "xsos"; + version = "0.7.19"; + + src = fetchFromGitHub { + owner = "ryran"; + repo = "xsos"; + rev = "v${version}"; + sha256 = "11cc8z3pz4gl0mwl2fc701mn4cgx50fybygx0rvs9bhvb0jnphay"; + }; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + installPhase = '' + mkdir -p $out/bin + cp -a xsos $out/bin + wrapProgram "$out/bin/xsos" --prefix PATH : ${lib.makeBinPath binPath} + installShellCompletion --bash --name xsos.bash xsos-bash-completion.bash + ''; + + meta = with lib; { + description = "Summarize system info from sosreports"; + homepage = "https://github.com/ryran/xsos"; + license = licenses.gpl3; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.nixinator ]; + }; +} diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 420b09234547f..26f35145b67ce 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; + sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4b4cb222e9646..5febf010dff83 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -888,7 +888,7 @@ in with py.pkgs; buildPythonApplication rec { ''; passthru = { - inherit availableComponents; + inherit availableComponents extraComponents; python = py; tests = { inherit (nixosTests) home-assistant; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7e2b2e0ceeda7..37ca8d2357490 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.47.1"; + version = "1.48.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ldk14yMaFZ1uegiTwB6txomGJTV1Gf/LqJyWJARmhJ4="; + sha256 = "sha256-G09VbfC9mZ0+shLHRNutR91URewvLW4l4lQaVrsZYaQ="; }; patches = [ diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 1465b9518ffa7..020a3a28fe77c 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -6,6 +6,7 @@ let inherit (stdenv.hostPlatform) system; }; version = (lib.importJSON ./package.json).version; + srcInfo = lib.importJSON ./src.json; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; @@ -15,7 +16,7 @@ ourNodePackages.package.override { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = version; - sha256 = "sha256-EncodJKptrLC54B5XipkiHXFgJ5cD+crcT3SOPOc+7M="; + inherit (srcInfo) sha256; }; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix index f2d2b6fc94c18..af405451e58b4 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -139,31 +139,41 @@ let sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" = { + name = "_at_matrix-org_slash_olm"; + packageName = "@matrix-org/olm"; + version = 1; + src = fetchurl { + name = "olm-1.tar.gz"; + url = "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz"; + sha1 = "edc0156a17eb1087df44f6e0b153ef0c9d454495"; + }; + }; + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@sentry/core-5.27.1" = { @@ -274,13 +284,31 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.8" = { + "@types/diff-5.0.1" = { + name = "_at_types_slash_diff"; + packageName = "@types/diff"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/diff/-/diff-5.0.1.tgz"; + sha512 = "XIpxU6Qdvp1ZE6Kr3yrkv1qgUab0fyf4mHYvW8N3Bx3PCsbN6or1q9/q72cv5jIFWolaGH08U9XyYoLLIykyKQ=="; + }; + }; + "@types/express-4.17.11" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + }; + }; + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.8"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; "@types/express-serve-static-core-4.17.19" = { @@ -310,13 +338,13 @@ let sha512 = "jpzrsR1ns0n3kyWt92QfOUQhIuJGQ9+QGa7M62rO6toe98woQjnsnzjdMtsQXCdvjjmqjS2ZBCC7xKw0cdzU+Q=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; "@types/mime-1.3.2" = { @@ -337,13 +365,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-12.12.54" = { + "@types/node-14.17.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.54"; + version = "14.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz"; - sha512 = "ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.19.tgz"; + sha512 = "jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA=="; }; }; "@types/nopt-3.0.29" = { @@ -400,67 +428,67 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@typescript-eslint/eslint-plugin-4.16.1" = { + "@typescript-eslint/eslint-plugin-4.33.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz"; - sha512 = "SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; + sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/experimental-utils-4.16.1" = { + "@typescript-eslint/experimental-utils-4.33.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz"; - sha512 = "0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; + sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; }; - "@typescript-eslint/parser-4.16.1" = { + "@typescript-eslint/parser-4.33.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz"; - sha512 = "/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz"; + sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/scope-manager-4.16.1" = { + "@typescript-eslint/scope-manager-4.33.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz"; - sha512 = "6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; + sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/types-4.16.1" = { + "@typescript-eslint/types-4.33.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz"; - sha512 = "nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz"; + sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/typescript-estree-4.16.1" = { + "@typescript-eslint/typescript-estree-4.33.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz"; - sha512 = "m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; + sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/visitor-keys-4.16.1" = { + "@typescript-eslint/visitor-keys-4.33.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz"; - sha512 = "s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; + sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; "abbrev-1.1.1" = { @@ -535,13 +563,13 @@ let sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; }; }; - "ansi-align-3.0.0" = { + "ansi-align-3.0.1" = { name = "ansi-align"; packageName = "ansi-align"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"; - sha512 = "ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="; + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; }; "ansi-colors-4.1.1" = { @@ -553,6 +581,24 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "ansi-regex-4.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -562,13 +608,13 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-3.2.1" = { @@ -607,6 +653,15 @@ let sha512 = "P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; "archy-1.0.0" = { name = "archy"; packageName = "archy"; @@ -616,6 +671,15 @@ let sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; + "are-we-there-yet-1.1.7" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -742,6 +806,15 @@ let sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "basic-auth-2.0.1" = { name = "basic-auth"; packageName = "basic-auth"; @@ -760,6 +833,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "better-sqlite3-7.4.3" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -778,6 +860,15 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.1" = { name = "bintrees"; packageName = "bintrees"; @@ -787,6 +878,15 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -850,6 +950,15 @@ let sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-writer-2.0.0" = { name = "buffer-writer"; packageName = "buffer-writer"; @@ -967,6 +1076,24 @@ let sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "ci-info-2.0.0" = { name = "ci-info"; packageName = "ci-info"; @@ -1003,6 +1130,15 @@ let sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -1120,6 +1256,15 @@ let sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; @@ -1273,6 +1418,15 @@ let sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; + "decompress-response-4.2.1" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -1327,6 +1481,15 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; "depd-1.1.2" = { name = "depd"; packageName = "depd"; @@ -1354,6 +1517,24 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1597,6 +1778,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1696,6 +1886,15 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "express-4.17.1" = { name = "express"; packageName = "express"; @@ -1732,13 +1931,13 @@ let sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1768,13 +1967,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fastq-1.11.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "fecha-4.2.1" = { @@ -1804,6 +2003,15 @@ let sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "fill-keys-1.0.2" = { name = "fill-keys"; packageName = "fill-keys"; @@ -1921,6 +2129,24 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1957,6 +2183,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -2020,6 +2255,15 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + }; "glob-7.1.7" = { name = "glob"; packageName = "glob"; @@ -2074,13 +2318,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globby-11.0.3" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; - sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; "got-9.6.0" = { @@ -2155,6 +2399,15 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; "has-yarn-2.1.0" = { name = "has-yarn"; packageName = "has-yarn"; @@ -2209,6 +2462,15 @@ let sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; "htmlencode-0.0.4" = { name = "htmlencode"; packageName = "htmlencode"; @@ -2290,6 +2552,15 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -2461,6 +2732,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -3019,15 +3299,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -3073,22 +3344,22 @@ let sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.6.1" = { + "matrix-appservice-bridge-3.1.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.6.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.1.tgz"; - sha512 = "XNOziYVQoTQ9cym3Z2acXy8CKRXPVcEbni0XXCUfvu4O9+cBjUPywtRmhDBENsl/bgGbFKqbJNr68E/j9j+Tbw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-3.1.2.tgz"; + sha512 = "1VjKSalKS/9/MknrcAkAEFcoeOduzqBWr3LHmuwc4+T94vtCrA3WX+SciurxW8jfs0D8sLdnNjH1sMVAPfA2Gw=="; }; }; - "matrix-bot-sdk-0.4.0" = { + "matrix-bot-sdk-0.6.0-beta.2" = { name = "matrix-bot-sdk"; packageName = "matrix-bot-sdk"; - version = "0.4.0"; + version = "0.6.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.4.0.tgz"; - sha512 = "ZIICFEYDsSX3emPnVRTV1FIV22zkt7KiJbTYN4rHQ3Z/rk66RB7Y+TMHxrkJCqPs3xVdaGmGkh5m+hNi4fibRg=="; + url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.6.0-beta.2.tgz"; + sha512 = "D9aQ2++1bJIzka2uIz22HkaeyT058QGOh96xdxiDOaezyzLY5BN7ehYg+P0xRzDYDFKx9DbqDYCt97IkfahtPw=="; }; }; "matrix-js-sdk-9.11.0" = { @@ -3100,15 +3371,6 @@ let sha512 = "wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ=="; }; }; - "matrix-lastactive-0.1.5" = { - name = "matrix-lastactive"; - packageName = "matrix-lastactive"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/matrix-lastactive/-/matrix-lastactive-0.1.5.tgz"; - sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw=="; - }; - }; "matrix-org-irc-1.2.0" = { name = "matrix-org-irc"; packageName = "matrix-org-irc"; @@ -3208,6 +3470,15 @@ let sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; + "mimic-response-2.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -3235,6 +3506,24 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minipass-3.1.5" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -3244,6 +3533,24 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; "module-not-found-error-1.0.1" = { name = "module-not-found-error"; packageName = "module-not-found-error"; @@ -3307,6 +3614,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -3343,6 +3659,15 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; + "node-abi-2.30.1" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.30.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + }; + }; "node-gyp-build-4.2.3" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -3415,6 +3740,24 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "nyc-14.1.1" = { name = "nyc"; packageName = "nyc"; @@ -3433,6 +3776,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; "object-hash-2.2.0" = { name = "object-hash"; packageName = "object-hash"; @@ -3658,13 +4010,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -3766,22 +4118,13 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; - }; - }; - "picomatch-2.2.3" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; - sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-3.0.0" = { @@ -3811,15 +4154,6 @@ let sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; - "postcss-7.0.35" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; - }; - }; "postcss-8.3.0" = { name = "postcss"; packageName = "postcss"; @@ -3865,6 +4199,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "prebuild-install-6.1.4" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + }; "prelude-ls-1.2.1" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -4306,15 +4649,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-1.27.5" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.27.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; - }; - }; "sanitize-html-2.4.0" = { name = "sanitize-html"; packageName = "sanitize-html"; @@ -4432,6 +4766,24 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-3.1.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -4594,6 +4946,24 @@ let sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; }; }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string-width-3.1.0" = { name = "string-width"; packageName = "string-width"; @@ -4612,6 +4982,15 @@ let sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; }; }; + "string-width-4.2.3" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -4630,6 +5009,24 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; "strip-ansi-5.2.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -4648,6 +5045,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-ansi-6.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; "strip-bom-3.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -4711,6 +5117,33 @@ let sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; }; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; "tdigest-0.1.1" = { name = "tdigest"; packageName = "tdigest"; @@ -4891,13 +5324,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-4.2.3" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.2.3"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz"; - sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "undefsafe-2.0.3" = { @@ -5071,6 +5504,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; "widest-line-3.1.0" = { name = "widest-line"; packageName = "widest-line"; @@ -5188,15 +5630,6 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -5228,7 +5661,7 @@ let args = { name = "matrix-appservice-irc"; packageName = "matrix-appservice-irc"; - version = "0.30.0"; + version = "0.32.1"; src = ./.; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -5262,9 +5695,10 @@ let sources."ignore-4.0.6" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sentry/core-5.27.1" sources."@sentry/hub-5.27.1" sources."@sentry/minimal-5.27.1" @@ -5277,14 +5711,15 @@ let sources."@types/bluebird-3.5.32" sources."@types/body-parser-1.19.0" sources."@types/connect-3.4.34" - sources."@types/express-4.17.8" + sources."@types/diff-5.0.1" + sources."@types/express-4.17.11" sources."@types/express-serve-static-core-4.17.19" sources."@types/extend-3.0.1" sources."@types/he-1.1.1" - sources."@types/json-schema-7.0.7" + sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" sources."@types/nedb-1.8.11" - sources."@types/node-12.12.54" + sources."@types/node-14.17.19" sources."@types/nopt-3.0.29" sources."@types/pg-8.6.0" sources."@types/qs-6.9.6" @@ -5296,25 +5731,29 @@ let ]; }) sources."@types/serve-static-1.13.9" - (sources."@typescript-eslint/eslint-plugin-4.16.1" // { + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/experimental-utils-4.16.1" - sources."@typescript-eslint/parser-4.16.1" - sources."@typescript-eslint/scope-manager-4.16.1" - sources."@typescript-eslint/types-4.16.1" - (sources."@typescript-eslint/typescript-estree-4.16.1" // { + (sources."@typescript-eslint/experimental-utils-4.33.0" // { + dependencies = [ + sources."eslint-utils-3.0.0" + ]; + }) + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-4.16.1" + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."acorn-7.4.1" @@ -5322,7 +5761,13 @@ let sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."another-json-0.2.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ansi-colors-4.1.1" sources."ansi-regex-4.1.0" (sources."ansi-styles-4.3.0" // { @@ -5332,7 +5777,14 @@ let }) sources."anymatch-3.1.2" sources."append-transform-1.0.0" + sources."aproba-1.2.0" sources."archy-1.0.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -5345,11 +5797,15 @@ let sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."base-x-3.0.8" + sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."better-sqlite3-7.4.3" sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" + sources."bindings-1.5.0" sources."bintrees-1.0.1" + sources."bl-4.1.0" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -5360,7 +5816,7 @@ let }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."chalk-3.0.0" sources."has-flag-4.0.0" sources."string-width-4.2.2" @@ -5372,6 +5828,7 @@ let sources."braces-3.0.2" sources."browser-request-0.3.3" sources."bs58-4.0.1" + sources."buffer-5.7.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -5394,10 +5851,12 @@ let }) sources."chardet-1.3.0" sources."chokidar-3.5.1" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cliui-5.0.0" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-3.0.0" (sources."color-convert-1.9.3" // { dependencies = [ @@ -5418,6 +5877,7 @@ let sources."write-file-atomic-3.0.3" ]; }) + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.7.0" @@ -5441,8 +5901,11 @@ let sources."default-require-extensions-2.0.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."dom-serializer-1.3.2" // { @@ -5478,7 +5941,7 @@ let sources."escape-string-regexp-4.0.0" (sources."eslint-7.21.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."chalk-4.1.1" sources."has-flag-4.0.0" sources."ignore-4.0.6" @@ -5516,6 +5979,7 @@ let sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" + sources."expand-template-2.0.3" (sources."express-4.17.1" // { dependencies = [ sources."cookie-0.4.0" @@ -5526,14 +5990,15 @@ let sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.11.0" + sources."fastq-1.13.0" sources."fecha-4.2.1" sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" + sources."file-uri-to-path-1.0.0" sources."fill-keys-1.0.2" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -5559,33 +6024,41 @@ let sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" + sources."github-from-package-0.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-2.1.0" sources."globals-12.4.0" - sources."globby-11.0.3" + sources."globby-11.0.4" sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - ]; - }) + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hash.js-1.1.7" (sources."hasha-3.0.0" // { @@ -5596,6 +6069,7 @@ let sources."he-1.2.0" sources."hosted-git-info-2.8.9" sources."html-escaper-2.0.2" + sources."html-to-text-6.0.0" sources."htmlencode-0.0.4" sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" @@ -5607,6 +6081,7 @@ let sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" sources."immediate-3.0.6" @@ -5683,7 +6158,6 @@ let sources."loglevel-1.7.1" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" sources."lru_map-0.3.3" (sources."make-dir-2.1.0" // { dependencies = [ @@ -5692,36 +6166,19 @@ let ]; }) sources."matrix-appservice-0.8.0" - (sources."matrix-appservice-bridge-2.6.1" // { + (sources."matrix-appservice-bridge-3.1.2" // { dependencies = [ + sources."@types/express-4.17.13" sources."argparse-2.0.1" sources."chalk-4.1.1" - sources."extend-3.0.2" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" + sources."lru-cache-6.0.0" + sources."matrix-bot-sdk-0.6.0-beta.2" + sources."mkdirp-1.0.4" sources."nopt-5.0.0" sources."supports-color-7.2.0" - ]; - }) - (sources."matrix-bot-sdk-0.4.0" // { - dependencies = [ - sources."chalk-3.0.0" - sources."escape-string-regexp-1.0.5" - sources."has-flag-4.0.0" - (sources."postcss-7.0.35" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" - ]; - }) - sources."sanitize-html-1.27.5" - sources."supports-color-7.2.0" + sources."yallist-4.0.0" ]; }) (sources."matrix-js-sdk-9.11.0" // { @@ -5729,18 +6186,13 @@ let sources."qs-6.10.1" ]; }) - sources."matrix-lastactive-0.1.5" sources."matrix-org-irc-1.2.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-source-map-1.1.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."micromatch-4.0.4" // { - dependencies = [ - sources."picomatch-2.2.3" - ]; - }) + sources."micromatch-4.0.4" sources."mime-1.6.0" sources."mime-db-1.47.0" sources."mime-types-2.1.30" @@ -5748,7 +6200,18 @@ let sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."minipass-3.1.5" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" sources."module-not-found-error-1.0.1" sources."moment-2.29.1" (sources."morgan-1.10.0" // { @@ -5760,10 +6223,16 @@ let }) sources."ms-2.1.2" sources."nanoid-3.1.23" + sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."node-gyp-build-4.2.3" (sources."nodemon-2.0.7" // { dependencies = [ @@ -5780,12 +6249,15 @@ let }) sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" (sources."nyc-14.1.1" // { dependencies = [ sources."rimraf-2.7.1" ]; }) sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."object-hash-2.2.0" sources."object-inspect-1.10.3" sources."on-finished-2.3.0" @@ -5811,7 +6283,7 @@ let sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" @@ -5822,7 +6294,7 @@ let sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pkg-dir-3.0.0" sources."postcss-8.3.0" @@ -5830,6 +6302,7 @@ let sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -5876,7 +6349,6 @@ let sources."release-zalgo-1.0.0" (sources."request-2.88.2" // { dependencies = [ - sources."extend-3.0.2" sources."qs-6.5.2" ]; }) @@ -5897,7 +6369,6 @@ let (sources."sanitize-html-2.4.0" // { dependencies = [ sources."domhandler-4.2.0" - sources."escape-string-regexp-4.0.0" sources."htmlparser2-6.1.0" ]; }) @@ -5920,6 +6391,13 @@ let sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.2" + sources."simple-concat-1.0.1" + (sources."simple-get-3.1.0" // { + dependencies = [ + sources."decompress-response-4.2.1" + sources."mimic-response-2.1.0" + ]; + }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."slice-ansi-4.0.0" @@ -5960,12 +6438,24 @@ let (sources."table-6.7.1" // { dependencies = [ sources."ajv-8.4.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."yallist-4.0.0" + ]; + }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + sources."tar-stream-2.2.0" sources."tdigest-0.1.1" sources."term-size-2.2.1" sources."test-exclude-5.2.3" @@ -5990,7 +6480,7 @@ let sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.2.3" + sources."typescript-4.4.3" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -6020,9 +6510,17 @@ let sources."verror-1.10.0" sources."which-2.0.2" sources."which-module-2.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; @@ -6050,7 +6548,6 @@ let sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" sources."y18n-4.0.3" - sources."yallist-3.1.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json index 998515f568e64..afbafc9b5e96b 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-irc", - "version": "0.30.0", + "version": "0.32.1", "description": "An IRC Bridge for Matrix", "main": "app.js", "bin": "./bin/matrix-appservice-irc", @@ -28,13 +28,12 @@ "dependencies": { "@sentry/node": "^5.27.1", "bluebird": "^3.7.2", + "diff": "^5.0.0", "escape-string-regexp": "^4.0.0", "extend": "^3.0.2", "he": "^1.2.0", "logform": "^2.2.0", - "matrix-appservice": "^0.8.0", - "matrix-appservice-bridge": "^2.6.1", - "matrix-lastactive": "^0.1.5", + "matrix-appservice-bridge": "^3.1.2", "matrix-org-irc": "^1.2.0", "nedb": "^1.1.2", "nodemon": "^2.0.7", @@ -50,20 +49,23 @@ }, "devDependencies": { "@types/bluebird": "^3.5.32", - "@types/express": "^4.17.7", + "@types/diff": "^5.0.1", "@types/extend": "^3.0.1", "@types/he": "^1.1.1", "@types/nedb": "^1.8.11", + "@types/node": "^14", "@types/nopt": "^3.0.29", "@types/pg": "^8.6.0", "@types/sanitize-html": "^2.3.1", - "@typescript-eslint/eslint-plugin": "^4.16.1", - "@typescript-eslint/parser": "^4.16.1", + "@types/express": "4.17.11", + "@types/express-serve-static-core": "4.17.19", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", "eslint": "^7.21.0", "jasmine": "^3.6.2", "nyc": "^14.1.1", - "prom-client": "^13.0.0", + "prom-client": "13.1.0", "proxyquire": "^1.4.0", - "typescript": "^4.2.2" + "typescript": "^4.4.3" } } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json new file mode 100644 index 0000000000000..14eb6c69d6df8 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/matrix-org/matrix-appservice-irc", + "rev": "6d5795ce9544c8d73f4846f1bd7190d352dddead", + "date": "2021-10-25T12:54:49+02:00", + "path": "/nix/store/by3iwfs5yayyv576qvfl650dgjw7jy5k-matrix-appservice-irc", + "sha256": "06v5ihn03vidfa8aq8q9yil5s0hdgz09hzsm75fk5v8d8bi3d7d4", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index d2c16dedfcd2c..4ed109cc352f9 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -1,11 +1,11 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix +#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix nix-prefetch-git set -euo pipefail # cd to the folder containing this script cd "$(dirname "$0")" -CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') +CURRENT_VERSION=$(nix-instantiate ../../../../. --eval --strict -A matrix-appservice-irc.version | tr -d '"') TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then @@ -23,6 +23,4 @@ wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-i rm ./package-lock-temp.json -# Apparently this is done by r-ryantm, so only uncomment for manual usage -#git add ./package.json ./node-packages.nix -#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +nix-prefetch-git --rev "$TARGET_VERSION" --url "https://github.com/matrix-org/matrix-appservice-irc" > ./src.json diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0b7fb6f50fe77..348ffa0e37e01 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud21 = generic { - version = "21.0.5"; - sha256 = "1q46h480kn97k7h3xm7r5gsa8l3f0kfiicapi46sh0p39pbjbyhv"; + version = "21.0.7"; + sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; }; nextcloud22 = generic { diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix new file mode 100644 index 0000000000000..5be17fc7b49e8 --- /dev/null +++ b/pkgs/servers/nfd/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, boost +, fetchFromGitHub +, libpcap +, ndn-cxx +, openssl +, pkg-config +, sphinx +, systemd +, wafHook +, websocketpp +, withSystemd ? stdenv.isLinux +, withWebSocket ? true +}: + +stdenv.mkDerivation rec { + pname = "nfd"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = lib.toUpper pname; + rev = "NFD-${version}"; + sha256 = "1l9bchj8c68r6qw4vr1kc96jgxl0vpqa2vjkvy1xmhz92sivr6gi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config sphinx wafHook ]; + buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; + + wafConfigureFlags = [ + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" + ] ++ lib.optional (!withWebSocket) "--without-websocket"; + + doCheck = true; + checkPhase = '' + runHook preCheck + build/unit-tests-core + # build/unit-tests-daemon # 3 tests fail + build/unit-tests-rib + build/unit-tests-tools + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Neworking (NDN) Forwarding Daemon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.bertof ]; + }; +} diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 4ae18f7953328..5fcd2f2d3bc0d 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-L9x7FmPl6ZcGv/NAk6pHMdS/IqWMtVWiUg7RveeNASw="; + sha256 = "sha256-YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b405a4c2f09df..f9e24a9567447 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config -, suggestSupport ? false, zeromq, libevent, msgpack +, suggestSupport ? false, zeromq, libevent, msgpack, openssl , lz4Support ? false, lz4 -, zlibSupport ? false, zlib +, zlibSupport ? true, zlib }: stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.5"; + version = "11.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; + sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4="; }; buildInputs = with lib; - [ pkg-config mecab kytea libedit ] + [ pkg-config mecab kytea libedit openssl ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 745031e8a4cda..3f0697bd2cc28 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation { ln -sv mariadb $dev/include/mysql ln -sv mariadb_version.h $dev/include/mariadb/mysql_version.h ln -sv libmariadb.pc $dev/lib/pkgconfig/mysqlclient.pc + install -Dm644 include/ma_config.h $dev/include/mariadb/my_config.h ''; meta = { diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index fafd5581e5a2c..5b0190b93ac50 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -71,7 +71,8 @@ let (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] - ++ lib.optionals gssSupport [ "--with-gssapi" ]; + ++ lib.optionals gssSupport [ "--with-gssapi" ] + ++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ]; patches = [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch) @@ -201,18 +202,18 @@ let in self: { postgresql_9_6 = self.callPackage generic { - version = "9.6.23"; + version = "9.6.24"; psqlSchema = "9.6"; - sha256 = "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"; + sha256 = "sha256-rrehlr4+vtGnR271ZfOXIhh8EI3UfadIm+nE/K6YKs4="; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.18"; + version = "10.19"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"; + sha256 = "sha256-brgwtCi2DoSuh+IENrzmecTZ0CAr567A5BsMZ9kTQjk="; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -220,36 +221,36 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.13"; + version = "11.14"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"; + sha256 = "sha256-llx/S+lvtk+VgYUsWMTwXDgS1K2CPA8+K9/nd8Fi+Zk="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.8"; + version = "12.9"; psqlSchema = "12"; - sha256 = "0an6v5bsp26d276wbdx76lsq6cq86hgi2fmkzwawnk63j3h02r72"; + sha256 = "sha256-if2i3jPtBKmFSOQ/PuXxW4gr4XUF1jH+DdGlQKK1bc4="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.4"; + version = "13.5"; psqlSchema = "13"; - sha256 = "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"; + sha256 = "sha256-m4EGelXtuqvEGKrO9FfdhHdkKCdJlWCwBhWm6mwT9rM="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.0"; + version = "14.1"; psqlSchema = "14"; - sha256 = "08m14zcrcvc2i0xl10p0wgzycsmfmk27gny40a8mwdx74s8xfapf"; + sha256 = "sha256-TTwQHqeuOJgvBr3HN1i1Nyf7ZALs2TggBvpezHwspB8="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 86c9e54526f78..c0d05fc1769fc 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy"; + sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 85f292711ef4e..2a0165a9fe669 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.6"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY="; + sha256 = "sha256-DmgCuv10TiB4UYISthJ1UghuPdvRKYl0cU9VxDvFjMc="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o="; + vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k="; doCheck = false; diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix index aa5ad75fbc702..e6e9461bcbef0 100644 --- a/pkgs/shells/bash/bash-5.1-patches.nix +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -9,4 +9,8 @@ patch: [ (patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm") (patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c") (patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j") +(patch "009" "1vn36dzd9g4y1h3jiss6418crla0rbcd0d6wwsyv9d5l7aaxlp74") +(patch "010" "0amfmvbzsand7bdypylkjdpcp88fa3cplfshn7vyzv2ff2rdgj52") +(patch "011" "0yq24abb4fzfxqnwl20b330sxl9lr9ds0nc4yi30f81l94b1y6aq") +(patch "012" "165bff97ffih49vfs4mkr5w3z5gn1w6zfyrf773iajkw6v48kw8h") ] diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index dd1953d783a01..c0d1c5e6e4a18 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - program = "dex"; - name = "${program}-${version}"; + pname = "dex"; version = "0.9.0"; src = fetchFromGitHub { owner = "jceb"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86"; }; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 0d74206155ab6..5b361e924eb77 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, libXrandr }: stdenv.mkDerivation rec { - name = "sct"; + pname = "sct"; + version = "unstable-2015-11-16"; src = fetchurl { url = "http://www.tedunangst.com/flak/files/sct.c"; diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index fe5ac9410a67a..05c0f1c69b407 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation { - name = "virtualgl-${lib.getVersion virtualglLib}"; + pname = "virtualgl"; + version = lib.getVersion virtualglLib; paths = [ virtualglLib ]; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 422c6da82d2f0..ff5d6c8f56faf 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "certigo"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; + sha256 = "sha256-3VysSE4N2MlNDOZ27RbCe8rUuYChU5Z3L/CIhtvMp38="; }; - vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; + vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y="; doCheck = false; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 568ff7292f082..0786f5b017a51 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,392 +1,392 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.17.1"; + version = "3.19.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.1-linux-x64.tar.gz"; - sha256 = "1npm5jv0wcylidirxgfxxmp21mv1r6xl2lz9x0hdjmrs2cr1kmrf"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.19.0-linux-x64.tar.gz"; + sha256 = "12q3zhwpy8hrg8ivihzqac82xpgj216nscfz66rwhys1aajdvlih"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.6.0-linux-amd64.tar.gz"; - sha256 = "198m5fdppwzpqr30vpvpl8sjx90rng8q8cxvrbvaj179jnfg3bm2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.10.1-linux-amd64.tar.gz"; + sha256 = "0hl67xg538arbn7p7qqlx6my9c1ql1q62azwiivrjpj81pfkvx76"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0wzbwpnnjm8lnph6kh2nrb0ns2v4y70sp10pp9qnwhcxggqjpb5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.7.0-linux-amd64.tar.gz"; + sha256 = "1xw8yq4q7d727zqyvc6lfrlf1pl4j0wzmcx5r3gqgv5p44w858vm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-amd64.tar.gz"; sha256 = "05nfdwgfzi5f3hgj2g6dccaidqf9a9xzlv5vp3cd1rsxd159yk9j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-linux-amd64.tar.gz"; - sha256 = "0mckcwyngxiv46khvchaxdylcgk82b5j5hlfjiky5qg60bic4gnr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.29.0-linux-amd64.tar.gz"; + sha256 = "1y5qspns2zab5k1ajkqkh48li0mvyz1wxjx5svdrzca89bnz63rq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; - sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.0-linux-amd64.tar.gz"; + sha256 = "1f21pz6v6bkx5vb02g113l97q5gw9aj459klq4dc9j75mgfdzvfz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; - sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-amd64.tar.gz"; + sha256 = "1p21963qr8rdl5jp7f05j02yq0ab3flybvzjn7xadcl7m85mkyxh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-linux-amd64.tar.gz"; - sha256 = "1rv6l82b1v44fa685dqq7ivsr1y4xaqln0mqd9hyqnajkb2761d5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-amd64.tar.gz"; + sha256 = "14kz4ywhwb0lcsf3nbr9c884x83jdlbxmcg3g9jaq7r739fawpi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.5.0-linux-amd64.tar.gz"; - sha256 = "00qvwqynyyj72lp41c4calxx53ckf2dg0cpn9s7sr9alvnffvwzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.30.0-linux-amd64.tar.gz"; + sha256 = "1brn2xfvjds5vfpy08r9syss723jw2whn82c8jsfggzfr978i2xh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-amd64.tar.gz"; - sha256 = "1p21963qr8rdl5jp7f05j02yq0ab3flybvzjn7xadcl7m85mkyxh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0wzbwpnnjm8lnph6kh2nrb0ns2v4y70sp10pp9qnwhcxggqjpb5r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; - sha256 = "0xrq4ffkaa0z5w2g7b9fdll3sh8wpzd6fg0xay7hfzjnl65dl3mp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0nri27c71kf3pjivd0w9ymkl4rn39flh5n2rphi4gn6v4kfb1192"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-linux-amd64.tar.gz"; - sha256 = "1rzwgfz2ikbcjp99yiiai2cqawk80xhwrc7335fylifrvl3wsqis"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.6.0-linux-amd64.tar.gz"; + sha256 = "1z43qiwyh9ql1kkmdxxnlbsimfihlr8iby93kzipf62wg9y9ag3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-linux-amd64.tar.gz"; - sha256 = "0nri27c71kf3pjivd0w9ymkl4rn39flh5n2rphi4gn6v4kfb1192"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.0-linux-amd64.tar.gz"; + sha256 = "195259nlcpwl84kl7bf8k4das4444kc3pigv9jzz9z4cynpdqqp4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-linux-amd64.tar.gz"; - sha256 = "0pd1a2xhhhxyb2sblq474hrwrm18k2dh4c20r3b2xqz77l25nzig"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0cn25lrd9f8x7ygaq2074dqv59hh71mfprzjpscl8l7zz3ssh8y9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; - sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-amd64.tar.gz"; - sha256 = "0dc96mvy76i0d70jp8gln14cwzsgdxccyhrxrcf3kq38j4vf3bl1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-amd64.tar.gz"; + sha256 = "19y5gm5s7ps0cwdv8j7lnlx1r4c94qf6cdc28z725wpyyq1grc38"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.6.0-linux-amd64.tar.gz"; - sha256 = "1536pz40m4a34swjxpy7vw7xik6jqfspwdnn2z49n8a42y691cd9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; + sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz"; - sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.0-linux-amd64.tar.gz"; + sha256 = "0w4604mgkq56ilr1k088piwkk676iwqwy2mync9di5iyig0cnrr1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.5.0-linux-amd64.tar.gz"; - sha256 = "0xy6h16vdg55rc0qmhxc2r1hz3iv78iyjx4i5j6jmlcwpgrwdlii"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.3.0-linux-amd64.tar.gz"; + sha256 = "1a2529yxrjj0gv89sbk74j1nrphwbbbl6x3hl3pv525xqg6j3r95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-linux-amd64.tar.gz"; - sha256 = "151bw127nxl5bdyqwbvkg0i8fi6060n8yn2skdb95s9p7f1b1fvp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-linux-amd64.tar.gz"; - sha256 = "19rmwbizkhpxlwayd32hfk2dvz9mddkbg956ryckhfgfis6s3scr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0kx0scva1r44ibfqjl7wwcy0fyywrmixdnx0c57fmf5qm2vlfr34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.0.0-linux-amd64.tar.gz"; + sha256 = "16y17hkzp6i3dqv3b41xkl05awkmhpki1bqnnwgl5318hbkvnwab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.27.2-linux-amd64.tar.gz"; - sha256 = "0dngfi5yy01yngwl9x65b9w67zrihhkbccfsr989ygbzxs3gi9bj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-amd64.tar.gz"; + sha256 = "0hl5liyga4iz7j3wy3qicx43d4mijnqayrnmpa5rws29lambgrql"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.1-darwin-x64.tar.gz"; - sha256 = "0cn6zramx5hjwd9w3i0kfpzsdz0j9pskqx43yram6dh7w7vh3wxw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.19.0-darwin-x64.tar.gz"; + sha256 = "0sp519ks3glfpmdpmss4pnfnd41ab28k7lm74yl9g96980pcrypd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.6.0-darwin-amd64.tar.gz"; - sha256 = "0vh8gnmjkchz5245iwgb1slwahq7cw18g6x9fihyqzzlpz83lr7h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.10.1-darwin-amd64.tar.gz"; + sha256 = "0pqcra8fi3kfg1d6ndpbgmzd3przsxrnypa84vsr933x9cp1748l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "0p3zkgr557ngl6pjdidrp76b741nkdsw4s7wf1aj4mpw74fshm3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.7.0-darwin-amd64.tar.gz"; + sha256 = "0pk15lbjnrq5ria8c6j8ygbq5gngmmb9g9c1sigfxp9iwlfbpa6k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-amd64.tar.gz"; sha256 = "0q19sh7l1mjl40i5vdsrjfldncxnicalmlgv3yjkw5xpxkgr98z0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "04hhvakbrvjqzlhhacpb4syy6bz8qgkhqfl8339wjapsczy776j5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.29.0-darwin-amd64.tar.gz"; + sha256 = "1c47ihgvz95r2dzd1s856l0bxh3myvqxmm2izjkpx9il7cqrf1rf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "09hb618pjfz930i9f9vb5qw9im7c8fwrrz5gbpm37zaskamvx7cw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1idvdcmbbia0cwkw5v7zp7695p1a6sfmrgsfmzn0r9p8lyg66k8w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "04l07fqzf3fs7hj4giggzyjv9979qcpxrqbiapdjp7x4qsbsz0fv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "15aj3vpafrb6hfrmi46pf6z3wj4y84dljsfzrvd6b5v0svmlr90d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "09biqsrcd4h01m6dkfdgb2gnly229ci8a0sd2rr1m75j749ijfh7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.30.0-darwin-amd64.tar.gz"; + sha256 = "050iqf2fls9r81kq5rimnh41gs8pp29scx31l8i2ff0bq5gvbg3h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1idvdcmbbia0cwkw5v7zp7695p1a6sfmrgsfmzn0r9p8lyg66k8w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "0p3zkgr557ngl6pjdidrp76b741nkdsw4s7wf1aj4mpw74fshm3g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; - sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "06s58xlwm3wf7895bzsqx4jsfb0kbxanzlaf21jff45y62nk1f1p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-darwin-amd64.tar.gz"; - sha256 = "03ccnifs1maxnr7qnqw1mn3lc7x2c06icbc9m9j218bx16lwf8jq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.6.0-darwin-amd64.tar.gz"; + sha256 = "0x74zlpzy1ajc9y0jkj32vhn4yn2rhldapdn0zlky7ss844a2gfk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "06s58xlwm3wf7895bzsqx4jsfb0kbxanzlaf21jff45y62nk1f1p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.0-darwin-amd64.tar.gz"; + sha256 = "0rggsafqsby8jy905xj0f6m75f2n0mf2z2wcjrsns3fcgcw322q1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-darwin-amd64.tar.gz"; - sha256 = "1f06x2h4i15vjzjyzcl5f01by2639hsfij2daayj5xiji3b415ps"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "1pmkwii8bsrr5k3lm0j2hr2fpzrcrwbbfisygr49w5cngx44k5sa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; - sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "1lfai2xd9538cq89b4jg85hj0slnvbwndd24y2g2q9h5qla08cx2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "115lcaqkliaxqg27hb1j773299kgs44d3l7p2da9kzla3sk7dps0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.6.0-darwin-amd64.tar.gz"; - sha256 = "05adn2mnfrhnqvq4cngsvjg489339azzsf6bzd9qj24qqwm9x5v3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; + sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "03f0k13qyi40hvhkfnwrdadxv5r1r2jphrf49nq81l35knqvs7fs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "144wz00hcd6zbybm0b7gqy8by3nnszf3885znvsichig23p1h76c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.3.0-darwin-amd64.tar.gz"; + sha256 = "1vdfvybqnvd0s8ln6340608vg00l2zhsndg8r03js57a5asmakyf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-darwin-amd64.tar.gz"; - sha256 = "183y60zvh2i20a3wg7yl1dm6bkpka0y6plnmb8746x7v9j5g4xlr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "148wdcdmip8rlh61clhcg44rk1kmvc15dkga1nhp8ngzry1f7lf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0bdhzbhzjdypf5xr756wx061myml9w765zmff7k7pw438hpzln2p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "0wry626g455r4lp8cfhjlg2zqwbgvbm2pk1qf9kwsisg1fszpq7a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.27.2-darwin-amd64.tar.gz"; - sha256 = "0ki3wq879ya82slmz75r6g4hzm4nmmgnwm3pjbhmls09irn46wc3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1wkyjxgrp3llvis3yjdnw65chscmxxcwigkr71i2crj28db8fhwx"; } ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.1-linux-arm64.tar.gz"; - sha256 = "1gwcrbwwmclxsviqmqb9q1swg4kz2463p42939vlv2r09lwpfvmi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.19.0-linux-arm64.tar.gz"; + sha256 = "1s0k743s7b6d2dccbia8909h7a7xjr8526h3ywkncqxam1gfjjlv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.6.0-linux-arm64.tar.gz"; - sha256 = "0f2frlkcai1489amas1yglpckwwz93acq1xllv88s2j1l6sab5vd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.10.1-linux-arm64.tar.gz"; + sha256 = "1zcpqjlgpkjzk2bdy8gcnhpfgzadc7r8z2vb5xc4vvf5q3q25sxy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-arm64.tar.gz"; - sha256 = "1hiqcy51ag4y8j47di5h07mnplrhpc5f406ab6car2c06fwr2wdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.7.0-linux-arm64.tar.gz"; + sha256 = "07j1gbmmciw9nyy4khhcfj8ayb91pwgrvghwr2i67f9prs570a79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-arm64.tar.gz"; sha256 = "0j2c23ii4dn9yhpw6nymij65gv82y1xp4gi8lgxxf41b1i9bpb2i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-linux-arm64.tar.gz"; - sha256 = "1hxaz0m33vf92d1vwksmib5lnpl57yrh8nf90nqmmzvjzajkzzbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.29.0-linux-arm64.tar.gz"; + sha256 = "1fr593m1g2y3k8qw1j20ssv2jd3c5m3cr6h4p5v6fng2ph3m3v7i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; - sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.0-linux-arm64.tar.gz"; + sha256 = "1m5gnc0a6svhzd27z0m151pzws6n3vsgj8bha7jl77znzxqrlxz1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz"; - sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-arm64.tar.gz"; + sha256 = "0k4yi9xqrmd5m99lr27h672ycwyh138d9jhh3wvgpmnjpdxy28jm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-linux-arm64.tar.gz"; - sha256 = "175bqcamkd2illd57gkycsfh5kyjw700g7phjsg057jij3cdfsr8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-arm64.tar.gz"; + sha256 = "06ii12cl7wsfs9pwjkwz01szacg686vfzc6i253l6xvmmiqp6q0j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.5.0-linux-arm64.tar.gz"; - sha256 = "1lz5dm1sgnydyi3rjp33y1lvs8wmy9lg0n71niibh1k4ppqbwm2m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.30.0-linux-arm64.tar.gz"; + sha256 = "02whsgdx0cd8nblfjgymsay9vyfmv8aah2y5nqkl7c6dzrlqllav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-arm64.tar.gz"; - sha256 = "0k4yi9xqrmd5m99lr27h672ycwyh138d9jhh3wvgpmnjpdxy28jm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; + sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; - sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-arm64.tar.gz"; + sha256 = "1hiqcy51ag4y8j47di5h07mnplrhpc5f406ab6car2c06fwr2wdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-arm64.tar.gz"; - sha256 = "03z7b32l2jp1si13qy2rjvkjw789sqaypza7q2k4vhwaxyiw715z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-linux-arm64.tar.gz"; + sha256 = "14v7wm2gkhd064drw2l894dacdsm5lnndii5qzl5hsl6p9a5m970"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-linux-arm64.tar.gz"; - sha256 = "1v5b5bwpzmr124xblrrr0rl0zbvky8ljcilyh0fmjgrmai25zbz2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.6.0-linux-arm64.tar.gz"; + sha256 = "0rp8qfrm3kgmr19ryg259m3n48wf5fyyff1bvnjinivq5irvl4j9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-linux-arm64.tar.gz"; - sha256 = "14v7wm2gkhd064drw2l894dacdsm5lnndii5qzl5hsl6p9a5m970"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.0-linux-arm64.tar.gz"; + sha256 = "0al7hrf3ymsq0h611j4f5i8k94rr19i44ym1gschmn7byn0v3ksa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-linux-arm64.tar.gz"; - sha256 = "0vjdl01ggnf3hj0ak3dak5828d8cj8x05ny9hsii2cqdphxybsj4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.4.0-linux-arm64.tar.gz"; + sha256 = "0sfnic280p76d2aa635h1jgjx5lbf1fgm6bkrvq5nx6i5x9vy05x"; } - # pulumi-resource-packet skipped (does not exist on remote) { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-arm64.tar.gz"; - sha256 = "0hq4l91ynjk5qzqcwvzqpd978wikqdx6lxngrawdkk501y0yh6f6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; + sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.6.0-linux-arm64.tar.gz"; - sha256 = "042mdf4l3nb8prialq8isr4iizsq7cjsz001ycshqs21j60kq0dq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-arm64.tar.gz"; + sha256 = "1hik4456fdln7hxiw02856v02v0m33zsyiad40c9wg4n772ybchy"; } + # pulumi-resource-packet skipped (does not exist on remote) { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.0-linux-arm64.tar.gz"; + sha256 = "1cz42cbvx4nah5jj712rf1r8r6p35ip6xl1kjgvxlrr23kq5vdjk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.5.0-linux-arm64.tar.gz"; - sha256 = "0ybxnskqxry9nbv9y02rqszlykcrihmlpa275s09ypbw3bibrjya"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.3.0-linux-arm64.tar.gz"; + sha256 = "06pag44k2rg5dhq2x0xrcqs365p49f9fkbp78rb8k31skvlc27jh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-linux-arm64.tar.gz"; - sha256 = "1jdjvx123qwd4mncnzms1ps55041ad5wl8ijr5qfay1yjphy4zn8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; + sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-linux-arm64.tar.gz"; - sha256 = "10p015rhp9dsxcwp0a0k3xvkphya8vji4ndv66z73jzr6z3vfqzm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.3.1-linux-arm64.tar.gz"; + sha256 = "13p2gg9ihwkyx35r7ilkp56qrrj4kcg4x1v8gspsbbahb9cbagvk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; - sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.0.0-linux-arm64.tar.gz"; + sha256 = "01rxaqzb72y56cwah90ypgrlg8jlajvyb7n6cakhvnn98nb281fi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.27.2-linux-arm64.tar.gz"; - sha256 = "0zgiaksn6x924g8lwcczfg8sm3jm747s4s6gbxv97p4cby4diw6m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-arm64.tar.gz"; + sha256 = "1f7h6xl3jk9y29ffjxv9r4a748fwip17x7pazs62zwc3h10a65ac"; } ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.1-darwin-arm64.tar.gz"; - sha256 = "0xl5191acq12ixd4dpcrg5d32dp43qfbj5m2k0q78nsq8p85y772"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.19.0-darwin-arm64.tar.gz"; + sha256 = "097sqsm53wdal1vnklqcxz8ys95w5ffw0n2gcx5rrgcld3fnrrc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.6.0-darwin-arm64.tar.gz"; - sha256 = "0bjpzd81913p6bgcq4al0prnaa66ag3h9v832cvnksm128n5yqmz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.10.1-darwin-arm64.tar.gz"; + sha256 = "1laqs75i8fnzg7zzf3v73xxvg1k4n5qazays1wh6id3wamx5mgk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-arm64.tar.gz"; - sha256 = "18ggnqx9zh8kl5h6nn2sa4zxvyby9pvscrvqnsam2l9yjv86r7i0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.7.0-darwin-arm64.tar.gz"; + sha256 = "12xnw6gp38dfgc6qvxbipbsv7yqidjazrzjj40aaknk5cqgr0b0f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-arm64.tar.gz"; sha256 = "1i5ipmidg0yspayxyglbjaihajhj1bsk46saxkncfrkvqnh4iq50"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-darwin-arm64.tar.gz"; - sha256 = "09vllijaql7141h0dw3p5ikvv4kp0mzfl5f0n7gd9d4pwl3q3yzv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.29.0-darwin-arm64.tar.gz"; + sha256 = "0dz698vijizcrfrv4ss4qadxnmklxpz78bwgv4x4crvwr3hjlamr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; - sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.0-darwin-arm64.tar.gz"; + sha256 = "1ziyhvjwkzq0wvxfxbprpprm8hcch75ifrij6fzlw3z0hxdd1bjf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz"; - sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-arm64.tar.gz"; + sha256 = "0fsmmgq0hvzyrw6vrdf3pppxjcj94fxxp52dl73r4f5wjkays33c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "0wzi2mb6jqmzyww2pbdx7cysi0xn4hp74g5n0jyz3mw68s5fm7vf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0sgg8bnsi5yyfv8gwzy8jw3f0fmkvizrgzh4jyc802qqc449p1ix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.5.0-darwin-arm64.tar.gz"; - sha256 = "1y77wjr7mpkf3vvqvp37bcdaci31bsjngg0kcsdwsqn93xs59vww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.30.0-darwin-arm64.tar.gz"; + sha256 = "11bhs20hpmgcyvpha8pbg8gd9v2r1fahjsaiif5fdx9dvpqmnsmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "0fsmmgq0hvzyrw6vrdf3pppxjcj94fxxp52dl73r4f5wjkays33c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; + sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-arm64.tar.gz"; + sha256 = "18ggnqx9zh8kl5h6nn2sa4zxvyby9pvscrvqnsam2l9yjv86r7i0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-arm64.tar.gz"; - sha256 = "0ci3xnxnwrk6dds21yifis1mrz24z2nxqdbya0qpqprkq6syvx41"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "0n60fk2nyb1idf4rdc61jxjpzpw4v9106gwn6r1by10g8f1712yr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-darwin-arm64.tar.gz"; - sha256 = "141mm2wa211gbs1kzqzq9ivjjz1bd93bb6vh9s28rz4z9ciaq44z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.6.0-darwin-arm64.tar.gz"; + sha256 = "1kg60sfa570k55p3fvqa952k1m17z9amr168m4lzqcdp63bfrzay"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.3.0-darwin-arm64.tar.gz"; - sha256 = "0n60fk2nyb1idf4rdc61jxjpzpw4v9106gwn6r1by10g8f1712yr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.0-darwin-arm64.tar.gz"; + sha256 = "13wxbpsqsh3prq6j12ih6cx6pcrfp97d0i5b7mk3d9imj3qdyf8x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-darwin-arm64.tar.gz"; - sha256 = "1lm26pinz7bjzv7bk22xq2qhyv5a4v7x7kwbl98sdv0gl1alj44f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0830la5hb84nv077mlsymrhl4ny4j1xvmqlpvy4r5kldrx0h9pa8"; } - # pulumi-resource-packet skipped (does not exist on remote) { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "1w78lqdf4ynfhl5h0bzxmvqnf4s59mflbdlbqhxq78qxwwq4v193"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.6.0-darwin-arm64.tar.gz"; - sha256 = "0vh64l3pxg76gxxjg9gsy2jd9zjg6yjr1vx343y7f2g9p0pbir29"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "1agi0dpck35rqsvxikdcl6xl2fpha2l4144mzgyslki4q86rqmhs"; } + # pulumi-resource-packet skipped (does not exist on remote) { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "1hinrhq950ah3ngszm2d9hn6i327lxfl0f9d83nxiknzpw395glw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.5.0-darwin-arm64.tar.gz"; - sha256 = "0wkppnwmij7sy8iwdg9q9aknwckh90ybxpdqpr5brz9ay1svqjix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.3.0-darwin-arm64.tar.gz"; + sha256 = "094zffj64rymjcgncbxwkdh6vp7g8s6f1nync9066jh29qzll6mf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-darwin-arm64.tar.gz"; - sha256 = "0h06wgmjqqvhsl7arx7k7q0mi9i484fj7bxbh4wvkjgxlhnm93ls"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "07ldq1anzrznan2a1x1igmgljfh6dx12cypggcyma7axiqj95ww1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.3.1-darwin-arm64.tar.gz"; + sha256 = "1qixa4vsak042vxqv7xsggvdcqyfs8sl10hnf3chdx2xwspm8hjy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "0lh4b6z75yg7zss59bfwmsp2dfryk867845jw5655g7ya15n99da"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.27.2-darwin-arm64.tar.gz"; - sha256 = "0l8x9b3np0cwk606621vx2c3k7a67hr7022jfdmaa5ajm44fn4ai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "1915f5d24vfrwgzvs5nkj5p05fjgqjyxpm54ym2wshl9s4fjb6sp"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index dcd4fd1256dc6..051cf4c90b000 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -6,7 +6,7 @@ API_URL="https://api.github.com/repos/pulumi" # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.17.1" +VERSION="3.19.0" # A hashmap containing a plugin's name and it's respective repository inside # Pulumi's Github organization diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/tools/archivers/tarlz/default.nix new file mode 100644 index 0000000000000..d5b53c5eaaaa2 --- /dev/null +++ b/pkgs/tools/archivers/tarlz/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, lzip, lzlib, texinfo }: + +stdenv.mkDerivation rec { + pname = "tarlz"; + version = "0.11"; + outputs = [ "out" "man" "info" ]; + + nativeBuildInputs = [ lzip texinfo ]; + buildInputs = [ lzlib ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + sha256 = "sha256-PalRMerepfYDSaDs4irck+1v5Gy/vlB9CyU6omWUXlk="; + }; + + enableParallelBuilding = true; + makeFlags = [ "CXX:=$(CXX)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Massively parallel combined implementation of the tar archiver and the lzip compressor"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index 70c4450140987..8f6e0db7ea273 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib, ncurses, fuse}: +{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}: stdenv.mkDerivation rec { name = "wiimms-iso-tools"; @@ -11,7 +11,19 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ncurses fuse ]; - patches = [ ./fix-paths.diff ]; + patches = [ + ./fix-paths.diff + + # Pull pending upstream fix for ncurses-6.3: + # https://github.com/Wiimm/wiimms-iso-tools/pull/14 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/Wiimm/wiimms-iso-tools/commit/3f1e84ec6915cc4f658092d33411985bd3eaf4e6.patch"; + sha256 = "18cfri4y1082phg6fzh402gk5ri24wr8ff4zl8v5rlgjndh610im"; + stripLen = 1; + }) + ]; + postPatch = '' patchShebangs setup.sh patchShebangs gen-template.sh diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index b8cd6df4751fa..11fe1a20a1956 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -20,6 +20,7 @@ , util-linux , vulkan-tools , which +, nix-update-script }: let @@ -36,13 +37,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.6.4"; + version = "0.7"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - sha256 = "sha256-xuv7u2lLQAB0Zmu7UHGXP/sJwcb8vHDf9hFL+pF+818="; + sha256 = "sha256-LdpgEfCNbf0/sY8v8D3KiapYEd23tVy4nQ7RuGwl7jM="; }; outputs = [ "out" "man" ]; @@ -102,6 +103,10 @@ in stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "An opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 96970cd769a1e..86f31a68dc707 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index 8c2276d..a62e60a 100644 +index 537491b..744f604 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -4913,7 +4913,7 @@ begin +@@ -5011,7 +5011,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index 8c2276d..a62e60a 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -4922,7 +4922,7 @@ begin +@@ -5020,7 +5020,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index 8c2276d..a62e60a 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -4931,7 +4931,7 @@ begin +@@ -5029,7 +5029,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index 8c2276d..a62e60a 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -4940,7 +4940,7 @@ begin +@@ -5038,7 +5038,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/tools/graphics/zxing/zxing.sh index ca6ac60bab694..a38558d87026d 100644 --- a/pkgs/tools/graphics/zxing/zxing.sh +++ b/pkgs/tools/graphics/zxing/zxing.sh @@ -2,17 +2,17 @@ choice="$1"; shift case "$choice" in - encode | create | write | CommandLineEncoder) - zxing-cmdline-encoder "$@"; - ;; - decode | read | run | CommandLineRunner) - zxing-cmdline-runner "$@"; - ;; - help | usage | --help | --usage | -h) - zxing read; - zxing write; - ;; - *) - zxing read "$choice" "$@" - ;; + encode | create | write | CommandLineEncoder) + zxing-cmdline-encoder "$@"; + ;; + decode | read | run | CommandLineRunner) + zxing-cmdline-runner "$@"; + ;; + help | usage | --help | --usage | -h) + zxing read; + zxing write; + ;; + *) + zxing read "$choice" "$@" + ;; esac diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 2ca60bca3e74c..cc290ab0eca94 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { strictDeps = true; # reconf needed to sucesfully cross-compile - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ m17n_db ]; + nativeBuildInputs = [ + autoreconfHook pkg-config + # requires m17n-db tool at build time + m17n_db + ]; # Fails parallel build due to missing intra-package depends: # https://savannah.nongnu.org/bugs/index.php?61377 diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index e2b99da82db05..d03fea2cefd28 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bunnyfetch"; - version = "unstable-2021-06-19"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "bunnyfetch"; - rev = "24370338b936bae1ebdefea73e8372ac0b4d2858"; - sha256 = "09wcffx6ak4djm2lrxq43n27p9qmczng4rf11qpwx3w4w67jvpz9"; + rev = "v${version}"; + sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M="; }; - vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + vendorSha256 = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM="; # No upstream tests doCheck = false; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index ffe3fd0fe1621..23df93172e999 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { version = "5.133"; - name = "byobu-" + version; + pname = "byobu"; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index fac8fbcfee974..3fbdcfae0fe47 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake , aesni ? stdenv.hostPlatform.aesSupport }: -let - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - date = "20160316"; -in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; + pname = "cpuminer-multi"; + version = "unstable-2016-03-16"; src = fetchFromGitHub { owner = "hyc"; repo = "cpuminer-multi"; - inherit rev; + rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f6f799a9b0c0a..e3f045f6292af 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "192"; + version = "194"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-ZaSE1yYznZIQV7yKyeBlqQzkgUn3CoadZY2fDA1/SnE="; + sha256 = "sha256-9JU8srcn7UMdMPAdQlpDzr/Ife5joGJTTqJIN1IJGLk="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 1ce5ced3f3ed2..5a44d7e846064 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20211021.0"; + version = "20211201.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stJ6fUs02XpCN671EztHTLkXd57eMo6472Q1e1/cbHY="; + sha256 = "sha256-/VARM59TI2Ff70Jq0smFMrt4o2G/wKSdcOreLfxMAMQ="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index dbe57f1bdf5b8..6f5725b2b3136 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -2,6 +2,7 @@ , pkgs , python3 , fetchFromGitHub +, fetchpatch , platformio , esptool , git @@ -16,18 +17,23 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.10.1"; + version = "2021.11.4"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zVZantMYtDWkvFrXmX0HpUchmc3T2gbkrMiWGP2ibNc="; + sha256 = "sha256-hPnng3Jkb2FucEOar/MIjvWHKbT3NNxEn6CIr3sd1Ng="; }; patches = [ # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch + ./fix-src-permissions.patch + (fetchpatch { + url = "https://github.com/esphome/esphome/commit/fbe1bca1b9896ba8c8b754c5a4faf790bffd887b.patch"; + sha256 = "sha256-Iyc79iL2YkLGD81TbFK3GaCY2L9nTE9mKz6MQSNQWr8="; + }) ]; postPatch = '' diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index b94b16d7bf545..1e140ecc0282e 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -21,7 +21,7 @@ }; in stdenv.mkDerivation rec { - name = "fx_cast_bridge-${version}"; + pname = "fx_cast_bridge"; version = "0.1.2"; src = pkgs.fetchFromGitHub { diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 5ff4a9e05e99d..f6c03edfe53d0 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.184.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ujhYcihLJh52cURvQ7p1B4fZTDx8cq3WA4RfKetWEBo="; + sha256 = "1rk2n1c2ia8kwqvbfnhsf3jbbi1qzndniq7cxs8iy9drn4adl7gv"; }; - vendorSha256 = "sha256-J9lAkmLDowMmbwcHV2t9/7iVzkZRnF60/4PSRS8+4Sg="; + vendorSha256 = "1hm5ya240vpfmgc8y6qv4gp4gbcqydk7hg05fwr7nzc2apj5fv6a"; ldflags = [ "-s" diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh index d3b138ad35770..a7db25afb64f3 100755 --- a/pkgs/tools/misc/grub/grub1.patches.sh +++ b/pkgs/tools/misc/grub/grub1.patches.sh @@ -13,39 +13,39 @@ set -u # https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches SERIES=( - snapshot.patch - menu.lst_gnu-hurd.patch - graphics.patch - raid.patch - raid_cciss.patch - xfs_freeze.patch - 2gb_limit.patch - grub-special_device_names.patch - grub-xvd_drives.patch - initrd_max_address.patch - splashimage_help.patch - grub-install_addsyncs.patch - grub-install_regexp.patch - grub-install_aoe_support.patch - grub-install_xvd.patch - geometry-26kernel.patch - print_func.patch - mprotect.patch - savedefault.patch - find-grub-dir.patch - intelmac.patch - crossreference_manpages.patch - ext3_256byte_inode.patch + snapshot.patch + menu.lst_gnu-hurd.patch + graphics.patch + raid.patch + raid_cciss.patch + xfs_freeze.patch + 2gb_limit.patch + grub-special_device_names.patch + grub-xvd_drives.patch + initrd_max_address.patch + splashimage_help.patch + grub-install_addsyncs.patch + grub-install_regexp.patch + grub-install_aoe_support.patch + grub-install_xvd.patch + geometry-26kernel.patch + print_func.patch + mprotect.patch + savedefault.patch + find-grub-dir.patch + intelmac.patch + crossreference_manpages.patch + ext3_256byte_inode.patch # Breaks on NixOS. - #use_grub-probe_in_grub-install.patch - objcopy-absolute.patch - no-reorder-functions.patch + #use_grub-probe_in_grub-install.patch + objcopy-absolute.patch + no-reorder-functions.patch - # We aren't building amd64 binaries, see #244498 - #fix_amd64_compile.patch - modern-automake.patch - no-combine-stack-adjustments.patch - no-pie.patch + # We aren't building amd64 binaries, see #244498 + #fix_amd64_compile.patch + modern-automake.patch + no-combine-stack-adjustments.patch + no-pie.patch ) # Revision mapping to current tip of the 0.97-73 branch. @@ -63,8 +63,8 @@ in EOF for PATCH in "${SERIES[@]}"; do - URL="$prefix/$PATCH" - HASH="$(nix-prefetch-url "$URL")" - echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE" + URL="$prefix/$PATCH" + HASH="$(nix-prefetch-url "$URL")" + echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE" done echo "]" >> "$FILE" diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 3dcefa8b2d0f3..19bc90779d833 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -2,10 +2,9 @@ , enableGUI ? false, qtbase ? null }: -let version = "1.4.2"; in - -mkDerivation { - name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; +mkDerivation rec { + pname = "heimdall${lib.optionalString enableGUI "-gui"}"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; @@ -15,7 +14,8 @@ mkDerivation { }; buildInputs = [ - zlib libusb1 + zlib + libusb1 ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; @@ -44,10 +44,10 @@ mkDerivation { ''; meta = with lib; { - homepage = "http://www.glassechidna.com.au/products/heimdall/"; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; - license = licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index f9038da04b577..7b52091104c76 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { version = "1.2.1"; - name = "jugglinglab"; + pname = "jugglinglab"; src = fetchFromGitHub { owner = "jkboyce"; repo = "jugglinglab"; diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/tools/misc/keymapviz/default.nix index 14c56d48dfc90..c31fbd6e32567 100644 --- a/pkgs/tools/misc/keymapviz/default.nix +++ b/pkgs/tools/misc/keymapviz/default.nix @@ -17,6 +17,6 @@ python3.pkgs.buildPythonApplication rec { description = "A qmk keymap.c visualizer"; homepage = "https://github.com/yskoht/keymapviz"; license = licenses.mit; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8c4cb5c1a7593..5abe5673bf298 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { patches = [ # Work around https://github.com/anrieff/libcpuid/pull/102. ./stdint.patch + # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1 + (fetchpatch { + name = "use-popcount-from-libc.patch"; + url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch"; + sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q"; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index e6d19fc6d4060..a299a85b6b822 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -4,7 +4,7 @@ # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. stdenv_32bit.mkDerivation rec { - name = "loadlibrary-${version}"; + pname = "loadlibrary"; version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 1c7ab29cbc863..b35e5a4aea438 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -11,10 +11,10 @@ with lib; let this = stdenv.mkDerivation rec { version = elk6Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = if enableUnfree then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053" diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index e11d0899df4ed..cb79d2ea236c6 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -34,7 +34,7 @@ xorg, }: let - version = "1.29.4"; + version = "1.29.5"; rpath = lib.makeLibraryPath [ alsa-lib @@ -84,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-CqC6BrRhMfjxamSwC6ub1u3+FtDuIq3/OMNdUZgpCAQ="; + sha256 = "sha256-2nzbWflONhBzzxsk+uxFP4/E2fORJatwNcbrG3xhaPc="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 70bace74b1e9a..51fd22b0c35e7 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: +{ lib +, stdenv +, fetchurl +, libibmad +, openssl +, zlib +}: stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.14.0-3"; + version = "4.17.0-1"; - src = fetchFromGitHub { - owner = "Mellanox"; - repo = pname; - rev = "v${version}"; - sha256 = "0zy9npyzf7dkxlfl9mx6997aa61mk23ixpjb01ckb1wvav5k6z82"; + src = fetchurl { + url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; + sha256 = "030vpiv44sxmjf0dng91ziq1cggwj33yp0l4xc6cdhnrv2prjs7y"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib libibmad openssl ]; + buildInputs = [ + libibmad + openssl + zlib + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 14f955be1cdc2..1c18cb82c5902 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { - name = "OpenCorsairLink-${version}"; - version = "2019-12-23"; + pname = "OpenCorsairLink"; + version = "unstable-2019-12-23"; buildInputs = [ libusb1 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index e75481fcc2c17..2fb48f05850ed 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay"; + pname = "ponysay"; version = "unstable-2021-03-27"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 47a81989cde6e..753a25eb35610 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -25,6 +25,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildFeatures = lib.optional (!stdenv.isDarwin) "notify-rust"; + postInstall = '' for shell in bash fish zsh; do STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index a833846dd00f0..1c7dfd20330cb 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: mkDerivation rec { - name = "veikk-linux-driver-gui"; + pname = "veikk-linux-driver-gui"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; }; diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index cd1c11dbdb643..ee64f69897d2f 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libXScrnSaver, libX11 }: stdenv.mkDerivation rec { - version = "9.2.4"; - name = "x11idle-org-${version}"; + pname = "x11idle-org"; src = fetchurl { url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index 907e39a3f27bc..4b649aecb698e 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "An extended cp(1)"; homepage = "https://github.com/tarka/xcp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ legendofmiracles ]; + maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 6a6a019dcbee7..e694e1561365f 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.11.10.1"; + version = "2021.12.1"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388"; + sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8="; }; propagatedBuildInputs = [ websockets mutagen ] diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 93535531d91bd..6fad1174bbf07 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { - name = "atinout-${version}"; + pname = "atinout"; version = "0.9.2-alpha"; NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index a4f2ef36360eb..9e47993df6029 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "bacnet-stack"; + pname = "bacnet-stack"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index cfe78590483fc..66334e0621034 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "bore"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromBitbucket { owner = "delan"; repo = "nonymous"; - rev = version; - sha256 = "0gws1f625izrb3armh6bay1k8l9p9csl37jx03yss1r720k4vn2x"; + rev = "${pname}-${version}"; + sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; }; - cargoSha256 = "1n09gcp1y885lz6g2f73zw3fd0fmv7nwlvaqba2yl0kylzk7naa6"; + cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx"; cargoBuildFlags = "-p ${pname}"; # FIXME can’t test --all-targets and --doc in a single invocation - checkFeatures = [ "std" ]; - cargoTestFlags = [ "--all-targets" "--workspace" ]; + checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin llvmPackages.libclang; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 2f2ef3851d1f4..fffcbbb528b79 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-pNy1mTP2AaeuwNvvfrHOp5v1nQgv+1DJRGYKgnx98Xo="; + sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4="; }; - vendorSha256 = "sha256-TYjkow/9W467CMyqV2SSRJAuqXGdnAgR9gtfq4vX4u0="; + vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index a6181e6f2dedb..e26526dc68d57 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; + sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index a4e5d565756b1..29ca9961546aa 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ="; + sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE="; }; configureFlags = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = "https://vincentbernat.github.io/lldpd/"; + homepage = "https://lldpd.github.io/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index fdd1857ef10e4..cfd768e40ab6a 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot"; + pname = "netboot"; version = "0.10.2"; src = fetchurl { diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index ca75e50fa5270..7e2b938e4c8b8 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -22,11 +22,21 @@ stdenv.mkDerivation rec { url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; }) + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/epam/nfstrace/pull/50 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch"; + sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx"; + }) ]; postPatch = '' + # -Wall -Wextra -Werror fails on clang and newer gcc substituteInPlace CMakeLists.txt \ - --replace "-Wno-braced-scalar-init" "" + --replace "-Wno-braced-scalar-init" "" \ + --replace "-Werror" "" ''; buildInputs = [ json_c libpcap ncurses libtirpc ]; diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index f1f8545c96de4..5366a2c3a9c66 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -16,8 +16,8 @@ let versions = lib.importJSON ./versions.json; in stdenv.mkDerivation { - name = "ngrok-${version}"; - version = version; + pname = "ngrok"; + inherit version; # run ./update src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index 43f32ddb9fb41..16311f5b99612 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "${program}-${version}"; - program = "prettyping"; + pname = "prettyping"; version = "1.0.1"; src = fetchFromGitHub { owner = "denilsonsa"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; }; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index b609cce90bc54..9b8989f30c2ac 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchFromGitHub, libevent }: -let - pkg = "redsocks"; +stdenv.mkDerivation rec { + pname = "redsocks"; version = "0.5"; -in -stdenv.mkDerivation { - name = "${pkg}-${version}"; src = fetchFromGitHub { owner = "darkk"; - repo = pkg; + repo = "redsocks"; rev = "release-${version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fd3a563c209d8..572625651e9ab 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, ppp } : let - version = "3.12"; in -stdenv.mkDerivation { - name = "rp-pppoe-" + version; +stdenv.mkDerivation rec { + pname = "rp-pppoe"; + version = "3.12"; + src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; @@ -11,7 +12,6 @@ stdenv.mkDerivation { buildInputs = [ ppp ]; - preConfigure = '' cd src export PPPD=${ppp}/sbin/pppd diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 9f1ac89ce8ec5..a38456bcc760a 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tdns-cli"; + pname = "tdns-cli"; version = "0.0.5"; src = fetchFromGitHub { owner = "rotty"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; + cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c5aaec66d9e32..57a5510bd4306 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation { - name = "toxvpn"; + pname = "toxvpn"; version = "unstable-2019-09-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 98b7b2547d691..f9ff82735b901 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -32,6 +32,9 @@ , withDNSTAP ? false , withTFO ? false , withRedis ? false +# Avoid .lib depending on openssl.out +# The build gets a little hacky, so in some cases we disable this approach. +, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , libnghttp2 }: @@ -105,10 +108,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString withSlimLib # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. - # There was some problem with this on Darwin; let's not complicate non-Linux. '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 8364cd5763dc1..c37d82024fe6b 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -2,8 +2,8 @@ { lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "waitron-unstable-${version}"; - version = "2020-01-24"; + pname = "waitron"; + version = "unstable-2020-01-24"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 94cd645d177cf..3062befe2d3bf 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk="; + sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; }; preConfigure = '' diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a94ae45ccea5f..a0700e43c5b25 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.3"; + version = "1.0.4.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; + hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0="; rev = "v${version}"; }; isLibrary = true; diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index 924ed8252811f..0c95e41f8c9a2 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "unstable-2020-11-02"; - name = "dydisnix-${version}"; + pname = "dydisnix"; src = fetchFromGitHub { owner = "svanderburg"; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 93e240ad3463c..d9faea9cea4d4 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; - passthru.tests.nix-serve = nixosTests.nix-serve; + passthru.tests = { + nix-serve = nixosTests.nix-serve; + nix-serve-ssh = nixosTests.nix-serve-ssh; + }; meta = { homepage = "https://github.com/edolstra/nix-serve"; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index ea2b565be27e0..d21c9b3c568f8 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-DzqttjYkCSgsHjF1YN93zioGpTGDm9H0F8JzKmHPHro="; + sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo="; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index c949b443e363c..b215a8e1d2853 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,7 +1,7 @@ { lib, python3Packages, fetchurl, git }: python3Packages.buildPythonApplication rec { - name = "nox-${version}"; + pname = "nox"; version = "0.0.6"; namePrefix = ""; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index aab524d77a285..125b969537341 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -9,17 +9,18 @@ , winetricks , yad , pytestCheckHook +, nix-update-script }: buildPythonApplication rec { pname = "protontricks"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY="; + sha256 = "sha256-XC5ip12wlXRo/AaTFJWEZvEZPPC1WtXTyeYivvyHZaE="; }; patches = [ @@ -55,6 +56,10 @@ buildPythonApplication rec { pythonImportsCheck = [ "protontricks" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index eead5ef6f49ed..d27289bb3f5c0 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index d811cb7..a376a34 100755 +index bd651aa..2b82aea 100755 --- a/src/protontricks/cli/main.py +++ b/src/protontricks/cli/main.py @@ -14,8 +14,8 @@ import sys @@ -57,9 +57,9 @@ index d811cb7..a376a34 100755 use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, - command=[str(winetricks_path)] + args.winetricks_command) - elif args.command: -@@ -296,7 +285,6 @@ def main(args=None): + command=[str(winetricks_path)] + args.winetricks_command + ) +@@ -297,7 +286,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -121,7 +121,7 @@ index be5322b..552f894 100644 APPINFO_STRUCT_SECTION = "<LLLLQ20sL" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index 5252d6c..f16dfec 100644 +index f2482fc..f9c1c33 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py @@ -5,15 +5,14 @@ import shutil @@ -243,7 +243,7 @@ index 5252d6c..f16dfec 100644 use_bwrap=True, **kwargs): """Run an arbitrary command with the correct environment variables -@@ -351,7 +338,7 @@ def run_command( +@@ -353,7 +340,7 @@ def run_command( os.environ["STEAM_RUNTIME_PATH"] = \ str(proton_app.required_tool_app.install_path) os.environ["PROTON_LD_LIBRARY_PATH"] = \ @@ -252,7 +252,7 @@ index 5252d6c..f16dfec 100644 runtime_name = proton_app.required_tool_app.name logger.info( -@@ -372,11 +359,8 @@ def run_command( +@@ -374,11 +361,8 @@ def run_command( "Current Steam Runtime not recognized by Protontricks." ) else: @@ -265,7 +265,7 @@ index 5252d6c..f16dfec 100644 # When Steam Runtime is enabled, create a set of helper scripts # that load the underlying Proton Wine executables with Steam Runtime -@@ -384,8 +368,6 @@ def run_command( +@@ -386,8 +370,6 @@ def run_command( wine_bin_dir = create_wine_bin_dir( proton_app=proton_app, use_bwrap=use_bwrap ) @@ -275,7 +275,7 @@ index 5252d6c..f16dfec 100644 os.environ["PATH"] = "".join([ str(wine_bin_dir), os.pathsep, os.environ["PATH"] diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py -index f714f2c..b03fac1 100644 +index 605ae26..4bf7e80 100644 --- a/tests/cli/test_main.py +++ b/tests/cli/test_main.py @@ -116,15 +116,10 @@ class TestCLIRun: @@ -324,7 +324,7 @@ index f714f2c..b03fac1 100644 assert command.env["STEAM_RUNTIME_PATH"] == \ str(steam_runtime_soldier.install_path) -@@ -335,7 +326,6 @@ class TestCLIRun: +@@ -344,7 +335,6 @@ class TestCLIRun: # Also ensure log messages are included in the error message assert b"Found Steam directory at" in message @@ -332,7 +332,7 @@ index f714f2c..b03fac1 100644 def test_run_gui_provider_not_found(self, cli, home_dir, steam_app_factory): """ -@@ -349,20 +339,6 @@ class TestCLIRun: +@@ -358,20 +348,6 @@ class TestCLIRun: assert "YAD or Zenity is not installed" in result @@ -345,11 +345,11 @@ index f714f2c..b03fac1 100644 - steam_app_factory(name="Fake game 1", appid=10) - result = cli( - ["10", "winecfg"], env={"STEAM_RUNTIME": "invalid/path"}, -- expect_exit=True +- expect_returncode=1 - ) - - assert "Steam Runtime was enabled but couldn't be found" in result - def test_run_proton_not_found(self, cli, steam_dir, steam_app_factory): steam_app_factory(name="Fake game 1", appid=10) - result = cli(["10", "winecfg"], expect_exit=True) + result = cli(["10", "winecfg"], expect_returncode=1) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e3b19037a6310..0191cbd6e48ca 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-27"; + version = "2021-12-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-gELHYX1gaNtQtDIyIa3cJOWilf02PknlSyMI4a7pOX4="; + sha256 = "sha256-xVEDbc+Kvp9gCV2n6KyQCLif231pannIxDzEE0dwmmY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 371a7ca67afde..6625a45679549 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -1,7 +1,8 @@ { stdenv, gnupg, coreutils, writeScript }: stdenv.mkDerivation { - name = "gnupg1compat-${gnupg.version}"; + pname = "gnupg1compat"; + version = gnupg.version; builder = writeScript "gnupg1compat-builder" '' PATH=${coreutils}/bin diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 07becc2c3488d..3e9164befc96c 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; + sha256 = "sha256-Mis3DQwcTazHVF7hkTRQ2OtQxeGut5LRUAloBXCdq3s="; }; - vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; + vendorSha256 = "sha256-53Mvc637J306MJLw+l1amAuZhUE/NdDvuWEe0fg4Hog="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 02533f7f6f5fc..9749f93282efc 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - sha256 = "1w1wc81mkjcsgjbrihbsphxkcmwnfnf555pmlsd2vs2a04nki01y"; + hash = "sha256-dEtmn6d7B+0p3SOmnpJigBCDjfnyY1qazXdmwtvoWwE="; }; deps = stdenv.mkDerivation { @@ -21,6 +21,14 @@ let export GRADLE_USER_HOME=$(mktemp -d) export JADX_VERSION=${version} gradle --no-daemon jar + + # Apparently, Gradle won't cache the `compileOnlyApi` dependency + # `org.jetbrains:annotations:22.0.0` which is defined in + # `io.github.skylot:raung-common`. To make it available in the + # output, we patch `build.gradle` and run Gradle again. + substituteInPlace build.gradle \ + --replace 'org.jetbrains:annotations:23.0.0' 'org.jetbrains:annotations:22.0.0' + gradle --no-daemon jar ''; # Mavenize dependency paths @@ -31,9 +39,8 @@ let | sh ''; - outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "05fsycpd90dbak2vgdpd9cz08liq5j78ag9ry9y1s62ld776g0hz"; + outputHash = "sha256-t2kfih5JbIZvJMSHcCsTteDJ9MWJK/wUiqmHU5odMdY="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e68980cc9659c..9534480b7dde5 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.131"; + version = "1.0.132"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcReo4pTdI8ssWH1IqD8gDUm4jQ0jBBJ+ltxSpdkxQE="; + sha256 = "sha256-hx11RCLEUW/2MKNIXz51wOyKC7zv0M3Wvblam/E3rdQ="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-SxJnYJyKFed1c+zgeeXQQhsKHlaDevJGMwqA5gPef3s="; + vendorSha256 = "sha256-GrQmWHdCk8Yl/ryS2zLQU8XCkjfS20qjlEScU8AQT0o="; ldflags = [ "-s" diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 7177b1891f2dd..e82052d961b8c 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-HkDgWwHoRWCNtWyfP4sj3veEd+KT5J7yL4J4Z/hJcrE="; }; - patches = lib.optionals stdenv.cc.isClang [ + patches = [ # Fix clang configuration; remove with next release (fetchpatch { url = "https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch"; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 587d7782e765f..8e4b3e697312b 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - - name = "srm-" + version; + pname = "srm"; version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/srm/${version}/srm-${version}.tar.gz"; sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 3a12761ee87fe..219f1c74e5a97 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -7,6 +7,7 @@ , PCSC , pkg-config , hsmSupport ? true +, nixosTests }: buildGoModule rec { @@ -46,6 +47,8 @@ buildGoModule rec { # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted __darwinAllowLocalNetworking = true; + passthru.tests.step-ca = nixosTests.step-ca; + meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index a11890dabd6f2..2166a671ab1cc 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - baseName = "ipmiutil"; + pname = "ipmiutil"; version = "3.1.6"; - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; + url = "mirror://sourceforge/project/ipmiutil/pmiutil-${version}.tar.gz"; sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548"; }; diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index 06df9afa8139b..7e54a5549b714 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -2,19 +2,13 @@ stdenv.mkDerivation rec { pname = "OpenIPMI"; - version = "2.0.31"; + version = "2.0.32"; src = fetchurl { url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; - sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh"; + sha256 = "sha256-9tD9TAp0sF+AkHIp0LJw9UyiMpS8wRl5+LjRJ2Z4aUU="; }; - patches = [ - # fix assertion when used as a library in collectd - # taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/ - ./fix-collectd-assertion.diff - ]; - buildInputs = [ ncurses popt python3 readline ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff deleted file mode 100644 index af39fcc056777..0000000000000 --- a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/unix/posix_thread_os_hnd.c -+++ b/unix/posix_thread_os_hnd.c -@@ -140,8 +140,6 @@ - fd_data->data_ready = data_ready; - fd_data->handler = handler; - fd_data->freed = freed; -- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); -- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); - rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, - free_fd_data); - if (rv) { diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 88c786e30b6e9..d6c8833618cda 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation { IOKit Metal QuartzCore + darwin.DarwinTools ]); builder = ./builder.sh; diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/tools/text/csvdiff/default.nix new file mode 100644 index 0000000000000..f85d725d6ca44 --- /dev/null +++ b/pkgs/tools/text/csvdiff/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "csvdiff"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "aswinkarthik"; + repo = "csvdiff"; + rev = "v${version}"; + sha256 = "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b"; + }; + + vendorSha256 = "1612s4kc0r8zw5y2n6agwdx9kwhxkdrjzagn4g22lzmjq02a64xf"; + + meta = with lib; { + homepage = "https://aswinkarthik.github.io/csvdiff/"; + description = "A fast diff tool for comparing csv files"; + license = licenses.mit; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 5d89619001b42..ceeed3d6f76bf 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - program = "grin"; + pname = "grin"; version = "1.2.1"; - name = "${program}-${version}"; namePrefix = ""; src = fetchFromGitHub { owner = "rkern"; - repo = program; + repo = pname; rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f"; sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd"; }; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index d8412605dcbe5..d61daf262d9c1 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "dylanowen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wIgWaCjJrrajvUZbJjpx9P4urN2/eVo3+Za2NjTKWvM="; + sha256 = "sha256-yY8ZdRNP0G9dwrwUtNZIaodIlEK4GRgZQ5D1GpLhDGg="; }; - cargoSha256 = "sha256-F8JuEk0ztB7jfcPNjU9vGsr3HLEJ2DmWGWxvdbLuyvQ="; + cargoSha256 = "sha256-d8/xa2Aq6g0Kvqq11kzVTp1oooN6dPowpKW0uenBevw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index c579dcb8a175b..04293d29efb27 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -4,7 +4,8 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-${mecab-base.version}"; + pname = "mecab"; + version = mecab-base.version; postInstall = '' sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/tools/text/mecab/nodic.nix index 1cbc31be4ee17..be9003623e05e 100644 --- a/pkgs/tools/text/mecab/nodic.nix +++ b/pkgs/tools/text/mecab/nodic.nix @@ -4,5 +4,6 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-nodic-${mecab-base.version}"; + pname = "mecab-nodic"; + version = mecab-base.version; }) diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index c3d005a97e08d..afc9d2d89e7a6 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -9,7 +9,8 @@ let gemset = ./gemset.nix; }; in stdenv.mkDerivation { - name = "papertrail-${(import ./gemset.nix).papertrail.version}"; + pname = "papertrail"; + version = (import ./gemset.nix).papertrail.version; dontUnpack = true; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index c599375bc1cc6..b58b4c62947dc 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { - name = "jade-${version}-${debpatch}"; + pname = "jade"; version = "1.2.1"; debpatch = "47.3"; diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 854e70c7622b8..02a29a91f47d9 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "smu"; + pname = "smu"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 4a7b588cd9d43..289740854f2e9 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; excludes = [ "ChangeLog" ]; }) + + # Upstream fix for clang-13 and gcc-12 test support + (fetchpatch { + name = "gcc-12.patch"; + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; + sha256 = "1v33zd2766k7cdgmajw2lffw9wd7v4f8z01f40z53f6bp608nr62"; + }) ]; # source-highlight uses it's own binary to generate documentation. @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { "--with-bash-completion=${placeholder "out"}/share/bash_completion.d" ]; - doCheck = !stdenv.cc.isClang; + doCheck = true; enableParallelBuilding = true; # Upstream uses the same intermediate files in multiple tests, running diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index fc350162845a6..7b4cde33f5d1e 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.11.2"; + version = "2.13.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; + sha256 = "sha256-I1hrmlNZUDhjWTsOzmp8xIc8rv2gTGRx2/yiAmCy9IY="; }; - vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; + vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index 61459e48b7f02..eab37c3c68fb5 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -15,28 +15,28 @@ installDoc () echo "building \`$doc' document..." if [ ! -f "doc/$doc/outfile.ps" ] then - ( PATH="$PWD:$PATH" ; \ - cd "doc/$doc" && lout -r4 -o outfile.ps all ) \ + ( PATH="$PWD:$PATH" ; \ + cd "doc/$doc" && lout -r4 -o outfile.ps all ) \ || return 1 fi - cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" && \ - ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4 \ + cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" && \ + ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4 \ "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf" done return 0 } -unpackPhase && \ -cd lout-*.* && \ -cat makefile | \ - sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ; \ - s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ; \ - s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ; \ - s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g" \ - > "$nixMakefile" && \ -mkdir -p "$out/bin" && mkdir -p "$out/lib" \ -mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" CC=cc install installman && \ -installDoc && \ +unpackPhase && \ +cd lout-*.* && \ +cat makefile | \ + sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ; \ + s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ; \ + s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ; \ + s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g" \ + > "$nixMakefile" && \ +mkdir -p "$out/bin" && mkdir -p "$out/lib" \ +mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ +make -f "$nixMakefile" CC=cc install installman && \ +installDoc && \ fixupPhase diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 1945e56b96e7b..00ca3f09d393e 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudmonkey"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "apache"; repo = "cloudstack-cloudmonkey"; rev = version; - sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU="; }; runVend = true; diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index 1605bcfa43b67..283219108424e 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rpmextract, fetchurl, python2, tree }: stdenv.mkDerivation { - name = "ec2-utils"; + pname = "ec2-utils"; version = "0.5.1"; # The url can be determined by booting an "Amazon Linux 2" and running: diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index d5ed6ae88ffef..3c974f4cb7798 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yq71nYNL3bFvwhVzrQ1g8n7/4tMmLuYUJ9pMBmxL8e8="; + sha256 = "sha256-aZvtgeaS3xxl5/A/Pwlbu0sI7bw2MONbEIK42IDcMy0="; }; vendorSha256 = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI="; diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix index d8fec3fd15c6c..9214f38b33037 100644 --- a/pkgs/tools/wayland/swaycwd/default.nix +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -4,13 +4,12 @@ , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: nimPackages.buildNimPackage rec{ - - name = "swaycwd"; + pname = "swaycwd"; version = "0.0.2"; src = fetchFromGitLab { owner = "cab404"; - repo = name; + repo = pname; rev = "v${version}"; hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk="; }; diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix new file mode 100644 index 0000000000000..0836723760e77 --- /dev/null +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wayland +, wayland-protocols +, wayland-scanner +, wlr-protocols +, libGL +}: + +stdenv.mkDerivation rec { + pname = "wl-mirror"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = "wl-mirror"; + rev = "v${version}"; + sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly"; + }; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \ + --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' + ''; + + nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; + buildInputs = [ + libGL + wayland + wayland-protocols + wlr-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/Ferdi265/wl-mirror"; + description = "Mirrors an output onto a Wayland surface."; + license = licenses.gpl3; + maintainers = with maintainers; [ twitchyliquid64 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e89081aef3c7..c78e211923912 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -394,6 +394,7 @@ mapAliases ({ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -837,6 +838,7 @@ mapAliases ({ sdlmame = mame; # added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; + sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11 shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51c88dfca1a12..ee5dffa4bf6fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1996,6 +1996,8 @@ with pkgs; asmfmt = callPackage ../development/tools/asmfmt { }; + asmrepl = callPackage ../development/interpreters/asmrepl { }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; @@ -2561,6 +2563,8 @@ with pkgs; wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + wl-mirror = callPackage ../tools/wayland/wl-mirror { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlr-randr = callPackage ../tools/wayland/wlr-randr { }; @@ -2632,6 +2636,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csvdiff = callPackage ../tools/text/csvdiff { }; + csview = callPackage ../tools/text/csview { }; csvkit = callPackage ../tools/text/csvkit { }; @@ -4649,6 +4655,9 @@ with pkgs; dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; + dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + }; domoticz = callPackage ../servers/domoticz { }; @@ -5632,9 +5641,7 @@ with pkgs; git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; - git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo { - pythonPackages = python3Packages; - }; + git-filter-repo = with python3Packages; toPythonApplication git-filter-repo; git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { inherit (darwin.apple_sdk.frameworks) Security; @@ -5761,9 +5768,7 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { - libgit2 = libgit2_1_1; # git2go only supports v1.1.x - }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -6315,6 +6320,8 @@ with pkgs; host = bind.host; + hostess = callPackage ../development/tools/hostess {}; + hotpatch = callPackage ../development/libraries/hotpatch { }; hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; @@ -9913,6 +9920,8 @@ with pkgs; target-isns = callPackage ../os-specific/linux/target-isns { }; + tarlz = callPackage ../tools/archivers/tarlz { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tarsnapper = callPackage ../tools/backup/tarsnapper { }; @@ -12248,116 +12257,31 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - - openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; - - openjdk8-bootstrap = - if adoptopenjdk-hotspot-bin-8.meta.available then - adoptopenjdk-hotspot-bin-8 - else - callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; - - /* legacy jdk for use as needed by older apps */ - openjdk8 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/8.nix { } - else - callPackage ../development/compilers/openjdk/8.nix { - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk8_headless = - if stdenv.isDarwin || stdenv.isAarch64 then - openjdk8 - else - openjdk8.override { headless = true; }; + inherit (javaPackages) openjfx11 openjfx15; + openjfx = openjfx15; + openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; + openjdk8 = javaPackages.compiler.openjdk8; + openjdk8_headless = javaPackages.compiler.openjdk8.headless; jdk8 = openjdk8; jdk8_headless = openjdk8_headless; jre8 = openjdk8.jre; jre8_headless = openjdk8_headless.jre; - openjdk11-bootstrap = - if adoptopenjdk-hotspot-bin-11.meta.available then - adoptopenjdk-hotspot-bin-11 - else - callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; - - openjdk11 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/11.nix { } - else - callPackage ../development/compilers/openjdk/11.nix { - openjfx = openjfx11; - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk11_headless = - if stdenv.isDarwin then - openjdk11 - else - openjdk11.override { headless = true; }; - - openjdk17-bootstrap = - if adoptopenjdk-hotspot-bin-16.meta.available then - adoptopenjdk-hotspot-bin-16 - else - /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ - callPackage ../development/compilers/openjdk/16.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk16-bootstrap = callPackage ../development/compilers/openjdk/15.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { - stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - }; - }; - }; - }; - }; - + openjdk11-bootstrap = javaPackages.compiler.openjdk11-bootstrap; + openjdk11 = javaPackages.compiler.openjdk11; + openjdk11_headless = javaPackages.compiler.openjdk11.headless; jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - /* Latest JDK */ - openjdk17 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin { } - else - callPackage ../development/compilers/openjdk/17.nix { - openjfx = openjfx15; - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk17_headless = - if stdenv.isDarwin then - openjdk17 - else - openjdk17.override { headless = true; }; - + openjdk17-bootstrap = javaPackages.compiler.openjdk17-bootstrap; + openjdk17 = javaPackages.compiler.openjdk17; + openjdk17_headless = javaPackages.compiler.openjdk17.headless; jdk17 = openjdk17; jdk17_headless = openjdk17_headless; + openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; + /* default JDK */ jdk = jdk17; @@ -12440,11 +12364,11 @@ with pkgs; julia-stable = julia_15; julia = julia-stable; - julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; + julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; - julia-lts-bin = julia_10-bin; - julia-stable-bin = julia_16-bin; + julia-lts-bin = julia_16-bin; + julia-stable-bin = julia_17-bin; julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; @@ -12476,6 +12400,8 @@ with pkgs; kotlin = callPackage ../development/compilers/kotlin { }; kotlin-native = callPackage ../development/compilers/kotlin/native.nix { }; + kotlin-language-server = callPackage ../development/tools/kotlin-language-server {}; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -13160,9 +13086,7 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_40 - vala_0_46 vala_0_48 - vala_0_50 vala_0_52 vala_0_54 vala; @@ -13474,8 +13398,6 @@ with pkgs; ### End of CuboCore - lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; @@ -14450,6 +14372,8 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; + datree = callPackage ../development/tools/datree { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -15276,7 +15200,9 @@ with pkgs; shards_0_16 shards; - shellcheck = callPackage ../development/tools/shellcheck {}; + shellcheck = callPackage ../development/tools/shellcheck { + ShellCheck = haskellPackages.ShellCheck_0_8_0; + }; shellharden = callPackage ../development/tools/shellharden {}; @@ -15871,6 +15797,8 @@ with pkgs; ndn-tools = callPackage ../tools/networking/ndn-tools { }; + nfd = callPackage ../servers/nfd { }; + cddlib = callPackage ../development/libraries/cddlib {}; cdk = callPackage ../development/libraries/cdk {}; @@ -18372,6 +18300,8 @@ with pkgs; libubox = callPackage ../development/libraries/libubox { }; + libudev-zero = callPackage ../development/libraries/libudev-zero { }; + libuecc = callPackage ../development/libraries/libuecc { }; libui = callPackage ../development/libraries/libui { @@ -18621,6 +18551,8 @@ with pkgs; lyra = callPackage ../development/libraries/lyra { }; + lzlib = callPackage ../development/libraries/lzlib { }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; @@ -21639,7 +21571,9 @@ with pkgs; syncserver = callPackage ../servers/syncserver { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo117Module; + }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -22543,6 +22477,10 @@ with pkgs; ofono = callPackage ../tools/networking/ofono { }; + okapi = callPackage ../development/libraries/okapi { + inherit (darwin.apple_sdk.frameworks) Security; + }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -22694,8 +22632,6 @@ with pkgs; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; - sepolgen = callPackage ../os-specific/linux/sepolgen { }; - setools = callPackage ../os-specific/linux/setools { }; seturgent = callPackage ../os-specific/linux/seturgent { }; @@ -23613,7 +23549,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (plasma5Packages) breeze-icons; + inherit (gnome) adwaita-icon-theme; }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -25213,6 +25149,14 @@ with pkgs; gpx = callPackage ../applications/misc/gpx { }; gqrx = callPackage ../applications/radio/gqrx { }; + gqrx-portaudio = callPackage ../applications/radio/gqrx { + portaudioSupport = true; + pulseaudioSupport = false; + }; + gqrx-gr-audio = callPackage ../applications/radio/gqrx { + portaudioSupport = false; + pulseaudioSupport = false; + }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -27607,8 +27551,6 @@ with pkgs; pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - # https://github.com/pdfpc/pdfpc/issues/594 - vala = vala_0_50; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; @@ -27898,6 +27840,8 @@ with pkgs; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; + qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; + qrcode = callPackage ../tools/graphics/qrcode {}; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; @@ -31623,7 +31567,7 @@ with pkgs; cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -31934,12 +31878,10 @@ with pkgs; }; maxima = callPackage ../applications/science/math/maxima { - ecl = null; + lisp-compiler = sbcl; }; maxima-ecl = maxima.override { - inherit ecl; - ecl-fasl = true; - sbcl = null; + lisp-compiler = ecl; }; mxnet = callPackage ../applications/science/math/mxnet { @@ -33875,6 +33817,8 @@ with pkgs; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; + xsos = callPackage ../os-specific/linux/xsos { }; + zesarux = callPackage ../misc/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 60d6265309bbc..3d6f6df611486 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html +, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -113,7 +113,12 @@ let ) (lib.attrNames set) ); mkCoq = version: callPackage ../applications/science/logic/coq { - inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit version + ocamlPackages_4_05 + ocamlPackages_4_09 + ocamlPackages_4_10 + ocamlPackages_4_12 + ; }; in rec { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba1ed113ab60a..0ac3ae8b43392 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -45,10 +45,6 @@ let inherit lib pkgs; }; - mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix { - inherit lib; - }; - mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix { inherit lib pkgs; }; @@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self - , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } - // orgPackages // { inherit orgPackages; } // manualPackages // { inherit manualPackages; } // { diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 7f1bb6e89a7c5..cf6474f0da5b9 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -5,8 +5,174 @@ with pkgs; let mavenbuild = callPackage ../development/java-modules/build-maven-package.nix { }; fetchMaven = callPackage ../development/java-modules/m2install.nix { }; + + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + in { - inherit mavenbuild fetchMaven; + inherit mavenbuild fetchMaven openjfx11 openjfx15; + + compiler = let + + gnomeArgs = { + inherit (gnome2) GConf gnome_vfs; + }; + + bootstrapArgs = gnomeArgs // { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + }; + + mkAdoptopenjdk = path-linux: path-darwin: let + package-linux = import path-linux { inherit lib; }; + package-darwin = import path-darwin { inherit lib; }; + package = if stdenv.isLinux + then package-linux + else package-darwin; + in rec { + inherit package-linux package-darwin; + + jdk-hotspot = callPackage package.jdk-hotspot {}; + jre-hotspot = callPackage package.jre-hotspot {}; + jdk-openj9 = callPackage package.jdk-openj9 {}; + jre-openj9 = callPackage package.jre-openj9 {}; + }; + + mkBootstrap = adoptopenjdk: path: args: + /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ + if adoptopenjdk.jdk-hotspot.meta.available + then adoptopenjdk.jdk-hotspot + else callPackage path args; + + mkOpenjdk = path-linux: path-darwin: args: + if stdenv.isLinux + then mkOpenjdkLinuxOnly path-linux args + else let + openjdk = callPackage path-darwin {}; + in openjdk // { headless = openjdk; }; + + mkOpenjdkLinuxOnly = path-linux: args: let + openjdk = callPackage path-linux (gnomeArgs // args); + in openjdk // { + headless = openjdk.override { headless = true; }; + }; + + openjdkDarwinMissing = version: + abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs."; + + in rec { + + adoptopenjdk-8 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-11 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-13 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + + adoptopenjdk-14 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + + adoptopenjdk-15 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + + adoptopenjdk-16 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + + openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 + ../development/compilers/openjdk/bootstrap.nix + { version = "8"; }; + + openjdk11-bootstrap = mkBootstrap adoptopenjdk-11 + ../development/compilers/openjdk/bootstrap.nix + { version = "10"; }; + + openjdk13-bootstrap = mkBootstrap adoptopenjdk-13 + ../development/compilers/openjdk/12.nix + (bootstrapArgs // { + /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + stdenv = gcc8Stdenv; + }); + + openjdk14-bootstrap = mkBootstrap adoptopenjdk-14 + ../development/compilers/openjdk/13.nix + (bootstrapArgs // { + inherit openjdk13-bootstrap; + }); + + openjdk15-bootstrap = mkBootstrap adoptopenjdk-15 + ../development/compilers/openjdk/14.nix + (bootstrapArgs // { + inherit openjdk14-bootstrap; + }); + + openjdk16-bootstrap = mkBootstrap adoptopenjdk-16 + ../development/compilers/openjdk/15.nix + (bootstrapArgs // { + inherit openjdk15-bootstrap; + }); + + openjdk17-bootstrap = mkBootstrap adoptopenjdk-16 + ../development/compilers/openjdk/16.nix + (bootstrapArgs // { + inherit openjdk16-bootstrap; + }); + + openjdk8 = mkOpenjdk + ../development/compilers/openjdk/8.nix + ../development/compilers/openjdk/darwin/8.nix + { }; + + openjdk11 = mkOpenjdk + ../development/compilers/openjdk/11.nix + ../development/compilers/openjdk/darwin/11.nix + { openjfx = openjfx11; }; + + openjdk12 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/12.nix { + /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + stdenv = gcc8Stdenv; + openjfx = openjfx11; + }; + + openjdk13 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/13.nix { + inherit openjdk13-bootstrap; + openjfx = openjfx11; + }; + + openjdk14 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/14.nix { + inherit openjdk14-bootstrap; + openjfx = openjfx11; + }; + + openjdk15 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/15.nix { + inherit openjdk15-bootstrap; + openjfx = openjfx15; + }; + + openjdk16 = mkOpenjdk + ../development/compilers/openjdk/16.nix + ../development/compilers/openjdk/darwin/16.nix + { + inherit openjdk16-bootstrap; + openjfx = openjfx15; + }; + + openjdk17 = mkOpenjdk + ../development/compilers/openjdk/17.nix + ../development/compilers/openjdk/darwin/17.nix + { + inherit openjdk17-bootstrap; + openjfx = openjfx15; + }; + }; mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bf6e52459c75..2211b67732d41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -437,6 +437,12 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + allure-python-commons = callPackage ../development/python-modules/allure-python-commons { }; + + allure-python-commons-test = callPackage ../development/python-modules/allure-python-commons-test { }; + + allure-pytest = callPackage ../development/python-modules/allure-pytest { }; + alot = callPackage ../development/python-modules/alot { }; alpha-vantage = callPackage ../development/python-modules/alpha-vantage { }; @@ -4199,6 +4205,8 @@ in { kerberos = callPackage ../development/python-modules/kerberos { }; + keyboard = callPackage ../development/python-modules/keyboard { }; + keyring = callPackage ../development/python-modules/keyring { }; keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { }; @@ -5359,6 +5367,8 @@ in { open-garage = callPackage ../development/python-modules/open-garage { }; + open-meteo = callPackage ../development/python-modules/open-meteo { }; + openant = callPackage ../development/python-modules/openant { }; openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; @@ -9624,6 +9634,8 @@ in { types-toml = callPackage ../development/python-modules/types-toml { }; + types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index dae1244786e3f..888401d167205 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -166,8 +166,7 @@ in i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; - # TODO: fix cross compilation of nix{,Unstable} to netbsd and switch to common - x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd embedded; + x86_64-netbsd = mapTestOnCross lib.systems.examples.x86_64-netbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a093442d3698c..459baaca2e636 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -42,7 +42,7 @@ let valueBuildBuild = pkgsBuildBuild.${name} or {}; valueBuildHost = pkgsBuildHost.${name} or {}; valueBuildTarget = pkgsBuildTarget.${name} or {}; - valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice."; + valueHostHost = pkgsHostHost.${name} or {}; valueHostTarget = pkgsHostTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue @@ -53,7 +53,7 @@ let __spliced = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) - // { hostHost = valueHostHost; } + // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; }); }; @@ -81,7 +81,7 @@ let pkgsBuildBuild = valueBuildBuild; pkgsBuildHost = valueBuildHost; pkgsBuildTarget = valueBuildTarget; - pkgsHostHost = {}; + pkgsHostHost = valueHostHost; pkgsHostTarget = valueHostTarget; pkgsTargetTarget = valueTargetTarget; # Don't be fancy about non-derivations. But we could have used used |