From bfc6898da5d156e202dfd21f7e9d72d765cbbaa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 20:03:50 +0000 Subject: [PATCH 001/114] libbytesize: 2.6 -> 2.7 --- pkgs/development/libraries/libbytesize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index eda85e286b4c..acf77ca3f795 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.6"; + version = "2.7"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "sha256-akZFd7rUjBQ/yj79NHWTNUro3wKu81F0Y1GX8gMdJ5Y="; + sha256 = "sha256-oSXa3cxJ+Eaeeusz6QeQrzQBs4eombNGJS+lJQMc2b4="; }; outputs = [ "out" "dev" "devdoc" ]; From 39e4cd93539911faf214c1cd2e1fe3414bccbee9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 15:53:23 +0000 Subject: [PATCH 002/114] libblockdev: 2.26 -> 2.27 --- pkgs/development/libraries/libblockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index feb721dce45f..840cc37ee798 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.26"; + version = "2.27"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI="; + sha256 = "sha256-rmzXaD56peZawgWsLsYSYGFfMhkEUk2oZI0Qybz9tBE="; }; outputs = [ "out" "dev" "devdoc" ]; From 6ee81c6c143c24aa8fc8765c35f8c70a58caf02a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 18:46:53 +0000 Subject: [PATCH 003/114] libdmtx: 0.7.5 -> 0.7.7 --- pkgs/development/libraries/libdmtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index c26ccc347f9a..4c5ef2c33140 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libdmtx"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "dmtx"; repo = "libdmtx"; rev = "v${version}"; - sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj"; + sha256 = "sha256-UQy8iFfl8BNT5cBUMVF1tIScFPfHekSofaebtel9JWk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From d2416b5f18b4e78fc6100fdcc7f8763c5af48daf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 17:02:17 +0200 Subject: [PATCH 004/114] python310Packages.qcs-api-client: 0.21.0 -> 0.21.1 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 95cd00d8facd..925d2e014a03 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-F3Fc03JWS73LcDCufWl/gLkjGvzlwLdBFVsSxtn3LvE="; + hash = "sha256-Fhu2XtreilkxwUZPmr79jFsNoajpLs0AzTMc7BaiduA="; }; nativeBuildInputs = [ From 18a921164008757a3da16aa0a940e6f06be62ad9 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 23 Aug 2022 17:32:29 +0200 Subject: [PATCH 005/114] appimage-run: add vulkan-loader and libpulseaudio --- pkgs/build-support/appimage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 17d5bca65669..6d4dbfbe421b 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -156,11 +156,13 @@ rec { wayland mesa libxkbcommon + vulkan-loader flac freeglut libjpeg libpng12 + libpulseaudio libsamplerate libmikmod libtheora From 3b3fa4f1da03ea8008540206dca796f21c10144c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 18:12:30 +0000 Subject: [PATCH 006/114] xrootd: 5.4.3 -> 5.5.0 --- pkgs/tools/networking/xrootd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index dda45fbce5b7..24354f3ec7c1 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.4.3"; + version = "5.5.0"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-BlMYm4ffSpUxqMjlDVZC59KOuLvwsk/BeBB3VBjAwjs="; + hash = "sha256-a8qw8uHxd7OLMMq+HPMB36O0Yjctlnf8DkfEdMvc1NQ="; }; outputs = [ "bin" "out" "dev" "man" ]; From dabaf5d73e253fcf24f62adfb18b8ae4d4004b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 21:15:10 +0000 Subject: [PATCH 007/114] memcached: 1.6.16 -> 1.6.17 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 61f48824ea45..9d83d12f3e43 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.16"; + version = "1.6.17"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-MFGpO/HdDDry0OWJ/272UR+HY4WjWxjp/4dB5KGrNNo="; + sha256 = "sha256-IFXjc2E9j8IVKa/58K3OPiO5zgG6BHjTDnlB2fK9EiQ="; }; configureFlags = [ From c9c906c8a2f6634092f4524e18c135eddb919553 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 13:15:49 +0000 Subject: [PATCH 008/114] earthly: 0.6.22 -> 0.6.23 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index d9c040606c80..cb76c5387dfc 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.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-W6BBLxKvZ8+KQjkJXv1LsxtCRdgmU1Hj6lBW8TACyN8="; + sha256 = "sha256-RbLAnk2O7wqY0OQLprWuRDUWMicqcLOPia+7aRuXbsk="; }; - vendorSha256 = "sha256-ZxuYNtekWlfpo9O1DEXebuixWbWuHMhnOH3G41KC1bU="; + vendorSha256 = "sha256-MDyQ9Wn5A5F5CQCfEXzkXZi/Fg6sT/Ikv+Y7fvLY8LA="; ldflags = [ "-s" "-w" From 150e5d9f4591191484ca8416b6ffb8c9594eeb73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 23:27:35 +0000 Subject: [PATCH 009/114] activemq: 5.17.1 -> 5.17.2 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index fed3a94afdb6..fd2ba8bc7392 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.17.1"; + version = "5.17.2"; src = fetchurl { - sha256 = "sha256-YX7CUQLMYiUubZsGzElnZq8RbJdSUlW8jEs+de6eAMg="; + sha256 = "sha256-QhY4ckDvOOkS+IFixS4mEo8PctFZEIUtEusKeEWBkZU="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; From 9f7effe27297143e62b0df6b171f47eb16ff69b5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 13 Sep 2022 19:15:30 +0300 Subject: [PATCH 010/114] =?UTF-8?q?keeweb:=201.18.6=20=E2=86=92=201.18.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/keeweb/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 40b176b0fb8b..6730d1f89b6c 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }: let pname = "keeweb"; - version = "1.18.6"; + version = "1.18.7"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage"; - sha256 = "sha256-hxXs8Dfh5YQy1zaFb20KDWNl8eqFjuN5QY7tsO6+E/U="; + hash = "sha256-W3Dfo7YZfLObodAS7ZN3jqnYzLNAnjJIfJC6il5THwY="; }; x86_64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; - sha256 = "sha256-8+7NzaHVcLinKb57SAcJmF2Foy9RfxFhcTxzvL0JSJQ="; + hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU="; }; aarch64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; - sha256 = "sha256-1BNY6kRS0F+AUI+80ZGFi/ek28NMP1uexo1UORz5D6g="; + hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; }; }; src = srcs.${stdenv.hostPlatform.system}; @@ -28,6 +28,7 @@ let description = "Free cross-platform password manager compatible with KeePass"; homepage = "https://keeweb.info/"; changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; @@ -44,7 +45,7 @@ let install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime substituteInPlace $out/share/applications/keeweb.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace "Exec=AppRun" "Exec=$out/bin/${pname}" ''; }; From bf5ddca465f1022d74a5a3120e72ab1c421bfe72 Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Wed, 14 Sep 2022 21:03:26 +0530 Subject: [PATCH 011/114] kthxbye: init at 0.15 --- .../servers/monitoring/prometheus/kthxbye.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/kthxbye.nix diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix new file mode 100644 index 000000000000..ab7812081fad --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -0,0 +1,39 @@ +{ pkgs +, lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "kthxbye"; + version = "0.15"; + + src = fetchFromGitHub rec { + owner = "prymitive"; + repo = "kthxbye"; + rev = "v${version}"; + hash = "sha256-N1MzutjzLk9MnE1b7dKRsiS7LL4Nb61+NpmjTBPGohI="; + }; + + vendorHash = "sha256-PtINxblqX/wxJyN42mS+hmwMy0lCd6FcQgmBnxTUdcc="; + + buildPhase = '' + make -j$NIX_BUILD_CORES + ''; + + installPhase = '' + install -Dm755 ./kthxbye -t $out/bin + ''; + + passthru.tests = { + kthxbye = nixosTests.kthxbye; + }; + + meta = with lib; { + description = "Prometheus Alertmanager alert acknowledgement management daemon"; + homepage = "https://github.com/prymitive/kthxbye"; + license = licenses.asl20; + maintainers = with maintainers; [ nukaduka ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57899333238b..b5bda2279256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29091,6 +29091,10 @@ with pkgs; pinniped = callPackage ../applications/networking/cluster/pinniped { }; + kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { + buildGoModule = buildGo119Module; + }; + pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; From 5c9d47e225841b6d124b59fbe82da3786da98e00 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 8 Sep 2022 05:32:51 +0200 Subject: [PATCH 012/114] dolphin-emu-beta: fix darwin build --- .../emulators/dolphin-emu/master.nix | 171 +++++++++++++++--- .../minizip-external-missing-include.patch | 18 ++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 163 insertions(+), 29 deletions(-) create mode 100644 pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 80b01962bc9c..de0a567b82a1 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -1,12 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb1, libpthreadstubs, libXext, libXxf86vm, libXinerama -, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib -, miniupnpc, enet, mbedtls, soundtouch, sfml, xz, writeScript -, vulkan-loader ? null, libpulseaudio ? null +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, wrapQtAppsHook +, qtbase +, bluez +, ffmpeg +, libao +, libGLU +, libGL +, pcre +, gettext +, libXrandr +, libusb1 +, libpthreadstubs +, libXext +, libXxf86vm +, libXinerama +, libSM +, libXdmcp +, readline +, openal +, udev +, libevdev +, portaudio +, curl +, alsa-lib +, miniupnpc +, enet +, mbedtls +, soundtouch +, sfml +, xz +, hidapi +, fmt_8 +, vulkan-loader +, libpulseaudio +, bzip2 -# - Inputs used for Darwin -, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: + # Used in passthru +, testers +, dolphin-emu-beta +, writeShellScript +, common-updater-scripts +, jq + + # Darwin-only dependencies +, CoreBluetooth +, ForceFeedback +, IOKit +, VideoToolbox +, OpenGL +, libpng +, moltenvk +}: stdenv.mkDerivation rec { pname = "dolphin-emu"; @@ -20,18 +68,62 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optional stdenv.isLinux wrapQtAppsHook; + patches = [ + # On x86_64-darwin CMake reportedly does not work without this in some cases. + # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765 + ./minizip-external-missing-include.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ - curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp - portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml xz + curl + ffmpeg + libao + libGLU + libGL + pcre + gettext + libpthreadstubs + libpulseaudio + libSM + readline + openal + portaudio + libusb1 + libpng + hidapi + miniupnpc + enet + mbedtls + soundtouch + sfml + xz qtbase + fmt_8 + bzip2 ] ++ lib.optionals stdenv.isLinux [ - bluez udev libevdev alsa-lib vulkan-loader + libXrandr + libXext + libXxf86vm + libXinerama + libXdmcp + bluez + udev + libevdev + alsa-lib + vulkan-loader ] ++ lib.optionals stdenv.isDarwin [ - CoreBluetooth OpenGL ForceFeedback IOKit + CoreBluetooth + OpenGL + ForceFeedback + IOKit + VideoToolbox + moltenvk ]; cmakeFlags = [ @@ -42,6 +134,12 @@ stdenv.mkDerivation rec { "-DDOLPHIN_WC_BRANCH=master" ] ++ lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we dont need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ @@ -51,10 +149,10 @@ stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; - # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt '' + lib.optionalString stdenv.isDarwin '' + # Allow Dolphin to use nix-provided libraries instead of submodules sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt @@ -62,26 +160,43 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; - passthru.updateScript = writeScript "dolphin-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - set -eou pipefail - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu-beta "$version" --rev="$rev" - ''; + passthru = { + tests.version = testers.testVersion { + package = dolphin-emu-beta; + command = "dolphin-emu-nogui --version"; + }; + + updateScript = writeShellScript "dolphin-update-script" '' + set -eou pipefail + export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} + + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu-beta "$version" --rev="$rev" + ''; + }; meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; - broken = stdenv.isDarwin; + mainProgram = "Dolphin"; platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + MP2E + ashkitten + xfix + ivar + ]; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch new file mode 100644 index 000000000000..7da013ecd8f6 --- /dev/null +++ b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch @@ -0,0 +1,18 @@ +commit 5e0cb8066fb1653399c54e93e42375295c2562bd +Author: Ivar Scholten +Date: Fri Sep 9 14:27:55 2022 +0200 + + Externals/minizip: add missing include to CheckFunctionExists + +diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt +index c3d7c5512e..f59f8b295c 100644 +--- a/Externals/minizip/CMakeLists.txt ++++ b/Externals/minizip/CMakeLists.txt +@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H) + target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) + endif() + ++include(CheckFunctionExists) + check_function_exists(fseeko HAVE_FSEEKO) + if (NOT HAVE_FSEEKO) + target_compile_definitions(minizip PRIVATE NO_FSEEKO) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c094df38748b..5caee8514bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1657,7 +1657,8 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; + inherit (darwin) moltenvk; }; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { From e8743bf62d00b05c3cc8d177895d0762e9bad0aa Mon Sep 17 00:00:00 2001 From: SuperSamus <40663462+SuperSamus@users.noreply.github.com> Date: Thu, 15 Sep 2022 01:28:07 +0200 Subject: [PATCH 013/114] dolphin-emu-beta: cleanup --- .../emulators/dolphin-emu/master.nix | 46 ++++++------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index de0a567b82a1..6ee11d42d014 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -7,24 +7,13 @@ , qtbase , bluez , ffmpeg -, libao -, libGLU , libGL -, pcre -, gettext , libXrandr , libusb1 -, libpthreadstubs , libXext -, libXxf86vm -, libXinerama -, libSM -, libXdmcp -, readline , openal , udev , libevdev -, portaudio , curl , alsa-lib , miniupnpc @@ -38,6 +27,9 @@ , vulkan-loader , libpulseaudio , bzip2 +, libiconv +, pugixml +, xxHash # Used in passthru , testers @@ -83,18 +75,13 @@ stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg - libao - libGLU + pugixml + xxHash libGL - pcre - gettext - libpthreadstubs libpulseaudio - libSM - readline openal - portaudio libusb1 + libiconv libpng hidapi miniupnpc @@ -109,9 +96,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libXrandr libXext - libXxf86vm - libXinerama - libXdmcp bluez udev libevdev @@ -127,6 +111,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" "-DDOLPHIN_WC_REVISION=${src.rev}" @@ -149,13 +134,11 @@ stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; - postPatch = '' - sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt - '' + lib.optionalString stdenv.isDarwin '' - # Allow Dolphin to use nix-provided libraries instead of submodules - sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt - sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ - CMakeLists.txt + # Use nix-provided libraries instead of submodules + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "if(NOT APPLE)" "if(true)" \ + --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" ''; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -167,7 +150,6 @@ stdenv.mkDerivation rec { ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; - passthru = { tests.version = testers.testVersion { package = dolphin-emu-beta; @@ -188,10 +170,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - branch = "master"; mainProgram = "Dolphin"; - platforms = platforms.unix; + branch = "master"; license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ MP2E ashkitten From ec4e9c3763439eeac49680a6bc2615742977343d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 00:08:15 +0000 Subject: [PATCH 014/114] ooniprobe-cli: 3.16.0 -> 3.16.3 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 6fd45acbd738..d62b0a7d5ad6 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.16.0"; + version = "3.16.3"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-UMnhisn/1PfNADNB9nN5+Yj2hmXetHiWULjgQPeHLc8="; + hash = "sha256-LCihFw0WprVmL6t0TLHRY35Uek7catA4fIfp+yox87E="; }; vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; From c0cd90470b848bc1f1e96aaabcd3093b3d8ef812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Sep 2022 11:29:15 +0200 Subject: [PATCH 015/114] navidrome: adhoc hack to fix the build This is very hacky, but I currently see any other way that does not involve changing node2nix in a non trivial way to allow these type of patches. --- pkgs/servers/misc/navidrome/default.nix | 2 ++ .../misc/navidrome/ui/node-composition.nix | 2 +- .../misc/navidrome/ui/node-packages.nix | 19 ++++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 173dd0caa88f..7a8d759a6988 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -23,6 +23,8 @@ let hash = "sha256-gTvJI+brdEpdpbEcdQycqw15seI+k5dMDVrjY3v6i14="; }; + # FIXME: we currently manually inject a patch for react-scripts in here + # See https://github.com/navidrome/navidrome/pull/1767 ui = callPackage ./ui { inherit src version; }; diff --git a/pkgs/servers/misc/navidrome/ui/node-composition.nix b/pkgs/servers/misc/navidrome/ui/node-composition.nix index a10eaa345edf..2ebf5ef666f0 100644 --- a/pkgs/servers/misc/navidrome/ui/node-composition.nix +++ b/pkgs/servers/misc/navidrome/ui/node-composition.nix @@ -12,6 +12,6 @@ let }; in import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit runCommand fetchpatch; inherit nodeEnv; } diff --git a/pkgs/servers/misc/navidrome/ui/node-packages.nix b/pkgs/servers/misc/navidrome/ui/node-packages.nix index f3743f8a990b..177f22921efa 100644 --- a/pkgs/servers/misc/navidrome/ui/node-packages.nix +++ b/pkgs/servers/misc/navidrome/ui/node-packages.nix @@ -1,6 +1,6 @@ # This file has been generated by node2nix 1.11.1. Do not edit! -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: +{nodeEnv, runCommand, fetchpatch, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -11258,10 +11258,19 @@ let name = "react-scripts"; packageName = "react-scripts"; version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz"; - sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A=="; - }; + src = runCommand "src.tgz" {} '' + tar -xvf ${fetchurl { + url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz"; + sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A=="; + }} + pushd package + patch -p2 < ${fetchpatch { + url = "https://raw.githubusercontent.com/navidrome/navidrome/c0364331748b8e0600b27caa956caa8160b2bdcd/ui/webpack-patch-for-openssl3.patch"; + sha512 = "sha512-PS1/yzneLGV76J+LvRuKtMv8imIBzB1gXnK2+vw61xQOWdNDffgfeFRUdQFBhp3Zm9oykX+YQcrwO215z+SQkg=="; + }} + popd + tar -czvf $out package + ''; }; "react-transition-group-4.4.1" = { name = "react-transition-group"; From 360d74ec527a407fed8f8050c0b1cc33773270a8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 19 Sep 2022 14:23:32 +0300 Subject: [PATCH 016/114] virtualpg: init at 2.0.1 --- .../libraries/virtualpg/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/virtualpg/default.nix diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/development/libraries/virtualpg/default.nix new file mode 100644 index 000000000000..277ca47d66e3 --- /dev/null +++ b/pkgs/development/libraries/virtualpg/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, validatePkgConfig, postgresql, sqlite }: + +stdenv.mkDerivation rec { + pname = "virtualpg"; + version = "2.0.1"; + + src = fetchurl { + url = "https://www.gaia-gis.it/gaia-sins/virtualpg-${version}.tar.gz"; + hash = "sha256-virr64yf8nQ4IIX1HUIugjhYvKT2vC+pCYFkZMah4Is="; + }; + + nativeBuildInputs = [ + validatePkgConfig + postgresql # for pg_config + ]; + + buildInputs = [ postgresql sqlite ]; + + meta = with lib; { + description = "Loadable dynamic extension to both SQLite and SpatiaLite"; + homepage = "https://www.gaia-gis.it/fossil/virtualpg"; + license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 184ed582f1c6..2419337a44dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22179,6 +22179,8 @@ with pkgs; vlock = callPackage ../misc/screensavers/vlock { }; + virtualpg = callPackage ../development/libraries/virtualpg { }; + vmime = callPackage ../development/libraries/vmime { }; vrb = callPackage ../development/libraries/vrb { }; From 08eb1cf02c2d6a325936de1fcb7cbd708c38f162 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 19 Sep 2022 17:37:26 +0300 Subject: [PATCH 017/114] librasterlite2: init at 1.1.0-beta1 --- .../libraries/librasterlite2/default.nix | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/development/libraries/librasterlite2/default.nix diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix new file mode 100644 index 000000000000..de9fa02d44db --- /dev/null +++ b/pkgs/development/libraries/librasterlite2/default.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, validatePkgConfig +, cairo +, curl +, fontconfig +, freetype +, freexl +, geos +, giflib +, libgeotiff +, libjpeg +, libpng +, librttopo +, libspatialite +, libtiff +, libwebp +, libxml2 +, lz4 +, minizip +, openjpeg +, pixman +, proj +, sqlite +, zstd +, ApplicationServices +}: + +stdenv.mkDerivation rec { + pname = "librasterlite2"; + version = "1.1.0-beta1"; + + src = fetchurl { + url = "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/librasterlite2-${version}.tar.gz"; + hash = "sha256-9yhM38B600OjFOSHjfAwCHSwFF2dMxsGOwlrSC5+RPQ="; + }; + + # Fix error: unknown type name 'time_t' + postPatch = '' + sed -i '49i #include ' headers/rasterlite2_private.h + ''; + + nativeBuildInputs = [ + pkg-config + validatePkgConfig + geos # for geos-config + ]; + + buildInputs = [ + cairo + curl + fontconfig + freetype + freexl + giflib + geos + libgeotiff + libjpeg + libpng + librttopo + libspatialite + libtiff + libwebp + libxml2 + lz4 + minizip + openjpeg + pixman + proj + sqlite + zstd + ] ++ lib.optional stdenv.isDarwin ApplicationServices; + + enableParallelBuilding = true; + + # Failed tests: + # - check_sql_stmt + doCheck = false; + + meta = with lib; { + description = "Advanced library supporting raster handling methods"; + homepage = "https://www.gaia-gis.it/fossil/librasterlite2"; + # They allow any of these + license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2419337a44dd..20265a0d10bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24621,6 +24621,10 @@ with pkgs; python = python3; }; + librasterlite2 = callPackage ../development/libraries/librasterlite2 { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + libraw = callPackage ../development/libraries/libraw { }; libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; From 57ec8cf4b38bc5b4726d5c75c14b3b8bfd3bb20f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 19 Sep 2022 19:51:34 +0300 Subject: [PATCH 018/114] spatialite_gui: init at 2.1.0-beta1 --- .../gis/spatialite-gui/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/applications/gis/spatialite-gui/default.nix diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix new file mode 100644 index 000000000000..541d0da8d734 --- /dev/null +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, desktopToDarwinBundle +, curl +, freexl +, geos +, librasterlite2 +, librttopo +, libspatialite +, libwebp +, libxlsxwriter +, libxml2 +, lz4 +, minizip +, openjpeg +, postgresql +, proj +, sqlite +, virtualpg +, wxGTK +, wxmac +, zstd +, Carbon +, Cocoa +, IOKit +}: + +stdenv.mkDerivation rec { + pname = "spatialite-gui"; + version = "2.1.0-beta1"; + + src = fetchurl { + url = "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${version}.tar.gz"; + hash = "sha256-ukjZbfGM68P/I/aXlyB64VgszmL0WWtpuuMAyjwj2zM="; + }; + + nativeBuildInputs = [ pkg-config ] + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + + buildInputs = [ + curl + freexl + geos + librasterlite2 + librttopo + libspatialite + libwebp + libxlsxwriter + libxml2 + lz4 + minizip + openjpeg + postgresql + proj + sqlite + virtualpg + zstd + ] ++ lib.optional stdenv.isLinux wxGTK + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + + enableParallelBuilding = true; + + postFixup = lib.optionalString stdenv.isDarwin '' + rm -fr $out/share + ''; + + meta = with lib; { + description = "Graphical user interface for SpatiaLite"; + homepage = "https://www.gaia-gis.it/fossil/spatialite_gui"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + mainProgram = "spatialite_gui"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20265a0d10bc..372d7c93b07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26478,6 +26478,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + spatialite_gui = callPackage ../applications/gis/spatialite-gui { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; + wxGTK = wxGTK30-gtk3; + }; + spatialite_tools = callPackage ../applications/gis/spatialite-tools { }; udig = callPackage ../applications/gis/udig { }; From f60377210e92df7dbd4d89682e476d6cb17e747d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 20 Sep 2022 13:08:34 +0200 Subject: [PATCH 019/114] knot-*: set .meta.mainProgram I believe it's clear what "main program" is in these cases. It seems unclear if this change is useful, but it's very simple and it shouldn't hurt anything. --- pkgs/servers/dns/knot-dns/default.nix | 1 + pkgs/servers/dns/knot-resolver/default.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 02b8e01437d0..6ed706c53786 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; + mainProgram = "knotd"; }; } diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index dc14049b9dbb..192400faea9e 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -112,6 +112,7 @@ unwrapped = stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; + mainProgram = "kresd"; }; }; @@ -126,6 +127,7 @@ wrapped-full = runCommand unwrapped.name ]; preferLocalBuild = true; allowSubstitutes = false; + inherit (unwrapped) meta; } '' mkdir -p "$out"/bin From 31857704c9c8b331727fa2a0e0a553e899e570e0 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 21 Sep 2022 02:31:44 -0300 Subject: [PATCH 020/114] kubeswitch: init at 0.7.2 --- pkgs/development/tools/kubeswitch/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/kubeswitch/default.nix diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix new file mode 100644 index 000000000000..2e683ecc31a4 --- /dev/null +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, kubeswitch }: + +buildGoModule rec { + pname = "kubeswitch"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "danielfoehrKn"; + repo = pname; + rev = version; + sha256 = "sha256-p4/nYZt+OwNsFX9f9ySfQaz6gbz+8Mvt00W2Rs4dpCY="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/main.go" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}" + "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01" + + ]; + + passthru.tests.version = testers.testVersion { + package = kubeswitch; + }; + + postInstall = '' + mv $out/bin/main $out/bin/switch + ''; + + meta = with lib; { + description = "The kubectx for operators"; + license = licenses.asl20; + homepage = "https://github.com/danielfoehrKn/kubeswitch"; + maintainers = with maintainers; [ bryanasdev000 ]; + mainProgram = "switch"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4a69104f56..430794e23fb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16638,6 +16638,8 @@ with pkgs; kubespy = callPackage ../applications/networking/cluster/kubespy { }; + kubeswitch = callPackage ../development/tools/kubeswitch { }; + kubie = callPackage ../development/tools/kubie { inherit (darwin.apple_sdk.frameworks) Security; }; From 6f363379466965b095b8eb4db92901ca5946a6b2 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 21 Sep 2022 14:48:31 +0800 Subject: [PATCH 021/114] v2ray-domain-list-community: 20220908131416 -> 20220921050909 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 78d7a3005f16..e80aef513ac3 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220908131416"; + version = "20220921050909"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-LXtdyLINmUcyT2x9w7KCoLLifcYrSq6JN+2J9wbKjCI="; + sha256 = "sha256-ujslsVqUQ16LFdCwwKmY2SnoqNTRenI5cEreupt/6c4="; }; vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { From 4f962f65c4294267574801c986d61ece84c8ff8d Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 21 Sep 2022 14:29:54 +0800 Subject: [PATCH 022/114] v2ray: 4.45.0 -> 5.1.0 and refactor --- pkgs/tools/networking/v2ray/default.nix | 92 ++++++++++++------------- pkgs/tools/networking/v2ray/update.sh | 49 ------------- 2 files changed, 43 insertions(+), 98 deletions(-) delete mode 100755 pkgs/tools/networking/v2ray/update.sh diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 630ea8ada8e6..58743eeb766f 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -1,69 +1,63 @@ -{ lib, fetchFromGitHub, fetchurl, symlinkJoin, buildGoModule, runCommand, makeWrapper, nixosTests -, v2ray-geoip, v2ray-domain-list-community, assets ? [ v2ray-geoip v2ray-domain-list-community ] +{ lib, fetchFromGitHub, symlinkJoin, buildGoModule, makeWrapper, nixosTests +, nix-update-script +, v2ray-geoip, v2ray-domain-list-community +, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: -let - version = "4.45.0"; +buildGoModule rec { + pname = "v2ray-core"; + version = "5.1.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "sha256-vVCWCppGeAc7dwY0fX+G0CU3Vy6OBPpDBUOBK3ykg60="; + hash = "sha256-87BtyaJN6qbinZQ+6MAwaK62YzbVnncj4qnEErG5tfA="; }; - vendorSha256 = "sha256-TbWMbIT578I8xbNsKgBeSP4MewuEKpfh62ZbJIeHgDs="; + # `nix-update` doesn't support `vendorHash` yet. + # https://github.com/Mic92/nix-update/pull/95 + vendorSha256 = "sha256-RuDCAgTzqwe5fUwa9ce2wRx4FPT8siRLbP7mU8/jg/Y="; + + ldflags = [ "-s" "-w" "-buildid=" ]; + + subPackages = [ "main" ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + install -Dm555 "$GOPATH"/bin/main $out/bin/v2ray + install -Dm444 release/config/systemd/system/v2ray{,@}.service -t $out/lib/systemd/system + install -Dm444 release/config/*.json -t $out/etc/v2ray + runHook postInstall + ''; assetsDrv = symlinkJoin { name = "v2ray-assets"; paths = assets; }; - core = buildGoModule rec { - pname = "v2ray-core"; - inherit version src; - - inherit vendorSha256; - - doCheck = false; - - buildPhase = '' - buildFlagsArray=(-v -p $NIX_BUILD_CORES -ldflags="-s -w") - runHook preBuild - go build "''${buildFlagsArray[@]}" -o v2ray ./main - go build "''${buildFlagsArray[@]}" -o v2ctl -tags confonly ./infra/control/main - runHook postBuild - ''; - - installPhase = '' - install -Dm755 v2ray v2ctl -t $out/bin - ''; - - meta = { - homepage = "https://www.v2fly.org/en_US/"; - description = "A platform for building proxies to bypass network restrictions"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ servalcatty ]; - }; - }; - -in runCommand "v2ray-${version}" { - inherit src version; - inherit (core) meta; - - nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/v2ray \ + --suffix XDG_DATA_DIRS : $assetsDrv/share + substituteInPlace $out/lib/systemd/system/*.service \ + --replace User=nobody DynamicUser=yes \ + --replace /usr/local/bin/ $out/bin/ \ + --replace /usr/local/etc/ /etc/ + ''; passthru = { - inherit core; - updateScript = ./update.sh; - tests = { - simple-vmess-proxy-test = nixosTests.v2ray; + updateScript = nix-update-script { + attrPath = "v2ray"; }; + tests.simple-vmess-proxy-test = nixosTests.v2ray; }; -} '' - for file in ${core}/bin/*; do - makeWrapper "$file" "$out/bin/$(basename "$file")" \ - --set-default V2RAY_LOCATION_ASSET ${assetsDrv}/share/v2ray - done -'' + meta = { + homepage = "https://www.v2fly.org/en_US/"; + description = "A platform for building proxies to bypass network restrictions"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ servalcatty ]; + }; +} diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh deleted file mode 100755 index 9b8e4cef13a4..000000000000 --- a/pkgs/tools/networking/v2ray/update.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq -set -eo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -version_nix=./default.nix -deps_nix=./deps.nix -nixpkgs=../../../.. - -old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix") -echo "Current version:" >&2 -echo "core: $old_core_rev" >&2 - -function fetch_latest_rev { - curl "https://api.github.com/repos/v2fly/$1/releases" | - jq '.[0].tag_name' --raw-output -} - -core_rev=$(fetch_latest_rev 'v2ray-core') -core_rev=${core_rev:1} -echo "Latest version:" >&2 -echo "core: $core_rev" >&2 - -if [[ $core_rev != $old_core_rev ]]; then - echo "Prefetching core..." >&2 - { read hash; read store_path; } < <( - nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip" - ) - - sed --in-place \ - -e "s/\bversion = \".*\"/version = \"$core_rev\"/" \ - -e "s/\bsha256 = \".*\"/sha256 = \"$hash\"/" \ - -e "s/\bvendorSha256 = \".*\"/vendorSha256 = \"0000000000000000000000000000000000000000000000000000\"/" \ - "$version_nix" -fi - -echo "Prebuilding..." >&2 -set +o pipefail -vendorSha256=$( - nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 | - tee /dev/stderr | - sed -nE 's/.*got:\s*(sha256\S+)$/\1/p' -) -[[ "$vendorSha256" ]] -sed --in-place \ - -e "s#vendorSha256 = \".*\"#vendorSha256 = \"$vendorSha256\"#" \ - "$version_nix" - -echo "vendorSha256 updated" >&2 From 07a9b7b1d83f1cde5544063351d6886a2ca9607c Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 21 Sep 2022 14:39:00 +0800 Subject: [PATCH 023/114] nixos/{test/,}v2ray: fix for new CLI and use upstream systemd units --- nixos/modules/services/networking/v2ray.nix | 18 ++++++++++-------- nixos/tests/v2ray.nix | 12 ++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/v2ray.nix b/nixos/modules/services/networking/v2ray.nix index 1ff1feed8f47..ba2aa5bc1de7 100644 --- a/nixos/modules/services/networking/v2ray.nix +++ b/nixos/modules/services/networking/v2ray.nix @@ -34,7 +34,7 @@ with lib; Either `configFile` or `config` must be specified. - See . + See . ''; }; @@ -56,7 +56,7 @@ with lib; Either `configFile` or `config` must be specified. - See . + See . ''; }; }; @@ -71,7 +71,7 @@ with lib; name = "v2ray.json"; text = builtins.toJSON cfg.config; checkPhase = '' - ${cfg.package}/bin/v2ray -test -config $out + ${cfg.package}/bin/v2ray test -c $out ''; }; @@ -83,13 +83,15 @@ with lib; } ]; + environment.etc."v2ray/config.json".source = configFile; + + systemd.packages = [ cfg.package ]; + systemd.services.v2ray = { - description = "v2ray Daemon"; - after = [ "network.target" ]; + restartTriggers = [ config.environment.etc."v2ray/config.json".source ]; + + # Workaround: https://github.com/NixOS/nixpkgs/issues/81138 wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/v2ray -config ${configFile}"; - }; }; }; } diff --git a/nixos/tests/v2ray.nix b/nixos/tests/v2ray.nix index fb36ea8557d5..9eee962c64e4 100644 --- a/nixos/tests/v2ray.nix +++ b/nixos/tests/v2ray.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let port = 1081; listen = "127.0.0.1"; protocol = "vmess"; - settings.clients = [v2rayUser]; + settings.clients = [ v2rayUser ]; } ]; outbounds = [ @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let settings.vnext = [{ address = "127.0.0.1"; port = 1081; - users = [v2rayUser]; + users = [ v2rayUser ]; }]; } { @@ -49,6 +49,14 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let inboundTag = "vmess_in"; outboundTag = "direct"; } + + # Assert assets "geoip" and "geosite" are accessible. + { + type = "field"; + ip = [ "geoip:private" ]; + domain = [ "geosite:category-ads" ]; + outboundTag = "direct"; + } ]; }; From 46a819578420da2ed0fe78fb064ba183b54de5d6 Mon Sep 17 00:00:00 2001 From: Marcello Nuccio ARPAE Date: Wed, 21 Sep 2022 11:17:25 +0200 Subject: [PATCH 024/114] subversion: openssl_3 -> openssl_1_1 to fix https lock Subversion hangs when accessing an HTTPS repository. Rollback to openssl_1_1 fixes the problem. Setting `openssl = openssl_1_1` only for subversion is not enough. I had to also set it for the `aprutil` instance used by the `serf` library used by `subversion`. I do not know if this is a distinct bug. I first reported the problem at https://discourse.nixos.org/t/how-to-find-what-has-changed-between-two-builds-of-a-derivation/21854?u=mnuccioarpae --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2c7e1bbc93f..44d42dda9360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21697,6 +21697,7 @@ with pkgs; serf = callPackage ../development/libraries/serf { openssl = openssl_1_1; + aprutil = aprutil.override { openssl = openssl_1_1; }; }; sfsexp = callPackage ../development/libraries/sfsexp {}; @@ -31372,6 +31373,7 @@ with pkgs; sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { + openssl = openssl_1_1; sasl = cyrus_sasl; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }) subversion; From 2d582d641b52fad9386880118c618fb58c4c2a32 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 21 Sep 2022 22:11:50 +0000 Subject: [PATCH 025/114] oven-media-engine: 0.13.2 -> 0.14.10 Fixes #162446 --- pkgs/servers/misc/oven-media-engine/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 76357bb4d8ab..2c49da684616 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -14,17 +14,18 @@ , srtp , jemalloc , pcre2 +, hiredis }: stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.13.2"; + version = "0.14.10"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "0lkpidx4r890mcdk9m69j4iahm7qr7w34h11w1nmi132v0rqm0h8"; + sha256 = "09diqgv5pbv8igb4x9lzrmaf5ic1fd3m8y7rlpwh4w145qwjxc8y"; }; sourceRoot = "source/src"; @@ -32,13 +33,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; preBuild = '' patchShebangs core/colorg++ patchShebangs core/colorgcc patchShebangs projects/main/update_git_info.sh + sed -i -e 's/const AVOutputFormat /AVOutputFormat /g' \ + projects/modules/mpegts/mpegts_writer.cpp \ + projects/modules/file/file_writer.cpp \ + projects/modules/rtmp/rtmp_writer.cpp sed -i -e '/^CC =/d' -e '/^CXX =/d' -e '/^AR =/d' projects/third_party/pugixml-1.9/scripts/pugixml.make ''; From ff63870d277e7ea8dde3edf7461d7452561181e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 11:20:16 +0000 Subject: [PATCH 026/114] python310Packages.pyipma: 3.0.2 -> 3.0.5 --- pkgs/development/python-modules/pyipma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index 6a9847d3778f..c0388f7757b7 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyipma"; - version = "3.0.2"; + version = "3.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AF4bwEsAwJ5MoBQieNDFQ00LILJu+bZZttw4T5+6gkk="; + hash = "sha256-KyXHNkP/XJlTdVFdP91x3udMquQju8G2VUHLPvZymtk="; }; propagatedBuildInputs = [ From c13952175c037ea938b9cd0403a76cb288d18d8e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:49:05 -0700 Subject: [PATCH 027/114] mxnet: 1.8.0 -> 1.9.1 --- .../science/math/mxnet/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index abff55413cec..599d97639742 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, fetchpatch, bash, cmake +{ config, stdenv, lib, fetchurl, bash, cmake , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 , cudnnSupport ? cudaSupport @@ -13,28 +13,14 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.8.0"; + version = "1.9.1"; src = fetchurl { name = "apache-mxnet-src-${version}-incubating.tar.gz"; url = "https://dlcdn.apache.org/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - hash = "sha256-la/5hYlaukCcCNVRRRCuOLiEkM+2KBqzpf8PWCbI21Q="; + hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI="; }; - patches = [ - # Fix build error https://github.com/apache/incubator-mxnet/issues/19405 - (fetchpatch { - name = "mxnet-fix-gcc-linker-error-1.patch"; - url = "https://github.com/apache/incubator-mxnet/commit/78e31d66d19e385ca4ef73245ce79a47e375d8d1.diff"; - sha256 = "sha256-UfmGhh4RbvrEOXe6IJxHm1Aqpy1gS6gHxrX5KQBXjv4="; - }) - (fetchpatch { - name = "mxnet-fix-gcc-linker-error-2.patch"; - url = "https://github.com/apache/incubator-mxnet/commit/9bfe3116aabd01049fdbd90855cb245a30b795df.diff"; - sha256 = "sha256-BL7Zf7Bgn0qpai9HbQ6LBxZNa3iLjVJSe5nxZgqI/fw="; - }) - ]; - nativeBuildInputs = [ cmake perl ]; buildInputs = [ opencv3 gtest blas.provider ] From 6178a38b3d2ff7c10d0a15971826eb4d1bd5d283 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Sep 2022 04:20:00 +0000 Subject: [PATCH 028/114] libblockdev: 2.26 -> 2.27 --- pkgs/development/libraries/libblockdev/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 840cc37ee798..c64fd87e6c28 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.27"; + version = "2.28"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "sha256-rmzXaD56peZawgWsLsYSYGFfMhkEUk2oZI0Qybz9tBE="; + sha256 = "sha256-6MrM3psLqMcpf4haaEHg3FwrhUDz5h/DeY1w96T0UlE="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; + changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.linux; From ba914d792561486c60dc13b8bbebfa99b587f34d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sun, 18 Sep 2022 14:29:56 +0200 Subject: [PATCH 029/114] pcsx2: 1.7.3165 -> 1.7.3331 pcsx2: 1.7.3324 -> 1.7.3331 --- pkgs/applications/emulators/pcsx2/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index a4e99b0515bc..34eba5ed7819 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.3165"; + version = "1.7.3331"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-FdLmLZLpS8zPmHVn4k0nE6vS/omYVIOal9ej0h3bE/Y="; + hash = "sha256-0RcmBMxKj/gnkNEjn2AUSSO1DzyNSf1lOZWPSUq6764="; }; cmakeFlags = [ @@ -79,13 +79,9 @@ stdenv.mkDerivation rec { zlib ]; - # Wayland doesn't seem to work right now (crashes when booting a game). - # Try removing `--prefix GDK_BACKEND : x11` on the next update. - # (This may be solved when the project finshes migrating to Qt) preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} - --prefix GDK_BACKEND : x11 ) ''; From 6448399431cb958d10e16b9112f7cb4762ab6e9c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 24 Sep 2022 09:32:32 +1000 Subject: [PATCH 030/114] defaultbrowser: init at unstable-2020-07-23 --- .../darwin/defaultbrowser/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/darwin/defaultbrowser/default.nix diff --git a/pkgs/os-specific/darwin/defaultbrowser/default.nix b/pkgs/os-specific/darwin/defaultbrowser/default.nix new file mode 100644 index 000000000000..be3dcd417731 --- /dev/null +++ b/pkgs/os-specific/darwin/defaultbrowser/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, Foundation }: + +stdenv.mkDerivation rec { + pname = "defaultbrowser"; + version = "unstable-2020-07-23"; + + src = fetchFromGitHub { + owner = "kerma"; + repo = pname; + rev = "d2860c00dd7fbb5d615232cc819d7d492a6a6ddb"; + sha256 = "sha256-SelUQXoKtShcDjq8uKg3wM0kG2opREa2DGQCDd6IsOQ="; + }; + + makeFlags = [ "CC=cc" "PREFIX=$(out)" ]; + + buildInputs = [ Foundation ]; + + meta = with lib; { + mainProgram = "defaultbrowser"; + description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X"; + homepage = "https://github.com/kerma/defaultbrowser"; + platforms = platforms.darwin; + maintainers = with maintainers; [ Enzime ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 194547c2e806..e6c1fb7242cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24281,6 +24281,10 @@ with pkgs; # `.override` clobbered. C.F. `llvmPackages` which does the same. darwin = callPackage ./darwin-packages.nix { }; + defaultbrowser = callPackage ../os-specific/darwin/defaultbrowser { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; displaylink = callPackage ../os-specific/linux/displaylink { From d06207386df9a53fe01f8a30130dfc9a839fc8fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Sep 2022 02:49:12 +0200 Subject: [PATCH 031/114] top-level/aliases: prune old aliases, add missing dates This removes throws older than 2021-09-01, converts aliases older than 2021-09-01 to throws and fills in missing dates here and there. --- pkgs/top-level/aliases.nix | 908 +++++++++++-------------------------- 1 file changed, 267 insertions(+), 641 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5f3af17ab44d..63ad3a03fc9f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,89 +49,73 @@ mapAliases ({ forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); - _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; # Added 2021-12-03 ### A ### accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 - aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 alarm-clock-applet = throw "'alarm-clock-applet' has been abandoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-16 - aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 - alsaLib = alsa-lib; # Added 2021-06-09 - alsaOss = alsa-oss; # Added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 - alsaPlugins = alsa-plugins; # Added 2021-06-10 - alsaTools = alsa-tools; # Added 2021-06-10 - alsaUtils = alsa-utils; # Added 2021-06-10 - amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained"; # Added 2020-10-30 + alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2022-09-24 + alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2022-09-24 + alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2022-09-24 + alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2022-09-24 + alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2022-09-24 + alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2022-09-24 aminal = throw "aminal was renamed to darktile"; # Added 2021-09-28 ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22 amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11 amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 - amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 - antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 - arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 - asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 - aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 - avldrums-lv2 = x42-avldrums; # Added 2020-03-29 - avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 + avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2022-09-24 awesome-4-0 = awesome; # Added 2022-05-05 aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21 awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = throw "'bar-xft' has been renamed to/replaced by 'lemonbar-xft'"; # Converted to throw 2022-02-22 bashCompletion = throw "'bashCompletion' has been renamed to/replaced by 'bash-completion'"; # Converted to throw 2022-02-22 - bashInteractive_5 = bashInteractive; # Added 2021-08-20 - bash_5 = bash; # Added 2021-08-20 + bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2022-09-24 + bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2022-09-24 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 - bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 - bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 bazel_0 = throw "bazel 0 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 - bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 bird2 = bird; # Added 2022-02-21 bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 - bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 - bluezFull = bluez; # Added 2019-12-03 - bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 + bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2022-09-24 botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 - bpftool = bpftools; # Added 2021-05-03 - brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 + bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2022-09-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 - bro = zeek; # Added 2019-09-29 + bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2022-09-24 btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 @@ -139,17 +123,15 @@ mapAliases ({ buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) - bitwarden_rs = vaultwarden; - bitwarden_rs-mysql = vaultwarden-mysql; - bitwarden_rs-postgresql = vaultwarden-postgresql; - bitwarden_rs-sqlite = vaultwarden-sqlite; - bitwarden_rs-vault = vaultwarden-vault; + bitwarden_rs = throw "'bitwarden_rs' has been renamed to/replaced by 'vaultwarden'"; # Converted to throw 2022-09-24 + bitwarden_rs-mysql = throw "'bitwarden_rs-mysql' has been renamed to/replaced by 'vaultwarden-mysql'"; # Converted to throw 2022-09-24 + bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2022-09-24 + bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2022-09-24 + bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2022-09-24 blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal"; # Added 2022-01-12 - bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies"; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 - btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 buildPerlPackage = throw "'buildPerlPackage' has been renamed to/replaced by 'perlPackages.buildPerlPackage'"; # Converted to throw 2022-02-22 buildkite-agent3 = throw "'buildkite-agent3' has been renamed to/replaced by 'buildkite-agent'"; # Converted to throw 2022-02-22 bundler_HEAD = throw "'bundler_HEAD' has been renamed to/replaced by 'bundler'"; # Converted to throw 2022-02-22 @@ -159,20 +141,12 @@ mapAliases ({ ### C ### c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10 - caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 callPackage_i686 = pkgsi686Linux.callPackage; cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 - cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 - casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; - catfish = xfce.catfish; # Added 2019-12-22 - ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 + catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2022-09-24 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 - cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs"; # Added 2020-06-05 checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 - chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 @@ -196,44 +170,30 @@ mapAliases ({ clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 - claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-09-24 clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03 clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15 clementineUnfree = throw "clementineUnfree has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 - cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 - codimd = hedgedoc; # Added 2020-11-29 + codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2022-09-24 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = picom; # Added 2019-12-02 + compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2022-09-24 compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 - concurrencykit = libck; # Added 2021-03 + concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2022-09-24 conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 container-linux-config-transpiler = throw "container-linux-config-transpiler is deprecated and archived by upstream"; # Added 2022-04-05 cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 - couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 - couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 - cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 - cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 cryptpad = throw "cryptpad has been removed, because it was unmaintained in nixpkgs"; # Added 2022-07-04 ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 # CUDA Toolkit - cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 cudatoolkit_10 = throw "cudatoolkit_10 has been renamed to cudaPackages_10.cudatoolkit"; # Added 2022-04-04 cudatoolkit_10_0 = throw "cudatoolkit_10_0 has been renamed to cudaPackages_10_0.cudatoolkit"; # Added 2022-04-04 cudatoolkit_10_1 = throw "cudatoolkit_10_1 has been renamed to cudaPackages_10_1.cudatoolkit"; # Added 2022-04-04 @@ -247,13 +207,9 @@ mapAliases ({ cudatoolkit_11_6 = throw "cudatoolkit_11_6 has been renamed to cudaPackages_11_6.cudatoolkit"; # Added 2022-04-04 cudnn = throw "cudnn is now part of cudaPackages*"; # Added 2022-04-04 - cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 - cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_7_4_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_7_6_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_7_6_cudatoolkit_10_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_8_1_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_1_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_1_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 @@ -268,10 +224,6 @@ mapAliases ({ cudnn_8_3_cudatoolkit_11_5 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_3_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_3_cudatoolkit_11 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05 curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 @@ -285,31 +237,27 @@ mapAliases ({ cutensor_cudatoolkit_11_3 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_11_4 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead"; # Added 2020-06-15 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; # Added 2021-11-03 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; # Added 2021-11-03 cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages"; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 - cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2022-09-24 ### D ### d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 - dart_dev = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 - dart_old = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 - dart_stable = dart; # Added 2020-01-15 + dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2022-09-24 dat = nodePackages.dat; dashpay = throw "'dashpay' has been removed because it was unmaintained"; # Added 2022-05-12 dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22 dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22 dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22 dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22 - dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 dd-agent = throw "dd-agent has been removed in favor of the newer datadog-agent"; # Added 2022-04-26 ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18 deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22 @@ -317,21 +265,9 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 - deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 - deltachat-electron = deltachat-desktop; # added 2021-07-18 - - deluge-1_x = throw '' - Deluge 1.x (deluge-1_x) is no longer supported. - Please use Deluge 2.x (deluge-2_x) instead, for example: - - services.deluge.package = pkgs.deluge-2_x; - - Note that it is NOT possible to switch back to Deluge 1.x after this change. - ''; # Added 2021-08-18 - + deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2022-09-24 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 @@ -342,9 +278,8 @@ mapAliases ({ disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12 dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 - dnnl = oneDNN; # Added 2020-04-22 + dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2022-09-24 docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 - docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 @@ -355,12 +290,9 @@ mapAliases ({ dotnet-netcore = dotnet-runtime; # Added 2021-10-07 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; - draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 - dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 - dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07 - dylibbundler = macdylibbundler; # Added 2021-04-24 + dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2022-09-24 ### E ### @@ -368,8 +300,6 @@ mapAliases ({ ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 - elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 - elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 # Electron electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 @@ -387,18 +317,16 @@ mapAliases ({ emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 - emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 - emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 + emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2022-09-24 + emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-09-24 emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 - emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2022-09-24 enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 - esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 @@ -408,136 +336,93 @@ mapAliases ({ ### F ### - facette = throw "facette has been removed"; # Added 2020-01-06 - fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - fastnlo = fastnlo_toolkit; # Added 2021-04-24 + fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo_toolkit'"; # Converted to throw 2022-09-24 fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 - fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 - fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; + fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 - finger_bsd = bsd-finger; - fingerd_bsd = bsd-fingerd; - firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; + finger_bsd = bsd-finger; # Added 2022-03-14 + fingerd_bsd = bsd-fingerd; # Added 2022-03-14 firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 - fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 fishfight = jumpy; # Added 2022-08-03 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 - flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 flatbuffers_1_12 = throw "FlatBuffers version 1.12 has been removed, because upstream no longer maintains it"; # Added 2022-05-12 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 - flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 - flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 - flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 - flvtool2 = throw "flvtool2 has been removed"; # Added 2020-11-03 fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 - foldingathome = fahclient; # Added 2020-09-03 + foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2022-09-24 font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 - - fontconfig-penultimate = throw '' - fontconfig-penultimate has been removed. - It was a fork of the abandoned fontconfig-ultimate. - ''; # Added 2020-07-21 - - fontconfig_210 = throw '' - fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 - and has only been used for old fontconfig caches. - ''; - foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl"; # Added 2021-11-07 - fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. - fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 ### G ### - g4py = python3Packages.geant4; # Added 2020-06-06 - gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2022-09-24 gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 - gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 - gfm = throw "gfm has been removed"; # Added 2021-01-15 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 - giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 gitAndTools = self // { - darcsToGit = darcs-to-git; - gitAnnex = git-annex; - gitBrunch = git-brunch; - gitFastExport = git-fast-export; - gitRemoteGcrypt = git-remote-gcrypt; - svn_all_fast_export = svn-all-fast-export; - topGit = top-git; - }; # Added 2021-01-14 + darcsToGit = throw "'gitAndTools.darcsToGit' has been renamed to 'darcs-to-git'"; # Converted to throw 2022-09-24 + gitAnnex = throw "'gitAndTools.gitAnnex' has been renamed to 'git-annex'"; # Converted to throw 2022-09-24 + gitBrunch = throw "'gitAndTools.gitBrunch' has been renamed to 'git-brunch'"; # Converted to throw 2022-09-24 + gitFastExport = throw "'gitAndTools.gitFastExport' has been renamed to 'git-fast-export'"; # Converted to throw 2022-09-24 + gitRemoteGcrypt = throw "'gitAndTools.gitRemoteGcrypt' has been renamed to 'git-remote-gcrypt'"; # Converted to throw 2022-09-24 + svn_all_fast_export = throw "'gitAndTools.svn_all_fast_export' has been renamed to 'svn-all-fast-export'"; # Converted to throw 2022-09-24 + topGit = throw "'gitAndTools.topGit' has been renamed to 'top-git'"; # Converted to throw 2022-09-24 + }; gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12 gksu = throw "gksu has been removed"; # Added 2022-01-16 glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 - gmailieer = lieer; # Added 2020-04-19 - gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 - gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 + gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2022-09-24 + gmic_krita_qt = throw "'gmic_krita_qt' has been renamed to/replaced by 'gmic-qt-krita'"; # Converted to throw 2022-09-24 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 - gnome-mpv = celluloid; # Added 2019-08-22 + gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2022-09-24 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 - gnome_user_docs = gnome-user-docs; # Added 2019-11-20 + gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2022-09-24 gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 - - gnuradio-with-packages = gnuradio3_7.override { - extraPackages = lib.attrVals [ - "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" - ] gnuradio3_7Packages; - }; # Added 2020-10-16 - - gmock = gtest; # moved from top-level 2021-03-14 - - gnome3 = gnome; # Added 2021-05-07 - gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 + gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2022-09-24 + gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2022-09-24 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 - gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 - gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 - gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 - gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 - gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 - gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2022-09-24 + gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2022-09-24 + gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2022-09-24 + gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2022-09-24 + gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2022-09-24 + gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2022-09-24 gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 - gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 - gobby5 = gobby; # Added 2021-02-01 + gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2022-09-24 gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21 goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 - gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 - google-gflags = gflags; # Added 2019-07-25 - google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2022-09-24 gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30 @@ -546,27 +431,26 @@ mapAliases ({ go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 - - graalvm11 = graalvm11-ce; + graalvm11 = graalvm11-ce; # Added 2021-10-15 graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 - gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2022-09-24 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 - gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2022-09-24 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 - gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 - gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 - gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 - gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2022-09-24 + gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2022-09-24 + gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2022-09-24 + gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2022-09-24 grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 - gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15 + gtmess = throw "gtmess has been removed, because it was a MSN client."; # Added 2021-12-15 guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 @@ -583,20 +467,18 @@ mapAliases ({ ### H ### - hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 - hepmc = hepmc2; # Added 2019-08-05 + hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2022-09-24 hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holdingnuts = throw "holdingnuts was removed from nixpkgs, as the project is no longer developed"; # Added 2022-05-10 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 - ht-rust = xh; # Added 2021-02-13 - hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06 + ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2022-09-24 hydra-unstable = hydra_unstable; # added 2022-05-10 hyperspace-cli = throw "hyperspace-cli is out of date, and has been deprecated upstream in favour of using the individual repos instead"; # Added 2022-08-29 @@ -604,54 +486,45 @@ mapAliases ({ i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 - iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 - icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 - icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2022-09-24 + icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2022-09-24 icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 - imagemagick7Big = imagemagickBig; # Added 2021-02-22 - imagemagick7 = imagemagick; # Added 2021-02-22 - imagemagick7_light = imagemagick_light; # Added 2021-02-22 + imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2022-09-24 + imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2022-09-24 + imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2022-09-24 impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 - i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped"; index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = rdma-core; # Added 2019-08-09 + infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2022-09-24 ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12 - inotifyTools = inotify-tools; + inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2022-09-24 intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15 interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 - inter-ui = inter; # Added 2021-03-27 + inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2022-09-24 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 - iproute = iproute2; # moved from top-level 2021-03-14 + iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2022-09-24 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 ### J ### - jack2Full = jack2; # moved from top-level 2021-03-14 + jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2022-09-24 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 - jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 - jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 - jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; # Julia - julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 - 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 julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 @@ -661,35 +534,28 @@ mapAliases ({ ### K ### k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04 - k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 kafkacat = kcat; # Added 2021-10-07 - 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 - kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 + kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2022-09-24 kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 - kerberos = libkrb5; # moved from top-level 2021-03-14 + kerberos = throw "'kerberos' has been renamed to/replaced by 'libkrb5'"; # Converted to throw 2022-09-24 kexectools = kexec-tools; # Added 2021-09-03 - kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 + kexpand = throw "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 - keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 + keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.plasmaMobileGear.keysmith'"; # Converted to throw 2022-09-24 kgx = gnome-console; # Added 2022-02-19 - kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 - kicad-with-packages3d = kicad; # Added 2019-11-25 - kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 - kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 - kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 + kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2022-09-24 knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01 kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07 - kodiGBM = kodi-gbm; - kodiPlain = kodi; - kodiPlainWayland = kodi-wayland; + kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2022-09-24 + kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-09-24 + kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2022-09-24 kodiPlugins = kodiPackages; # Added 2021-03-09; - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2022-09-24 krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05 @@ -700,7 +566,7 @@ mapAliases ({ ### L ### lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 - latinmodern-math = lmmath; + latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2022-09-24 letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 @@ -709,10 +575,8 @@ mapAliases ({ libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 - libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 + libcap_pam = throw "'libcap_pam has been renamed to/replaced by 'libcap.pam'"; # Converted to throw 2022-09-24 libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 - libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16 - libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04 libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22 libdbusmenu_qt = throw "'libdbusmenu_qt' (Qt4) is deprecated and unused, use 'libsForQt5.libdbusmenu'"; # Added 2022-06-14 libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22 @@ -727,44 +591,38 @@ mapAliases ({ libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 - libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 - libixp_hg = libixp; - libjpeg_drop = libjpeg_original; # Added 2020-06-05 + libintlOrEmpty = "'libintlOrEmpty' has been renamed to/replace by 'gettext'"; # Converted to throw 2022-09-24 + libixp_hg = libixp; # Added 2022-04-25 + libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2022-09-24 libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2021-11-09 liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 - liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 + liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24 liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; - libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 - libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 - librdf = lrdf; # Added 2020-03-22 + librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-09-24 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 - librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 - libseat = seatd; # Added 2021-06-24 + libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2022-09-24 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 - libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 - libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 - libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 - libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; - libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; + libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24 + libtorrentRasterbar-1_1_x = throw "'libtorrentRasterbar-1_1_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_1_x'"; # Converted to throw 2022-09-24 + libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2022-09-24 + libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2022-09-24 libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 - libungif = giflib; # Added 2020-02-12 - libusb = libusb1; # Added 2020-04-28 + libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2022-09-24 + libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2022-09-24 libusb1-axoloti = throw "libusb1-axoloti has been removed: axoloti has been removed"; # Added 2022-05-13 libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 - libwnck3 = libwnck; + libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2022-09-24 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 @@ -815,38 +673,15 @@ mapAliases ({ linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - # Added 2020-04-04 - linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; - linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + linuxPackages_xen_dom0 = throw "'linuxPackages_xen_dom0' has been renamed to/replaced by 'linuxPackages'"; # Converted to throw 2022-09-24 + linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2022-09-24 + linuxPackages_xen_dom0_hardened = throw "'linuxPackages_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_hardened'"; # Converted to throw 2022-09-24 + linuxPackages_latest_xen_dom0_hardened = throw "'linuxPackages_latest_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_latest_hardened'"; # Converted to throw 2022-09-24 - # Added 2021-04-04 - linuxPackages_xen_dom0 = linuxPackages; - linuxPackages_latest_xen_dom0 = linuxPackages_latest; - linuxPackages_xen_dom0_hardened = linuxPackages_hardened; - linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - - # Added 2021-08-16 - linuxPackages_latest_hardened = throw '' - The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches - frequently lag behind the upstream kernel. In some cases this meant that this attribute - had to refer to an older kernel[1] because the latest hardened kernel was EOL and - the latest supported kernel didn't have patches. - - If you want to use a hardened kernel, please check which kernel minors are supported - and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'. - - [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587 - ''; - linux_latest_hardened = linuxPackages_latest_hardened; - - linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 - - loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - lobster-two = google-fonts; # Added 2021-07-22 + lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2022-09-24 love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 - lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 lttngTools = throw "'lttngTools' has been renamed to/replaced by 'lttng-tools'"; # Converted to throw 2022-02-22 lttngUst = throw "'lttngUst' has been renamed to/replaced by 'lttng-ust'"; # Converted to throw 2022-02-22 lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 @@ -854,83 +689,66 @@ mapAliases ({ lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 - lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 - lzma = xz; # moved from top-level 2021-03-14 + lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2022-09-24 ### M ### m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 - mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 - marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 - matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 - mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 - matrique = spectral; # Added 2020-01-27 + matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2022-09-24 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 - mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 mcomix3 = mcomix; # Added 2022-06-05 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 - meme = meme-image-generator; # Added 2021-04-21 + meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2022-09-24 memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 - mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 - mess = mame; # Added 2019-10-30 - metal = throw "metal has been removed due to lack of maintainers"; + mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2022-09-24 + metal = throw "metal has been removed due to lack of maintainers"; # Added 2022-06-30 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2"; # Added 2022-01-01 - minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 - minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01 minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 - mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 - moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 - mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 mopidy-spotify = throw "mopidy-spotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = mozart2-binary; # Added 2019-09-23 - mozart = mozart2-binary; # Added 2019-09-23 + mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2022-09-24 + mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2022-09-24 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2022-09-24 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 - mumble_git = pkgs.mumble; # Added 2019-08-01 - murmur_git = pkgs.murmur; # Added 2019-08-01 + mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2022-09-24 + murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2022-09-24 mutt-with-sidebar = mutt; # Added 2022-09-17 - mysql-client = hiPrio mariadb.client; - mysql = mariadb; # moved from top-level 2021-03-14 + mysql-client = throw "'mysql-client' has been renamed to/replaced by 'hiPrio'"; # Converted to throw 2022-09-24 + mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2022-09-24 - # floating point textures patents are expired, - # so package reduced to alias - mesa_drivers = mesa.drivers; + mesa_drivers = throw "'mesa_drivers' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-09-24 mesa_noglu = throw "'mesa_noglu' has been renamed to/replaced by 'mesa'"; # Converted to throw 2022-02-22 - mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 + mpv-with-scripts = throw "'mpv-with-scripts' has been renamed to/replaced by 'self.wrapMpv'"; # Converted to throw 2022-09-24 mssys = throw "'mssys' has been renamed to/replaced by 'ms-sys'"; # Converted to throw 2022-02-22 multipath_tools = throw "'multipath_tools' has been renamed to/replaced by 'multipath-tools'"; # Converted to throw 2022-02-22 mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 mupen64plus1_5 = throw "'mupen64plus1_5' has been renamed to/replaced by 'mupen64plus'"; # Converted to throw 2022-02-22 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 - mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative"; # Added 2021-04-15 mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22 myxer = throw "Myxer has been removed from nixpkgs, as it has been unmaintained since Jul 31, 2021"; # Added 2022-06-08 @@ -941,46 +759,41 @@ mapAliases ({ nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 - net_snmp = net-snmp; # Added 2019-12-21 - nagiosPluginsOfficial = monitoring-plugins; - navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 + net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2022-09-24 + nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2022-09-24 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10 - netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 networkmanager_openconnect = throw "'networkmanager_openconnect' has been renamed to/replaced by 'networkmanager-openconnect'"; # Converted to throw 2022-02-22 networkmanager_openvpn = throw "'networkmanager_openvpn' has been renamed to/replaced by 'networkmanager-openvpn'"; # Converted to throw 2022-02-22 networkmanager_vpnc = throw "'networkmanager_vpnc' has been renamed to/replaced by 'networkmanager-vpnc'"; # Converted to throw 2022-02-22 - neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 - nix-direnv-flakes = nix-direnv; - nix-review = nixpkgs-review; # Added 2019-12-22 - nixFlakes = nixVersions.stable; # Added 2021-05-21 + nix-direnv-flakes = nix-direnv; # Added 2021-11-09 + nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2022-09-24 + nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2022-09-24 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 - nix_2_3 = nixVersions.nix_2_3; - nix_2_4 = nixVersions.nix_2_4; - nix_2_5 = nixVersions.nix_2_5; - nix_2_6 = nixVersions.nix_2_6; + nix_2_3 = nixVersions.nix_2_3; # Added 2022-01-26 + nix_2_4 = nixVersions.nix_2_4; # Added 2022-01-26 + nix_2_5 = nixVersions.nix_2_5; # Added 2022-01-26 + nix_2_6 = nixVersions.nix_2_6; # Added 2022-01-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23 - nmap-unfree = nmap; # Added 2021-04-06 + nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-09-24 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 - nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 - now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21 nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 @@ -988,35 +801,27 @@ mapAliases ({ oathToolkit = oath-toolkit; # Added 2022-04-04 oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14; - oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 - oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2022-09-24 ocropus = throw "ocropus has been removed: abandoned by upstream"; # Added 2022-04-24 - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set"; # Added 2021-01-24 - ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 - ofp = throw "ofp is not compatible with odp-dpdk"; - olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 - openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2022-09-24 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 - openisns = open-isns; # Added 2020-01-28 - openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 - openjpeg_2 = openjpeg; # Added 2021-01-25 + openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2022-09-24 + openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2022-09-24 openmpt123 = libopenmpt; # Added 2021-09-05 opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 - orchis = orchis-theme; # Added 2021-06-09 - osxfuse = macfuse-stubs; # Added 2021-03-20 - otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 + orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2022-09-24 + osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2022-09-24 owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 ### P ### @@ -1025,9 +830,9 @@ mapAliases ({ p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 - paperless = paperless-ngx; # Added 2021-06-06 + paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2022-09-24 paperless-ng = paperless-ngx; # Added 2022-04-11 - parity = openethereum; # Added 2020-08-01 + parity = throw "'parity' has been renamed to/replaced by 'openethereum'"; # Converted to throw 2022-09-24 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parlatype = throw "parlatype has been removed: unmaintained"; # Added 2022-04-24 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 @@ -1035,14 +840,12 @@ mapAliases ({ pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01 - pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 - pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 - pgadmin = pgadmin4; + pgadmin = pgadmin4; # Added 2022-01-14 pgadmin3 = throw "pgadmin3 was removed for being unmaintained, use pgadmin4 instead."; # Added 2022-03-30 pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 @@ -1057,55 +860,20 @@ mapAliases ({ php74Packages = php74; # Added 2022-05-24 php74Extensions = php74; # Added 2022-05-24 - php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03 - php73Packages = php73; # Added 2021-06-03 - php73Extensions = php73; # Added 2021-06-03 + php73Packages = throw "'php73Packages' has been renamed to/replaced by 'php73'"; # Converted to throw 2022-09-24 + php73Extensions = throw "'php73Extensions' has been renamed to/replaced by 'php73'"; # Converted to throw 2022-09-24 - php-embed = throw '' - php*-embed has been dropped, you can build something similar - with the following snippet: - php74.override { embedSupport = true; apxs2Support = false; } - ''; # Added 2020-04-01 - php73-embed = php-embed; # Added 2020-04-01 - php74-embed = php-embed; # Added 2020-04-01 + php73-embed = throw "'php73-embed' has been renamed to/replaced by 'php-embed'"; # Converted to throw 2022-09-24 + php74-embed = throw "'php74-embed' has been renamed to/replaced by 'php-embed'"; # Converted to throw 2022-09-24 - phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build something - similar with the following snippet: - (php74.override { embedSupport = true; apxs2Support = false; }).packages - ''; # Added 2020-04-01 - php73Packages-embed = phpPackages-embed; - php74Packages-embed = phpPackages-embed; + php73Packages-embed = throw "'php73Packages-embed' has been renamed to/replaced by 'phpPackages-embed'"; # Converted to throw 2022-09-24 + php74Packages-embed = throw "'php74Packages-embed' has been renamed to/replaced by 'phpPackages-embed'"; # Converted to throw 2022-09-24 - php-unit = throw '' - php*-unit has been dropped, you can build something similar with - the following snippet: - php74.override { - embedSupport = true; - apxs2Support = false; - systemdSupport = false; - phpdbgSupport = false; - cgiSupport = false; - fpmSupport = false; - } - ''; # Added 2020-04-01 - php73-unit = php-unit; # Added 2020-04-01 - php74-unit = php-unit; # Added 2020-04-01 + php73-unit = throw "'php73-unit' has been renamed to/replaced by 'php-unit'"; # Converted to throw 2022-09-24 + php74-unit = throw "'php74-unit' has been renamed to/replaced by 'php-unit'"; # Converted to throw 2022-09-24 - phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build something - similar with this following snippet: - (php74.override { - embedSupport = true; - apxs2Support = false; - systemdSupport = false; - phpdbgSupport = false; - cgiSupport = false; - fpmSupport = false; - }).packages - ''; # Added 2020-04-01 - php73Packages-unit = phpPackages-unit; - php74Packages-unit = phpPackages-unit; + php73Packages-unit = throw "'php73Packages-unit' has been renamed to/replaced by 'phpPackages-unit'"; # Converted to throw 2022-09-24 + php74Packages-unit = throw "'php74Packages-unit' has been renamed to/replaced by 'phpPackages-unit'"; # Converted to throw 2022-09-24 pidgin-with-plugins = throw "'pidgin-with-plugins' has been renamed to/replaced by 'pidgin'"; # Converted to throw 2022-02-22 pidginlatex = throw "'pidginlatex' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 @@ -1119,12 +887,11 @@ mapAliases ({ ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 - pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2022-09-24 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 - pleroma-otp = pleroma; # Added 2021-07-10 + pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2022-09-24 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 - pltScheme = racket; # just to be sure + pltScheme = racket; # Added 20218-01-01 pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 @@ -1135,40 +902,35 @@ mapAliases ({ portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 # postgresql - postgresql96 = postgresql_9_6; + postgresql96 = throw "'postgresql96' has been renamed to/replaced by 'postgresql_9_6'"; # Converted to throw 2022-09-24 postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 # postgresql plugins - cstore_fdw = postgresqlPackages.cstore_fdw; - pg_cron = postgresqlPackages.pg_cron; - pg_hll = postgresqlPackages.pg_hll; - pg_repack = postgresqlPackages.pg_repack; - pg_similarity = postgresqlPackages.pg_similarity; - pg_topn = postgresqlPackages.pg_topn; - pgjwt = postgresqlPackages.pgjwt; - pgroonga = postgresqlPackages.pgroonga; - pgtap = postgresqlPackages.pgtap; - plv8 = postgresqlPackages.plv8; - postgis = postgresqlPackages.postgis; + cstore_fdw = throw "'cstore_fdw' has been renamed to/replaced by 'postgresqlPackages.cstore_fdw'"; # Converted to throw 2022-09-24 + pg_cron = throw "'pg_cron' has been renamed to/replaced by 'postgresqlPackages.pg_cron'"; # Converted to throw 2022-09-24 + pg_hll = throw "'pg_hll' has been renamed to/replaced by 'postgresqlPackages.pg_hll'"; # Converted to throw 2022-09-24 + pg_repack = throw "'pg_repack' has been renamed to/replaced by 'postgresqlPackages.pg_repack'"; # Converted to throw 2022-09-24 + pg_similarity = throw "'pg_similarity' has been renamed to/replaced by 'postgresqlPackages.pg_similarity'"; # Converted to throw 2022-09-24 + pg_topn = throw "'pg_topn' has been renamed to/replaced by 'postgresqlPackages.pg_topn'"; # Converted to throw 2022-09-24 + pgjwt = throw "'pgjwt' has been renamed to/replaced by 'postgresqlPackages.pgjwt'"; # Converted to throw 2022-09-24 + pgroonga = throw "'pgroonga' has been renamed to/replaced by 'postgresqlPackages.pgroonga'"; # Converted to throw 2022-09-24 + pgtap = throw "'pgtap' has been renamed to/replaced by 'postgresqlPackages.pgtap'"; # Converted to throw 2022-09-24 + plv8 = throw "'plv8' has been renamed to/replaced by 'postgresqlPackages.plv8'"; # Converted to throw 2022-09-24 + postgis = throw "'postgis' has been renamed to/replaced by 'postgresqlPackages.postgis'"; # Converted to throw 2022-09-24 tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 - timescaledb = postgresqlPackages.timescaledb; - tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; - tsearch_extras = postgresqlPackages.tsearch_extras; + timescaledb = throw "'timescaledb' has been renamed to/replaced by 'postgresqlPackages.timescaledb'"; # Converted to throw 2022-09-24 + tsearch_extras = throw "'tsearch_extras' has been renamed to/replaced by 'postgresqlPackages.tsearch_extras'"; # Converted to throw 2022-09-24 - pinentry_curses = pinentry-curses; # Added 2019-10-14 - pinentry_emacs = pinentry-emacs; # Added 2019-10-14 - pinentry_gnome = pinentry-gnome; # Added 2019-10-14 - pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 - pinentry_qt = pinentry-qt; # Added 2019-10-14 - pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2022-09-24 + pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2022-09-24 + pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2022-09-24 + pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2022-09-24 + pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2022-09-24 + pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2022-09-24 prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 - privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 - processing3 = processing; # Added 2019-08-16 + processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2022-09-24 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 - proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 - proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 - prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 @@ -1176,25 +938,18 @@ mapAliases ({ pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 - pulseeffects-pw = easyeffects; # Added 2021-07-07 + pulseeffects-pw = throw "'pulseeffects-pw' has been renamed to/replaced by 'easyeffects'"; # Converted to throw 2022-09-24 py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 - pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; - pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; - pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 - pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 - pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 - pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 - pyo3-pack = maturin; + pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2022-09-24 + pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2022-09-24 pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-01 python = python2; # Added 2022-01-11 python-swiftclient = swiftclient; # Added 2021-09-09 - python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead"; # Added 2021-03-08 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 @@ -1203,78 +958,58 @@ mapAliases ({ QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 - qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2022-09-24 qflipper = qFlipper; # Added 2022-02-11 - qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 - qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 - qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 - qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 - qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2022-09-24 qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14 - quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 - quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 - quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03 - qvim = throw "qvim has been removed"; # Added 2020-08-31 - qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 ### R ### - radare2-cutter = cutter; # Added 2021-03-30 + radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2022-09-24 railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27 - raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01 rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 - readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 - redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30? - resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; - resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; - resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; + resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; # Added 2022-04-08 + resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; # Added 2022-04-08 + resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; # Added 2022-04-08 residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 - retroshare06 = retroshare; - rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2022-09-24 riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22 - riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 - rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06 rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 - rpiboot-unstable = rpiboot; # Added 2021-07-30 + rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2022-09-24 rr-unstable = rr; # Added 2022-09-17 rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22 - rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 - rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 - rubyMinimal = throw "rubyMinimal was removed due to being unused"; - runCommandNoCC = runCommand; - runCommandNoCCLocal = runCommandLocal; - runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 + runCommandNoCC = throw "'runCommandNoCC' has been renamed to/replaced by 'runCommand'"; # Converted to throw 2022-09-24 + runCommandNoCCLocal = throw "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'"; # Converted to throw 2022-09-24 rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 - rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 - rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2022-09-24 + rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2022-09-24 # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2022-09-24 ### S ### - s2n = s2n-tls; # Added 2021-03-03 + s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2022-09-24 s3gof3r = throw "s3gof3r has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-04 s6Dns = throw "'s6Dns' has been renamed to/replaced by 's6-dns'"; # Converted to throw 2022-02-22 s6LinuxUtils = throw "'s6LinuxUtils' has been renamed to/replaced by 's6-linux-utils'"; # Converted to throw 2022-02-22 @@ -1284,116 +1019,97 @@ mapAliases ({ salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05 sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 - sane-backends-git = sane-backends; # Added 2021-02-19 + sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-09-24 saneBackends = throw "'saneBackends' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 saneBackendsGit = throw "'saneBackendsGit' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 - scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 - scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 + scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # Added 2021-12-15 scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 - sdlmame = mame; # Added 2019-10-30 - seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 + sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2022-09-24 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 - session-desktop-appimage = session-desktop; + session-desktop-appimage = session-desktop; # Added 2022-08-22 shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 - inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 + inherit (libsForQt5.mauiPackages) shelf; # Added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 - skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2021-07-14 - skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 - slack-dark = slack; # Added 2020-03-27 + slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2022-09-24 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 - slurm-llnl = slurm; # renamed July 2017 - slurm-llnl-full = slurm-full; # renamed July 2017 + slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-09-24 + slurm-llnl-full = throw "'slurm-llnl-full' has been renamed to/replaced by 'slurm-full'"; # Converted to throw 2022-09-24 smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 - smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = solr; # Added 2021-01-30 + solr_8 = throw "'solr_8' has been renamed to/replaced by 'solr'"; # Converted to throw 2022-09-24 - # Added 2020-02-10 sourceHanSansPackages = { - japanese = source-han-sans; - korean = source-han-sans; - simplified-chinese = source-han-sans; - traditional-chinese = source-han-sans; + japanese = throw "'sourceHanSansPackages.japanese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 + korean = throw "'sourceHanSansPackages.korean' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 + simplified-chinese = throw "'sourceHanSansPackages.simplified-chinese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 + traditional-chinese = throw "'sourceHanSansPackages.traditional-chinese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 }; - source-han-sans-japanese = source-han-sans; - source-han-sans-korean = source-han-sans; - source-han-sans-simplified-chinese = source-han-sans; - source-han-sans-traditional-chinese = source-han-sans; + source-han-sans-japanese = throw "'source-han-sans-japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 + source-han-sans-korean = throw "'source-han-sans-korean' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 + source-han-sans-simplified-chinese = throw "'source-han-sans-simplified-chinese' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 + source-han-sans-traditional-chinese = throw "'source-han-sans-traditional-chinese' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 sourceHanSerifPackages = { - japanese = source-han-serif; - korean = source-han-serif; - simplified-chinese = source-han-serif; - traditional-chinese = source-han-serif; + japanese = throw "'sourceHanSerifPackages.japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 + korean = throw "'sourceHanSerifPackages.korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 + simplified-chinese = throw "'sourceHanSerifPackages.simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 + traditional-chinese = throw "'sourceHanSerifPackages.traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 }; - source-han-serif-japanese = source-han-serif; - source-han-serif-korean = source-han-serif; - source-han-serif-simplified-chinese = source-han-serif; - source-han-serif-traditional-chinese = source-han-serif; + source-han-serif-japanese = throw "'source-han-serif-japanese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 + source-han-serif-korean = throw "'source-han-serif-korean' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 + source-han-serif-simplified-chinese = throw "'source-han-serif-simplified-chinese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 + source-han-serif-traditional-chinese = throw "'source-han-serif-traditional-chinese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 sourcetrail = throw "sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 - spectral = neochat; # Added 2020-12-27 + spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2022-09-24 speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 - spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 - spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 - spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 - # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # Added 2020-10-09 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2022-09-24 split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 - spring-boot = spring-boot-cli; # added 2020-04-24 + spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2022-09-24 sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 - squid4 = squid; # added 2019-08-22 + squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2022-09-24 srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 - stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 - steam-run-native = steam-run; # added 2022-02-21 + steam-run-native = steam-run; # Added 2022-02-21 stride = throw "'stride' aka. Atlassian Stride is dead since 2019 (bought by Slack)"; # added 2022-06-15 - stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 - subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 - sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 sweep-visualizer = throw "'sweep-visualizer' is abondoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-15 - swfdec = throw "swfdec has been removed as broken and unmaintained"; # Added 2020-08-23 - swtpm-tpm2 = swtpm; # Added 2021-02-26 - syncthing-cli = syncthing; # Added 2021-04-06 + swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2022-09-24 + syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2022-09-24 synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 system_config_printer = throw "'system_config_printer' has been renamed to/replaced by 'system-config-printer'"; # Converted to throw 2022-02-22 - systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 - systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 systool = throw "'systool' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ### T ### tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 - tangogps = foxtrotgps; # Added 2020-01-26 + tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2022-09-24 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 - tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 - telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 telepathy_glib = throw "'telepathy_glib' has been renamed to/replaced by 'telepathy-glib'"; # Converted to throw 2022-02-22 @@ -1404,7 +1120,6 @@ mapAliases ({ telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 - terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 @@ -1418,33 +1133,17 @@ mapAliases ({ tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 textadept11 = textadept; # Added 2022-06-07 tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 - thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; - thunderbird-bin-68 = thunderbird-68; - timescale-prometheus = promscale; # Added 2020-09-29 + timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2022-09-24 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 tkcvs = tkrev; # Added 2022-03-07 - togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tomboy = throw "tomboy is not actively developed anymore and was removed"; # Added 2022-01-27 - tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 - tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 - tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life"; # Added 2020-03-11 tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned"; # Added 2022-01-01 torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 - torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 - transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 - transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned"; - trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; - trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 - tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 @@ -1452,46 +1151,42 @@ mapAliases ({ ### U ### uade123 = uade; # Added 2022-07-30 - uberwriter = apostrophe; # Added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2022-09-24 + ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2022-09-24 uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 - ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 - unicorn-emu = unicorn; # Added 2020-10-29 - unifiStable = unifi6; # Added 2020-12-28 + unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2022-09-24 + unifiStable = throw "'unifiStable' has been renamed to/replaced by 'unifi6'"; # Converted to throw 2022-09-24 unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 - untrunc = untrunc-anthwlock; # Added 2021-02-01 - urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 - urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 - urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 + untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2022-09-24 + urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2022-09-24 + urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2022-09-24 + urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2022-09-24 + urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2022-09-24 + urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2022-09-24 + urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2022-09-24 + urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2022-09-24 + urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2022-09-24 usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 - usbguard-nox = usbguard; # Added 2019-09-04 + usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2022-09-24 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = util-linux; # Added 2020-11-24 + utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2022-09-24 ### V ### - v4l_utils = v4l-utils; # Added 2019-08-07 - vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 - vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; - varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 - varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 - varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15 + v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2022-09-24 + vamp = { + vampSDK = throw "'vamp.vampSDK' has been renamed to 'vamp-plugin-sdk'"; # Converted to throw 2022-09-24 + }; + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; # Added 2022-01-15 varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 - vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 - venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 + vdirsyncerStable = throw "vdirsyncerStable has been replaced by vdirsyncer"; # Converted to throw 2022-09-24 vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 - virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 - virtmanager = virt-manager; # Added 2019-10-29 - virtmanager-qt = virt-manager-qt; # Added 2019-10-29 + virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2022-09-24 + virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2022-09-24 virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21 vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 @@ -1501,7 +1196,6 @@ mapAliases ({ ### W ### wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 - way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 @@ -1513,12 +1207,12 @@ mapAliases ({ wineStable = throw "'wineStable' has been renamed to/replaced by 'winePackages.stable'"; # Converted to throw 2022-02-22 wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 - wineWayland = wine-wayland; + wineWayland = wine-wayland; # Added 2022-01-03 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name - wmii_hg = wmii; + wmii_hg = wmii; # Added 2022-04-25 ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 @@ -1526,58 +1220,43 @@ mapAliases ({ ### X ### x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22 - xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 xbmcPlain = throw "'xbmcPlain' has been renamed to/replaced by 'kodiPlain'"; # Converted to throw 2022-02-22 xbmcPlugins = throw "'xbmcPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2022-02-22 - xdg_utils = xdg-utils; # Added 2021-02-01 - xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 + xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2022-09-24 xfce4-14 = xfce; - xfceUnstable = xfce4-14; # Added 2019-09-17 - xineLib = xine-lib; # Added 2021-04-27 - xineUI = xine-ui; # Added 2021-04-27 + xfceUnstable = throw "'xfceUnstable' has been renamed to/replaced by 'xfce4-14'"; # Converted to throw 2022-09-24 + xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2022-09-24 + xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2022-09-24 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 - xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; xp-pen-g430 = throw "xp-pen-g430 has been renamed to xp-pen-g430-driver"; # Converted to throw 2022-06-23 xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 - xf86_input_mtrack = throw '' - xf86_input_mtrack has been removed from nixpkgs as it is broken and - unmaintained. Working alternatives are libinput and synaptics. - ''; - xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs"; # Added 2020-01-20 xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 xow = throw ( "Upstream has ended support for 'xow' and the package has been removed" + "from nixpkgs. Users are urged to switch to 'xone'." ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 - xv = xxv; # Added 2020-02-22 - xvfb_run = xvfb-run; # Added 2021-05-07 + xv = throw "'xv' has been renamed to/replaced by 'xxv'"; # Converted to throw 2022-09-24 + xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2022-09-24 ### Y ### - yacc = bison; # moved from top-level 2021-03-14 + yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2022-09-24 yafaray-core = libyafaray; # Added 2022-09-23 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 - ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; - yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead"; # Added 2021-03-08 yuzu-ea = yuzu-early-access; # Added 2022-08-18 - yuzu = yuzu-mainline; # Added 2021-01-25 + yuzu = throw "'yuzu' has been renamed to/replaced by 'yuzu-mainline'"; # Converted to throw 2022-09-24 ### Z ### - zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 - zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. - # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 - # branch-off - ocamlPackages_4_00_1 = throw "'ocamlPackages_4_00_1' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1'"; # Converted to throw 2022-02-22 ocamlPackages_4_01_0 = throw "'ocamlPackages_4_01_0' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0'"; # Converted to throw 2022-02-22 ocamlPackages_4_02 = throw "'ocamlPackages_4_02' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02'"; # Converted to throw 2022-02-22 @@ -1602,68 +1281,15 @@ mapAliases ({ ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01 ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01 - zabbix44 = throw '' - Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at - https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 - ''; # Added 2020-08-17 + zeroc_ice = throw "'zeroc_ice' has been renamed to 'zeroc-ice'"; # Converted to throw 2022-09-24 - # Added 2019-09-06 - zeroc_ice = pkgs.zeroc-ice; + dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2022-09-24 + gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2022-09-24 - # Added 2020-06-22 - zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; - jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; - - avian = throw '' - The package doesn't compile anymore on NixOS and both development & - maintenance is abandoned by upstream. - ''; # Cleanup before 21.11, Added 2021-05-07 - ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula"; - dina-font-pcf = dina-font; # Added 2020-02-09 - dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2"; # Added 2020-02-02 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7"; - gnatsd = nats-server; # Added 2019-10-28 - - obs-gstreamer = throw '' - obs-gstreamer has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-gstreamer. - ''; # Added 2021-06-01 - - obs-move-transition = throw '' - obs-move-transition has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-move-transition. - ''; # Added 2021-06-01 - - obs-multi-rtmp = throw '' - obs-multi-rtmp has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-multi-rtmp. - ''; # Added 2021-06-01 - - obs-ndi = throw '' - obs-ndi has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-ndi. - ''; # Added 2021-06-01 - - obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 - - obs-wlrobs = throw '' - wlrobs has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.wlrobs. - ''; # Added 2021-06-01 - - oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream"; # Cleanup before 20.09 - oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 - oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 - posix_man_pages = man-pages-posix; # Added 2021-04-15 - riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 - riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 - sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 - todolist = throw "todolist is now ultralist"; # Added 2020-12-27 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 + posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2022-09-24 torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 - ttyrec = ovh-ttyrec; # Added 2021-01-02 - zplugin = zinit; # Added 2021-01-30 + ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2022-09-24 + zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2022-09-24 zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 From ddb7c7bd95a25d7c4101ee111d20fe16446d947c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Sep 2022 03:58:08 +0200 Subject: [PATCH 032/114] top-level/python-aliases: prune old aliases, add missing dates This removes throws odler than 2021-09-01, converts aliases older than 2021-09-01 to throws and fills in missing dates in two cases. --- pkgs/top-level/python-aliases.nix | 77 +++++++++++++------------------ 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6f9f6accd927..acda1e472c7b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -40,21 +40,18 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 - blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 - bt_proximity = bt-proximity; # added 2021-07-02 + bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2022-09-24 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 - ConfigArgParse = configargparse; # added 2021-03-18 + ConfigArgParse = throw "'ConfigArgParse' has been renamed to/replaced by 'configargparse'"; # Converted to throw 2022-09-24 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 - dateutil = python-dateutil; # added 2021-07-03 + dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2022-09-24 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 - diff_cover = diff-cover; # added 2021-07-02 - discogs_client = discogs-client; # added 2021-07-02 - djangorestframework-jwt = drf-jwt; # added 2021-07-20 + diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2022-09-24 + discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2022-09-24 + djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2022-09-24 django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 @@ -66,26 +63,24 @@ mapAliases ({ django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11 - dns = dnspython; # added 2017-12-10 + dns = throw "'dns' has been renamed to/replaced by 'dnspython'"; # Converted to throw 2022-09-24 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 email_validator = email-validator; # added 2022-06-22 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 - faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 garminconnect-ha = garminconnect; # added 2022-02-05 - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - google_api_python_client = google-api-python-client; # added 2021-03-19 - googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2022-09-24 + googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2022-09-24 graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10 graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 - grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 + grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2022-09-24 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 - HAP-python = hap-python; # added 2021-06-01 + HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2022-09-24 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 @@ -95,10 +90,9 @@ mapAliases ({ influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 - lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 - MechanicalSoup = mechanicalsoup; # added 2021-06-01 + MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2022-09-24 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 @@ -116,9 +110,8 @@ mapAliases ({ poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 - privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 - prometheus_client = prometheus-client; # added 2021-06-10 - prompt_toolkit = prompt-toolkit; # added 2021-07-22 + prometheus_client = throw "'prometheus_client' has been renamed to/replaced by 'prometheus-client'"; # Converted to throw 2022-09-24 + prompt_toolkit = throw "'prompt_toolkit' has been renamed to/replaced by 'prompt-toolkit'"; # Converted to throw 2022-09-24 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 @@ -127,10 +120,8 @@ mapAliases ({ pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 pyjson5 = json5; # added 2022-08-28 - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pyreadability = readability-lxml; # added 2022-05-24 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 @@ -143,48 +134,43 @@ mapAliases ({ pysmart-smartx = pysmart; # added 2021-10-22 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 pytest_6 = pytest; # added 2022-02-10 - pytestcov = pytest-cov; # added 2021-01-04 - pytest-pep8 = pytestpep8; # added 2021-01-04 + pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2022-09-24 + pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2022-09-24 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 - pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 - pytestquickcheck = pytest-quickcheck; # added 2021-07-20 - pytestrunner = pytest-runner; # added 2021-01-04 + pytestquickcheck = throw "'pytestquickcheck' has been renamed to/replaced by 'pytest-quickcheck'"; # Converted to throw 2022-09-24 + pytestrunner = throw "'pytestrunner' has been renamed to/replaced by 'pytest-runner'"; # Converted to throw 2022-09-24 python-igraph = igraph; # added 2021-11-11 - python-lz4 = lz4; # added 2018-06-01 + python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2022-09-24 python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 python-subunit = subunit; # added 2021-09-10 - pytest_xdist = pytest-xdist; # added 2021-01-04 - python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 + pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2022-09-24 + python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2022-09-24 pytorch = torch; # added 2022-09-30 pytorch-bin = torch-bin; # added 2022-09-30 pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 - qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 requests_oauthlib = requests-oauthlib; # added 2022-02-12 - requests_toolbelt = requests-toolbelt; # added 2017-09-26 + requests_toolbelt = throw "'requests_toolbelt' has been renamed to/replaced by 'requests-toolbelt'"; # Converted to throw 2022-09-24 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 - ROPGadget = ropgadget; # added 2021-07-06 - rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2022-09-24 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 sapi-python-client = kbcstorage; # added 2022-04-20 - scikitlearn = scikit-learn; # added 2021-07-21 - selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 - setuptools_scm = setuptools-scm; # added 2021-06-03 + scikitlearn = throw "'scikitlearn' has been renamed to/replaced by 'scikit-learn'"; # Converted to throw 2022-09-24 + setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2022-09-24 sharkiqpy = sharkiq; # added 2022-05-21 - smart_open = smart-open; # added 2021-03-14 - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - SPARQLWrapper = sparqlwrapper; + smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2022-09-24 + SPARQLWrapper = sparqlwrapper; # Added 2022-03-31 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 - sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 + sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2022-09-24 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 @@ -192,13 +178,12 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 - tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 - websocket_client = websocket-client; # added 2021-06-15 + websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2022-09-24 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 - zc-buildout221 = zc-buildout; # added 2021-07-21 - zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; + zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2022-09-24 + zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; # Added 2021-12-08 }) From d756106b0a0ac7ea095a922b021b9716bb9ce329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 16:20:16 +0000 Subject: [PATCH 033/114] python310Packages.aiolifx: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 818d39ab3897..b4ed3861f73b 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.4"; + version = "0.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r5bBomAoRwlII8pT/2o+0va/oBr3s8b8v2jq9n6WDwI="; + hash = "sha256-+mp6MycCDInFOZTVwpOhJiLkl/qKYjPhoch6LwO5aL4="; }; propagatedBuildInputs = [ From ed4574574a74da80ae324d5f6acfeea115583e49 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Fri, 23 Sep 2022 09:12:04 -0700 Subject: [PATCH 034/114] xdg-ninja: init at 0.2.0.1 --- pkgs/tools/misc/xdg-ninja/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/xdg-ninja/default.nix diff --git a/pkgs/tools/misc/xdg-ninja/default.nix b/pkgs/tools/misc/xdg-ninja/default.nix new file mode 100644 index 000000000000..e0c59260a454 --- /dev/null +++ b/pkgs/tools/misc/xdg-ninja/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, jq, glow }: + +stdenvNoCC.mkDerivation rec { + pname = "xdg-ninja"; + version = "0.2.0.1"; + + src = fetchFromGitHub { + owner = "b3nj5m1n"; + repo = "xdg-ninja"; + rev = "v${version}"; + sha256 = "sha256-ZyqxMlyCB8gEsZTVrxgLdW/mQ/4xeTHTK+lDKIzYs6I="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + install -Dm755 xdg-ninja.sh "$out/share/xdg-ninja/xdg-ninja.sh" + install -Dm644 programs/* -t "$out/share/xdg-ninja/programs" + + mkdir -p "$out/bin" + ln -s "$out/share/xdg-ninja/xdg-ninja.sh" "$out/bin/xdg-ninja" + + wrapProgram "$out/bin/xdg-ninja" \ + --prefix PATH : "${lib.makeBinPath [ glow jq ]}" + runHook postInstall + ''; + + meta = with lib; { + description = "A shell script which checks your $HOME for unwanted files and directories"; + homepage = "https://github.com/b3nj5m1n/xdg-ninja"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ patricksjackson ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0106424aa8eb..8d62b9f83baa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12418,6 +12418,8 @@ with pkgs; xdummy = callPackage ../tools/misc/xdummy { }; + xdg-ninja = callPackage ../tools/misc/xdg-ninja { }; + xdxf2slob = callPackage ../tools/misc/xdxf2slob { }; xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; From 96de24efbad1e3f766251341db332133971913fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 18:32:14 +0000 Subject: [PATCH 035/114] onlyoffice-documentserver: 7.1.1-23 -> 7.2.0 --- pkgs/servers/onlyoffice-documentserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 703eaecf6016..8584a924f188 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.1.1-23"; + version = "7.2.0"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-hmQx8htSjFszdSAzJgiU7Lo6ebF7TVRfK8rJbJDhX5Q="; + sha256 = "sha256-BaKLOOZUrTzmBlXqo6wWRAoxrTIjUqhTzgFPNVpbueM="; }; preferLocalBuild = true; From 1fad65c54227da9c29a7a39dd5e8a2d8c9157cbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 19:42:02 +0000 Subject: [PATCH 036/114] railway: 2.0.11 -> 2.0.12 --- pkgs/development/tools/railway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 7e42d4616bb5..f8914aa773b3 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "railway"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-A8bfs8GgpsuX3QlJsjUWhgh0zXX0+HULRBQSY+lkXuE="; + sha256 = "sha256-g1ljbdRppu4IGEgYxHeaRtG8SvgQ+/+Tir1L1dfuZw4="; }; ldflags = [ "-s" "-w" ]; From c2383288423a34163d38300473f6c1989dd16deb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 20:23:35 +0000 Subject: [PATCH 037/114] shod: 2.4.0 -> 2.5.0 --- pkgs/applications/window-managers/shod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix index f9e6216a86ab..c2f0158a3b5a 100644 --- a/pkgs/applications/window-managers/shod/default.nix +++ b/pkgs/applications/window-managers/shod/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "shod"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "phillbush"; repo = "shod"; rev = "v${version}"; - sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc="; + sha256 = "sha256-hunHcYWxboCWM+SYH5u09MKP0b7U/9CVfhC6vLVpc3Q="; }; buildInputs = [ From 5243f0cacaf49ea13c52a068ec7955fd61e3ac8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 22:52:25 +0200 Subject: [PATCH 038/114] python310Packages.sensor-state-data: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 80755b26bcc4..7ccd5b941b97 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.6.0"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qu8dP0HAu6szL/GwfX6ar3P0No5HDBbULNWdjLaiLwc="; + hash = "sha256-1wSSxUMx3/UxmDQp23k1Iyv38m7oIYewjtP4gmezEtY="; }; nativeBuildInputs = [ From 1dded5d888a31995bcf4de1dc8a8ffc02dd9a381 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 22:53:18 +0200 Subject: [PATCH 039/114] python310Packages.sensor-state-data: 2.7.0 -> 2.8.0 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 7ccd5b941b97..a1c3df5150d4 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1wSSxUMx3/UxmDQp23k1Iyv38m7oIYewjtP4gmezEtY="; + hash = "sha256-oSz1MAvHf5yk7niIvlwHOJTMmemQaZeBZpBVvwJcmug="; }; nativeBuildInputs = [ From 923fae081f6e78256f032f1c1a599f48d64163ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 23:16:22 +0200 Subject: [PATCH 040/114] python310Packages.dbus-fast: 1.4.0 -> 1.11.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index f3cad737aef9..16dd1221d87b 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.4.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-vbsigiUSGeetY+1MEeQ/cO3Oj8Ah0Yg9BUPo2Gc06KU="; + hash = "sha256-j0bD8JtcMRX+G0QaxbSUqmGUw/ubrmz1ngGyzaR9UHA="; }; nativeBuildInputs = [ @@ -32,7 +32,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=dbus_fast --cov-report=term-missing:skip-covered" "" + --replace " --cov=dbus_fast --cov-report=term-missing:skip-covered" "" \ + --replace "[tool.poetry.group.dev.dependencies]" "" ''; pythonImportsCheck = [ From 4580bd4cc8c4cf03540a371544ae285dd115d33c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 23:22:47 +0200 Subject: [PATCH 041/114] python310Packages.msgspec: init at 0.9.0 --- .../python-modules/msgspec/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/msgspec/default.nix diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix new file mode 100644 index 000000000000..773adb2a50d6 --- /dev/null +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msgpack +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "msgspec"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jcrist"; + repo = pname; + rev = version; + hash = "sha256-8guKmEnDAOVzBuSvqy5V+dWY1f8FPbysMZTe9FVJPxQ="; + }; + + # Requires libasan to be accessible + doCheck = false; + + pythonImportsCheck = [ + "msgspec" + ]; + + meta = with lib; { + description = "Module to handle JSON/MessagePack"; + homepage = "https://github.com/jcrist/msgspec"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb4600bcaaec..a3993a9a6973 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5873,6 +5873,8 @@ in { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + msgspec = callPackage ../development/python-modules/msgspec { }; + msldap = callPackage ../development/python-modules/msldap { }; msoffcrypto-tool = callPackage ../development/python-modules/msoffcrypto-tool { }; From 62afcb75260520b5cd87eed6273289000362b652 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 23:30:25 +0200 Subject: [PATCH 042/114] python310Packages.json-stream: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/json-stream/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 15f6724af79e..5ccda914b226 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zsjKOqkXy3Je7z8U4M016a4t2cWdUqL2tf27Dc8a/gw="; + hash = "sha256-6VWAaTjzVDss01aFI53Lg0oNuus5u4TRF/co9DHOhLU="; }; propagatedBuildInputs = [ @@ -30,6 +30,10 @@ buildPythonPackage rec { "json_stream" ]; + disabledTests = [ + "test_writer" + ]; + meta = with lib; { description = "Streaming JSON parser"; homepage = "https://github.com/daggaz/json-stream"; From d41cac455b1fb8b8e3682ef1fe5c9f109768d554 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 23:36:04 +0200 Subject: [PATCH 043/114] python310Packages.govee-ble: 0.17.3 -> 0.19.0 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 2d6453e0f6e6..28c3110d4202 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.17.3"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0tUTqSxpOYhdrXbe0/Rqr9HkQ8kJKJFK6GHLX6740hc="; + hash = "sha256-KMWz/CiF0Xti8G31T6JAJfUJEUpBa5QczjrQeA2KcrA="; }; nativeBuildInputs = [ From 0e3a9cae0d7e27bd52ffea141a6c53c3770130e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 00:02:50 +0200 Subject: [PATCH 044/114] python310Packages.aiounifi: 34 -> 35 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index b25fa9839b3c..8425cb3f86c7 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "34"; + version = "35"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NxxM1rU781QTfNWfE6maNovPZNDwU54ST1lxhTKmmBA="; + hash = "sha256-mKAg6LNtHEmF223xIrZM7rSxE2+B4jUPCv0dCtHmHXc="; }; propagatedBuildInputs = [ From fb0385eb6bde2d83c31fb24737287cc140ebe683 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 00:05:48 +0200 Subject: [PATCH 045/114] python310Packages.boschshcpy: 0.2.34 -> 0.2.35 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index e42df94cbe1a..9b824c33e7b2 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.34"; + version = "0.2.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-GVJw0ugvzP7gGOhaV03JxWGUlStnedbRVV1+S7BDU/w="; + sha256 = "sha256-MzVv0HN87eDsz0mP/rqH6FZVRgq95iTuu8mikkofT30="; }; propagatedBuildInputs = [ From 954d07720abcf28ef7cd9152d380ddfb7992db1c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 23 Apr 2022 11:28:20 -0300 Subject: [PATCH 046/114] muon: init at unstable-2022-09-24 --- .../tools/build-managers/muon/default.nix | 138 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 + 2 files changed, 144 insertions(+) create mode 100644 pkgs/development/tools/build-managers/muon/default.nix diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix new file mode 100644 index 000000000000..937b53dac293 --- /dev/null +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -0,0 +1,138 @@ +{ lib +, stdenv +, fetchFromSourcehut +, fetchurl +, curl +, libarchive +, libpkgconf +, pkgconf +, python3 +, samurai +, scdoc +, zlib +, embedSamurai ? false +, buildDocs ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "muon" + + lib.optionalString embedSamurai "-embedded-samurai"; + version = "unstable-2022-09-24"; + + src = fetchFromSourcehut { + name = "muon-src"; + owner = "~lattis"; + repo = "muon"; + rev = "f385c82a6104ea3341ca34756e2812d700bc43d8"; + hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0="; + }; + + nativeBuildInputs = [ + pkgconf + samurai + ] + ++ lib.optionals buildDocs [ + (python3.withPackages (ps: [ ps.pyyaml ])) + scdoc + ]; + + buildInputs = [ + curl + libarchive + libpkgconf + samurai + zlib + ]; + + strictDeps = true; + + postUnpack = let + # URLs manually extracted from subprojects directory + meson-docs-wrap = fetchurl { + name = "meson-docs-wrap"; + url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz"; + hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg="; + }; + + samurai-wrap = fetchurl { + name = "samurai-wrap"; + url = "https://mochiro.moe/wrap/samurai-1.2-28-g4e3a595.tar.gz"; + hash = "sha256-TZAEwndVgoWr/zhykfr0wcz9wM96yG44GfzM5p9TpBo="; + }; + in '' + pushd $sourceRoot/subprojects + ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"} + ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"} + popd + ''; + + postPatch = '' + patchShebangs bootstrap.sh + '' + + lib.optionalString buildDocs '' + patchShebangs subprojects/meson-docs/docs/genrefman.py + ''; + + # tests try to access "~" + postConfigure = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = let + featureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; + conditionFlag = condition: flag: + "-D${condition}=${lib.boolToString flag}"; + cmdlineForMuon = lib.concatStringsSep " " [ + (conditionFlag "static" stdenv.targetPlatform.isStatic) + (featureFlag "docs" buildDocs) + (featureFlag "samurai" embedSamurai) + ]; + cmdlineForSamu = "-j$NIX_BUILD_CORES"; + in '' + runHook preBuild + + ./bootstrap.sh stage-1 + + ./stage-1/muon setup ${cmdlineForMuon} stage-2 + samu ${cmdlineForSamu} -C stage-2 + + stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 + samu ${cmdlineForSamu} -C stage-3 + + runHook postBuild + ''; + + # tests are failing because they don't find Python + doCheck = false; + + checkPhase = '' + runHook preCheck + + ./stage-3/muon -C stage-3 test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + stage-3/muon -C stage-3 install + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://muon.build/"; + description = "An implementation of Meson build system in C99"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; # typical `ar failure` + }; +}) +# TODO LIST: +# 1. setup hook +# 2. multiple outputs +# 3. automate sources acquisition (especially wraps) +# 4. tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea2767d8e99b..615b0998cc5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17200,6 +17200,12 @@ with pkgs; samurai = callPackage ../development/tools/build-managers/samurai { }; + muon = callPackage ../development/tools/build-managers/muon { }; + muonStandalone = muon.override { + embedSamurai = true; + buildDocs = false; + }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; From 0a564318e84a720f2139a3927e622e85583102e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Sep 2022 01:34:37 +0200 Subject: [PATCH 047/114] nixos/onlyoffice: fix database upgrades --- nixos/modules/services/web-apps/onlyoffice.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index ad0a527759ca..db4a9582794e 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -252,7 +252,10 @@ in .rabbitmq.url = "${cfg.rabbitmqUrl}" ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json - if ! psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then + if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then + psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql + psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql + else psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql fi ''; From 86f15e11b5dec57cd6e8c4e6b95e40818f217648 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 23:43:13 +0000 Subject: [PATCH 048/114] python310Packages.dj-email-url: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/dj-email-url/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index b10b8ec93136..ec3e95139a2b 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.0.5"; + version = "1.0.6"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk="; + sha256 = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo="; }; checkPhase = '' From 56bb9fb23d8f2b31f664d0120d4932a619ed8245 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Sep 2022 20:12:47 -0400 Subject: [PATCH 049/114] python3Packages.vector: init at 0.10.0 --- .../python-modules/vector/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/vector/default.nix diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix new file mode 100644 index 000000000000..706c6eb85ec8 --- /dev/null +++ b/pkgs/development/python-modules/vector/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "vector"; + version = "0.10.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490"; + }; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vector" ]; + + meta = with lib; { + description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; + homepage = "https://github.com/scikit-hep/vector"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb4600bcaaec..a151f079da6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11508,6 +11508,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vector = callPackage ../development/python-modules/vector { }; + vehicle = callPackage ../development/python-modules/vehicle { }; vega = callPackage ../development/python-modules/vega { }; From 5ac4f45f728fc44ddc95f7beabbdc0b9102e508f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:50:21 -0700 Subject: [PATCH 050/114] mxnet: patch to fix build on aarch64-darwin The patches autodetect when the system is x86 and supports SSE. --- .../applications/science/math/mxnet/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 599d97639742..9a1b550d882d 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, fetchpatch, bash, cmake , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 , cudnnSupport ? cudaSupport @@ -21,6 +21,21 @@ stdenv.mkDerivation rec { hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI="; }; + patches = [ + # Remove the following two patches when updating mxnet to 2.0. + (fetchpatch { + name = "1-auto-disable-sse-for-non-x86.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/55e69871d4cadec51a8bbb6700131065388cb0b9.patch"; + hash = "sha256-uaMpM0F9HRtEBXz2ewB/dlbuKaY5/RineCPUE2T6CHU="; + }) + (fetchpatch { + name = "2-auto-disable-sse-for-non-x86.patch"; + url = "https://github.com/apache/incubator-mxnet/commit/c1b96f562f55dfa024ac941d7b104f00e239ee0f.patch"; + excludes = ["ci/docker/runtime_functions.sh"]; + hash = "sha256-r1LbC8ueRooW5tTNakAlRSJ+9aR4WXXoEKx895DgOs4="; + }) + ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ opencv3 gtest blas.provider ] From 771bd3212ba864941ede0574988b8f6040a1b101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 00:54:30 +0000 Subject: [PATCH 051/114] python310Packages.fjaraskupan: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/fjaraskupan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index 9eb9e814981e..fb73d00afc5c 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fjaraskupan"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "elupus"; repo = pname; - rev = version; - hash = "sha256-ohadGQxtW8YcSDIF7xZhy84xu0Vi5yj/QEVi8WRRBSI="; + rev = "refs/tags/${version}"; + hash = "sha256-i7816KJraHkrXKYA+vhKMs5xhXksnYc2uYiE0pPEicw="; }; propagatedBuildInputs = [ From 237197eff57536b9779579b22dc158d91841c405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 01:18:50 +0000 Subject: [PATCH 052/114] python310Packages.gaphas: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/gaphas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 3c8933686b22..52bbf757dc9e 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.6.0"; + version = "3.7.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yleYbAJdDVzZrMQ3izi9UX3Ji1vIuQDc+RK5+wzrMi4="; + sha256 = "sha256-iT8Gez8PgIrdAS9Kd83aY1yOQFL45KB+SES/50wTFEI="; }; nativeBuildInputs = [ From e5cac189d4c266d742a44611e019a91b4e3cda72 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Sat, 24 Sep 2022 22:15:54 -0300 Subject: [PATCH 053/114] luaPackages: fennel -> luaPackages.fennel --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/development/compilers/fennel/default.nix | 31 ------------------- .../lua-modules/generated-packages.nix | 26 ++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 9 ++++++ pkgs/development/tools/fnlfmt/default.nix | 6 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/compilers/fennel/default.nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 650a7d94c4de..85edf354ad42 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -14,6 +14,7 @@ cqueues,,,,,,vcunat cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, +fennel,,,,,,misterio77 fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix deleted file mode 100644 index 9362c34808d3..000000000000 --- a/pkgs/development/compilers/fennel/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }: - -stdenv.mkDerivation rec { - pname = "fennel"; - version = "1.2.0"; - - src = fetchFromSourcehut { - owner = "~technomancy"; - repo = pname; - rev = version; - sha256 = "sha256-TXmqvhT7Ab+S0UdLgl4xWrVvE//eCbu6qNnoxB7smE4="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ lua ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - postInstall = '' - installManPage fennel.1 - ''; - - meta = with lib; { - description = "A Lua Lisp language"; - homepage = "https://fennel-lang.org/"; - license = licenses.mit; - platforms = lua.meta.platforms; - maintainers = [ maintainers.maaslalani ]; - }; -} diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2065c3ebd2d5..263ffab64d06 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -453,6 +453,32 @@ buildLuarocksPackage { }; }) {}; +fennel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { + pname = "fennel"; + version = "1.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/fennel-1.2.0-1.rockspec"; + sha256 = "14qr0gldqgvzx3yzfjvy48inqn46xf0d92pcxp3hr1a17sf7xqmf"; + }).outPath; + src = fetchurl { + url = "https://fennel-lang.org/downloads/fennel-1.2.0.tar.gz"; + sha256 = "0ymnsri27pj98jbwx7hxsn1w39rxns0i8ds1fl421spc13gx88gx"; + }; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://fennel-lang.org/"; + description = "A lisp that compiles to Lua"; + maintainers = with lib.maintainers; [ misterio77 ]; + license.fullName = "MIT"; + }; +}) {}; + fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchzip, lua }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 556d0616ddb6..56e23c73f5d7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -29,6 +29,15 @@ with prev; ''; }); + fennel = prev.fennel.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs ++ [ + pkgs.installShellFiles + ]; + postInstall = '' + installManPage fennel.1 + ''; + }); + cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl_1_1; } diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index f762e5453cfa..702c90d36a5b 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromSourcehut, fennel, lua }: +{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }: stdenv.mkDerivation rec { pname = "fnlfmt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg="; }; - nativeBuildInputs = [ fennel ]; + nativeBuildInputs = [ luaPackages.fennel ]; buildInputs = [ lua ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { runHook preBuild echo "#!${lua}/bin/lua" > fnlfmt - ${fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt + ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt chmod +x fnlfmt runHook postBuild diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 63ad3a03fc9f..238b1a0c113b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -339,6 +339,7 @@ mapAliases ({ fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo_toolkit'"; # Converted to throw 2022-09-24 fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 + inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af157a6218ad..85cafda6b282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13394,8 +13394,6 @@ with pkgs; fasmg = callPackage ../development/compilers/fasmg { }; - fennel = callPackage ../development/compilers/fennel { }; - firrtl = callPackage ../development/compilers/firrtl { }; flasm = callPackage ../development/compilers/flasm { }; From 4419927a5cdc178e35ba81d458b1ee8a7ed9f952 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 24 Sep 2022 22:47:00 -0300 Subject: [PATCH 054/114] gp2c: 0.0.12 -> 0.0.13 Also, inheriting meta attributes from pari. --- pkgs/applications/science/math/pari/gp2c.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 7f31543a925f..512aaba78d54 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"; + hash = "sha256-JhN07Kc+vXbBEqlZPcootkgSqnYlYf2lpLLCzXmmnTY="; }; buildInputs = [ @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A compiler to translate GP scripts to PARI programs"; homepage = "http://pari.math.u-bordeaux.fr/"; + description = "A compiler to translate GP scripts to PARI programs"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + inherit (pari.meta) license maintainers platforms broken; }; } From c897c59a4a4a9e04f3283296c214ae9982fa718b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 24 Sep 2022 22:52:31 -0300 Subject: [PATCH 055/114] pari: remove myself from maintainers Because it is now mostly managed by the Sage team, and I don't want to be in a team for now. --- pkgs/applications/science/math/pari/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 9f13914474c1..933ad45fd519 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -3,10 +3,11 @@ , fetchurl , gmp , libX11 +, libpthreadstubs , perl , readline , tex -, withThread ? true, libpthreadstubs +, withThread ? true }: assert withThread -> libpthreadstubs != null; @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; + maintainers = with maintainers; [ ertes ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin && stdenv.isAarch64; mainProgram = "gp"; From c88be6d6c71549347d135806ae7f1d159c97ac8c Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 24 Sep 2022 20:11:41 -0700 Subject: [PATCH 056/114] mmdoc: 0.10.0 -> 0.12.0 --- pkgs/tools/text/mmdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix index bc92bb2d45f7..6399c3333c12 100644 --- a/pkgs/tools/text/mmdoc/default.nix +++ b/pkgs/tools/text/mmdoc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mmdoc"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = version; - hash = "sha256-c2YwlvJQfVRjldzfOjTSztIUg64GWq+5ijkFxp4qA8I="; + hash = "sha256-wg0wFZMijwTWU6B3PuQ785F98JqObDMvltHaI5ltpx8="; }; nativeBuildInputs = [ ninja meson pkg-config xxd ]; From 87cfa16c707a9be3c8f3a77fc0545e7058bf70f6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 25 Sep 2022 11:39:37 +1000 Subject: [PATCH 057/114] terraform-providers: update 2022-09-25 --- .../terraform-providers/providers.json | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fa65a70f401f..b2295f6ea744 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -102,13 +102,13 @@ "version": "2.24.0" }, "aws": { - "hash": "sha256-v+ye1qynG958XHvAcg954toIjVHIyoa5dcKXUB8zi8E=", + "hash": "sha256-nIFfPAuRZv+deLHDhOhl27TcIkVFIrI704RmlK9fH38=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.31.0", - "vendorHash": "sha256-99iNQPVOhuKOGq2VRExm6y6Ab/NzaRmJxwRJfmkYycM=", - "version": "4.31.0" + "rev": "v4.32.0", + "vendorHash": "sha256-qnh28bbG5k6jMUepcxtgDWk1DptQiXjkg702QtYIM28=", + "version": "4.32.0" }, "azuread": { "hash": "sha256-r7trdPrlvZ5rW75L7AEkG1baQaLMXnZ48Axi552nPIM=", @@ -120,13 +120,13 @@ "version": "2.28.1" }, "azurerm": { - "hash": "sha256-gUZTP2oOGAv75pBjLHs3mFBuzEFn7oqnAJw7S3SBWb0=", + "hash": "sha256-5HMy28/AnUH+18i5eBm1OjQZElvrXsWd6jwQteFCpR4=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.23.0", + "rev": "v3.24.0", "vendorHash": null, - "version": "3.23.0" + "version": "3.24.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -139,13 +139,13 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-uKq0mgIhoV5tszbK944DfZRDsqteDtaE0fI+75o79Cc=", + "hash": "sha256-0tu+WwL5aZVhmQs30KwY7ctlPqhcYb179QVLI3wGedw=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.15.8", + "rev": "v1.15.9", "vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=", - "version": "1.15.8" + "version": "1.15.9" }, "bigip": { "hash": "sha256-fh1RRl+NLKTLLFUGK5gkWqWMCzUwHBFk69Tc0JIuFgs=", @@ -269,13 +269,13 @@ "version": "0.4.5" }, "consul": { - "hash": "sha256-QX0f9yM408HfdGNIpmkAKFUz0RfH90V4WBt1Hnwzoy8=", + "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.15.1", - "vendorHash": null, - "version": "2.15.1" + "rev": "v2.16.2", + "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=", + "version": "2.16.2" }, "ct": { "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", @@ -368,13 +368,13 @@ "version": "1.9.0" }, "exoscale": { - "hash": "sha256-yjpO36B5r4//2ytPe4pwvQ5A8r4hF3nL6M7/SRI0Ml8=", + "hash": "sha256-d+CMg3wYHsOYow8LG7P+qcszUBiCbNwEp1zCJN7yZKo=", "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.40.2", + "rev": "v0.41.0", "vendorHash": null, - "version": "0.40.2" + "version": "0.41.0" }, "external": { "hash": "sha256-gImRxsDUgBHmw/5DeKcO9BzB906JB8dUcSGKQj+Vcy0=", @@ -424,13 +424,13 @@ "version": "2.1.0" }, "github": { - "hash": "sha256-wslz9Nf4f1g9dkZYXhE6Xvg/rNOgGKuv/gh1SfP4/co=", + "hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.2.0", + "rev": "v5.3.0", "vendorHash": null, - "version": "5.2.0" + "version": "5.3.0" }, "gitlab": { "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", @@ -471,13 +471,13 @@ "version": "0.7.0" }, "grafana": { - "hash": "sha256-iUo7fhUDklFy6pSoZUe2ymEbRbf69dxirASFwSBmJvc=", + "hash": "sha256-ccU2jj/0bpKpu/YxJOtPONup0W10OP3O0iRMVayvGVM=", "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.28.2", - "vendorHash": "sha256-YEkJgNtF7I1ofNjRBaIa6u/KFQZcxpR0+uBf+5D5FiM=", - "version": "1.28.2" + "rev": "v1.29.0", + "vendorHash": "sha256-oswrLzRQkXiwmjtP8xBGCaKSurbXyvZkSF4zoj0WPcw=", + "version": "1.29.0" }, "gridscale": { "hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", @@ -779,13 +779,13 @@ "version": "0.6.12" }, "newrelic": { - "hash": "sha256-qTXnS7ZBHD33W0gcCNnq/Zg99l58Hb+dDl2Ck5wKl8Q=", + "hash": "sha256-xh7ufhv0zHTHS1aMz15PKlKoNPSDhXOIeSxj6tvRKKo=", "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.2.1", + "rev": "v3.3.0", "vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=", - "version": "3.2.1" + "version": "3.3.0" }, "nomad": { "hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=", @@ -834,13 +834,13 @@ "version": "1.7.1" }, "oci": { - "hash": "sha256-xFDdEGa170VPxDOteLnerF+QGHbQP+3+RL4qEPWkUHo=", + "hash": "sha256-qB/sRPvX+srpySJPDWxoZviVFtbVTK9hwAR6D4pyjmc=", "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.93.0", + "rev": "v4.94.0", "vendorHash": null, - "version": "4.93.0" + "version": "4.94.0" }, "okta": { "hash": "sha256-rgDBZsbXBzBcDgVoaFkPD27Ezef9J23oqtBJAHqJrrE=", @@ -879,22 +879,22 @@ "version": "1.48.0" }, "opentelekomcloud": { - "hash": "sha256-gjHRzDyxD9DA0k9H1gfEkFZ3nTzxXUkrCmAJ0CXLEwc=", + "hash": "sha256-X4e74tgqHbt9j5prq2Zjqbcmwvr6m1UDFp5y1xfwkEQ=", "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.3", - "vendorHash": "sha256-MGtxmZwo+Av6c7KPUzjSLoizVXbS3TltGxjoCUbeEb0=", - "version": "1.31.3" + "rev": "v1.31.4", + "vendorHash": "sha256-ARlkXkty4/h86cmWnmKnP1Vhzt7oTOOxSFraNGp2BWs=", + "version": "1.31.4" }, "opsgenie": { - "hash": "sha256-IoN7z8/ZPEr6pW7vnDjY65+gAtncV1fr+YsnggSZuZA=", + "hash": "sha256-hdLKa2usoDedzOlzPQrADJOqIxtANqTeTamn/DakRh4=", "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.14", + "rev": "v0.6.15", "vendorHash": null, - "version": "0.6.14" + "version": "0.6.15" }, "ovh": { "hash": "sha256-DHk1AUxHuXLrPiRhfAtJDDNT4TYH1XsUzBqjKGvPK7c=", @@ -996,13 +996,13 @@ "version": "0.4.3" }, "scaleway": { - "hash": "sha256-bYy3bTn5mFbu0Y7hy7KY2ZkU2xMC0HgBRRh7cxT/A9s=", + "hash": "sha256-EPbh9lUcamFe33EKj2TzzaKChOU8fQb5/uigln2ALJ8=", "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.9", - "vendorHash": "sha256-Jg1FalV+WsKYOZpszeNYydP4Qtf2cdaZt7xz4O699wc=", - "version": "2.2.9" + "rev": "v2.3.0", + "vendorHash": "sha256-C4viIkYpu9B79kDByyg8cTCsXW6fGued280kIPAYHjc=", + "version": "2.3.0" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1059,13 +1059,13 @@ "version": "0.14.5" }, "snowflake": { - "hash": "sha256-RmCmiQKVNAQexYKFp9shbfPbWUFlJSTCOFUcgADyJg4=", + "hash": "sha256-1aHhiZhswlLzEBkvjFQI7jLPAX2/KLxE0oKLspnRtQI=", "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.44.0", + "rev": "v0.45.0", "vendorHash": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=", - "version": "0.44.0" + "version": "0.45.0" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", @@ -1113,13 +1113,13 @@ "version": "2.19.0" }, "tencentcloud": { - "hash": "sha256-Sn58Xyj0UoVX7YfuLyuUVGrPEWYOH0O5YoTk8vYQQVA=", + "hash": "sha256-aC/KtMOl5Ldrlme9Bd4E4UQSLVsKFsJbsL9KMGDmJbo=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.77.11", + "rev": "v1.78.0", "vendorHash": null, - "version": "1.77.11" + "version": "1.78.0" }, "tfe": { "hash": "sha256-DRbJ1ZmYMkEncZHE12uLcNHhbSnxvyG3IYqlUsxs+pI=", @@ -1186,13 +1186,13 @@ "version": "1.32.2" }, "utils": { - "hash": "sha256-KgQnccuNEppJsSF+mddkss1uFCsfx2egdNffQ8a/6Pg=", + "hash": "sha256-FYOu48Bg8iMfNl+2EETBMxEfwg2ToO+Oexz1yPi0g38=", "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.1.0", - "vendorHash": "sha256-tiujJ9jqTHQtxyYo8HKEKETpcRmfXR6cObBKmB8YzfE=", - "version": "1.1.0" + "rev": "1.2.0", + "vendorHash": "sha256-eDNA4zvOYnWvaCHhNHWOjy1VstG1nITWkCMOilu9Wxg=", + "version": "1.2.0" }, "vault": { "hash": "sha256-fEITfA3XXyUiILPse7fOmBW8M6dzEIUMg+7b3l4z2vo=", @@ -1276,12 +1276,12 @@ "version": "3.2.0" }, "yandex": { - "hash": "sha256-fnN1Gghgwbbxz8WWr/RJi59+SI+0th4NdB59l+3aVVY=", + "hash": "sha256-h8uMN08lwpG8gnCd4jnz/+eIfJEQnZcexW/THYLM4/8=", "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.79.0", + "rev": "v0.80.0", "vendorHash": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=", - "version": "0.79.0" + "version": "0.80.0" } } From a233e59d190efc4eeee5067484473d2c09a1547b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 25 Sep 2022 00:38:04 -0500 Subject: [PATCH 058/114] nixos/pam: fix deprecated gnome3 reference --- nixos/modules/security/pam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c4d891333f57..c74f66d91829 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1279,7 +1279,7 @@ in mr ${pkgs.pam_mount}/lib/security/pam_mount.so, '' + optionalString (isEnabled (cfg: cfg.enableGnomeKeyring)) '' - mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so, + mr ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so, '' + optionalString (isEnabled (cfg: cfg.startSession)) '' mr ${config.systemd.package}/lib/security/pam_systemd.so, From e4b57b1481e0ad56f5c196ccb880e2f8ddecfc44 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Sun, 25 Sep 2022 11:18:29 +0530 Subject: [PATCH 059/114] maintainers: add meain --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b48c2fa0c9b..f176a029d8a4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8591,6 +8591,13 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + meain = { + email = "mail@meain.io"; + matrix = "@meain:matrix.org"; + github = "meain"; + githubId = 14259816; + name = "Abin Simon"; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; From c87abaa0f77effca6757145631be78fd5cc93a11 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 25 Sep 2022 01:39:26 -0500 Subject: [PATCH 060/114] jaq: init at 0.8.0 --- pkgs/development/tools/jaq/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/jaq/default.nix diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix new file mode 100644 index 000000000000..9c28cdf73994 --- /dev/null +++ b/pkgs/development/tools/jaq/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "jaq"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "01mf02"; + repo = "jaq"; + rev = "v${version}"; + sha256 = "sha256-4WCVXrw/v3cGsl7S1nGqKmWrIHeM/ODCXQBxQJgZLjw="; + }; + + cargoSha256 = "sha256-D+Wpzgj05PJcMlGS9eL43SdncHO/q1Wt00gvPlC7ZAE="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A jq clone focused on correctness, speed and simplicity"; + homepage = "https://github.com/01mf02/jaq"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85cafda6b282..454f8ec6f0b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7866,6 +7866,10 @@ with pkgs; usePulseaudio = true; }; + jaq = callPackage ../development/tools/jaq { + inherit (darwin.apple_sdk.frameworks) Security; + }; + jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; jazzy = callPackage ../development/tools/jazzy { }; From 4afb3c31c3319c47719097abe1a49deffe69dd13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 08:49:26 +0200 Subject: [PATCH 061/114] python310Packages.dj-email-url: disable on older Python releases --- .../python-modules/dj-email-url/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index ec3e95139a2b..f539a637d4f4 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -2,15 +2,19 @@ , buildPythonPackage , fetchPypi , python +, pythonOlder }: buildPythonPackage rec { - version = "1.0.6"; pname = "dj-email-url"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo="; + hash = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo="; }; checkPhase = '' @@ -21,9 +25,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/migonzalvar/dj-email-url"; description = "Use an URL to configure email backend settings in your Django Application"; + homepage = "https://github.com/migonzalvar/dj-email-url"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From dd76aebb98123e2064f8a1f657db449d8af193b3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 25 Sep 2022 01:46:46 -0500 Subject: [PATCH 062/114] trealla: 1.20.31 -> 2.2.6 --- .../interpreters/trealla/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 45e63d98bdae..770661c60534 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, readline, openssl, withThread ? true, withSSL ? true, xxd }: +{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, withThread ? true, withSSL ? true, xxd }: stdenv.mkDerivation rec { pname = "trealla"; - version = "1.20.31"; + version = "2.2.6"; src = fetchFromGitHub { - owner = "infradig"; + owner = "trealla-prolog"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A="; + sha256 = "sha256-DxlexijQPcNxlPjo/oIvsN//8nZ0injXFHc2t3n4yjg="; }; postPatch = '' @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ xxd ]; - buildInputs = [ readline openssl ]; + buildInputs = [ readline openssl libffi ]; + enableParallelBuilding = true; installPhase = '' install -Dm755 -t $out/bin tpl @@ -34,13 +35,16 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = '' - # Disable test 81 due to floating point error - rm tests/issues/test081.expected tests/issues/test081.pl + # Disable tests due to floating point error + rm tests/issues-OLD/test081.pl + rm tests/issues-OLD/test585.pl + # Disable test due to Unicode issues + rm tests/issues-OLD/test252.pl ''; meta = with lib; { description = "A compact, efficient Prolog interpreter written in ANSI C"; - homepage = "https://github.com/infradig/trealla"; + homepage = "https://github.com/trealla-prolog/trealla"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; mainProgram = "tpl"; From 63d54a85c19b55df8a05c76210bd862b338af62b Mon Sep 17 00:00:00 2001 From: Rishi Desai Date: Sun, 25 Sep 2022 00:06:04 -0700 Subject: [PATCH 063/114] humility: init at unstable-2022-09-15 A debugger for the Hubris RTOS --- .../tools/rust/humility/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/rust/humility/default.nix diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix new file mode 100644 index 000000000000..92e3e78077c1 --- /dev/null +++ b/pkgs/development/tools/rust/humility/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, libusb +, libftdi +, cargo-readme +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "humility"; + version = "unstable-2022-09-15"; + + nativeBuildInputs = [ pkg-config cargo-readme ]; + buildInputs = [ libusb libftdi ]; + + src = fetchFromGitHub { + owner = "oxidecomputer"; + repo = pname; + rev = "d336c21c7b6da7f8203a9331c7657581de2bc6ad"; + sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY="; + }; + + cargoSha256 = "sha256-UhO8VO3OCfYc8Xq/P+l9f5ZrhOD/TBzSClAeAXLJLlc="; + + meta = with lib; { + description = "Debugger for Hubris"; + homepage = "https://github.com/oxidecomputer/humility"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ therishidesai ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3d5098ba676..5c6756888a3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24438,6 +24438,8 @@ with pkgs; htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; + humility = callPackage ../development/tools/rust/humility {}; + btop = callPackage ../tools/system/btop { stdenv = gcc11Stdenv; }; From acf5b5d79d8c6046b24b9b38353402709c4aecdf Mon Sep 17 00:00:00 2001 From: Rishi Desai Date: Sun, 25 Sep 2022 00:06:56 -0700 Subject: [PATCH 064/114] add therishidesai to the maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b48c2fa0c9b..541a950edcbd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13276,6 +13276,12 @@ githubId = 57180880; name = "Ansh Tyagi"; }; + therishidesai = { + email = "desai.rishi1@gmail.com"; + github = "therishidesai"; + githubId = 5409166; + name = "Rishi Desai"; + }; thesola10 = { email = "me@thesola.io"; github = "Thesola10"; From 00f75d8a4f6007c8e22cb93902eac30fe686a546 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 10 Jan 2022 14:39:52 +0100 Subject: [PATCH 065/114] bluemail: init at 1.131.4-1795 --- .../mailreaders/bluemail/default.nix | 82 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/bluemail/default.nix diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/applications/networking/mailreaders/bluemail/default.nix new file mode 100644 index 000000000000..50dec500870a --- /dev/null +++ b/pkgs/applications/networking/mailreaders/bluemail/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, lib +, fetchurl +, dpkg +, autoPatchelfHook +, pango +, gtk3 +, alsa-lib +, nss +, libXdamage +, libdrm +, mesa +, libxshmfence +, makeWrapper +, wrapGAppsHook +, gcc-unwrapped +, udev +}: + +stdenv.mkDerivation rec { + pname = "bluemail"; + version = "1.131.4-1795"; + + # Taking a snapshot of the DEB release because there are no tagged version releases. + # For new versions, download the upstream release, extract it and check for the version string. + # In case there's a new version, create a snapshot of it on https://archive.org before updating it here. + src = fetchurl { + url = "https://web.archive.org/web/20220921124548/https://download.bluemail.me/BlueMail/deb/BlueMail.deb"; + sha256 = "sha256-deO+D9HSfj1YEDSO5Io0MA7H8ZK9iFSRwB/e+8GkgOU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + dpkg + wrapGAppsHook + ]; + + buildInputs = [ + pango + gtk3 + alsa-lib + nss + libXdamage + libdrm + mesa + libxshmfence + udev + ]; + + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + + dontBuild = true; + dontStrip = true; + dontWrapGApps = true; + + installPhase = '' + mkdir -p $out/bin + mv opt/BlueMail/* $out + ln -s $out/bluemail $out/bin/bluemail + ''; + + makeWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" + ]; + + preFixup = '' + wrapProgram $out/bin/bluemail \ + ''${makeWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} + ''; + + meta = with lib; { + description = "Free, secure, universal email app, capable of managing an unlimited number of mail accounts"; + homepage = "https://bluemail.me"; + license = licenses.unfree; + platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f250222cc5e..3fa5de6054fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26955,6 +26955,8 @@ with pkgs; bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; + bluemail = callPackage ../applications/networking/mailreaders/bluemail { }; + blugon = callPackage ../applications/misc/blugon { }; bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; From 2bc8cde50872937b3e2629bf13ad2835f25d2004 Mon Sep 17 00:00:00 2001 From: Goetz Date: Sun, 18 Sep 2022 19:33:04 +0200 Subject: [PATCH 066/114] Add me as a maintainer of the package Fix: Sort mrtarantoga alphabetical --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dfe49de5e371..95218eb8347e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8920,6 +8920,12 @@ githubId = 15896005; name = "Vladyslav Burzakovskyy"; }; + mrtarantoga = { + email = "goetz-dev@web.de"; + name = "Götz Grimmer"; + github = "MrTarantoga"; + githubId = 53876219; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; From 3be64031269cd1b384bcf0afca8151805ab8b497 Mon Sep 17 00:00:00 2001 From: Goetz Date: Sun, 25 Sep 2022 10:59:54 +0200 Subject: [PATCH 067/114] quarto: init at 1.1.189 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quarto is a library/support package for several pandoc projects. Fix: Remove trailing whitespace Add final newline to default.nix Fix indention and newline errors Fix: Missed unpackPhase resolved Add: sourceProvenance Suggestion of: https://github.com/NixOS/nixpkgs/pull/186697#discussion_r945336064 Fix: reduce imports Fix: use version attribute in download string Fix: reduce path expression Fix: add runHook {pre/post}Install as common practice Fix: replace gpl2 with gpl2Plus Fix: change maintainers description Fix: do not use symlinks, use the PATH instead Fix wrong platforms ++ means concatenation and is not correct in this context. Co-authored-by: Sandro Change structure to support fixed output derivations Co-authored-by: Sandro Fix Fix Apply suggestion Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Fix suggestion Bundle makeProgram function call Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Update library version from 1.0.38 to 1.1.189 Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Add missing dependencies Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> pandoc, deno, esbuild can be hooked into QUARTO_* environment variables, so they are not needed in buildInputs. Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Fix deno-path patch Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Remove wrong spaces Add python3 jupyter host support Fix spacing Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Sort quarto in all-packages.nix alphabetical Remove lib prefix from maintainers Co-authored-by: Sebastián Mancilla <238528+smancill@users.noreply.github.com> Simplify mkdir command Co-authored-by: Sandro Fix missusage of makeBinPath Co-authored-by: Sandro Remove python3Packages -> not used Co-authored-by: Sandro Remove punctuation from description Co-authored-by: Sandro Fix review Error in https://github.com/NixOS/nixpkgs/pull/186697#discussion_r975107345 Fix wrong path for import_map.json Do not strip downloaded binary --- pkgs/development/libraries/quarto/default.nix | 68 +++++++++++++++++++ .../libraries/quarto/fix-deno-path.patch | 8 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 78 insertions(+) create mode 100644 pkgs/development/libraries/quarto/default.nix create mode 100644 pkgs/development/libraries/quarto/fix-deno-path.patch diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix new file mode 100644 index 000000000000..d78432f734f4 --- /dev/null +++ b/pkgs/development/libraries/quarto/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, pandoc +, esbuild +, deno +, fetchurl +, nodePackages +, rWrapper +, rPackages +, makeWrapper +, python3 +}: + +stdenv.mkDerivation rec { + pname = "quarto"; + version = "1.1.189"; + src = fetchurl { + url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; + sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7"; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + patches = [ + ./fix-deno-path.patch + ]; + + dontStrip = true; + + preFixup = '' + wrapProgram $out/bin/quarto \ + --prefix PATH : ${lib.makeBinPath [ deno ]} \ + --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ + --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ + --prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \ + --prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown]; }}/bin/R \ + --prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ])}/bin/python3 + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + + rm -r bin/tools + + mv bin/* $out/bin + mv share/* $out/share + + runHook preInstall + ''; + + meta = with lib; { + description = "Open-source scientific and technical publishing system built on Pandoc"; + longDescription = '' + Quarto is an open-source scientific and technical publishing system built on Pandoc. + Quarto documents are authored using markdown, an easy to write plain text format. + ''; + homepage = "https://quarto.org/"; + changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mrtarantoga ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; + }; +} diff --git a/pkgs/development/libraries/quarto/fix-deno-path.patch b/pkgs/development/libraries/quarto/fix-deno-path.patch new file mode 100644 index 000000000000..895419712ad8 --- /dev/null +++ b/pkgs/development/libraries/quarto/fix-deno-path.patch @@ -0,0 +1,8 @@ +--- a/bin/quarto ++++ b/bin/quarto +@@ -125,4 +125,4 @@ fi + # Be sure to include any already defined QUARTO_DENO_OPTIONS + QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}" + +-"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" ++deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ac6af8eda63..5b0ea3d1fd57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20790,6 +20790,8 @@ with pkgs; qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + quarto = callPackage ../development/libraries/quarto { }; + qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { From 4d371382c8efec90150a734391e2436a947ce140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 11:34:20 +0200 Subject: [PATCH 068/114] python310Packages.aiocurrencylayer: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/aiocurrencylayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix index 0eb84fdba662..4c853d7d3a39 100644 --- a/pkgs/development/python-modules/aiocurrencylayer/default.nix +++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocurrencylayer"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = pname; rev = version; - sha256 = "sha256-t2Pcoakk25vtUYajIZVITsrEUSdwwiA3fbdswy3n9P8="; + sha256 = "sha256-neWUld/XnF5xTHSrw5EfGfNhpYzZi5TZsWN4+eqsVXs="; }; nativeBuildInputs = [ From 4e9f99e8fac18d0e9e266bade1b4b725a593d957 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 11:35:39 +0200 Subject: [PATCH 069/114] python310Packages.netdata: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix index e3071ea437d3..660f2bd19fa7 100644 --- a/pkgs/development/python-modules/netdata/default.nix +++ b/pkgs/development/python-modules/netdata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netdata"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-netdata"; rev = version; - sha256 = "sha256-D0W+zOpD2+iynhHMZh4obUSJJKmP3DnzA7blNWi6eHk="; + sha256 = "sha256-vrXXvCoZ1jErlxTcjGbtA8Uio7UDxnt3aNb9FQ0PkrU="; }; nativeBuildInputs = [ From a9da0a7de2023363f4d67c96278374832ff90033 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Sep 2022 16:02:54 +0200 Subject: [PATCH 070/114] gallia: init at 1.0.3 --- pkgs/tools/security/gallia/default.nix | 60 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/security/gallia/default.nix diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix new file mode 100644 index 000000000000..c52532117cc3 --- /dev/null +++ b/pkgs/tools/security/gallia/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gallia"; + version = "1.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Fraunhofer-AISEC"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-CoZ3niGuEjcaSyIGc0MIy95v64nTbhgqW/0uz4a/f1o="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiofiles + aiohttp + aiosqlite + argcomplete + can + construct + msgspec + pydantic + tabulate + tomlkit + xdg + zstandard + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'zstandard = "^0.17.0"' 'zstandard = "*"' + ''; + + pythonImportsCheck = [ + "gallia" + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + meta = with lib; { + description = "Pentesting framework with the focus on the automotive domain"; + homepage = "https://github.com/Fraunhofer-AISEC/gallia"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fa5de6054fa..fcd543032f51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18391,6 +18391,8 @@ with pkgs; galer = callPackage ../tools/security/galer { }; + gallia = callPackage ../tools/security/gallia { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; From 035cca50b7dc3c1d281756b64b9c91f8e479884d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Sep 2022 22:29:31 +0200 Subject: [PATCH 071/114] gallia: mark as broken on darwin --- pkgs/tools/security/gallia/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index c52532117cc3..14657c6ecc7d 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , python3 }: @@ -56,5 +57,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Fraunhofer-AISEC/gallia"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } From 872c7674ed60c935c8501cc3878ca5dba584043a Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 25 Sep 2022 11:55:43 +0200 Subject: [PATCH 072/114] broot: 1.14.3 -> 1.15.0 https://github.com/Canop/broot/releases/tag/v1.15.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5848116307d2..a1183d550106 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.14.3"; + version = "1.15.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OtpIbBrQtpxx8njhBKDB+Vk6o5sJY4jzs8cIYmUxEmw="; + sha256 = "sha256-nLwHYZ9CuhQBX0Vl/aAe3CiUlvLe2LTr4ydlk8POAI8="; }; - cargoHash = "sha256-lGV4fvpZ5/pcUMAvffSqh/PBASiFIpnpEKc+8zQ5/0M="; + cargoHash = "sha256-Q7BIwcebWV86MY7b79MMjKgDOaQmC9tWa2fh8JQQhYs="; nativeBuildInputs = [ installShellFiles From 2239172ea0f49fcf6457361692dac5523187a3d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 10:02:07 +0000 Subject: [PATCH 073/114] babashka: 0.9.162 -> 0.10.163 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index f200c4fcc8ab..955ef5e8b80c 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.9.162"; + version = "0.10.163"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-eSn3E5opJO+7dVay+j5xEkCIKJvmymozZGVD+vAzO4A="; + sha256 = "sha256-54RqqjhKBNSmIIomyhgjujC4CsY33Mkd3QSIc2w9fRg="; }; executable = "bb"; From ba3319568df2c6675dbe36478fb3edf16e114ac3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 12:30:14 +0200 Subject: [PATCH 074/114] utillinux: drop alias, don't throw It confuses node2nix, which looks for utillinux in pkgs but does not expect a throw. --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 238b1a0c113b..e466bba8e172 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1172,7 +1172,6 @@ mapAliases ({ usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2022-09-24 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2022-09-24 ### V ### From eba37cb48d476a16c3bd65ed7a2938c8b9c4775e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 11:05:14 +0000 Subject: [PATCH 075/114] discordchatexporter-cli: 2.36 -> 2.36.1 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index ba93488625e4..33b072ddcb15 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.36"; + version = "2.36.1"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "0PHTW1fo+bp2OwyNeUfBXMn+aVWQc4mc+T6BEzG/gDA="; + sha256 = "svBVXny8ZsZnXG5cDPDKlR2dNhPzPOW4VGaOZkLrRNA="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; From 9a1edca21486bcc686c2216c55fad318c3eaff26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 13:19:04 +0200 Subject: [PATCH 076/114] libtensorflow-bin: drop The package was introduced when our source package did not expose libtensorflow, which it does these days. Additionally the -bin package has not been well maintained and is stuck on a version from 2020/12. --- .../configuration-tensorflow.nix | 5 +- .../libraries/science/math/tensorflow/bin.nix | 75 ------------------- .../science/math/tensorflow/binary-hashes.nix | 15 ---- .../science/math/tensorflow/prefetcher.sh | 26 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 10 +-- 6 files changed, 3 insertions(+), 129 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/tensorflow/bin.nix delete mode 100644 pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix delete mode 100755 pkgs/development/libraries/science/math/tensorflow/prefetcher.sh diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 31c679f9b842..54a5bc52ebaa 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -23,10 +23,7 @@ in { tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto); - tensorflow = (setTensorflowSourceRoot "tensorflow" super.tensorflow).override { - # the "regular" Python package does not seem to include the binary library - libtensorflow = pkgs.libtensorflow-bin; - }; + tensorflow = setTensorflowSourceRoot "tensorflow" super.tensorflow; tensorflow-core-ops = setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix deleted file mode 100644 index 1b769f44eeb1..000000000000 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv -, fetchurl -, addOpenGLRunpath -, cudaSupport ? false, cudaPackages ? {} -, symlinkJoin -}: - -with lib; -let - broken = !stdenv.isLinux && !stdenv.isDarwin; - - inherit (cudaPackages) cudatoolkit cudnn; - - tfType = if cudaSupport then "gpu" else "cpu"; - - system = - if stdenv.isLinux then "linux" - else "darwin"; - - platform = "x86_64"; - - rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] - ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]); - - packages = import ./binary-hashes.nix; - - patchLibs = - if stdenv.isDarwin - then '' - install_name_tool -id $out/lib/libtensorflow.dylib $out/lib/libtensorflow.dylib - install_name_tool -id $out/lib/libtensorflow_framework.dylib $out/lib/libtensorflow_framework.dylib - '' - else '' - patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so - patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so - ${optionalString cudaSupport '' - addOpenGLRunpath $out/lib/libtensorflow.so $out/lib/libtensorflow_framework.so - ''} - ''; - -in stdenv.mkDerivation rec { - pname = "libtensorflow"; - inherit (packages) version; - - src = fetchurl packages."${tfType}-${system}-${platform}"; - - nativeBuildInputs = optional cudaSupport addOpenGLRunpath; - - # Patch library to use our libc, libstdc++ and others - buildCommand = '' - mkdir -pv $out - tar -C $out -xzf $src - chmod -R +w $out - ${patchLibs} - - # Write pkg-config file. - mkdir $out/lib/pkgconfig - cat > $out/lib/pkgconfig/tensorflow.pc << EOF - Name: TensorFlow - Version: ${version} - Description: Library for computation using data flow graphs for scalable machine learning - Requires: - Libs: -L$out/lib -ltensorflow - Cflags: -I$out/include/tensorflow - EOF - ''; - - meta = { - description = "C API for TensorFlow"; - homepage = "https://www.tensorflow.org/install/lang_c"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix deleted file mode 100644 index b606e45477a9..000000000000 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ -version = "2.4.0"; -"cpu-linux-x86_64" = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz"; - sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk"; -}; -"gpu-linux-x86_64" = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz"; - sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq"; -}; -"cpu-darwin-x86_64" = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz"; - sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3"; -}; -} diff --git a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh deleted file mode 100755 index d571d38f7719..000000000000 --- a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# ./prefetcher.sh 2.4.0 binary-hashes.nix - -version="$1" -hashfile="$2" -rm -f $hashfile -echo "{" >> $hashfile -echo "version = \"$version\";" >> $hashfile -for sys in "linux" "darwin"; do - for tfpref in "cpu" "gpu"; do - for platform in "x86_64"; do - if [ $sys = "darwin" ] && [ $tfpref = "gpu" ]; then - continue - fi - url=https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-$tfpref-$sys-$platform-$version.tar.gz - hash=$(nix-prefetch-url $url) - echo "\"${tfpref}-${sys}-${platform}\" = {" >> $hashfile - echo " url = \"$url\";" >> $hashfile - echo " sha256 = \"$hash\";" >> $hashfile - echo "};" >> $hashfile - done - done -done -echo "}" >> $hashfile - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e466bba8e172..2b9d3fd202d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -612,6 +612,7 @@ mapAliases ({ libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2022-09-24 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 + libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24 libtorrentRasterbar-1_1_x = throw "'libtorrentRasterbar-1_1_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_1_x'"; # Converted to throw 2022-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 979735e37135..a47449477019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3046,15 +3046,7 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; - libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { - cudaSupport = config.cudaSupport or false; - cudaPackages = cudaPackages_10_0; - }; - - libtensorflow = - if python3.pkgs.tensorflow ? libtensorflow - then python3.pkgs.tensorflow.libtensorflow - else libtensorflow-bin; + libtensorflow = python3.pkgs.tensorflow.libtensorflow; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { cudaSupport = config.cudaSupport or false; From 728044b22ce94d19e8e62e645b8e48a1d2b09c88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 11:31:31 +0000 Subject: [PATCH 077/114] python310Packages.xsdata: 22.8 -> 22.9 --- pkgs/development/python-modules/xsdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 3ae950bf86ae..e87b07b89fa4 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "22.8"; + version = "22.9"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-MWHMRPY35Fs4n9O0z3QRW4IylfSltH3XUNdrCBK2iW4="; + hash = "sha256-xi1QArTeWbrKTE6p7f3Aj7d1lxPsIROaruv/IMw+fPw="; }; postPatch = '' From 57b303909207336077a3173f45e7203e803b2a42 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 25 Sep 2022 14:19:33 +0200 Subject: [PATCH 078/114] libmpack: build with config=release --- pkgs/development/libraries/libmpack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index b62da40499cd..3ec800f890fe 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; - makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ]; + makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" "config=release" ]; meta = with lib; { description = "Simple implementation of msgpack in C"; From c0118dcbbb70bcdf64f4227d8c62851531eced6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 08:13:50 +0000 Subject: [PATCH 079/114] python310Packages.telethon: 1.25.0 -> 1.25.1 Fetch source from GitHub, enable tests, migrate build to pyproject and add setuptools to nativeBuildInputs. --- .../python-modules/telethon/default.nix | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 0dcf98d41831..71df98720834 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -1,13 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, openssl, rsa, pyaes, pythonOlder }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, openssl +, rsa +, pyaes +, pythonOlder +, setuptools +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "telethon"; - version = "1.25.0"; + version = "1.25.1"; + format = "pyproject"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit version; - pname = "Telethon"; - sha256 = "sha256-Z22XuSbm0w2+0x1sbmYRzeyfyCdZeFzqVcR3C3RhQpA="; + src = fetchFromGitHub { + owner = "LonamiWebs"; + repo = "Telethon"; + rev = "refs/tags/v${version}"; + hash = "sha256-xmFoCUqYo600RH72KWG/aM7hKGiTYdCBsbPOFipxIzA="; }; patchPhase = '' @@ -15,15 +28,23 @@ buildPythonPackage rec { "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ rsa pyaes ]; - # No tests available - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - disabled = pythonOlder "3.5"; + pytestFlagsArray = [ + "tests/telethon" + ]; meta = with lib; { homepage = "https://github.com/LonamiWebs/Telethon"; From 0ed54c5ecf5f18e5ac9c14b44f5a6f97e3922309 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 16:03:09 +0200 Subject: [PATCH 080/114] mautrix-telegram: fix tulir-telethon override --- pkgs/servers/mautrix-telegram/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 7e31c22ebd3b..98f1d5ec562a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -11,10 +11,11 @@ let tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { version = "1.25.0a20"; pname = "tulir-telethon"; - src = oldAttrs.src.override { + src = super.fetchPypi { inherit pname version; sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc="; }; + doCheck = false; }); }; }; From 4e03ac8e7008357e98537cf63950705cc405dfe0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 16:06:31 +0200 Subject: [PATCH 081/114] python310Packages.aiopg: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/aiopg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index b78a552f01fa..314931af7ded 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.3.4"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WzyBgUxqxLvyNNMoRO2FuLxAyNvhBrA7U5eZqHxaL4Q="; + sha256 = "sha256-ZHfwuDtQm7SlLX3sAoYONgCIWnafOj/L8bXjAdwYDKI="; }; propagatedBuildInputs = [ From 0ada9fff8a86dc582ebee158107d4f942e865ab0 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 16 Sep 2022 14:14:59 +0200 Subject: [PATCH 082/114] lib/types.nix: Document that it should not be used Co-authored-by: Robert Hensing Co-authored-by: Valentin Gagarin --- lib/types.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 3750ba965558..ed1d5f44064f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -119,8 +119,22 @@ rec { # - "composite": a phrase with an "of" connective # See the `optionDescriptionPhrase` function. , descriptionClass ? null - , # Function applied to each definition that should return true if - # its type-correct, false otherwise. + , # DO NOT USE WITHOUT KNOWING WHAT YOU ARE DOING! + # Function applied to each definition that must return false when a definition + # does not match the type. It should not check more than the root of the value, + # because checking nested values reduces laziness, leading to unnecessary + # infinite recursions in the module system. + # Further checks of nested values should be performed by throwing in + # the merge function. + # Strict and deep type checking can be performed by calling lib.deepSeq on + # the merged value. + # + # See https://github.com/NixOS/nixpkgs/pull/6794 that introduced this change, + # https://github.com/NixOS/nixpkgs/pull/173568 and + # https://github.com/NixOS/nixpkgs/pull/168295 that attempted to revert this, + # https://github.com/NixOS/nixpkgs/issues/191124 and + # https://github.com/NixOS/nixos-search/issues/391 for what happens if you ignore + # this disclaimer. check ? (x: true) , # Merge a list of definitions together into a single value. # This function is called with two arguments: the location of From 254a6aada9af000d6d34789564c6ee2c4df3a25b Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 17 Sep 2022 11:35:21 +0200 Subject: [PATCH 083/114] CODEOWNERS: add piegames to check-meta.nix --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 264305299f1b..b687c1572d67 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -37,6 +37,7 @@ /pkgs/top-level/splice.nix @Ericson2314 @matthewbauer /pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer /pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde /pkgs/stdenv/cross @Ericson2314 @matthewbauer /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 From 6762de9a28e248f46bd0810e03c9666289de8e1d Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 14 Sep 2022 12:17:39 +0200 Subject: [PATCH 084/114] check-meta.nix: type checking changes - Enable metadata checking by default, see https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 - Check metadata before any other package issues, see https://github.com/NixOS/nixpkgs/issues/191124#issuecomment-1246523976 - Document that type checks only apply to the top level of nested values. Co-authored-by: Valentin Gagarin --- .../from_md/release-notes/rl-2211.section.xml | 8 ++++ .../manual/release-notes/rl-2211.section.md | 3 ++ pkgs/stdenv/generic/check-meta.nix | 45 +++++++++++++------ pkgs/top-level/config.nix | 7 +++ 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 0f1dffc798e7..8f4a7dd002d3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -474,6 +474,14 @@ maintainer to update the package. + + + The (previously undocumented) Nixpkgs configuration option + checkMeta now defaults to + true. This may cause evaluation failures + for packages with incorrect meta attribute. + + xow package removed along with the diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 7214937781d2..f6515256dbc6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -164,6 +164,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. +- The (previously undocumented) Nixpkgs configuration option `checkMeta` now defaults to `true`. This may cause evaluation + failures for packages with incorrect `meta` attribute. + - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. - dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module. diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index f9bea506af6e..85a9c9c4d41e 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -13,10 +13,6 @@ let getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}"); - # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 - # for why this defaults to false, but I (@copumpkin) want to default it to true soon. - shouldCheckMeta = config.checkMeta or false; - allowUnfree = config.allowUnfree || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; @@ -248,6 +244,16 @@ let isEnabled = lib.findFirst (x: x == reason) null showWarnings; in if isEnabled != null then builtins.trace msg true else true; + + # A shallow type check. We are using NixOS' + # option types here, which however have the major drawback + # of not providing full type checking (part of the type check is + # done by the module evaluation itself). Therefore, the checks + # will not recurse into attributes. + # We still provide the full type for documentation + # purposes and in the hope that they will be used eventually. + # See https://github.com/NixOS/nixpkgs/pull/191171 for an attempt + # to fix this, or mkOptionType in lib/types.nix for more information. metaTypes = with lib.types; rec { # These keys are documented description = str; @@ -297,17 +303,23 @@ let badPlatforms = platforms; }; + # WARNING: this does not check inner values of the attribute, like list elements or nested attributes. + # See metaTypes above and mkOptionType in lib/types.nix for more information checkMetaAttr = k: v: if metaTypes?${k} then - if metaTypes.${k}.check v then null else "key '${k}' has a value ${toString v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" - else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + if metaTypes.${k}.check v then + null + else + "key 'meta.${k}' has a value of invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" + else + "key 'meta.${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; + checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; actualOutputs = attrs.outputs or [ "out" ]; missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs; - in if shouldCheckMeta + in if config.checkMeta then builtins.length missingOutputs > 0 else false; @@ -326,7 +338,17 @@ let unsupported = hasUnsupportedPlatform attrs; insecure = isMarkedInsecure attrs; } - // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then + // ( + # Check meta attribute types first, to make sure it is always called even when there are other issues + # Note that this is not a full type check and functions below still need to by careful about their inputs! + let res = checkMeta (attrs.meta or {}); in if res != [] then + { valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } + # --- Put checks that cannot be ignored here --- + else if checkOutputsToInstall attrs then + { valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } + + # --- Put checks that can be ignored here --- + else if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then { valid = "no"; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlocklistedLicense attrs then { valid = "no"; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; } @@ -338,10 +360,7 @@ let { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; } - else if checkOutputsToInstall attrs then - { valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } - else let res = checkMeta (attrs.meta or {}); in if res != [] then - { valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } + # --- warnings --- # Please also update the type in /pkgs/top-level/config.nix alongside this. else if hasNoMaintainers attrs then diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 4fedad00f24b..6ddd647a2b1a 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -128,6 +128,13 @@ let ''; }; + checkMeta = mkOption { + type = types.bool; + default = true; + description = '' + Whether to check that the `meta` attribute of derivations are correct during evaluation time. + ''; + }; }; in { From 916a8308d16f05b2592fe3c1a33daca9f548d8dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 19:47:53 +0000 Subject: [PATCH 085/114] remote-touchpad: 1.2.1 -> 1.2.2 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index c07cff71def6..35e334a2fe7f 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A7/NLopJkIXwS5rAsf7J6tDL10kNOKCoyAj0tCTW6jQ="; + sha256 = "sha256-KkrBWrZBvALM0TdF8AlW5Zf+r8EO9I76Otkq4cA+ikg="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-UbDbUjC8R6LcYUPVWZID5dtu5tCV4NB268K6qTXYmZY="; + vendorSha256 = "sha256-lEl0SOqbw6PARgO1qIN20p13BbexfCeJug1ZkuahV+k="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; From 4bb26cf7a17844158b1eacb156aaea012443cc6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 16:45:57 +0200 Subject: [PATCH 086/114] python310Packages.typer: add optional-dependencies --- .../python-modules/typer/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 2019a956ce54..35a946c6079b 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, colorama , fetchpatch , fetchPypi , flit-core @@ -23,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; + hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; }; nativeBuildInputs = [ @@ -34,14 +35,20 @@ buildPythonPackage rec { click ]; + passthru.optional-dependencies = { + all = [ + colorama + shellingham + rich + ]; + }; + checkInputs = [ - pytestCheckHook - pytest-xdist - pytest-sugar - shellingham - rich coverage # execs coverage in tests - ]; + pytest-sugar + pytest-xdist + pytestCheckHook + ] ++ passthru.optional-dependencies.all; preCheck = '' export HOME=$(mktemp -d); @@ -54,10 +61,12 @@ buildPythonPackage rec { "test_install_completion" ]; - pythonImportsCheck = [ "typer" ]; + pythonImportsCheck = [ + "typer" + ]; meta = with lib; { - description = "Python library for building CLI applications"; + description = "Library for building CLI applications"; homepage = "https://typer.tiangolo.com/"; license = licenses.mit; maintainers = with maintainers; [ winpat ]; From 408d220f0e9f5fbce66bcbaa03da24f355bb8820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sun, 25 Sep 2022 11:54:53 -0300 Subject: [PATCH 087/114] linux-zen: 5.19.10 -> 5.19.11 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 99f3ab5e7957..63a1778dcd2e 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.19.10"; #zen + version = "5.19.11"; #zen suffix = "zen1"; #zen - sha256 = "1agwg917w1452d84ysc4v37knc1ljp2108nhrbp88qkiy2s7f4mb"; #zen + sha256 = "0slrbsqdvnlnk2hr356wjmbhh8qkn39k34jn1lidhjyfb9c7fg6a"; #zen isLqx = false; }; # ./update-zen.py lqx From 88a97a22c4032885bf0736f79aa3c2f7b15f87e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 14:55:51 +0000 Subject: [PATCH 088/114] miniplayer: 1.7.0 -> 1.7.1 --- pkgs/applications/audio/miniplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index b808bfb8b2e3..4eea3dbcb7f9 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -6,12 +6,12 @@ with python3Packages; buildPythonApplication rec { pname = "miniplayer"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-JUlUFj/5DOTLa1XCZX/9Nj3Z9W+k4gnpJONiS4qNBIU="; + hash = "sha256-NrIDv61mRDe9JWpSP8cvlU4CGoN6Ou6XuNOIn1p47Pw="; }; propagatedBuildInputs = [ From b49efa0116e274465ec2e98e59f3ffe2f4ad19ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sun, 25 Sep 2022 11:57:41 -0300 Subject: [PATCH 089/114] linux-lqx: 5.19.10 -> 5.19.11 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 63a1778dcd2e..a50afc46bf5e 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.10"; #lqx + version = "5.19.11"; #lqx suffix = "lqx1"; #lqx - sha256 = "0szrh7xj0xh696cvx95ng1bwddzs1bggk6cwhqbjdnk0pjk85xg7"; #lqx + sha256 = "0mv3ic1zx1xil87zllbqkm587lpzzj3vrw376ch4imzyvmz6b2yx"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 031d152c4a43dab6cc7cc52836cb7ec1bf4417c5 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Sun, 25 Sep 2022 10:44:33 +0900 Subject: [PATCH 090/114] cadical: 1.5.0 -> 1.5.3 --- pkgs/applications/science/logic/cadical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 7052d3fce0df..a49aea8d40c8 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-Po+pGoUwk1gtBqz4Sc/QQ52rRGbA2pATebX+KPYII5o="; + sha256 = "sha256-3H/vowWfE1jfomYg2hOi3B3zjWa4CaLHAJXnoKWzskU="; }; outputs = [ "out" "dev" "lib" ]; From 3c009ec99894f6c0913fa7d91f5fdc4e65f9a371 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 16:49:19 +0200 Subject: [PATCH 091/114] python310Packages.pyunifiprotect: 4.2.0 -> 4.3.3 --- .../python-modules/pyunifiprotect/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 03070e5a3374..60a010aa0b05 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -3,6 +3,7 @@ , aiohttp , aioshutil , buildPythonPackage +, dateparser , fetchFromGitHub , ipython , orjson @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.2.0"; + version = "4.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -36,13 +37,12 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DBOPHeSEdM6cev2BZs1AwXmzNPVsekNklu9c+KhECiI="; + hash = "sha256-77vBKca4S0XEa5O4ntuBW8uEwVig7IBH6BX3QEmvHWc="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pyunifiprotect --cov-append" "" - substituteInPlace setup.cfg \ + --replace "--cov=pyunifiprotect --cov-append" "" \ --replace "pydantic!=1.9.1" "pydantic" ''; @@ -50,6 +50,7 @@ buildPythonPackage rec { aiofiles aiohttp aioshutil + dateparser orjson packaging pillow @@ -57,7 +58,7 @@ buildPythonPackage rec { pyjwt pytz typer - ]; + ] ++ typer.optional-dependencies.all; passthru.optional-dependencies = { shell = [ From d614292a030f854c873bdef7c52d05d52bcb2359 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 17:07:00 +0200 Subject: [PATCH 092/114] python310Packages.dbus-fast: 1.11.0 -> 1.13.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 16dd1221d87b..82f4873a51c2 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.11.0"; + version = "1.13.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-j0bD8JtcMRX+G0QaxbSUqmGUw/ubrmz1ngGyzaR9UHA="; + hash = "sha256-SADUeLD4quPxKChf1A4ph1iI8zu7oCDg4nJNFl77f+k="; }; nativeBuildInputs = [ From d1f77549784162e455d06535611610727ca908f3 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 25 Sep 2022 12:32:23 +0200 Subject: [PATCH 093/114] streamdeck-ui: 2.0.4 -> 2.0.6 --- pkgs/applications/misc/streamdeck-ui/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index 141652e63d69..be98b3713867 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "streamdeck-ui"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitHub { repo = pname; owner = "timothycrosley"; rev = "v${version}"; - hash = "sha256-NV4BkHEgfxIOuLfmn0vcPNqivmHLD6v7jLdLZgnrb0Q="; + sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; }; desktopItems = [ (makeDesktopItem { @@ -33,11 +33,7 @@ python3Packages.buildPythonApplication rec { postInstall = let udevRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", TAG+="uaccess" ''; in '' From 58c774d72754472cc981b637664d40490bb5e641 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 17:58:59 +0200 Subject: [PATCH 094/114] python310Packages.rstcheck: 6.0.0.post1 -> 6.1.0 --- pkgs/development/python-modules/rstcheck/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index b5a3ccefc08c..a3789b97088a 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, colorama , docutils , fetchFromGitHub , importlib-metadata @@ -9,7 +8,6 @@ , pytestCheckHook , pythonOlder , rstcheck-core -, shellingham , typer , types-docutils , typing-extensions @@ -17,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.0.0.post1"; + version = "6.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +24,7 @@ buildPythonPackage rec { owner = "rstcheck"; repo = pname; rev = "v${version}"; - hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw="; + hash = "sha256-dw/KggiZpKaFZMcTIaSBUhR4oQsZI3iSmEj9Sy80wTs="; }; nativeBuildInputs = [ @@ -34,10 +32,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - colorama docutils rstcheck-core - shellingham types-docutils typing-extensions pydantic @@ -45,7 +41,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata - ]; + ] ++ typer.optional-dependencies.all; checkInputs = [ pytestCheckHook @@ -53,6 +49,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' \ --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' ''; From 05d2c86f06bca6fb25f41a38e134a28c5ab66ebe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 18:08:06 +0200 Subject: [PATCH 095/114] markdown-anki-decks: 1.0.0 -> 1.1.1 --- .../misc/markdown-anki-decks/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 62c8ca86e6f0..d035c9db7317 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -4,13 +4,12 @@ python3.pkgs.buildPythonApplication rec { pname = "markdown-anki-decks"; - version = "1.0.0"; - + version = "1.1.1"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "R6T8KOHMb1Neg/RG5JQl9+7LxOkAoZL0L5wvVaqm9O0="; + hash = "sha256-SvKjjE629OwxWsPo2egGf2K6GzlWAYYStarHhA4Ex0w="; }; nativeBuildInputs = with python3.pkgs; [ @@ -18,31 +17,30 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - genanki - typer - colorama - shellingham beautifulsoup4 + genanki markdown python-frontmatter - ]; + typer + ] ++ typer.optional-dependencies.all; postPatch = '' - # No API changes. substituteInPlace pyproject.toml \ - --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ - --replace 'genanki = "^0.10.1"' 'genanki = "*"' \ - --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' + --replace 'typer = "^0.4.0"' 'typer = "*"' ''; # No tests available on Pypi and there is only a failing version assertion test in the repo. doCheck = false; + pythonImportsCheck = [ + "markdown_anki_decks" + ]; + meta = with lib; { - description = "Simple program to convert markdown files into anki decks"; - maintainers = with maintainers; [ jtojnar ]; + description = "Tool to convert Markdown files into Anki Decks"; homepage = "https://github.com/lukesmurray/markdown-anki-decks"; license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } From dbf8bba95bea7255565d6f4862ac515944f45254 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 24 Sep 2022 12:34:59 -0500 Subject: [PATCH 096/114] nixos/yggdrasil: services.yggdrasil.config renamed to settings --- nixos/modules/services/networking/yggdrasil.nix | 8 ++++---- nixos/modules/services/networking/yggdrasil.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 620ace2d8c83..e56f169d05eb 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -40,14 +40,14 @@ in { If the {option}`persistentKeys` is enabled then the keys that are generated during activation will override - those in {option}`config` or + those in {option}`settings` or {option}`configFile`. If no keys are specified then ephemeral keys are generated and the Yggdrasil interface will have a random IPv6 address each time the service is started, this is the default. - If both {option}`configFile` and {option}`config` + If both {option}`configFile` and {option}`settings` are supplied, they will be combined, with values from {option}`configFile` taking precedence. @@ -62,7 +62,7 @@ in { example = "/run/keys/yggdrasil.conf"; description = lib.mdDoc '' A file which contains JSON configuration for yggdrasil. - See the {option}`config` option for more information. + See the {option}`settings` option for more information. ''; }; @@ -81,7 +81,7 @@ in { discovery. The NixOS firewall blocks link-local communication, so in order to make local peering work you will also need to set `LinkLocalTCPPort` in your - yggdrasil configuration ({option}`config` or + yggdrasil configuration ({option}`settings` or {option}`configFile`) to a port number other than 0, and then add that port to {option}`networking.firewall.allowedTCPPorts`. diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml index a341d5d8153b..bc9da84fa431 100644 --- a/nixos/modules/services/networking/yggdrasil.xml +++ b/nixos/modules/services/networking/yggdrasil.xml @@ -27,7 +27,7 @@ An annotated example of a simple configuration: # The NixOS module will generate new keys and a new IPv6 address each time # it is started if persistentKeys is not enabled. - config = { + settings = { Peers = [ # Yggdrasil will automatically connect and "peer" with other nodes it # discovers via link-local multicast annoucements. Unless this is the @@ -58,7 +58,7 @@ in { services.yggdrasil = { enable = true; persistentKeys = true; # Maintain a fixed public key and IPv6 address. - config = { + settings = { Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ]; NodeInfo = { # This information is visible to the network. From 60f34d39195a63b0f0c91772f2e7130ab8869116 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Sep 2022 15:05:38 +0200 Subject: [PATCH 097/114] coqPackages.serapi: init at 8.16.0+0.16.0 for Coq 8.16 --- pkgs/development/coq-modules/serapi/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 65643fc2ea69..7c3b656da913 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.16.0+0.16.0".sha256 = "sha256-Of5vO6wvqGyxagjGuuY3qCiLKbBr3VzLHiIn9U2R21E="; "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; @@ -17,6 +18,7 @@ in defaultVersion = with versions; switch coq.version [ + { case = isEq "8.16"; out = "8.16.0+0.16.0"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } @@ -78,7 +80,15 @@ in then [ ./8.12.0+0.12.1.patch ] - else [ + else if version == "8.14.0+0.14.0" || version == "8.15.0+0.15.0" + then [ ./janestreet-0.15.patch + ] + else [ ]; + + propagatedBuildInputs = o.propagatedBuildInputs ++ + lib.optional (version == "8.16.0+0.16.0" || version == "dev") coq.ocamlPackages.ppx_hash + ; + }) From dca39dc8616d18984ace60c223e1ab5070d7a06f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 18:37:32 +0200 Subject: [PATCH 098/114] exploitdb: 2022-09-22 -> 2022-09-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index f2825d70cadb..28eea75bbb61 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-09-22"; + version = "2022-09-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AG9CgZbh0JN5fhLOV055YrnFbllLEAG5fYXYoLA0sxM="; + hash = "sha256-QroDg06vAyeFeA2Gy0iFJ5bc277EkMV1Xz92c+xrUF0="; }; nativeBuildInputs = [ From 855db46b9db5012e6f4056037d7630da1f6cc8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 Sep 2022 18:59:45 +0200 Subject: [PATCH 099/114] openscad: add support for exporting PDFs Add cairo to buildInputs for PDF export support. Without this, trying to export using "File -> Export -> Export as PDF" leads to ERROR: Export to PDF format was not enabled when building the application. PDF export finished: /home/bf/Untitled.pdf (The pdf file is 0 KiB -- broken.) Fixes #192895. --- pkgs/applications/graphics/openscad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 646594d4afba..94c30fe0a321 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -30,6 +30,7 @@ , wayland , wayland-protocols , qtwayland +, cairo }: mkDerivation rec { @@ -61,7 +62,7 @@ mkDerivation rec { buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig - qtbase qtmultimedia qscintilla + qtbase qtmultimedia qscintilla cairo ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav From 84bcdf9b771c67d80bb25499fc6b00de9a28b98d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 18:38:44 +0000 Subject: [PATCH 100/114] texlab: 4.2.2 -> 4.3.0 --- pkgs/development/tools/misc/texlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 8d41b7488e4d..cd57796b0bc3 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -14,16 +14,16 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vGKDngFYh24wwR5nAYEz1GXm+K4sqEBvOp9jsioE0wU="; + sha256 = "sha256-PhzxWLkqsHU32vIZwHzdy86bwIzDDmnxp12PS774P3k="; }; - cargoSha256 = "sha256-s2gQuLkPxKQceGl3II9D6vWisYgL+YCI/YhX+mSyPoo="; + cargoSha256 = "sha256-tH566L0oHnI9mNp1KtJYaBaWCkiAOrtBYkfVSCA2N6w="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -48,7 +48,7 @@ in rustPlatform.buildRustPackage rec { # generate the man page + lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.2.2/.github/workflows/publish.yml#L131-L135 + # https://github.com/latex-lsp/texlab/blob/v4.3.0/.github/workflows/publish.yml#L131-L135 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From cd709a0659c370a084b048ac3b58cd0a138e3477 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 18:40:21 +0000 Subject: [PATCH 101/114] tidal-hifi: 4.1.2 -> 4.2.0 --- pkgs/applications/audio/tidal-hifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index ca7fc28f7405..048367703f02 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-HurREfN4VxhFiyP+oAx8QeTfoZTk+PlRX5pVWyU+Dwg="; + sha256 = "sha256-YydpWzGH+Orb8Vot8hchh+FFcd327VwQ8Kr7x8WYnv4="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; From 5a93846946dddcc99eac92a6278bb202943d4a9f Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Mon, 26 Sep 2022 00:16:03 +0530 Subject: [PATCH 102/114] nixos/kthxbye: init --- .../from_md/release-notes/rl-2211.section.xml | 8 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/kthxbye.nix | 166 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/kthxbye.nix | 110 ++++++++++++ 6 files changed, 288 insertions(+) create mode 100644 nixos/modules/services/monitoring/kthxbye.nix create mode 100644 nixos/tests/kthxbye.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 590141c935b4..ac5be1161db1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -203,6 +203,14 @@ services.infnoise. + + + kthxbye, + an alert acknowledgement management daemon for Prometheus + Alertmanager. Available as + services.kthxbye + + kanata, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3992dec20476..3c4e2ac31e00 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -75,6 +75,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). +- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) + - [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e6f077dd5d08..50092357ccca 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -681,6 +681,7 @@ ./services/monitoring/heapster.nix ./services/monitoring/incron.nix ./services/monitoring/kapacitor.nix + ./services/monitoring/kthxbye.nix ./services/monitoring/loki.nix ./services/monitoring/longview.nix ./services/monitoring/mackerel-agent.nix diff --git a/nixos/modules/services/monitoring/kthxbye.nix b/nixos/modules/services/monitoring/kthxbye.nix new file mode 100644 index 000000000000..3f988dcb722f --- /dev/null +++ b/nixos/modules/services/monitoring/kthxbye.nix @@ -0,0 +1,166 @@ +{ config, pkgs, lib, ... }: +with lib; + +let + cfg = config.services.kthxbye; +in + +{ + options.services.kthxbye = { + enable = mkEnableOption (mdDoc "kthxbye alert acknowledgement management daemon"); + + package = mkOption { + type = types.package; + default = pkgs.kthxbye; + defaultText = literalExpression "pkgs.kthxbye"; + description = mdDoc '' + The kthxbye package that should be used. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Whether to open ports in the firewall needed for the daemon to function. + ''; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = []; + description = mdDoc '' + Extra command line options. + + Documentation can be found [here](https://github.com/prymitive/kthxbye/blob/main/README.md). + ''; + example = literalExpression '' + [ + "-extend-with-prefix 'ACK!'" + ]; + ''; + }; + + alertmanager = { + timeout = mkOption { + type = types.str; + default = "1m0s"; + description = mdDoc '' + Alertmanager request timeout duration in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format. + ''; + example = "30s"; + }; + uri = mkOption { + type = types.str; + default = "http://localhost:9093"; + description = mdDoc '' + Alertmanager URI to use. + ''; + example = "https://alertmanager.example.com"; + }; + }; + + extendBy = mkOption { + type = types.str; + default = "15m0s"; + description = mdDoc '' + Extend silences by adding DURATION seconds. + + DURATION should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format. + ''; + example = "6h0m0s"; + }; + + extendIfExpiringIn = mkOption { + type = types.str; + default = "5m0s"; + description = mdDoc '' + Extend silences that are about to expire in the next DURATION seconds. + + DURATION should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format. + ''; + example = "1m0s"; + }; + + extendWithPrefix = mkOption { + type = types.str; + default = "ACK!"; + description = mdDoc '' + Extend silences with comment starting with PREFIX string. + ''; + example = "!perma-silence"; + }; + + interval = mkOption { + type = types.str; + default = "45s"; + description = mdDoc '' + Silence check interval duration in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format. + ''; + example = "30s"; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = mdDoc '' + The address to listen on for HTTP requests. + ''; + example = "127.0.0.1"; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = mdDoc '' + The port to listen on for HTTP requests. + ''; + }; + + logJSON = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Format logged messages as JSON. + ''; + }; + + maxDuration = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc '' + Maximum duration of a silence, it won't be extended anymore after reaching it. + + Duration should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format. + ''; + example = "30d"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.kthxbye = { + description = "kthxbye Alertmanager ack management daemon"; + wantedBy = [ "multi-user.target" ]; + script = '' + ${cfg.package}/bin/kthxbye \ + -alertmanager.timeout ${cfg.alertmanager.timeout} \ + -alertmanager.uri ${cfg.alertmanager.uri} \ + -extend-by ${cfg.extendBy} \ + -extend-if-expiring-in ${cfg.extendIfExpiringIn} \ + -extend-with-prefix ${cfg.extendWithPrefix} \ + -interval ${cfg.interval} \ + -listen ${cfg.listenAddress}:${toString cfg.port} \ + ${optionalString cfg.logJSON "-log-json"} \ + ${optionalString (cfg.maxDuration != null) "-max-duration ${cfg.maxDuration}"} \ + ${concatStringsSep " " cfg.extraOptions} + ''; + serviceConfig = { + Type = "simple"; + DynamicUser = true; + Restart = "on-failure"; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2464ec4d404b..b5a6dada29c2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -277,6 +277,7 @@ in { komga = handleTest ./komga.nix {}; krb5 = discoverTests (import ./krb5 {}); ksm = handleTest ./ksm.nix {}; + kthxbye = handleTest ./kthxbye.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; languagetool = handleTest ./languagetool.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; diff --git a/nixos/tests/kthxbye.nix b/nixos/tests/kthxbye.nix new file mode 100644 index 000000000000..5ca0917ec8e7 --- /dev/null +++ b/nixos/tests/kthxbye.nix @@ -0,0 +1,110 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +{ + name = "kthxbye"; + + meta = with lib.maintainers; { + maintainers = [ nukaduka ]; + }; + + nodes.server = { ... }: { + environment.systemPackages = with pkgs; [ prometheus-alertmanager ]; + services.prometheus = { + enable = true; + + globalConfig = { + scrape_interval = "5s"; + scrape_timeout = "5s"; + evaluation_interval = "5s"; + }; + + scrapeConfigs = [ + { + job_name = "prometheus"; + scrape_interval = "5s"; + static_configs = [ + { + targets = [ "localhost:9090" ]; + } + ]; + } + ]; + + rules = [ + '' + groups: + - name: test + rules: + - alert: node_up + expr: up != 0 + for: 5s + labels: + severity: bottom of the barrel + annotations: + summary: node is fine + '' + ]; + + alertmanagers = [ + { + static_configs = [ + { + targets = [ + "localhost:9093" + ]; + } + ]; + } + ]; + + alertmanager = { + enable = true; + openFirewall = true; + configuration.route = { + receiver = "test"; + group_wait = "5s"; + group_interval = "5s"; + group_by = [ "..." ]; + }; + configuration.receivers = [ + { + name = "test"; + webhook_configs = [ + { + url = "http://localhost:1234"; + } + ]; + } + ]; + }; + }; + + services.kthxbye = { + enable = true; + openFirewall = true; + extendIfExpiringIn = "30s"; + logJSON = true; + maxDuration = "15m"; + interval = "5s"; + }; + }; + + testScript = '' + with subtest("start the server"): + start_all() + server.wait_for_unit("prometheus.service") + server.wait_for_unit("alertmanager.service") + server.wait_for_unit("kthxbye.service") + + server.sleep(2) # wait for units to settle + server.systemctl("restart kthxbye.service") # make sure kthxbye comes up after alertmanager + server.sleep(2) + + with subtest("set up test silence which expires in 20s"): + server.succeed('amtool --alertmanager.url "http://localhost:9093" silence add alertname="node_up" -a "nixosTest" -d "20s" -c "ACK! this server is fine!!"') + + with subtest("wait for 21 seconds and check if the silence is still active"): + server.sleep(21) + server.systemctl("status kthxbye.service") + server.succeed("amtool --alertmanager.url 'http://localhost:9093' silence | grep 'ACK'") + ''; +}) From 9460046dbfc26c869670691a0a376ddfd1e4986e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 18:50:23 +0000 Subject: [PATCH 103/114] unciv: 4.2.6 -> 4.2.11 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 522c845c471d..f61e67635903 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.2.6"; + version = "4.2.11"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-AJqD8xF+FIKw34NhcnYCexXRs8aIzL8XDHhs5fGBTn0="; + sha256 = "sha256-bA1rz4PvpcdMSGob+KIdSpyq6ePlLj8l61r0+XclfZY="; }; dontUnpack = true; From c9fdfaa9334ab71ed00bb4ed23214908ffee4778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 21:31:17 +0200 Subject: [PATCH 104/114] python310Packages.canonicaljson: 1.6.2 -> 1.6.3 --- .../python-modules/canonicaljson/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index e5ecff7837f9..feee27e852ec 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,21 +9,26 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.2"; - format = "setuptools"; + version = "1.6.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rwC+jOnFiYV98Xa7lFlPDUOw4CfwJ6jXz4l4/bgZAko="; + hash = "sha256-yll2C8J0qJmg2nWAnWkJrkPlEjOB/W7wQKRNGVLAtEg="; }; propagatedBuildInputs = [ - frozendict simplejson ]; + passthru.optional-dependencies = { + frozendict = [ + frozendict + ]; + }; + checkInputs = [ pytestCheckHook ]; From 469b42802d0a5f6380386d1cc00fab6284c82ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Sun, 25 Sep 2022 21:46:16 +0200 Subject: [PATCH 105/114] fractal-next: unstable-2022-07-21 -> 5-alpha1 --- .../instant-messengers/fractal-next/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index f1b8b0a9e9c7..5613fbc899b4 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "fractal-next"; - version = "unstable-2022-09-09"; + version = "5-alpha1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; - rev = "5f0a4b48a745ccce202d14e7d02e14f51598fb42"; - hash = "sha256-7s2ytHpM5pZ0dhnVMA8KDWIBaSWds7t9GB6Wav+0dQA="; + rev = version; + hash = "sha256-gHMfBGrq3HiGeqHx2knuc9LomgIW9QA9fCSCcQncvz0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-CJD9YmL06ELR3X/gIrsVCpDyJnWPbH/JF4HlXvWjiZ8="; + hash = "sha256-fTETUD/OaOati5HvNxto5Cw26wMclt6mxPLm4cyE3+0="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e2c228f7a42..91e106f22eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28126,13 +28126,13 @@ with pkgs; fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; libadwaita = libadwaita.overrideAttrs (finalAtts: rec { - version = "1.2.alpha"; + version = "1.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-JMxUeIOUPp9k5pImQqWLVkQ2GHaKvopvg6ol9pvA+Bk="; + hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; }; }); }; From 7c49c85106aceb05960f4ad8320c425c555d9180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 22:11:52 +0200 Subject: [PATCH 106/114] python310Packages.luftdaten: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/luftdaten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index e14db125fba5..db43387df27a 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-luftdaten"; rev = version; - sha256 = "sha256-tYaY/F4mdO5k+Oj+RkNFWP8xqh1xuDyoAKBFzAhamkA="; + sha256 = "sha256-+wIouOHIYgjIrObos21vzdKFQLhwutorarVUBDxCsaA="; }; nativeBuildInputs = [ From a1d5c22e959a2422ff96f0aaf83068dd40a73317 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Mon, 25 Jul 2022 17:12:02 -0400 Subject: [PATCH 107/114] gdlv: init at 1.8.0 --- pkgs/development/tools/gdlv/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/gdlv/default.nix diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/development/tools/gdlv/default.nix new file mode 100644 index 000000000000..55e44238b495 --- /dev/null +++ b/pkgs/development/tools/gdlv/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, OpenGL }: + +buildGoModule rec { + pname = "gdlv"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "aarzilli"; + repo = "gdlv"; + rev = "v${version}"; + sha256 = "sha256-G1/Wbz836yfGZ/1ArICrNbWU6eh4SHXDmo4FKkjUszY="; + }; + + vendorSha256 = null; + subPackages = "."; + + buildInputs = lib.optionals stdenv.isDarwin [ OpenGL ]; + + meta = with lib; { + description = "GUI frontend for Delve"; + homepage = "https://github.com/aarzilli/gdlv"; + maintainers = with maintainers; [ mmlb ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12998682665a..f7cbe41044c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24844,6 +24844,10 @@ with pkgs; ginkgo = callPackage ../development/tools/ginkgo { }; + gdlv = callPackage ../development/tools/gdlv { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; From e7a66a4a2200ee37703f90c104c716f8b1b18e70 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 25 Sep 2022 23:11:47 +0200 Subject: [PATCH 108/114] quarto: fix formatting --- pkgs/development/libraries/quarto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index d78432f734f4..38eea0a70f56 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; patches = [ - ./fix-deno-path.patch + ./fix-deno-path.patch ]; dontStrip = true; From 81231a82dea880804977160cddfc2b8ee33110b5 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sun, 25 Sep 2022 23:12:38 +0200 Subject: [PATCH 109/114] fire: init at 1.0.0.3 (#188515) --- .../fire/0001-Remove-FetchContent-usage.patch | 62 ++++++++++ pkgs/applications/audio/fire/default.nix | 117 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 3 files changed, 184 insertions(+) create mode 100644 pkgs/applications/audio/fire/0001-Remove-FetchContent-usage.patch create mode 100644 pkgs/applications/audio/fire/default.nix diff --git a/pkgs/applications/audio/fire/0001-Remove-FetchContent-usage.patch b/pkgs/applications/audio/fire/0001-Remove-FetchContent-usage.patch new file mode 100644 index 000000000000..35f4c8252e5e --- /dev/null +++ b/pkgs/applications/audio/fire/0001-Remove-FetchContent-usage.patch @@ -0,0 +1,62 @@ +From fbf2ddd872db6a3640bc7d693356b99be9dd70f5 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 18 Aug 2022 20:12:07 +0200 +Subject: [PATCH] Remove FetchContent usage + +--- + CMakeLists.txt | 27 +++++---------------------- + 1 file changed, 5 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 84c66a7..5234903 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,20 +30,9 @@ project(Fire VERSION 0.9.9) + # or + # add_subdirectory(JUCE) # If you've put JUCE in a subdirectory called JUCE + +-include(FetchContent) +-FetchContent_Declare( +- JUCE +- GIT_REPOSITORY https://github.com/juce-framework/JUCE.git +- GIT_TAG 7.0.1 +-) +-FetchContent_MakeAvailable(JUCE) +- +-FetchContent_Declare( +- readerwriterqueue +- GIT_REPOSITORY https://github.com/cameron314/readerwriterqueue +- GIT_TAG v1.0.6 +-) +-FetchContent_MakeAvailable(readerwriterqueue) ++add_subdirectory(JUCE EXCLUDE_FROM_ALL) ++ ++add_subdirectory(readerwriterqueue EXCLUDE_FROM_ALL) + + # If you are building a VST2 or AAX plugin, CMake needs to be told where to find these SDKs on your + # system. This setup should be done before calling `juce_add_plugin`. +@@ -172,13 +161,7 @@ set(TestFiles + test/CatchMain.cpp + test/PluginTest.cpp) + +-# Download the tagged version of Catch2 +-Include(FetchContent) +-FetchContent_Declare( +- Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG v2.13.7) +-FetchContent_MakeAvailable(Catch2) ++add_subdirectory(Catch2 EXCLUDE_FROM_ALL) + + # Setup the test executable, again C++ 20 please + add_executable(Tests ${TestFiles}) +@@ -199,4 +182,4 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/test PREFIX "" FILES ${TestFiles}) + # We have to manually provide the source directory here for now + # https://github.com/catchorg/Catch2/issues/2026 + include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake) +-catch_discover_tests(Tests) +\ No newline at end of file ++catch_discover_tests(Tests) +-- +2.36.0 + diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix new file mode 100644 index 000000000000..54d5bba44661 --- /dev/null +++ b/pkgs/applications/audio/fire/default.nix @@ -0,0 +1,117 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, catch2 +, libX11 +, libXrandr +, libXinerama +, libXext +, libXcursor +, freetype +, alsa-lib +, Cocoa +, WebKit +, CoreServices +, DiscRecording +, CoreAudioKit +, MetalKit +, simd +}: + +let + # FetchContent replacement, check CMakeLists.txt for requested versions (Nixpkgs' Catch2 works) + readerwriterqueue = fetchFromGitHub { + owner = "cameron314"; + repo = "readerwriterqueue"; + rev = "v1.0.6"; + sha256 = "sha256-g7NX7Ucl5GWw3u6TiUOITjhv7492ByTzACtWR0Ph2Jc="; + }; +in +stdenv.mkDerivation rec { + pname = "fire"; + version = "1.0.0.3"; + + src = fetchFromGitHub { + owner = "jerryuhoo"; + repo = "Fire"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE="; + }; + + patches = [ + ./0001-Remove-FetchContent-usage.patch + ]; + + postPatch = '' + # 1. Remove hardcoded LTO flags: needs extra setup on Linux, + # possibly broken on Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + # 2. Disable automatic copying of built plugins during buildPhase, it defaults + # into user home and we want to have building & installing separated. + sed -i \ + -e '/juce::juce_recommended_lto_flags/d' \ + -e 's/COPY_PLUGIN_AFTER_BUILD TRUE/COPY_PLUGIN_AFTER_BUILD FALSE/g' \ + CMakeLists.txt + ''; + + preConfigure = '' + ln -s ${readerwriterqueue} readerwriterqueue + ln -s ${catch2.src} Catch2 + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXrandr + libXinerama + libXext + libXcursor + freetype + alsa-lib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + WebKit + CoreServices + DiscRecording + CoreAudioKit + MetalKit + simd + ]; + + installPhase = let + vst3Dir = "${placeholder "out"}/${if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/VST3" else "lib/vst3"}"; + auDir = "${placeholder "out"}/Library/Audio/Plug-Ins/Components"; + in '' + runHook preInstall + + mkdir -p ${vst3Dir} + # Exact path of the build artefact depends on used CMAKE_BUILD_TYPE + cp -R Fire_artefacts/*/VST3/* ${vst3Dir}/ + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p ${auDir} + cp -R Fire_artefacts/*/AU/* ${auDir}/ + '' + '' + + runHook postInstall + ''; + + # Fails to find fp.h on its own + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "Multi-band distortion plugin by Wings"; + homepage = "https://github.com/jerryuhoo/Fire"; + license = licenses.agpl3Only; # Not clarified if Only or Plus + platforms = platforms.unix; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57b4773d5c22..934d48e6242a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28038,6 +28038,11 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; + fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit; + inherit (darwin.apple_sdk_11_0.libs) simd; + }; + buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {}; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {}); From 65f1654de2c36add85ebab7bcb70dd112ff2df2c Mon Sep 17 00:00:00 2001 From: Robert Gerus Date: Sun, 25 Sep 2022 20:39:15 +0200 Subject: [PATCH 110/114] mastodon: Fix compatibility for openssl 3 https://github.com/mastodon/mastodon/issues/17924 --- pkgs/servers/mastodon/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 17ecdc60ef93..a312ecb76da7 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { buildPhase = '' export HOME=$PWD + # This option is needed for openssl-3 compatibility + # Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924 + export NODE_OPTIONS=--openssl-legacy-provider fixup_yarn_lock ~/yarn.lock yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress From cf49501b2197568ae226c34ee839b8a65772a4cd Mon Sep 17 00:00:00 2001 From: Madeline S Date: Sun, 25 Sep 2022 23:42:38 +0200 Subject: [PATCH 111/114] uefi-run: init at 0.5.0 (#184200) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 +++++ .../tools/virtualization/uefi-run/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/tools/virtualization/uefi-run/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d54f61b3fcfb..016523fdab5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8107,6 +8107,12 @@ githubId = 42545625; name = "Maas Lalani"; }; + maddiethecafebabe = { + email = "maddie@cafebabe.date"; + github = "maddiethecafebabe"; + githubId = 75337286; + name = "Madeline S."; + }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix new file mode 100644 index 000000000000..8174f8980897 --- /dev/null +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "uefi-run"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Richard-W"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fwzWdOinW/ECVI/65pPB1shxPdl2nZThAqlg8wlWg/g="; + }; + + cargoSha256 = "sha256-c+wzMzTkG0FpfQ1rZ8e9dn0ez12vmoecrtNeFk90sdQ="; + + meta = with lib; { + description = "Directly run UEFI applications in qemu"; + homepage = "https://github.com/Richard-W/uefi-run"; + license = licenses.mit; + maintainers = [ maintainers.maddiethecafebabe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d34cca80a837..c4f607c7014e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31878,6 +31878,8 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; + uefi-run = callPackage ../tools/virtualization/uefi-run { }; + uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; umurmur = callPackage ../applications/networking/umurmur { From 93c3dec06bb303b7c5d6d25c5f7125750a80df75 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Sun, 25 Sep 2022 18:29:47 -0300 Subject: [PATCH 112/114] vimPlugins.nvim-moonwalk: init at 2022-04-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 40862bf8d758..31a3c800491a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5625,6 +5625,18 @@ final: prev: meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; + nvim-moonwalk = buildVimPluginFrom2Nix { + pname = "nvim-moonwalk"; + version = "2022-04-12"; + src = fetchFromGitHub { + owner = "gpanders"; + repo = "nvim-moonwalk"; + rev = "86a59f16ae01606824cef3d0f3f87c9886b312d0"; + sha256 = "0cwfsm5wb4qn04930km9p4i6xbhaw4023dfzw3s6cr6a428rpc5j"; + }; + meta.homepage = "https://github.com/gpanders/nvim-moonwalk/"; + }; + nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; version = "2022-09-23"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 616c1c7b23ed..4d67bc5bd207 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -473,6 +473,7 @@ https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, https://github.com/rafcamlet/nvim-luapad/,, https://github.com/scalameta/nvim-metals/,, +https://github.com/gpanders/nvim-moonwalk/,, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, From f225c0c5c740ba9823bb2113d3e2fb14aefbf312 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 23:38:37 +0200 Subject: [PATCH 113/114] python310Packages.skodaconnect: 1.1.23 -> 1.1.25 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 2d389fa4c5c4..a874e668e475 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.23"; + version = "1.1.25"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nRGuDcllBAJTGjA0CIPOX/WCO04dYCm+AFC/aYKiBdY="; + hash = "sha256-Zky1PShQE/V2pSJURYTQHnsqdfsD3k7DWMnDidmwfxs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a8b721d4960189a6366f77baa3fd75b5673fac08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Sep 2022 23:28:07 +0200 Subject: [PATCH 114/114] python310Packages.fastapi: 0.79.1 -> 0.85.0 --- .../python-modules/fastapi/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 05644d43310f..8815da5dfdee 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -9,6 +9,8 @@ , databases , flask , httpx +, hatchling +, orjson , passlib , peewee , python-jose @@ -19,18 +21,22 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.79.1"; - format = "flit"; + version = "0.85.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vriEwUcdITKLeIy1++dvsl5Guhtjlk2WZQrprVQsYMc="; + hash = "sha256-mgrw5MQMqFcXExtsu/jW01dMlygfE1GzSqXHI6BG7j4="; }; + nativeBuildInputs = [ + hatchling + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "starlette==" "starlette>=" @@ -46,6 +52,7 @@ buildPythonPackage rec { databases flask httpx + orjson passlib peewee python-jose