diff --git a/COPYING b/COPYING
index fe46c6a1d82d..65ac1feaf010 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2021 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 843b03692bc9..c88bce2901be 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3435,6 +3435,12 @@
githubId = 4742;
name = "Aaron Bull Schaefer";
};
+ elatov = {
+ email = "elatov@gmail.com";
+ github = "elatov";
+ githubId = 7494394;
+ name = "Karim Elatov";
+ };
eleanor = {
email = "dejan@proteansec.com";
github = "proteansec";
@@ -4116,12 +4122,6 @@
githubId = 7551358;
name = "Frede Emil";
};
- freepotion = {
- email = "42352817+freepotion@users.noreply.github.com";
- github = "freepotion";
- githubId = 42352817;
- name = "Free Potion";
- };
freezeboy = {
email = "freezeboy@users.noreply.github.com";
github = "freezeboy";
@@ -6374,7 +6374,7 @@
};
kmein = {
- email = "kieran.meinhardt@gmail.com";
+ email = "kmein@posteo.de";
name = "Kierán Meinhardt";
github = "kmein";
githubId = 10352507;
diff --git a/nixos/modules/hardware/hackrf.nix b/nixos/modules/hardware/hackrf.nix
new file mode 100644
index 000000000000..7f03b765bbda
--- /dev/null
+++ b/nixos/modules/hardware/hackrf.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.hardware.hackrf;
+
+in
+{
+ options.hardware.hackrf = {
+ enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enables hackrf udev rules and ensures 'plugdev' group exists.
+ This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev.
+ '';
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ services.udev.packages = [ pkgs.hackrf ];
+ users.groups.plugdev = { };
+ };
+}
diff --git a/nixos/modules/hardware/rtl-sdr.nix b/nixos/modules/hardware/rtl-sdr.nix
index 9605c7967f61..e85fc04e29bb 100644
--- a/nixos/modules/hardware/rtl-sdr.nix
+++ b/nixos/modules/hardware/rtl-sdr.nix
@@ -5,10 +5,14 @@ let
in {
options.hardware.rtl-sdr = {
- enable = lib.mkEnableOption ''
- Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules.
- This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
- '';
+ enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules.
+ This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
+ '';
+ };
};
config = lib.mkIf cfg.enable {
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b4a0bcb01dca..b56b9ae8d8b4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -53,6 +53,7 @@
./hardware/flirc.nix
./hardware/gpgsmartcards.nix
./hardware/i2c.nix
+ ./hardware/hackrf.nix
./hardware/sensor/hddtemp.nix
./hardware/sensor/iio.nix
./hardware/keyboard/teck.nix
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index c680063a47c3..35380f864208 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -25,6 +25,9 @@ let
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
)) + "\n";
+ knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ]
+ ++ map pkgs.copyPathToStore cfg.knownHostsFiles;
+
in
{
###### interface
@@ -177,7 +180,9 @@ in
You can fetch a public key file from a running SSH server
with the ssh-keyscan command. The content
of the file should follow the same format as described for
- the publicKey option.
+ the publicKey option. Only a single key
+ is supported. If a host has multiple keys, use
+ instead.
'';
};
};
@@ -202,6 +207,28 @@ in
'';
};
+ knownHostsFiles = mkOption {
+ default = [];
+ type = with types; listOf path;
+ description = ''
+ Files containing SSH host keys to set as global known hosts.
+ /etc/ssh/ssh_known_hosts (which is
+ generated by ) and
+ /etc/ssh/ssh_known_hosts2 are always
+ included.
+ '';
+ example = literalExpression ''
+ [
+ ./known_hosts
+ (writeText "github.keys" '''
+ github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+ github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+ github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+ ''')
+ ]
+ '';
+ };
+
kexAlgorithms = mkOption {
type = types.nullOr (types.listOf types.str);
default = null;
@@ -258,6 +285,7 @@ in
# Generated options from other settings
Host *
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
+ GlobalKnownHostsFile ${concatStringsSep " " knownHostsFiles}
${optionalString cfg.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 6df147be0c49..98c35a7ec84b 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -204,7 +204,7 @@ in
postStart = ''
# Make sure elasticsearch is up and running before dependents
# are started
- while ! ${pkgs.curl}/bin/curl -sS -f http://localhost:${toString cfg.port} 2>/dev/null; do
+ while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.listenAddress}:${toString cfg.port} 2>/dev/null; do
sleep 1
done
'';
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index 481dedf84054..3caed746ca91 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -27,6 +27,7 @@ in
message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";
} ];
+ boot.initrd.availableKernelModules = [ "mptspi" ];
boot.initrd.kernelModules = [ "vmw_pvscsi" ];
environment.systemPackages = [ open-vm-tools ];
diff --git a/pkgs/applications/accessibility/svkbd/default.nix b/pkgs/applications/accessibility/svkbd/default.nix
index eb9ddb091693..f9cad958c02c 100644
--- a/pkgs/applications/accessibility/svkbd/default.nix
+++ b/pkgs/applications/accessibility/svkbd/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "svkbd";
- version = "0.4";
+ version = "0.4.1";
src = fetchurl {
url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
- sha256 = "sha256-j9RW5/4cb8l3FK9jpFf206l1rQhCR5H/WMiu7I6rzV8=";
+ sha256 = "sha256-+8Jh/D4dgULhRXtC1tZQg6AK4POh9czyRyrMi0auD1o=";
};
inherit patches;
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 9dd37e35eb4f..885e8170d3fa 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.17.3.0";
+ version = "0.17.3.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "0rc1p0k16icgfhc7yvkvb8p6570zz0cvigs648l05fcm3mf787rp";
+ sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix
deleted file mode 100644
index 43b933d3e6ae..000000000000
--- a/pkgs/applications/blockchains/parity-ui/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, pkgs, fetchurl, makeWrapper, nodePackages }:
-
-let
-
-uiEnv = pkgs.callPackage ./env.nix { };
-
-in stdenv.mkDerivation rec {
- pname = "parity-ui";
- version = "0.3.4";
-
- src = fetchurl {
- url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
- sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
- name = "${pname}-${version}.deb";
- };
-
- nativeBuildInputs = [ makeWrapper nodePackages.asar ];
-
- buildCommand = ''
- mkdir -p $out/usr/
- ar p $src data.tar.xz | tar -C $out -xJ .
- substituteInPlace $out/usr/share/applications/parity-ui.desktop \
- --replace "/opt/Parity UI" $out/bin
- mv $out/usr/* $out/
- mv "$out/opt/Parity UI" $out/share/parity-ui
- rm -r $out/usr/
- rm -r $out/opt/
-
- fixupPhase
-
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \
- $out/share/parity-ui/parity-ui
-
- find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \;
-
- mkdir -p $out/bin
- ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui
- '';
-
- meta = with lib; {
- description = "UI for Parity. Fast, light, robust Ethereum implementation";
- homepage = "http://parity.io";
- license = licenses.gpl3;
- maintainers = [ maintainers.sorpaas ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/blockchains/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix
deleted file mode 100644
index 5f485ed78a92..000000000000
--- a/pkgs/applications/blockchains/parity-ui/env.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
-, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
-
-let
- packages = [
- stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
- fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
- xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
- xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
- xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb libsecret gnome2.GConf
- ];
-
- libPathNative = lib.makeLibraryPath packages;
- libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
- libPath = "${libPathNative}:${libPath64}";
-
-in { inherit packages libPath; }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 1e13c8bcaa10..59583e4d6e15 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -371,7 +371,8 @@ let
--replace 'defcustom telega-server-command "telega-server"' \
"defcustom telega-server-command \"$out/bin/telega-server\""
- substituteInPlace telega-sticker.el --replace '"dwebp"' '"${pkgs.libwebp}/bin/dwebp"'
+ substituteInPlace telega-sticker.el --replace '"dwebp' '"${pkgs.libwebp}/bin/dwebp'
+ substituteInPlace telega-sticker.el --replace '"ffmpeg' '"${pkgs.ffmpeg}/bin/ffmpeg'
substituteInPlace telega-vvnote.el --replace '"ffmpeg' '"${pkgs.ffmpeg}/bin/ffmpeg'
'';
diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index e9f415f722dc..561e41d1de14 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "imgbrd-grabber";
- version = "7.5.1";
+ version = "7.7.0";
src = fetchFromGitHub {
owner = "Bionus";
repo = "imgbrd-grabber";
rev = "v${version}";
- sha256 = "sha256-40JCdtRhAQpz2lBGmYh2MgA9rRzHmOZx7lWW0IbfjP4=";
+ sha256 = "sha256-Mym/fuV9YVyj5w8U9KlZ/wuwnnC3K5TGNo9RrAFHI5g=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
deleted file mode 100644
index 68e28c5cc886..000000000000
--- a/pkgs/applications/graphics/k3d/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
-, cmake, ninja, libGLU, libGL, zlib, python2, expat, libxml2, libsigcxx, libuuid, freetype
-, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
-
-stdenv.mkDerivation rec {
- version = "0.8.0.6";
- pname = "k3d";
- src = fetchFromGitHub {
- owner = "K-3D";
- repo = "k3d";
- rev = "${pname}-${version}";
- sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
- };
-
- patches = [
- (fetchpatch { /* glibmm 2.50 fix */
- url = "https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch";
- sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j";
- })
- ];
-
- cmakeFlags = [
- "-DK3D_BUILD_DOCS=false"
- "-DK3D_BUILD_GUIDE=false"
- ];
-
- preConfigure = ''
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
- '';
-
- nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
-
- buildInputs = [
- libGLU libGL zlib python2 expat libxml2 libsigcxx libuuid freetype libpng
- boost cairomm libjpeg libtiff
- ftgl glew gtkmm2 glibmm gtkglext libXmu
- ];
-
- #doCheck = false;
-
- NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
-
- meta = with lib; {
- description = "A 3D editor with support for procedural editing";
- homepage = "http://www.k-3d.org/";
- platforms = platforms.linux;
- maintainers = [ maintainers.raskin ];
- license = licenses.gpl2;
- };
-}
diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix
index 64cae5b64e5e..da4216cd8b83 100644
--- a/pkgs/applications/misc/kondo/default.nix
+++ b/pkgs/applications/misc/kondo/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kondo";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "tbillington";
repo = pname;
rev = "v${version}";
- sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf";
+ sha256 = "sha256-TTgsfoJ3TEK7wyRJfBIxvPA53wZbq7KJ4LxjUbrHE4Y=";
};
- cargoSha256 = "0sddsm0jys1bsj2bsr39lcyx8k2hzw17nlsv6aql0v82x8qbsiv4";
+ cargoSha256 = "sha256-s5e997I7YiDKF6rOB0XwcxbnHR8AifYPX9ctvdz8VTw=";
meta = with lib; {
description = "Save disk space by cleaning unneeded files from software projects";
diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix
index c92eeaa72a7e..13e7c60f5192 100644
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@@ -9,13 +9,13 @@
buildGoPackage rec {
pname = "mob";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
- sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4=";
+ sha256 = "sha256-nf0FSaUi8qX1f4Luo0cP4ZLoOKbyvgmpilMOWXbzzIM=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index f29e3d52310e..11f6e7bbc048 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "moolticute";
- version = "0.53.2";
+ version = "0.53.7";
src = fetchFromGitHub {
owner = "mooltipass";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CJVOmFX2wqftQt8j9Tlw93YBiTWE8l1RLprG0cmHeUE=";
+ sha256 = "sha256-1hVvpfrfL/+DIeiPW5iVBEnoc8dy8vVWim4JjhsBlzM=";
};
outputs = [ "out" "udev" ];
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index d711f43ad570..51e1a15b47ba 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "moonlight-embedded";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = "moonlight-embedded";
rev = "v${version}";
- sha256 = "0wn6yjpqyjv52278xsx1ivnqrwca4fnk09a01fwzk4adpry1q9ck";
+ sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix
new file mode 100644
index 000000000000..a7583dabd733
--- /dev/null
+++ b/pkgs/applications/misc/ratt/default.nix
@@ -0,0 +1,26 @@
+{ buildGoModule, fetchFromSourcehut, lib }:
+buildGoModule rec {
+ pname = "ratt";
+ version = "unstable-2022-01-11";
+
+ src = fetchFromSourcehut {
+ owner = "~ghost08";
+ repo = "ratt";
+ rev = "eac7e14b15ad4e916e7d072780397c414c740630";
+ hash = "sha256-/WzPF98MovNg4t5NJhL2Z1bAFDG/3I56M9YgRJF7Wjk=";
+ };
+
+ proxyVendor = true;
+ vendorSha256 = "sha256-NW5B9oO/LJqPigvOcMeL4hQLKmAL01I2Ff41y169BTQ=";
+
+ # tests try to access the internet to scrape websites
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A tool for converting websites to rss/atom feeds";
+ homepage = "https://git.sr.ht/~ghost08/ratt";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kmein ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix
index 212f15329213..5243c4130f14 100644
--- a/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
- version = "0.17";
+ version = "0.18.3";
src = fetchFromGitHub {
owner = "cloudskiff";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-JloeRoW+1tepSJzhcOQu38TDQfY10NtG2EyeVhP26BQ=";
+ sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE=";
};
- vendorSha256 = "sha256-aaJ5fpS+BiVq1K8OxN+/CBD96wy3flGDhch8O2ACIh8=";
+ vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU=";
postUnpack = ''
# Without this, tests fail to locate aws/3.19.0.json
diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix
new file mode 100644
index 000000000000..8e4c85cebeae
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/photon/default.nix
@@ -0,0 +1,27 @@
+{ buildGoModule, fetchFromSourcehut, lib, xorg }:
+
+buildGoModule rec {
+ pname = "photon";
+ version = "unstable-2022-01-11";
+
+ src = fetchFromSourcehut {
+ owner = "~ghost08";
+ repo = "photon";
+ rev = "5d1f7dd8d0d526096886b03c7bc0ef56cbdd6d79";
+ sha256 = "sha256-2RSGLWfthcChd5YhDSBfLSch6wuTUv1Sh1f7flgzQwc=";
+ };
+
+ buildInputs = [ xorg.libX11 ];
+
+ proxyVendor = true;
+
+ vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4=";
+
+ meta = with lib; {
+ description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy";
+ homepage = "https://sr.ht/~ghost08/photon";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ kmein ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/office/kalendar/default.nix
index fa8f686c5eea..00aa23f6d1fd 100644
--- a/pkgs/applications/office/kalendar/default.nix
+++ b/pkgs/applications/office/kalendar/default.nix
@@ -38,14 +38,14 @@
mkDerivation rec {
pname = "kalendar";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "pim";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-foG8j/MRbDZyzM9KmxEARfWUQXMz8ylQgersE1/gtnQ=";
+ sha256 = "sha256-j383I40lChsI/VOgceaHYGhE61p3SpvInUrkUV5HnHY=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
index 0db8cf87077e..7cefd485d144 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
- version = "1.21.1";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-naCCJ9s63UPDxRWbVjVikXtGUlM4Lp7vyDHlESEtXeI=";
+ sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE=";
};
- vendorSha256 = "sha256-rciT4UcsLu/vI0PqdTlMjbYXVumzo3ASsopkgiHGM60=";
+ vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0=";
ldflags = [
"-X main.version=${version}"
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index d700f686f630..4b0789e35eb8 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -174,6 +174,9 @@ runCommand drvName
} ''
mkdir -p $out/bin
+ mkdir -p $out/bin/cache/
+ ln -sf ${dart} $out/bin/cache/dart-sdk
+
echo -n "$startScript" > $out/bin/${pname}
chmod +x $out/bin/${pname}
''
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ae32bbe95223..7e281892a1fd 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,9 +1,8 @@
-{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
+{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, xlibsWrapper, libXmu, libXi
, OpenGL
+, enableEGL ? false
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "glew";
version = "2.2.0";
@@ -13,48 +12,46 @@ stdenv.mkDerivation rec {
sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l";
};
- outputs = [ "bin" "out" "dev" "doc" ];
+ outputs = [ "bin" "out" "dev" ];
- buildInputs = optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
- propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
-
- patchPhase = ''
- sed -i 's|lib64|lib|' config/Makefile.linux
- substituteInPlace config/Makefile.darwin --replace /usr/local "$out"
- ${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
- sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
- ''}
- '';
-
- buildFlags = [ "all" ];
- installFlags = [ "install.all" ];
-
- preInstall = ''
- makeFlagsArray+=(GLEW_DEST=$out BINDIR=$bin/bin INCDIR=$dev/include/GL)
- '';
-
- postInstall = ''
- mkdir -pv $out/share/doc/glew
- mkdir -p $out/lib/pkgconfig
- cp glew*.pc $out/lib/pkgconfig
- cp -r README.md LICENSE.txt doc $out/share/doc/glew
- rm $out/lib/*.a
- '';
-
- makeFlags = [
- "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}"
- "CC=${stdenv.cc.targetPrefix}cc"
- "LD=${stdenv.cc.targetPrefix}cc"
- "AR=${stdenv.cc.targetPrefix}ar"
+ patches = [
+ # https://github.com/nigels-com/glew/pull/342
+ (fetchpatch {
+ url = "https://github.com/nigels-com/glew/commit/966e53fa153175864e151ec8a8e11f688c3e752d.diff";
+ sha256 = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw=";
+ })
];
- enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = lib.optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ];
+ propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h
+
+ cmakeDir = "cmake";
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=ON"
+ ] ++ lib.optional enableEGL "-DGLEW_EGL=ON";
+
+ postInstall = ''
+ moveToOutput lib/cmake "''${!outputDev}"
+ moveToOutput lib/pkgconfig "''${!outputDev}"
+
+ cat >> "''${!outputDev}"/lib/cmake/glew/glew-config.cmake <=3.0.2"
+ '';
+
disabledTests = [
# No API key available
"api_key"
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 353f4d0f4e06..e4a616f9995e 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -99,6 +99,10 @@ in newPython.pkgs.buildPythonApplication rec {
# Not enabled right now due to time constraints/failing tests that I didn't have time to track down
doCheck = false;
+ postPatch = ''
+ substituteInPlace conans/requirements.txt --replace 'PyYAML>=3.11, <6.0' 'PyYAML>=3.11'
+ '';
+
meta = with lib; {
homepage = "https://conan.io";
description = "Decentralized and portable C/C++ package manager";
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index bc335da78a7b..b012522c83ef 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
- sha256 = "sha256-qYwCt7+//GJHJyDrZ8rcGCKLshKebIDBQCyn6rLOhJQ=";
+ sha256 = "sha256-ct4SsIs6ErWl2XbxfqX3FTOU9K9tTKo8YWu1QT83iTI=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://www.lihaoyi.com/mill";
+ homepage = "https://com-lihaoyi.github.io/mill/";
license = licenses.mit;
description = "A build tool for Scala, Java and more";
longDescription = ''
diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix
index 505a0681085a..d2c910b2544e 100644
--- a/pkgs/development/tools/dprint/default.nix
+++ b/pkgs/development/tools/dprint/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
- version = "0.18.2";
+ version = "0.19.2";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-5vWkIQtbeQzPgc1BDjxfWCmCYseOUiV0LXapypcLItI=";
+ sha256 = "sha256-mTurSfYyLDmHCiza/noToRFtQL0zsdzib69PCtUseSI=";
};
- cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw=";
+ cargoSha256 = "sha256-B4b6RSegtS3FQ4BHFVmw9+jlA/oKEmB5i/kdb6nuzkQ=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 1c91fdef97eb..42198a65f701 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minify";
- version = "2.9.22";
+ version = "2.9.24";
src = fetchFromGitHub {
owner = "tdewolff";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ph5PrM917qGwp7SLg6Ujfk5YJWFSlUBdW/JJRiwq7fw=";
+ sha256 = "sha256-4M7Oj/hHFH2OUz0y64GIEnv0Kk0+zAje3kHA2e4RQS0=";
};
- vendorSha256 = "sha256-0GKIGIVtMywpKxopsVrUZMgeXP/l76U2As8FiG2Niqw=";
+ vendorSha256 = "sha256-oYZZ9DzpY544QTWDGz/wkHA9aP0riEXLUTWvzV1KxQc=";
doCheck = false;
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 36490cd582e3..ce0eeea738af 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
homepage = "https://attnam.com/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [freepotion];
+ maintainers = with maintainers; [];
};
}
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 1ef17a012b5e..71f95472bb44 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation {
})
];
- nativeBuildInputs = [ autoreconfHook perl groff util-linux texinfo ] ++ lib.optionals stdenv.isLinux [ yodl ];
+ nativeBuildInputs = [ autoreconfHook perl groff texinfo ]
+ ++ lib.optionals stdenv.isLinux [ util-linux yodl ];
buildInputs = [ ncurses pcre ];
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 2cfd2cdac8bb..355d3e348852 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
- version = "5.4.3";
+ version = "5.4.4";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
- sha256 = "sha256-A/+XnLusceJXik86EiYeVFi4iplp4+izbYpWNp8QPiM=";
+ sha256 = "sha256-2kiaP7V/dGDHiYTqvVEwAaAMrSoLzYtvR4hgtG6iUoQ=";
};
dontConfigure = true;
diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix
index 2dc6ba9f89e4..5ffad1825d46 100644
--- a/pkgs/tools/misc/macchina/default.nix
+++ b/pkgs/tools/misc/macchina/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
- version = "5.0.5";
+ version = "6.0.5";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-si+5LvRUIWp48vsD1WxGWl2O/2bpaBX+ArkZPbBqtME=";
+ sha256 = "sha256-x13ldPUr2PkrweDKyyQWMwd3PL4lsY11TIKrmBV5vkA=";
};
- cargoSha256 = "sha256-CN7PxPUkfyDGxVaf879Sp6w0UbqwL/is15xcfH2fm1w=";
+ cargoSha256 = "sha256-y6UMpzt8uiN4jfYnDmwNFGQ1opUsQz8n870XY775qZo=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 23b040f26097..adcc2bd9b042 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -3,6 +3,7 @@
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "4.0.7";
+ format = "pyproject";
src = fetchFromGitHub {
repo = "yubikey-manager";
@@ -12,12 +13,12 @@ python3Packages.buildPythonPackage rec {
};
postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"'
substituteInPlace "ykman/pcsc/__init__.py" \
- --replace '/usr/bin/pkill' '${procps}/bin/pkill'
+ --replace 'pkill' '${procps}/bin/pkill'
'';
- format = "pyproject";
-
nativeBuildInputs = with python3Packages; [ poetry-core ];
propagatedBuildInputs =
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 74d4b61064bd..28868e853734 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
"--with-gsasl"
"--with-mysql"
"--with-path-sendmail=${system-sendmail}/bin/sendmail"
+ "--with-mail-rc=/etc/mail.rc"
];
readmsg-tests = let
diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix
new file mode 100644
index 000000000000..66d7a5a7537a
--- /dev/null
+++ b/pkgs/tools/security/fwbuilder/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, cmake, qtbase, wrapQtAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "fwbuilder";
+ version = "6.0.0-rc1";
+
+ src = fetchFromGitHub {
+ owner = "fwbuilder";
+ repo = "fwbuilder";
+ rev = "v${version}";
+ hash = "sha256-j5HjGcIqq93Ca9OBqEgSotoSXyw+q6Fqxa3hKk1ctwQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ wrapQtAppsHook
+ ];
+
+ meta = with lib; {
+ description = "GUI Firewall Management Application";
+ homepage = "https://github.com/fwbuilder/fwbuilder";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.elatov ];
+ };
+}
diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix
index 07d966353abf..0a6bd4dd5abf 100644
--- a/pkgs/tools/security/log4j-sniffer/default.nix
+++ b/pkgs/tools/security/log4j-sniffer/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "log4j-sniffer";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "palantir";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2scESCuENM4m3YrxPjoXcPKEkBPTMWOGJR3WenkTNBA=";
+ sha256 = "sha256-q9PwUzHmcTYKMl0dVR5owB/UXYv5ZgmvRK0S6vOBFT8=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix
index 67bfa89ad2eb..a33848b5d487 100644
--- a/pkgs/tools/security/log4j-vuln-scanner/default.nix
+++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "log4j-vuln-scanner";
- version = "0.11";
+ version = "0.13";
src = fetchFromGitHub {
owner = "hillu";
repo = "local-log4j-vuln-scanner";
rev = "v${version}";
- sha256 = "sha256-YGo2dhfqLPNP8O9gdRJfxKmEK/pKd17WNTXQ2cq78qg=";
+ sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 66c28b5ab087..22b2cb70e0ed 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.24"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 77c92e9f4f68..38c9bda14349 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f
- ref: refs/tags/6.1.23
+ revision: 0991344df7a2b343b99e83507bf217137f11801d
+ ref: refs/tags/6.1.24
specs:
- metasploit-framework (6.1.23)
+ metasploit-framework (6.1.24)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -19,11 +19,12 @@ GIT
em-http-request
eventmachine
faker
- faraday
+ faraday (= 1.8.0)
faye-websocket
filesize
hrr_rb_ssh-ed25519
http-cookie
+ io-console (= 0.5.9)
irb
jsobfu
json
@@ -129,12 +130,12 @@ GEM
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.547.0)
- aws-sdk-core (3.125.1)
+ aws-sdk-core (3.125.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.290.0)
+ aws-sdk-ec2 (1.291.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0)
@@ -175,33 +176,29 @@ GEM
eventmachine (1.2.7)
faker (2.19.0)
i18n (>= 1.6, < 2)
- faraday (1.9.3)
+ faraday (1.8.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
- faraday-httpclient (~> 1.0)
- faraday-multipart (~> 1.0)
+ faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
- faraday-net_http_persistent (~> 1.0)
+ faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
- faraday-retry (~> 1.0)
+ multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
- faraday-multipart (1.0.2)
- multipart-post (>= 1.2, < 3)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
- faraday-retry (1.0.3)
faye-websocket (0.11.1)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- ffi (1.15.4)
+ ffi (1.15.5)
filesize (0.2.0)
gssapi (1.3.1)
ffi (>= 1.0.1)
@@ -218,10 +215,10 @@ GEM
httpclient (2.8.3)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
- io-console (0.5.11)
+ io-console (0.5.9)
irb (1.3.6)
reline (>= 0.2.5)
- jmespath (1.4.0)
+ jmespath (1.5.0)
jsobfu (0.4.2)
rkelly-remix
json (2.6.1)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index c1f6e7116ad3..727518fe81df 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.1.23";
+ version = "6.1.24";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA=";
+ sha256 = "sha256-eCnudckLCiE6L2EC/IHqbXdOrGBkSmWZHyHFvvFUqQ4=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index cbf772acdb63..a9bcf2c227f4 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,20 +114,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1";
+ sha256 = "1jp8nz18r9skri118haqy0slqmr5bwjw7xvrghcmj9lx409f0m6p";
type = "gem";
};
- version = "3.125.1";
+ version = "3.125.2";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p";
+ sha256 = "1awg6wdq5nqlxq5zqj2h06898d9b24ci3jnczpss9pqgis4g0w0n";
type = "gem";
};
- version = "1.290.0";
+ version = "1.291.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -344,10 +344,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
+ sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
type = "gem";
};
- version = "1.9.3";
+ version = "1.8.0";
};
faraday-em_http = {
groups = ["default"];
@@ -389,16 +389,6 @@
};
version = "1.0.1";
};
- faraday-multipart = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87";
- type = "gem";
- };
- version = "1.0.2";
- };
faraday-net_http = {
groups = ["default"];
platforms = [];
@@ -439,16 +429,6 @@
};
version = "1.0.0";
};
- faraday-retry = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
- type = "gem";
- };
- version = "1.0.3";
- };
faye-websocket = {
groups = ["default"];
platforms = [];
@@ -464,10 +444,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
- version = "1.15.4";
+ version = "1.15.5";
};
filesize = {
groups = ["default"];
@@ -574,10 +554,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y";
+ sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja";
type = "gem";
};
- version = "0.5.11";
+ version = "0.5.9";
};
irb = {
groups = ["default"];
@@ -594,10 +574,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
type = "gem";
};
- version = "1.4.0";
+ version = "1.5.0";
};
jsobfu = {
groups = ["default"];
@@ -684,12 +664,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f";
- sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds";
+ rev = "0991344df7a2b343b99e83507bf217137f11801d";
+ sha256 = "03m9akqvxi913ycnajk4c2n4wxvdxa0zq0k15wx222hbr5sywabq";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.1.23";
+ version = "6.1.24";
};
metasploit-model = {
groups = ["default"];
diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix
index ed486fbf4c52..db15f8b02522 100644
--- a/pkgs/tools/system/gptman/default.nix
+++ b/pkgs/tools/system/gptman/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "gptman";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "cecton";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MWrTwVXlV2B8GzYRgI3np6NqqSGPbRZCKpLU7aC1mX0=";
+ sha256 = "sha256-hI3F1E1vdbNDEeJ4FrU0EvR0t64svzUIpI6zaf0CquM=";
};
- cargoSha256 = "sha256-dVvZTYk17fyurtrJxjUgkxU37rxJubiTAQ1AWMnFP4s=";
+ cargoSha256 = "sha256-3PRGPZGymccRo9dtQZgMMEL29x+GiUkTzgc8uAB/ocQ=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
index 5d4df37a2b66..43aa2b10cc3f 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "java-service-wrapper";
- version = "3.5.46";
+ version = "3.5.48";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
- sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg=";
+ sha256 = "sha256-woANhwLOhvTnq+Bnc8zCIDZEJOv3swNfeI/3nQ7Y1SM=";
};
buildInputs = [ jdk ];
diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix
index a0abd672559e..5e4bd7becc52 100644
--- a/pkgs/tools/text/mark/default.nix
+++ b/pkgs/tools/text/mark/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mark";
- version = "6.5.1";
+ version = "6.7";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
- sha256 = "sha256-NTe7J08Lu4uVI/mLj4m87n1BZXiUPDvi5OtjJfddJw8=";
+ sha256 = "sha256-ZPKYZbWrR69V4SkXTiAK59Q2xpxkOC6KyAuspjzERwQ=";
};
vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8=";
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 96aa01abe6dd..ab573dfd7a11 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "html-xml-utils";
- version = "8.0";
+ version = "8.1";
src = fetchurl {
url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
- sha256 = "sha256-dJBZkGwzHCx/us7uAkZiRaI3uRvUCN/485bQc0oGCuI=";
+ sha256 = "sha256-23SCNQpo0udPbCpuF9hxugbJQQHs4edKNX6nghu0Ges=";
};
buildInputs = [curl libiconv];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 47dd8f3e6cb0..0d98bf688189 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -420,6 +420,7 @@ mapAliases ({
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
+ k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # added 2022-01-04
kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
kdiff3-qt5 = kdiff3; # added 2017-02-18
@@ -671,6 +672,7 @@ mapAliases ({
packet-cli = metal-cli; # added 2021-10-25
paperless = paperless-ng; # added 2021-06-06
parity = openethereum; # added 2020-08-01
+ parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10
parquet-cpp = arrow-cpp; # added 2018-09-08
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ba9dd629339..fe1c97840eb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1011,6 +1011,8 @@ with pkgs;
godspeed = callPackage ../tools/networking/godspeed { };
+ fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
+
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
linux-router = callPackage ../tools/networking/linux-router { };
@@ -8699,6 +8701,8 @@ with pkgs;
phodav = callPackage ../tools/networking/phodav { };
+ photon-rss = callPackage ../applications/networking/feedreaders/photon { };
+
pim6sd = callPackage ../servers/pim6sd { };
phosh = callPackage ../applications/window-managers/phosh { };
@@ -9112,6 +9116,8 @@ with pkgs;
ratools = callPackage ../tools/networking/ratools { };
+ ratt = callPackage ../applications/misc/ratt { };
+
rc = callPackage ../shells/rc { };
rcon = callPackage ../tools/networking/rcon { };
@@ -16608,10 +16614,10 @@ with pkgs;
glew110 = callPackage ../development/libraries/glew/1.10.nix {
inherit (darwin.apple_sdk.frameworks) AGL OpenGL;
};
- glew-egl = glew.overrideAttrs (oldAttrs: {
- pname = "glew-egl";
- makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ];
- });
+ glew-egl = callPackage ../development/libraries/glew {
+ inherit (darwin.apple_sdk.frameworks) OpenGL;
+ enableEGL = true;
+ };
glfw = glfw3;
glfw-wayland = glfw.override {
@@ -26486,19 +26492,6 @@ with pkgs;
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
- k3d = callPackage ../applications/graphics/k3d {
- inherit (gnome2) gtkglext;
- stdenv = gcc6Stdenv;
- boost = boost155.override {
- enablePython = true;
- python = python2;
- stdenv = gcc6Stdenv;
- buildPackages = buildPackages // {
- stdenv = gcc6Stdenv;
- };
- };
- };
-
k3s = callPackage ../applications/networking/cluster/k3s {};
kconf = callPackage ../applications/networking/cluster/kconf { };
@@ -30179,8 +30172,6 @@ with pkgs;
openethereum = callPackage ../applications/blockchains/openethereum { };
- parity-ui = callPackage ../applications/blockchains/parity-ui { };
-
polkadot = callPackage ../applications/blockchains/polkadot { };
particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 569c10d69094..24a0dcb52fc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5374,11 +5374,11 @@ in {
nmapthon2 = callPackage ../development/python-modules/nmapthon2 { };
- nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
+ amaranth-boards = callPackage ../development/python-modules/amaranth-boards { };
- nmigen = callPackage ../development/python-modules/nmigen { };
+ amaranth = callPackage ../development/python-modules/amaranth { };
- nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
+ amaranth-soc = callPackage ../development/python-modules/amaranth-soc { };
nocasedict = callPackage ../development/python-modules/nocasedict { };