diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1484e0156d56..df80e577b2b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -741,6 +741,7 @@ angustrau = { name = "Angus Trau"; email = "nix@angus.ws"; + matrix = "@angustrau:matrix.org"; github = "angustrau"; githubId = 13267947; }; @@ -3115,6 +3116,7 @@ }; earvstedt = { email = "erik.arvstedt@gmail.com"; + matrix = "@erikarvstedt:matrix.org"; github = "erikarvstedt"; githubId = 36110478; name = "Erik Arvstedt"; @@ -4816,6 +4818,7 @@ }; ilkecan = { email = "ilkecan@protonmail.com"; + matrix = "@ilkecan:matrix.org"; github = "ilkecan"; githubId = 40234257; name = "ilkecan bozdogan"; @@ -8782,6 +8785,7 @@ }; peterhoeg = { email = "peter@hoeg.com"; + matrix = "@peter:hoeg.com"; github = "peterhoeg"; githubId = 722550; name = "Peter Hoeg"; @@ -9652,6 +9656,7 @@ }; rnhmjoj = { email = "rnhmjoj@inventati.org"; + matrix = "@rnhmjoj:maxwell.ydns.eu"; github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; @@ -9753,6 +9758,7 @@ }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; + matrix = "@roosemberth:orbstheorem.ch"; github = "roosemberth"; githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; @@ -9893,6 +9899,7 @@ }; ryantm = { email = "ryan@ryantm.com"; + matrix = "@ryantm:matrix.org"; github = "ryantm"; githubId = 4804; name = "Ryan Mulligan"; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9b21dc78b19d..5067047e9690 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -677,15 +677,13 @@ in { RuntimeDirectory = "grafana"; RuntimeDirectoryMode = "0755"; # Hardening - CapabilityBoundingSet = [ "" ]; + AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ]; DeviceAllow = [ "" ]; LockPersonality = true; - MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateDevices = true; PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; @@ -701,6 +699,8 @@ in { RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; + # Upstream grafana is not setting SystemCallFilter for compatibility + # reasons, see https://github.com/grafana/grafana/pull/40176 SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0027"; }; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch b/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch deleted file mode 100644 index 3826e92440f0..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ -# Notes by Charles Duffy -- -# -# - The new version of OpenMP does not allow outside variables to be referenced -# *at all* without an explicit declaration of how they're supposed to be -# handled. Thus, this was an outright build failure beforehand. The new -# pragmas copy the initial value from the outer scope into each parallel -# thread. Since these variables are all constant within the loops, this is -# clearly correct. (Not sure it's *optimal*, but quite sure it isn't -# *wrong*). -# - Upstream has been contacted -- I'm a Lulzbot customer with an active -# support contract and sent them the patch. That said, they're in the middle -# of some major corporate churn (sold themselves out of near-bankruptcy to an -# out-of-state business entity formed as a holding company; moved to that -# state; have been slowly restaffing after), so a response may take a while. -# - The patch is purely my own work. - ---- curaengine/src/support.cpp.orig 2020-03-28 10:38:01.953912363 -0500 -+++ curaengine/src/support.cpp 2020-03-28 10:45:28.999791908 -0500 -@@ -854,7 +854,7 @@ - const double tan_angle = tan(angle) - 0.01; // the XY-component of the supportAngle - xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance); - // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area -- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) -+ #pragma omp parallel for default(none) firstprivate(layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) - for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++) - { - Polygons outlines = storage.getLayerOutlines(layer_idx, false); -@@ -1054,7 +1054,7 @@ - const int max_checking_layer_idx = std::min(static_cast(storage.support.supportLayers.size()) - , static_cast(layer_count - (layer_z_distance_top - 1))); - const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx); --#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) -+#pragma omp parallel for default(none) firstprivate(max_checking_idx_size_t, layer_z_distance_top) shared(support_areas, storage) schedule(dynamic) - for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++) - { - support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false)); ---- curaengine/src/layerPart.cpp.orig 2020-03-28 10:36:40.381023651 -0500 -+++ curaengine/src/layerPart.cpp 2020-03-28 10:39:54.584140465 -0500 -@@ -49,7 +49,7 @@ - { - const auto total_layers = slicer->layers.size(); - assert(mesh.layers.size() == total_layers); --#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic) -+#pragma omp parallel for default(none) firstprivate(total_layers) shared(mesh, slicer) schedule(dynamic) - for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++) - { - SliceLayer& layer_storage = mesh.layers[layer_nr]; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix deleted file mode 100644 index 5d1df20e224b..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: - -gcc8Stdenv.mkDerivation rec { - pname = "curaengine-lulzBot"; - version = "3.6.21"; - - src = fetchgit { - url = "https://code.alephobjects.com/source/curaengine-lulzbot.git"; - rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d"; - sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8"; - }; - - patches = [ ./curaengine-openmp-compat.patch ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libarcusLulzbot stb protobuf ]; - - cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; - - meta = with lib; { - description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/"; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; - }; -} diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix deleted file mode 100644 index 360ef47ecf1d..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, mkDerivation, wrapQtAppsHook, callPackage, fetchgit, cmake, jq, python3, qtbase, qtquickcontrols2 }: - -let - # admittedly, we're using (printer firmware) blobs when we could compile them ourselves. - curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others. - curaBinaryData = fetchgit { - url = "https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git"; - rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e"; - sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4"; - }; - - libarcusLulzbot = callPackage ./libarcus.nix { - inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder; - }; - libsavitarLulzbot = callPackage ./libsavitar.nix { - inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder; - }; - - inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; - curaengine = callPackage ./curaengine.nix { - inherit libarcusLulzbot; - }; - uraniumLulzbot = callPackage ./uranium.nix { - inherit callPackage libarcusLulzbot; - inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; - }; -in -mkDerivation rec { - pname = "cura-lulzbot"; - version = "3.6.21"; - - src = fetchgit { - url = "https://code.alephobjects.com/source/cura-lulzbot.git"; - rev = "7faeb18604c83004846a02c60cb240708db0034f"; - sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq"; - }; - - buildInputs = [ qtbase qtquickcontrols2 ]; - # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415 - propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl - nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - - cmakeFlags = [ - "-DURANIUM_DIR=${uraniumLulzbot.src}" - "-DCURA_VERSION=${version}" - ]; - - postPatch = '' - sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt - sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py - ''; - - preFixup = '' - substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication' - ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware" - ln -sT "${uraniumLulzbot}/share/uranium" "$out/share/uranium" - ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF' - ${builtins.toJSON { - cura = version; - cura_version = version; - binarydata = curaBinaryDataVersion; - engine = curaengine.version; - libarcus = libarcusLulzbot.version; - libsavitar = libsavitarLulzbot.version; - uranium = uraniumLulzbot.version; - }} - EOF - ''; - - postFixup = '' - wrapPythonPrograms - wrapQtApp "$out/bin/cura-lulzbot" - ''; - - meta = with lib; { - description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://code.alephobjects.com/diffusion/CURA/"; - license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; - }; -} diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix deleted file mode 100644 index 15e221a8f743..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }: - -buildPythonPackage { - pname = "libarcus"; - version = "3.6.21"; - format = "other"; - - src = fetchgit { - url = "https://code.alephobjects.com/source/arcus.git"; - rev = "aeda02d7727f45b657afb72cef203283fbf09325"; - sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99"; - }; - - disabled = pythonOlder "3.4.0"; - - propagatedBuildInputs = [ sip_4 ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ protobuf ]; - - postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake - ''; - - meta = with lib; { - description = "Communication library between internal components for Ultimaker software"; - homepage = "https://code.alephobjects.com/source/arcus/"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; - }; -} - diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix deleted file mode 100644 index dd84173ffce1..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }: - -buildPythonPackage { - pname = "libsavitar-lulzbot"; - name = "libsavitar-lulzbot"; - version = "3.6.21"; - format = "other"; - - src = fetchgit { - url = "https://code.alephobjects.com/source/savitar.git"; - rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234"; - sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j"; - }; - - postPatch = '' - # To workaround buggy SIP detection which overrides PYTHONPATH - sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake - ''; - - nativeBuildInputs = [ cmake ]; - - propagatedBuildInputs = [ sip_4 ]; - - disabled = pythonOlder "3.4.0"; - - meta = with lib; { - description = "C++ implementation of 3mf loading with SIP python bindings"; - homepage = "https://github.com/Ultimaker/libSavitar"; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ chaduffy ]; - }; -} diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix deleted file mode 100644 index 01166092b2b5..000000000000 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake -, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: - -buildPythonPackage { - version = "3.6.21"; - pname = "uranium"; - name = "uraniumLulzbot"; - format = "other"; - - src = fetchgit { - url = "https://code.alephobjects.com/diffusion/U/uranium.git"; - rev = "54d911edd2551c5875c554928896122835a0dd6c"; - sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i"; - }; - - disabled = pythonOlder "3.5.0"; - - buildInputs = [ python gettext ]; - propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ]; - nativeBuildInputs = [ cmake doxygen ]; - - postPatch = '' - sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt - sed -i \ - -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \ - -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \ - UM/Application.py - ''; - - meta = with lib; { - description = "A Python framework for building Desktop applications"; - homepage = "https://code.alephobjects.com/diffusion/U/"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; - }; -} - diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d6d97b8e3447..18f73de2fd5b 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dino/dino"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mic92 qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 77a8d9d897f1..0eb806bfeea3 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.13.3"; + version = "3.0.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "sha256-T4s/xnu5nL6dkEIo7xGywaE+EPH2OnzsaCF9OCGu7WQ="; + sha256 = "0989wai2k1gzkmwk5x6f6llsf0nn5jr5dpwayw4f8bws09da6dm6"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -30,7 +30,7 @@ buildGoPackage rec { meta = with lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; - changelog = "https://github.com/git-lfs/git-lfs/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; license = [ licenses.mit ]; maintainers = [ maintainers.twey maintainers.marsam ]; }; diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 03be881311fb..91aae055f6ad 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, coreutils, nix-prefetch-git, fetchurl, nodejs-slim, prefetch-yarn-deps, cacert, callPackage }: +{ stdenv, lib, makeWrapper, coreutils, nix-prefetch-git, fetchurl, nodejs-slim, prefetch-yarn-deps, cacert, callPackage, nix }: let yarnpkg-lockfile-tar = fetchurl { @@ -13,7 +13,7 @@ in { dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ coreutils nix-prefetch-git nodejs-slim ]; + buildInputs = [ coreutils nix-prefetch-git nodejs-slim nix ]; buildPhase = '' runHook preBuild @@ -33,7 +33,7 @@ in { mkdir -p $out/bin cp -r libexec $out makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \ - --prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git ]} + --prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git nix ]} runHook postInstall ''; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index a8a7e2076c1c..9c25f9ec94a5 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.09.30"; + version = "2021.10.16"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "gqy9iaLZlTyv9ufHrUG87ta2xyc1OaZ/KRGhAzB+wsQ="; + sha256 = "03b693s7s7dzflv5qkf61gd8ji9bn6fq4pxd8pd3a6ppkwj6b5vc"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 50e9c447f2fc..73426401eca9 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "TASVideos"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0="; + sha256 = "sha256-k9GkG+HLscSv9Ar58gdj4+WvXRchGqeDcvgiKyxEMHs="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 89573ed75423..4de703ccded8 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "0a3p0hqya0g87rdc0ka024als07xa7xgpv6fs0q3mj80v6416r3v"; + sha256 = "1n5csi0lxghlrhyk1wz45a95ikzblkvc5r7pb7jqq3cpk110biy4"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 54f3152ebec0..8a3bc7a477f9 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/r1rTU+te8pKKiPGCHJTTBkg9RZ/N1yFTlaDAhWWxjs="; + sha256 = "15q88ix5800wmqq6nbmnw0gxk0sx1k9iqv1fvy5kcbgcj65acvwx"; }; - cargoSha256 = "sha256-pHZRKXZo5fyyXjgNTDBZjRiMDOaoCfFUSl53yE2t210="; + cargoSha256 = "0dlap5db8wvghaqzqbm7q3k38xvncdikq0y9gc55w5hzic63khbx"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix index 163ebc592c5e..12c692a1d58c 100644 --- a/pkgs/tools/security/keyscope/default.nix +++ b/pkgs/tools/security/keyscope/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "keyscope"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "spectralops"; repo = pname; rev = "v${version}"; - sha256 = "0dv559a5al7p8r3l90sky4fx4qsxwxlm0ani8qn75pxb70z22qj5"; + sha256 = "sha256-4ZKIukxeadzGpq2lwxbyyIKqWgbZpdHPRAT+LsyWjzk="; }; - cargoSha256 = "sha256-+6O1EY67MVxWrco7a0QTF7Ls1w9YWwNYjiaEe9ckCkg="; + cargoSha256 = "sha256-aq7xUma8QDRnu74R7JSuZjrXCco7L9JrNmAZiGtTyts="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 8c70910a9925..43d08b119656 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.8.1"; + version = "5.9.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "1410mmijzjvcylrynyq4p2fayi1wjy61sibd3kws96k3k7ylb14n"; + sha256 = "sha256-bJvIm2ZmbfSI+RtaBYlUYVVF7Q7vKwtKMCUC8tS8ZOI="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb5abb37d382..fdb08d8989e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -164,6 +164,7 @@ mapAliases ({ cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23 cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 cvs_fast_export = cvs-fast-export; # added 2021-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de13775ab62a..9fd690797e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27852,8 +27852,6 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; - curaByDagoma = callPackage ../applications/misc/curabydagoma { }; peru = callPackage ../applications/version-management/peru {};