diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index 6935d0bbd21..270728a61c6 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -25,7 +25,7 @@ jobs:
- name: Fetch editorconfig-checker
if: env.PR_DIFF
env:
- ECC_VERSION: "2.2.0"
+ ECC_VERSION: "2.3.1"
ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
run: |
curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 3da8080958e..0b1d0d509d7 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1343,6 +1343,14 @@ CREATE ROLE postgres LOGIN SUPERUSER;
It was chosen to do this as it has a usability breaking issue (see issue #98819)
that makes it unsuitable to be a default app.
+
+
+ Issue #98819
+ is now fixed and gnome3.epiphany is once
+ again installed by default.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 05daca1d710..9070957aee4 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -504,6 +504,11 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
The option's description was incorrect regarding ownership management and has been simplified greatly.
+
+
+ The GNOME desktop manager once again installs gnome3.epiphany by default.
+
+
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8fd5d4519fd..c2a9e0f3201 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -492,6 +492,7 @@
./services/misc/nix-ssh-serve.nix
./services/misc/novacomd.nix
./services/misc/nzbget.nix
+ ./services/misc/nzbhydra2.nix
./services/misc/octoprint.nix
./services/misc/osrm.nix
./services/misc/packagekit.nix
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index e09e4861646..c8e5045f6dc 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -10,6 +10,14 @@ let
gid = config.ids.gids.mpd;
cfg = config.services.mpd;
+ credentialsPlaceholder = (creds:
+ let
+ placeholders = (imap0
+ (i: c: ''password "{{password-${toString i}}}@${concatStringsSep "," c.permissions}"'')
+ creds);
+ in
+ concatStringsSep "\n" placeholders);
+
mpdConf = pkgs.writeText "mpd.conf" ''
# This file was automatically generated by NixOS. Edit mpd's configuration
# via NixOS' configuration.nix, as this file will be rewritten upon mpd's
@@ -32,6 +40,8 @@ let
}
''}
+ ${credentialsPlaceholder cfg.credentials}
+
${cfg.extraConfig}
'';
@@ -152,16 +162,35 @@ in {
'';
};
- credentialsFile = mkOption {
- type = types.path;
+ credentials = mkOption {
+ type = types.listOf (types.submodule {
+ options = {
+ passwordFile = mkOption {
+ type = types.path;
+ description = ''
+ Path to file containing the password.
+ '';
+ };
+ permissions = let
+ perms = ["read" "add" "control" "admin"];
+ in mkOption {
+ type = types.listOf (types.enum perms);
+ default = [ "read" ];
+ description = ''
+ List of permissions that are granted with this password.
+ Permissions can be "${concatStringsSep "\", \"" perms}".
+ '';
+ };
+ };
+ });
description = ''
- Path to a file to be merged with the settings during the service startup.
- Useful to merge a file which is better kept out of the Nix store
- because it contains sensible data like MPD's password. Example may look like this:
- password "myMpdPassword@read,add,control,admin"
+ Credentials and permissions for accessing the mpd server.
'';
- default = "/dev/null";
- example = "/var/lib/secrets/mpd.conf";
+ default = [];
+ example = [
+ {passwordFile = "/var/lib/secrets/mpd_readonly_password"; permissions = [ "read" ];}
+ {passwordFile = "/var/lib/secrets/mpd_admin_password"; permissions = ["read" "add" "control" "admin"];}
+ ];
};
fluidsynth = mkOption {
@@ -201,12 +230,15 @@ in {
serviceConfig = mkMerge [
{
User = "${cfg.user}";
- ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
- ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
- #!${pkgs.runtimeShell}
+ ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /run/mpd/mpd.conf";
+ ExecStartPre = pkgs.writeShellScript "mpd-start-pre" ''
set -euo pipefail
- cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
+ install -m 600 ${mpdConf} /run/mpd/mpd.conf
+ ${pkgs.replace}/bin/replace-literal -fe ${
+ concatStringsSep " -a " (imap0 (i: c: "\"{{password-${toString i}}}\" \"$(cat ${c.passwordFile})\"") cfg.credentials)
+ } /run/mpd/mpd.conf
'';
+ RuntimeDirectory = "mpd";
Type = "notify";
LimitRTPRIO = 50;
LimitRTTIME = "infinity";
@@ -230,14 +262,6 @@ in {
})
];
};
- environment.etc."mpd.conf" = {
- mode = "0640";
- group = cfg.group;
- user = cfg.user;
- # To be modified by the service' ExecStartPre
- text = ''
- '';
- };
users.users = optionalAttrs (cfg.user == name) {
${name} = {
diff --git a/nixos/modules/services/misc/nzbhydra2.nix b/nixos/modules/services/misc/nzbhydra2.nix
new file mode 100644
index 00000000000..c396b4b8f6e
--- /dev/null
+++ b/nixos/modules/services/misc/nzbhydra2.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let cfg = config.services.nzbhydra2;
+
+in {
+ options = {
+ services.nzbhydra2 = {
+ enable = mkEnableOption "NZBHydra2";
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/nzbhydra2";
+ description = "The directory where NZBHydra2 stores its data files.";
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ "Open ports in the firewall for the NZBHydra2 web interface.";
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.nzbhydra2;
+ defaultText = "pkgs.nzbhydra2";
+ description = "NZBHydra2 package to use.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.tmpfiles.rules =
+ [ "d '${cfg.dataDir}' 0700 nzbhydra2 nzbhydra2 - -" ];
+
+ systemd.services.nzbhydra2 = {
+ description = "NZBHydra2";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ User = "nzbhydra2";
+ Group = "nzbhydra2";
+ ExecStart =
+ "${cfg.package}/bin/nzbhydra2 --nobrowser --datafolder '${cfg.dataDir}'";
+ Restart = "on-failure";
+ # Hardening
+ NoNewPrivileges = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ DevicePolicy = "closed";
+ ProtectSystem = "strict";
+ ReadWritePaths = cfg.dataDir;
+ ProtectHome = "read-only";
+ ProtectControlGroups = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ RestrictAddressFamilies ="AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ LockPersonality = true;
+ };
+ };
+
+ networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ 5076 ]; };
+
+ users.users.nzbhydra2 = {
+ group = "nzbhydra2";
+ isSystemUser = true;
+ };
+
+ users.groups.nzbhydra2 = {};
+ };
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 68a65d77d62..a36a47d376b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -19,7 +19,7 @@ let
defaultFavoriteAppsOverride = ''
[org.gnome.shell]
- favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]
+ favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]
'';
nixos-gsettings-desktop-schemas = let
@@ -409,9 +409,7 @@ in
baobab
cheese
eog
- /* Not in good standing on nixos:
- * https://github.com/NixOS/nixpkgs/issues/98819
- /* epiphany */
+ epiphany
gedit
gnome-calculator
gnome-calendar
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8d04f10157e..d53c6f6511e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -274,6 +274,7 @@ in
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
nsd = handleTest ./nsd.nix {};
nzbget = handleTest ./nzbget.nix {};
+ nzbhydra2 = handleTest ./nzbhydra2.nix {};
oh-my-zsh = handleTest ./oh-my-zsh.nix {};
openarena = handleTest ./openarena.nix {};
openldap = handleTest ./openldap.nix {};
diff --git a/nixos/tests/nzbhydra2.nix b/nixos/tests/nzbhydra2.nix
new file mode 100644
index 00000000000..c82c756c3a1
--- /dev/null
+++ b/nixos/tests/nzbhydra2.nix
@@ -0,0 +1,17 @@
+import ./make-test-python.nix ({ lib, ... }:
+
+ with lib;
+
+ {
+ name = "nzbhydra2";
+ meta.maintainers = with maintainers; [ jamiemagee ];
+
+ nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; };
+
+ testScript = ''
+ machine.start()
+ machine.wait_for_unit("nzbhydra2.service")
+ machine.wait_for_open_port(5076)
+ machine.succeed("curl --fail http://localhost:5076/")
+ '';
+ })
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 377260a662d..63d5ba8d484 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
- version = "0.12.2";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
- sha256 = "sha256:0fb227kgani32ljnw73a0h5zn5361z5lraf79y34a0chcby2qv35";
+ sha256 = "sha256-yTvFQWmNxoB+CNZLHGmzJq7mKuOUxUqV4g8PWlOlRbM=";
};
- cargoSha256 = "sha256:0ilfr32zcajag05qcpwi5ixz250s427i4xrjf4wrk7qy32bblnr5";
+ cargoSha256 = "sha256:19vijhcs1i02jhz68acil7psv3pcn0jzi1i4y2l05i4m3ayxivjf";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl oniguruma ]
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index 668a229a62e..f344b8c3eb9 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub }:
-# SHA of ${version} for the tool's help output
-let rev = "e03f9ee353717ccc5f58c902633553e34b2fe46a";
+# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
+let rev = "f6e19140201d6bf2f1274bf6567087bc25154210";
in
buildGoModule rec {
pname = "sonobuoy";
- version = "0.19.0";
+ version = "0.20.0"; # Do not forget to update `rev` above
buildFlagsArray =
let t = "github.com/vmware-tanzu/sonobuoy";
@@ -17,7 +17,7 @@ buildGoModule rec {
'';
src = fetchFromGitHub {
- sha256 = "1gw58a30akidk15wk8kk7f8lsyqr1q180j6fzr4462ahwxdbjgkr";
+ sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri";
rev = "v${version}";
repo = "sonobuoy";
owner = "vmware-tanzu";
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 39f4d0d2334..2fe9365a84d 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -2,18 +2,19 @@
buildGoModule rec {
pname = "ipfs-cluster";
- version = "0.13.0";
- rev = "v${version}";
+ version = "unstable-2020-10-20";
- vendorSha256 = "00fkyxxi4iz16v0j33270x8qrspqpsv9j6csnikjy0klyb038pfq";
+ vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d";
- doCheck = false;
+ patches = [
+ ./test.patch
+ ];
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
- inherit rev;
- sha256 = "0jf3ngxqkgss5f1kifp5lp3kllb21jxc475ysl01ma8l3smqdvya";
+ rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4";
+ sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/ipfs-cluster/test.patch b/pkgs/applications/networking/ipfs-cluster/test.patch
new file mode 100644
index 00000000000..65f10fec8ef
--- /dev/null
+++ b/pkgs/applications/networking/ipfs-cluster/test.patch
@@ -0,0 +1,12 @@
+diff --git a/peer_manager_test.go b/peer_manager_test.go
+index 521e754..cf0d777 100644
+--- a/peer_manager_test.go
++++ b/peer_manager_test.go
+@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr {
+ }
+
+ func TestClustersPeerAdd(t *testing.T) {
++ t.Skip("test is disabld by nixos")
+ ctx := context.Background()
+ clusters, mocks, boot := peerManagerClusters(t)
+ defer shutdownClusters(t, clusters, mocks)
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index f8eb064e1fd..05f93a1a205 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -1,22 +1,34 @@
{ stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps
, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook
+, python3
}:
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "octopus";
- version = "10.0";
+ version = "10.3";
src = fetchFromGitLab {
owner = "octopus-code";
repo = "octopus";
rev = version;
- sha256 = "1c6q20y0x9aacwa7vp6gj3yvfzain7hnk6skxmvg3wazp02l91kn";
+ sha256 = "1axr3j53mi30gm3f645ga5jkhxbc7rbx432w2k2lgg6g9dv3fcs4";
};
nativeBuildInputs = [ perl procps autoreconfHook ];
- buildInputs = [ libyaml gfortran libxc blas lapack gsl fftw netcdf arpack ];
+ buildInputs = [
+ libyaml
+ gfortran
+ libxc
+ blas
+ lapack
+ gsl
+ fftw
+ netcdf
+ arpack
+ (python3.withPackages (ps: [ ps.pyyaml ]))
+ ];
configureFlags = [
"--with-yaml-prefix=${libyaml}"
@@ -44,7 +56,7 @@ stdenv.mkDerivation rec {
description = "Real-space time dependent density-functional theory code";
homepage = "https://octopus-code.org";
maintainers = with maintainers; [ markuskowa ];
- license = licenses.gpl2;
+ license = with licenses; [ gpl2Only asl20 lgpl3Plus bsd3 ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 2087db493cf..43ea2d69281 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index ecca8c5bfdd..cfd7e573399 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,395 +4,395 @@
{
bluedevil = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz";
- sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129";
- name = "bluedevil-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz";
+ sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk";
+ name = "bluedevil-5.20.5.tar.xz";
};
};
breeze = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz";
- sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f";
- name = "breeze-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz";
+ sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l";
+ name = "breeze-5.20.5.tar.xz";
};
};
breeze-grub = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz";
- sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb";
- name = "breeze-grub-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz";
+ sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2";
+ name = "breeze-grub-5.20.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz";
- sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d";
- name = "breeze-gtk-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz";
+ sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l";
+ name = "breeze-gtk-5.20.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz";
- sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada";
- name = "breeze-plymouth-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz";
+ sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m";
+ name = "breeze-plymouth-5.20.5.tar.xz";
};
};
discover = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz";
- sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012";
- name = "discover-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz";
+ sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5";
+ name = "discover-5.20.5.tar.xz";
};
};
drkonqi = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz";
- sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8";
- name = "drkonqi-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz";
+ sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9";
+ name = "drkonqi-5.20.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz";
- sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34";
- name = "kactivitymanagerd-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz";
+ sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068";
+ name = "kactivitymanagerd-5.20.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz";
- sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3";
- name = "kde-cli-tools-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz";
+ sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04";
+ name = "kde-cli-tools-5.20.5.tar.xz";
};
};
kdecoration = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz";
- sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8";
- name = "kdecoration-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz";
+ sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf";
+ name = "kdecoration-5.20.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz";
- sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1";
- name = "kde-gtk-config-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz";
+ sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r";
+ name = "kde-gtk-config-5.20.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz";
- sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7";
- name = "kdeplasma-addons-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz";
+ sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n";
+ name = "kdeplasma-addons-5.20.5.tar.xz";
};
};
kgamma5 = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz";
- sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41";
- name = "kgamma5-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz";
+ sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld";
+ name = "kgamma5-5.20.5.tar.xz";
};
};
khotkeys = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz";
- sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648";
- name = "khotkeys-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz";
+ sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8";
+ name = "khotkeys-5.20.5.tar.xz";
};
};
kinfocenter = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz";
- sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3";
- name = "kinfocenter-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz";
+ sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm";
+ name = "kinfocenter-5.20.5.tar.xz";
};
};
kmenuedit = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz";
- sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b";
- name = "kmenuedit-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz";
+ sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf";
+ name = "kmenuedit-5.20.5.tar.xz";
};
};
kscreen = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz";
- sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c";
- name = "kscreen-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz";
+ sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y";
+ name = "kscreen-5.20.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz";
- sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126";
- name = "kscreenlocker-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz";
+ sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0";
+ name = "kscreenlocker-5.20.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz";
- sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218";
- name = "ksshaskpass-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz";
+ sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry";
+ name = "ksshaskpass-5.20.5.tar.xz";
};
};
ksysguard = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz";
- sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4";
- name = "ksysguard-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz";
+ sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j";
+ name = "ksysguard-5.20.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz";
- sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9";
- name = "kwallet-pam-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz";
+ sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk";
+ name = "kwallet-pam-5.20.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz";
- sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d";
- name = "kwayland-integration-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz";
+ sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk";
+ name = "kwayland-integration-5.20.5.tar.xz";
};
};
kwayland-server = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz";
- sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44";
- name = "kwayland-server-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz";
+ sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0";
+ name = "kwayland-server-5.20.5.tar.xz";
};
};
kwin = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz";
- sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a";
- name = "kwin-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz";
+ sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c";
+ name = "kwin-5.20.5.tar.xz";
};
};
kwrited = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz";
- sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2";
- name = "kwrited-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz";
+ sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz";
+ name = "kwrited-5.20.5.tar.xz";
};
};
libkscreen = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz";
- sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d";
- name = "libkscreen-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz";
+ sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv";
+ name = "libkscreen-5.20.5.tar.xz";
};
};
libksysguard = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz";
- sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422";
- name = "libksysguard-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz";
+ sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8";
+ name = "libksysguard-5.20.5.tar.xz";
};
};
milou = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz";
- sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201";
- name = "milou-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz";
+ sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h";
+ name = "milou-5.20.5.tar.xz";
};
};
oxygen = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz";
- sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67";
- name = "oxygen-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz";
+ sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr";
+ name = "oxygen-5.20.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz";
- sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4";
- name = "plasma-browser-integration-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz";
+ sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2";
+ name = "plasma-browser-integration-5.20.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz";
- sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355";
- name = "plasma-desktop-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz";
+ sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx";
+ name = "plasma-desktop-5.20.5.tar.xz";
};
};
plasma-disks = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz";
- sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845";
- name = "plasma-disks-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz";
+ sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1";
+ name = "plasma-disks-5.20.5.tar.xz";
};
};
plasma-integration = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz";
- sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299";
- name = "plasma-integration-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz";
+ sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8";
+ name = "plasma-integration-5.20.5.tar.xz";
};
};
plasma-nano = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz";
- sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd";
- name = "plasma-nano-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz";
+ sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5";
+ name = "plasma-nano-5.20.5.tar.xz";
};
};
plasma-nm = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz";
- sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf";
- name = "plasma-nm-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz";
+ sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6";
+ name = "plasma-nm-5.20.5.tar.xz";
};
};
plasma-pa = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz";
- sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3";
- name = "plasma-pa-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz";
+ sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d";
+ name = "plasma-pa-5.20.5.tar.xz";
};
};
plasma-phone-components = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz";
- sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e";
- name = "plasma-phone-components-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz";
+ sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms";
+ name = "plasma-phone-components-5.20.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz";
- sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea";
- name = "plasma-sdk-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz";
+ sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y";
+ name = "plasma-sdk-5.20.5.tar.xz";
};
};
plasma-tests = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz";
- sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735";
- name = "plasma-tests-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz";
+ sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j";
+ name = "plasma-tests-5.20.5.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz";
- sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429";
- name = "plasma-thunderbolt-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz";
+ sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0";
+ name = "plasma-thunderbolt-5.20.5.tar.xz";
};
};
plasma-vault = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz";
- sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c";
- name = "plasma-vault-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz";
+ sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2";
+ name = "plasma-vault-5.20.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz";
- sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9";
- name = "plasma-workspace-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz";
+ sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim";
+ name = "plasma-workspace-5.20.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz";
- sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808";
- name = "plasma-workspace-wallpapers-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz";
+ sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3";
+ name = "plasma-workspace-wallpapers-5.20.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz";
- sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77";
- name = "plymouth-kcm-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz";
+ sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz";
+ name = "plymouth-kcm-5.20.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.20.4";
+ version = "1-5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz";
- sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61";
- name = "polkit-kde-agent-1-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz";
+ sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v";
+ name = "polkit-kde-agent-1-5.20.5.tar.xz";
};
};
powerdevil = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz";
- sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d";
- name = "powerdevil-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz";
+ sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj";
+ name = "powerdevil-5.20.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz";
- sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e";
- name = "sddm-kcm-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz";
+ sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az";
+ name = "sddm-kcm-5.20.5.tar.xz";
};
};
systemsettings = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz";
- sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9";
- name = "systemsettings-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz";
+ sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j";
+ name = "systemsettings-5.20.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.20.4";
+ version = "5.20.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz";
- sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8";
- name = "xdg-desktop-portal-kde-5.20.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz";
+ sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl";
+ name = "xdg-desktop-portal-kde-5.20.5.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index 4aa92921898..956b34fd93d 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
version = "3.104.0";
patches = [
- ./glsl-import.patch
+ (fetchpatch {
+ # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131
+ url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch";
+ sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc";
+ })
];
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/libplacebo/glsl-import.patch b/pkgs/development/libraries/libplacebo/glsl-import.patch
deleted file mode 100644
index f2ef362c65b..00000000000
--- a/pkgs/development/libraries/libplacebo/glsl-import.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
-index f701acc..c64cbf5 100644
---- a/src/glsl/glslang.cc
-+++ b/src/glsl/glslang.cc
-@@ -26,7 +26,7 @@ extern "C" {
-
- #include
- #include
--#include
-+#include
-
- #include "glslang.h"
-
diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix
new file mode 100644
index 00000000000..4ada562557b
--- /dev/null
+++ b/pkgs/development/python-modules/asysocks/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "asysocks";
+ version = "0.0.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1h9awwnn4dr3ppdlnjb4abhyw873n1iddipw6wkwjpw7nnaqqr6i";
+ };
+
+ # Upstream hasn't release the tests yet
+ doCheck = false;
+ pythonImportsCheck = [ "asysocks" ];
+
+ meta = with lib; {
+ description = "Python Socks4/5 client and server library";
+ homepage = "https://github.com/skelsec/asysocks";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix
index b9345e78eab..936db1081b6 100644
--- a/pkgs/development/python-modules/crytic-compile/default.nix
+++ b/pkgs/development/python-modules/crytic-compile/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "crytic-compile";
- version = "0.1.9";
+ version = "0.1.12";
disabled = pythonOlder "3.6";
@@ -10,12 +10,13 @@ buildPythonPackage rec {
owner = "crytic";
repo = "crytic-compile";
rev = version;
- sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna";
+ sha256 = "1q75n84yxv2cb6x7gqyk3vcwkxpq7pni30wgz3d1bk6pmi2pqgw6";
};
propagatedBuildInputs = [ pysha3 setuptools ];
doCheck = false;
+ pythonImportsCheck = [ "crytic_compile" ];
meta = with lib; {
description = "Abstraction layer for smart contract build systems";
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 9cd39c34ea0..aee130f789e 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, python, buildPythonPackage, fetchPypi, isPy3k }:
buildPythonPackage rec {
pname = "demjson";
version = "2.2.4";
- disabled = isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
};
- doCheck = false;
- pythonImportsCheck = [ "demjson" ];
+ checkPhase = stdenv.lib.optionalString isPy3k ''
+ ${python.interpreter} -m lib2to3 -w test/test_demjson.py
+ '' + ''
+ ${python.interpreter} test/test_demjson.py
+ '';
meta = with stdenv.lib; {
description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 4f784642537..9c30606f75d 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "discord.py";
- version = "1.5.1";
+ version = "1.6.0";
disabled = pythonOlder "3.5.3";
# only distributes wheels on pypi now
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "v${version}";
- sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza";
+ sha256 = "036prc4iw91qx31zz48hy3b30kn2qnlg68lgrvv2mcvsjxf2gd1l";
};
propagatedBuildInputs = [ aiohttp websockets ];
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 8d1055029b7..20ae1d81b6a 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
buildPythonPackage rec {
- version = "3.11.2";
+ version = "3.12.2";
pname = "djangorestframework";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
+ src = fetchFromGitHub {
+ owner = "encode";
+ repo = "django-rest-framework";
+ rev = version;
+ sha256 = "y/dw6qIOc6NaNpBWJXDwHX9aFodgKv9rGKWQKS6STlk=";
};
# Test settings are missing
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index da61365e3ae..1f98794f704 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "Flask-Cors";
- version = "3.0.9";
+ version = "3.0.10";
src = fetchPypi {
inherit pname version;
- sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
+ sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de";
};
checkInputs = [ nose packaging ];
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index d1b9da15cc5..bc08633da8b 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
postPatch = ''
# Tests run without most of the dependencies
echo "" > test-requirements.txt
+ # PrettyTable is now maintained again
+ substituteInPlace requirements.txt --replace "PrettyTable<0.8,>=0.7.2" "PrettyTable"
'';
nativeBuildInputs = [ pbr ];
@@ -24,7 +26,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A simple connector pool for python-ldap";
- homepage = "https://git.openstack.org/cgit/openstack/ldappool";
- license = licenses.mpl20;
+ homepage = "https://opendev.org/openstack/ldappool/";
+ license = with licenses; [ mpl11 lgpl21Plus gpl2Plus ];
};
}
diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix
new file mode 100644
index 00000000000..7537fb2e157
--- /dev/null
+++ b/pkgs/development/python-modules/minikerberos/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, asn1crypto
+, asysocks
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "minikerberos";
+ version = "0.2.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08ngf55pbnzyqkgffzxix6ldal9l38d2jjn9rvxkg88ygxsalfvm";
+ };
+
+ propagatedBuildInputs = [
+ asn1crypto
+ asysocks
+ ];
+
+ # no tests are published: https://github.com/skelsec/minikerberos/pull/5
+ doCheck = false;
+ pythonImportsCheck = [ "minikerberos" ];
+
+ meta = with lib; {
+ description = "Kerberos manipulation library in Python";
+ homepage = "https://github.com/skelsec/minikerberos";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix
index 341d3f9660c..7c1bb88bcaa 100644
--- a/pkgs/development/python-modules/r2pipe/default.nix
+++ b/pkgs/development/python-modules/r2pipe/default.nix
@@ -18,10 +18,10 @@ buildPythonPackage rec {
''
# Fix find_library, can be removed after
# https://github.com/NixOS/nixpkgs/issues/7307 is resolved.
- substituteInPlace r2pipe/native.py --replace "find_library('r_core')" "'${libr_core}'"
+ substituteInPlace r2pipe/native.py --replace 'find_library("r_core")' "'${libr_core}'"
# Fix the default r2 executable
- substituteInPlace r2pipe/open_sync.py --replace "r2e = 'radare2'" "r2e = '${radare2}/bin/radare2'"
+ substituteInPlace r2pipe/open_sync.py --replace 'r2e = "radare2"' "r2e = '${radare2}/bin/radare2'"
substituteInPlace r2pipe/open_base.py --replace 'which("radare2")' "'${radare2}/bin/radare2'"
'';
diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index 19677a71eca..deb12817a7b 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "slither-analyzer";
- version = "0.6.14";
+ version = "0.7.0";
disabled = pythonOlder "3.6";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "79f5098d27c149ca9cce2b8008ed29e2e0c8cee8fa3414c7e5455cb73c90a9a8";
+ sha256 = "10r479xidgxvas4wb0z6injp59jrn7rfq8d7bxlcalc2dy4mawr0";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix
new file mode 100644
index 00000000000..c08c5541a61
--- /dev/null
+++ b/pkgs/development/python-modules/winacl/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "winacl";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp";
+ };
+
+ # Project doesn't have tests
+ doCheck = false;
+ pythonImportsCheck = [ "winacl" ];
+
+ meta = with lib; {
+ description = "Python module for ACL/ACE/Security descriptor manipulation";
+ homepage = "https://github.com/skelsec/winacl";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix
new file mode 100644
index 00000000000..02156ba17e5
--- /dev/null
+++ b/pkgs/development/python-modules/winsspi/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, minikerberos
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+ pname = "winsspi";
+ version = "0.0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1q8hr8l8d9jxyp55qsrlkyhdhqjc0n18ajzms7hf1xkhdl7rrbd2";
+ };
+ propagatedBuildInputs = [ minikerberos ];
+
+ # Project doesn't have tests
+ doCheck = false;
+ pythonImportsCheck = [ "winsspi" ];
+
+ meta = with lib; {
+ description = "Python module for ACL/ACE/Security descriptor manipulation";
+ homepage = "https://github.com/skelsec/winsspi";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index e69e35442b3..a680dd097fe 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.18.0";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4";
+ sha256 = "15ps4z41r8inyg0g1k8s9s3hkbnrl942w0n3957bv8g8gjihww0f";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 401bbdbee6e..5edbdba4141 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "editorconfig-checker";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
- sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32";
+ sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz";
};
vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h";
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7f6b139affb..2ca2da67596 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-01-06";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "4c454c96a9d142475b155a94cc24fad34eca26b2";
- sha256 = "0xjacj8pw25qrzasgiwpisrc2fbh4k7ljpn1pq07z2h756cn54lf";
+ rev = "54dd731cf14c809ebcc9c21b41084a17c5411744";
+ sha256 = "1j3jndx2cl7dxw7ilai7dxi1vkgjzh24k2vl43adai87gl6jqqs5";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -89,7 +89,7 @@ let
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
- version = "2021-01-08";
+ version = "2020-12-21";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
@@ -305,12 +305,12 @@ let
brainfuck-vim = buildVimPluginFrom2Nix {
pname = "brainfuck-vim";
- version = "2021-01-07";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "fruit-in";
repo = "brainfuck-vim";
- rev = "ada4fce239ab5386aee51a9453cb0fafc7c2626d";
- sha256 = "1mm82m7p3khykd1fkag4ppvf2xgnqj8jbhdq7gq06ys1wxzw9rhj";
+ rev = "4e5344436f480d65d99c89d623e5564d71cdd0f7";
+ sha256 = "1p5kyy6z2nrnxdvwnpcvbd1xk9r0pqr3hayz3p7c2zi30rj0fdx5";
};
meta.homepage = "https://github.com/fruit-in/brainfuck-vim/";
};
@@ -594,12 +594,12 @@ let
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
- version = "2021-01-05";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
- rev = "a31127e97feaef9ef70499b1241d41579d42dba2";
- sha256 = "17q5z9rkc64yx2fifna6wsw43iinjfwbijmfjlxxkhgwmlg5y9cx";
+ rev = "25dac52c4eb37bf28cc1b8fd6283b151db85e764";
+ sha256 = "1ljzva5zy1d5d5yfvpf57rjpfzp194rkf98arslns8i0as30kbmd";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
@@ -822,12 +822,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-01-06";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "6bf297376aa9ad76500778081ed2ff92fef72301";
- sha256 = "0k0iyvyg1cbalml1sv8vvs47k4af8vvz0gk6vba6yzjf72v6vj2d";
+ rev = "a9259687391457c71fa8bcbf609ca83742b6d277";
+ sha256 = "0smlfvxdily3vz9i3vr0b5r3410zp5asf13cbjxxv219fqa3z22a";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -870,12 +870,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2020-12-29";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "7990823563392e4031cd474d3e90482329eef877";
- sha256 = "0jzg4qcc50hhh3jfdhynddv5kr0yzh2f0ckzv0dmddx01p66nwcv";
+ rev = "f7667ec03c4cdef1b4d9a95521d1ee5866f3f2de";
+ sha256 = "19s3809kasiybv18q6q7c36bf43cq9ndq7z5zpqrxgg6kf3my2d8";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@@ -1112,12 +1112,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-01-07";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "028ebd60d5ad963bf8f77e13c2a85e9edb190f48";
- sha256 = "0qy6knv5c4v568lvz3fh3ca2lcaym19hi0ywwvj6xyrllil2kk4b";
+ rev = "0901b1886208a32880b92f22bf8f38a17e95045a";
+ sha256 = "0r66sjkgbbhgdalqnfyzy3ym3jiikyd10pi5236aqga75vysvk0s";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1318,12 +1318,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-01-06";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "591e2001fe0546ba28cc7dd614c40f5d92050f92";
- sha256 = "0cwzsqfyj4bk8f3y9aw9rmfx99gg760apkj7ppww14drc6lzfq09";
+ rev = "100764195f8cea2edf8a8c6a69a3cb707e35cf6d";
+ sha256 = "099mk22287zjgc0sy0v9vsw8l9ssa2rr56jasxpd6yswppafdrs7";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1425,6 +1425,18 @@ let
meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";
};
+ fzf-lsp-nvim = buildVimPluginFrom2Nix {
+ pname = "fzf-lsp-nvim";
+ version = "2020-12-24";
+ src = fetchFromGitHub {
+ owner = "gfanto";
+ repo = "fzf-lsp.nvim";
+ rev = "de69b03c9feaa4b574e4a3e053a9a33467848227";
+ sha256 = "09kpcmnvzgsdbwd5nsnkm93khqhncb8bjl67519wjgx39g73pq50";
+ };
+ meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
+ };
+
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2021-01-07";
@@ -2110,6 +2122,18 @@ let
meta.homepage = "https://github.com/junegunn/limelight.vim/";
};
+ lsp-status-nvim = buildVimPluginFrom2Nix {
+ pname = "lsp-status-nvim";
+ version = "2021-01-05";
+ src = fetchFromGitHub {
+ owner = "nvim-lua";
+ repo = "lsp-status.nvim";
+ rev = "5215ea78a5949b42b86bf474d33608de6b7594a3";
+ sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd";
+ };
+ meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
+ };
+
lsp_extensions-nvim = buildVimPluginFrom2Nix {
pname = "lsp_extensions-nvim";
version = "2020-11-30";
@@ -2122,6 +2146,18 @@ let
meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
};
+ lualine-nvim = buildVimPluginFrom2Nix {
+ pname = "lualine-nvim";
+ version = "2021-01-09";
+ src = fetchFromGitHub {
+ owner = "hoob3rt";
+ repo = "lualine.nvim";
+ rev = "8742b6e466dff01657b1cd4187f2f25aa57d2916";
+ sha256 = "00i0mx18apx48lhzmc4fik0mbqm3vsfdp4pbl2z8d0fnmldhqx75";
+ };
+ meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
+ };
+
lushtags = buildVimPluginFrom2Nix {
pname = "lushtags";
version = "2017-04-19";
@@ -2760,12 +2796,12 @@ let
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-01-04";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "1f899535a01ae9fb8c9ca8a6ccff651188fe78d3";
- sha256 = "1gmyy5l5zy0j59z8rpyablav62zrss4312dpjfr8d6mcxmfa53wd";
+ rev = "81930348bbb1398635cc0ecbbc88e3defd8aaa0f";
+ sha256 = "106g7pxa9rwwq45hmsb55b3dy0px2lr5lb25yy8n6jx6a70z9hf7";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@@ -2796,36 +2832,36 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-01-07";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "fa2ccc10d5a7b390c1d808ddf74dce5158debca4";
- sha256 = "1mdnk4vvxk9qzcinzw64fck87a3dg5f21jm8203zhgj94ylc851y";
+ rev = "8c68dc78d00fc9b55312108d48c4191ec3851f6a";
+ sha256 = "09mzkn7psfv4iaq3myi7mq5qymxz0jnisr0d0k927z64ca3vzjbq";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
nvim-lsputils = buildVimPluginFrom2Nix {
pname = "nvim-lsputils";
- version = "2020-12-31";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "nvim-lsputils";
- rev = "58cd320e966c2aed5a5ebf8544a310a2341ccd5c";
- sha256 = "1iv5gxj2vx3w3nx335kn0pnin4ij9xwpid909rp9hlh48vkardjp";
+ rev = "7f393053d303750868d17c8743c350a5503c3139";
+ sha256 = "0r17l5g8fpx7bax3sriawj0f7pkzj33vjr27i5yxa5934gxawv0q";
};
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-01-05";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "99e153bb534f5ec5e24ef6d35366d9b29f409ee3";
- sha256 = "1p0an1j7qw1rl5hkv6mvqvdzihxanf0vxf2ryih2cnmmys3cw9v1";
+ rev = "426fc6549aff1d5a1b84127dd80807a4f134d4ab";
+ sha256 = "0yadrawg9q49fiizn4k8ng9hsp9vi2l0bw73s6ib0szg641k1w42";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -2856,12 +2892,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-01-07";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "2e8621ff1afa2284de3df316ecd0baf8e9195927";
- sha256 = "0yb5lf29j3ddi9ia7lld8ps662r7kw2znxhp2pyyjlgnd76m08nr";
+ rev = "00ea65199e316aec5934cc2666ec9738e410b711";
+ sha256 = "1q37hd8cggx863d91ld9r4s51wld73pqgq93zwlg22i7qyl2v423";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3794,12 +3830,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-01-06";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "1d6195ff643ed153eb0f233b32f1becc68c79ee6";
- sha256 = "1ma2m0jx50kdkvdibagqlqqap0phkjnascimfiandpzcsl3r6939";
+ rev = "de80a9837cd1d207981c1f6dbf504436f8bfee13";
+ sha256 = "1zasdfn982akcgyyxvwwyp9vvh4p7kyi1gfkc57rj6jqkygwicsm";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -3975,12 +4011,12 @@ let
unite-vim = buildVimPluginFrom2Nix {
pname = "unite-vim";
- version = "2020-12-20";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "unite.vim";
- rev = "beab32c6474d0b0ba763b43db41cd62ea5f97aa6";
- sha256 = "0kyl006vp2fs67pr0wa7qyff6x1rpa4i2jhaalizpqbaldimidb9";
+ rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63";
+ sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc";
};
meta.homepage = "https://github.com/Shougo/unite.vim/";
};
@@ -4287,12 +4323,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-01-05";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "30bcbb07c3d08703cc26a918b78251e636d7b1fe";
- sha256 = "0qcg01br8sb67hmsvkg37kahnzz3m3vgs5pivvfypl98a1lgpszm";
+ rev = "fdfc11f53adce1bd6644a5dac6002106ef08db95";
+ sha256 = "1bas31zkrkz6pxsxnh5s4kph861z85gxg0fik0psd698yg9zzgc1";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -4479,7 +4515,7 @@ let
vim-capslock = buildVimPluginFrom2Nix {
pname = "vim-capslock";
- version = "2021-01-07";
+ version = "2019-11-13";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-capslock";
@@ -4527,12 +4563,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-01-05";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "83cac4972caef144d0e947025ff43af6fd2becac";
- sha256 = "18cackh5rrkyg7ffhwp4vca6srr1hlj3gximjdwc6krcgq0v0r0s";
+ rev = "284ef9a0b7776ab34d387fb403d500371a65cbda";
+ sha256 = "06jc831kcbpdh4k3890sh2srisbgljr0azx8g1g9fq0328qqnpbs";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -4959,12 +4995,12 @@ let
vim-elm-syntax = buildVimPluginFrom2Nix {
pname = "vim-elm-syntax";
- version = "2020-10-29";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "andys8";
repo = "vim-elm-syntax";
- rev = "998ef67262dcbeadd596458d7ff40079b5bc5cbb";
- sha256 = "0gja4ifdpl6wfq3n897h1h635kf92v5c44jzr0ixbv3i924xqjhj";
+ rev = "b65370b5292730ef35cbdb969da05b52d77d51dc";
+ sha256 = "0nd3ig7zpx49dmgwyqhs3545x64jxbrrgzd9fch4ihb6bhd4j3fr";
};
meta.homepage = "https://github.com/andys8/vim-elm-syntax/";
};
@@ -5103,12 +5139,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-01-07";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "5e218d8387b7ca1ade1c625a1b81d45996cc21ae";
- sha256 = "1sgdyjwq5h0m6d40aapz9n2z59jc92vpgj04d5ciisifwh54aaga";
+ rev = "428a59e4ec5061cae34dacd865bd831ddee7a446";
+ sha256 = "0jfdbaxjizb127s8rhx2ilhz48cg5xahv77rhm9sa4v9lky8zgrr";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5271,12 +5307,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-01-03";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "706c73bb369d9bab0fadca6b755a7244626f61aa";
- sha256 = "07rbrk1qah16mi1f7dkp6ixi2kwgimgms23pfqiqjfrqgk304b6d";
+ rev = "9ac9a4337e4e71ca434f97a7678f301eca7266f7";
+ sha256 = "06lzyakavb89k7pwhicqd2zc5rd12cjd6p8pb4m3xzw9kff6gzy1";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5909,12 +5945,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-01-05";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "87cd0e6137e0ebb1c0b451c20ba39f14e1a95f60";
- sha256 = "0j1948ns6kwhfazcsvpy61w0a1dbpcy6hhvs54v6kil8ffgdcmh6";
+ rev = "678c0592382c7073505650d30e71e9f9cbc3353c";
+ sha256 = "0s7yhgajjqavj0lfzwassrk0n83dckf41bca54p5833ds85vwnsz";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -6618,12 +6654,12 @@ let
vim-puppet = buildVimPluginFrom2Nix {
pname = "vim-puppet";
- version = "2019-09-16";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "rodjek";
repo = "vim-puppet";
- rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d";
- sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x";
+ rev = "d2cfbfe7b6a810f0be4de1f024a75ce6e9d9a260";
+ sha256 = "049fimc3mvn6c6cfwg8i1kzjn81arx60gyid39wsi2h0gb1sxv12";
};
meta.homepage = "https://github.com/rodjek/vim-puppet/";
};
@@ -6942,12 +6978,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2020-12-31";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "5ee3530714771b61fc509d2ffdcbced9404c150a";
- sha256 = "1msjl7swz43rwpf4h8skk377s9kfyvcgr1z0dcwbbmn3jymfs5sk";
+ rev = "72171eaaf176d7eb3f73ecebf86ff3e5f4ba7dbd";
+ sha256 = "0rcy6p4g8784w2dbbq0b7y1z3anqjpvycns40d556vbf1y1pbc41";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -7783,12 +7819,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-01-07";
+ version = "2021-01-09";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "07ea3880acf5977075831c64536e683ddb2fed89";
- sha256 = "1gkvagird3xa47gicpc739s4c5p5358yvp16fxx2l98jzzi7wvcj";
+ rev = "5303de81954b854161dffb76da37f8508c9c1476";
+ sha256 = "0xkgirbb2rw4b0h4qdv8f2lsvadqcyqrclxd8a3i8r2dc4xdgp3p";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -7796,12 +7832,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-01-07";
+ version = "2021-01-08";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "d219436e224960b8e4c11db8a1e482ef52f8d63b";
- sha256 = "00brsffbs6550k876bbgxl7v8d4dqs9vca3ghncm3wcjpjs2qhar";
+ rev = "7806f0f5e1615d4ce9cef6b7edfb6ec6b1b7e666";
+ sha256 = "0j1b1lf8y58jqp4r9vjw266nxlf38gz509qzaxp3n0sb4svg93pw";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0a29eb32f24..5b5e13a362a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -129,6 +129,7 @@ fszymanski/deoplete-emoji
garbas/vim-snipmate
gentoo/gentoo-syntax
GEverding/vim-hocon
+gfanto/fzf-lsp.nvim@main
gibiansky/vim-textobj-haskell
glts/vim-textobj-comment
godlygeek/csapprox
@@ -158,6 +159,7 @@ hecal3/vim-leader-guide
henrik/vim-indexed-search
HerringtonDarkholme/yats.vim
honza/vim-snippets
+hoob3rt/lualine.nvim
hotwatermorning/auto-git-diff
hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
@@ -393,6 +395,7 @@ numirias/semshi
nvie/vim-flake8
nvim-lua/completion-nvim
nvim-lua/diagnostic-nvim
+nvim-lua/lsp-status.nvim
nvim-lua/lsp_extensions.nvim
nvim-lua/plenary.nvim
nvim-lua/popup.nvim
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 72849c58db8..91a6b42ac41 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,27 +1,27 @@
{
"4.14": {
- "extra": "",
- "name": "linux-hardened-4.14.213.a.patch",
- "sha256": "0lkjgg6cbsaiypxij7p00q3y094qf0h172hc2p7wgy39777b45a7",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.213.a/linux-hardened-4.14.213.a.patch"
+ "extra": ".a",
+ "name": "linux-hardened-4.14.214.a.patch",
+ "sha256": "14m075fnbzlshrz09vpyk9v9qbki896caj8f49am2z8dmm5hnr6b",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.214.a/linux-hardened-4.14.214.a.patch"
},
"4.19": {
"extra": ".a",
- "name": "linux-hardened-4.19.165.a.patch",
- "sha256": "06v34jaj4jg6f3v05wbkkfnr69ahxqyyq0gam4ma3wgm74x6cf3s",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.165.a/linux-hardened-4.19.165.a.patch"
+ "name": "linux-hardened-4.19.166.a.patch",
+ "sha256": "0wkyd8k68qy378vj3937dk0valqb4sgdz5fg3107bjcgv7a4lvis",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.166.a/linux-hardened-4.19.166.a.patch"
},
"5.10": {
"extra": ".a",
- "name": "linux-hardened-5.10.5.a.patch",
- "sha256": "1fq2n60brhi6wjazkdgj2aqc4maskvlymbznl03hvj0x5kahjxvx",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.5.a/linux-hardened-5.10.5.a.patch"
+ "name": "linux-hardened-5.10.6.a.patch",
+ "sha256": "18ryh9zhrv5mmg876wss8k5fx8abm7ay0qpanvzmf5bjw7dc6qkq",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.6.a/linux-hardened-5.10.6.a.patch"
},
"5.4": {
"extra": ".a",
- "name": "linux-hardened-5.4.87.a.patch",
- "sha256": "01hpww6lm00iry8z4z86hh86x66h3xbmxknxhmmhh2zwz6ahkmfd",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.87.a/linux-hardened-5.4.87.a.patch"
+ "name": "linux-hardened-5.4.88.a.patch",
+ "sha256": "0fz44izfmcsj205l7hjmkp78f5isy96fcjsz2bvrpb4x3h98bm5i",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.88.a/linux-hardened-5.4.88.a.patch"
},
"5.9": {
"extra": "",
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index aff68e1efa7..fc876e80353 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.213";
+ version = "4.14.214";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "079axkl14jp8lz30h21q4gmhmjw6zf5ycmxji65kgcgyg7dwwyzx";
+ sha256 = "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 6c559103f49..48c2050842b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.165";
+ version = "4.19.166";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1l72wka1dli0jdb91sx4zr13vy0q5l6p37fh6hf093gjn14mdh51";
+ sha256 = "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 744f35e3ea8..6ff11414fce 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.249";
+ version = "4.4.250";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "04pb4vgia6zaindf6804gq9jn3mhmy01yijqmpi79sh9rlqzzh1i";
+ sha256 = "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index bf044f73246..e634716d0af 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.249";
+ version = "4.9.250";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0kjcw0vgga9msgqnipgg028v3rcc5am2d094v3hqkkjvzyb8dwxi";
+ sha256 = "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 28f03143183..2e82728107c 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.10.5";
+ version = "5.10.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1x1fc4cywqnjm514q376d5540zsxmqv95n0lykaphz8qdbhsk49r";
+ sha256 = "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2fc1b6013c1..a81d38b1527 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.87";
+ version = "5.4.88";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0cawb7md97i0hz83hf7l4ihn9lyrg8q64j8jam8n9fw45qzfjd3a";
+ sha256 = "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 07a74c10771..ed19559f95f 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.1-rt20"; # updated by ./update-rt.sh
+ version = "5.10.4-rt22"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd";
+ sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "0z8ljfcn908hzjl11fkmwrx2r7j0hcgpx07g21ag162qrn6g5qby";
+ sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index a57611ecb1d..4b0c060f9ce 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -26,7 +26,7 @@ rec {
sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag";
settingsVersion = "460.27.04";
settingsSha256 = "1z9ibkhyjqzhhzi3gj88f5jlpc1d76jsncsy6wxpnbdbak8ljkw5";
- persistencedSha256 = "36sM+djZmv77lGe7cdZ5tppzgkQD4IA0FJgCGsdZRI8=";
+ persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl";
}
else legacy_390;
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index b8aa251489d..d065dea846b 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "open-iscsi";
- version = "2.1.2";
+ version = "2.1.3";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod openisns.lib openssl systemd util-linux ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "open-iscsi";
repo = "open-iscsi";
rev = version;
- sha256 = "0fazf2ighj0akrvcj3jm3kd6wl9lgznvr38g6icwfkqk7bykjkam";
+ sha256 = "14rcf4xmrmz522z57sm8bb3mn79dqsdwz84rl6id84fgjbwbsp6b";
};
DESTDIR = "$(out)";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
homepage = "https://www.open-iscsi.com";
platforms = platforms.linux;
maintainers = with maintainers; [ cleverca22 zaninime ];
diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix
new file mode 100644
index 00000000000..3ba758c1088
--- /dev/null
+++ b/pkgs/servers/nzbhydra2/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchzip, makeWrapper, jre, python3, unzip }:
+
+stdenv.mkDerivation rec {
+ pname = "nzbhydra2";
+ version = "3.8.0";
+
+ src = fetchzip {
+ url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip";
+ sha512 = "1gybricq26hixr5cmw1iwyax7h17d0n5wqzhrx727xda1x35jfjp5ynjdkxzysbfhs1za6vy54bpm0sda4nkrh16p0xqnz3nsd4hvzh";
+ stripRoot = false;
+ };
+
+ nativeBuildInputs = [ jre makeWrapper unzip ];
+
+ installPhase = ''
+ install -d -m 755 "$out/lib/${pname}"
+ cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2"
+ install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py"
+
+ makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \
+ --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \
+ --prefix PATH ":" ${jre}/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Usenet meta search";
+ homepage = "https://github.com/theotherp/nzbhydra2";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jamiemagee ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index ed3fe43faeb..20e3637f40c 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -13,7 +13,10 @@ let
, this, self, newScope, buildEnv
# source specification
- , version, sha256, psqlSchema
+ , version, sha256, psqlSchema,
+
+ # for tests
+ nixosTests, thisAttr
}:
let
atLeast = lib.versionAtLeast version;
@@ -142,6 +145,8 @@ let
postgresql = this;
}
this.pkgs;
+
+ tests.postgresql = nixosTests.postgresql-wal-receiver.${thisAttr};
};
meta = with lib; {
@@ -191,6 +196,7 @@ in self: {
psqlSchema = "9.5";
sha256 = "0an2k4m1da96897hyxlff8p4p63wg4dffwsfg57aib7mp4yzsp06";
this = self.postgresql_9_5;
+ thisAttr = "postgresql_9_5";
inherit self;
};
@@ -199,6 +205,7 @@ in self: {
psqlSchema = "9.6";
sha256 = "1dkv916y7vrfbygrfbfvs6y3fxaysnh32i5j88nvcnnl16jcn21x";
this = self.postgresql_9_6;
+ thisAttr = "postgresql_9_6";
inherit self;
};
@@ -207,6 +214,7 @@ in self: {
psqlSchema = "10.0"; # should be 10, but changing it is invasive
sha256 = "0zhzj9skag1pgqas2rnd217vj41ilaalqna17j47gyngpvhbqmjr";
this = self.postgresql_10;
+ thisAttr = "postgresql_10";
inherit self;
};
@@ -215,6 +223,7 @@ in self: {
psqlSchema = "11.1"; # should be 11, but changing it is invasive
sha256 = "16bqp6ds37kbwqx7mk5gg3y6gv59wq6xz33iqwxldzk20vwd5rhk";
this = self.postgresql_11;
+ thisAttr = "postgresql_11";
inherit self;
};
@@ -223,6 +232,7 @@ in self: {
psqlSchema = "12";
sha256 = "15gzg778da23sbfmy7sqg443f9ny480301lm7i3vay4m3ls2a3dx";
this = self.postgresql_12;
+ thisAttr = "postgresql_12";
inherit self;
};
@@ -231,6 +241,7 @@ in self: {
psqlSchema = "13";
sha256 = "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j";
this = self.postgresql_13;
+ thisAttr = "postgresql_13";
inherit self;
};
}
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 7cec67d0078..8412ffa9cad 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -6,40 +6,45 @@
, libGLU
, gnutls, pam, nettle
, xterm, openssh, perl
-, makeWrapper}:
+, makeWrapper
+}:
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.10.1";
+ version = "1.11.0";
pname = "tigervnc";
src = fetchFromGitHub {
owner = "TigerVNC";
repo = "tigervnc";
- rev = "v1.10.1";
- sha256 = "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr";
+ rev = "v${version}";
+ sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560=";
};
inherit fontDirectories;
- patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ];
-
postPatch = ''
- sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
+ sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in
fontPath=
for i in $fontDirectories; do
for j in $(find $i -name fonts.dir); do
addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
done
done
- sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver
+ sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in
substituteInPlace vncviewer/vncviewer.cxx \
--replace '"/usr/bin/ssh' '"${openssh}/bin/ssh'
'';
dontUseCmakeBuildDir = true;
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
+ "-DCMAKE_INSTALL_SBINDIR=${placeholder "out"}/bin"
+ "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin"
+ ];
+
postBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast"
export CXXFLAGS="$CXXFLAGS -fpermissive"
diff --git a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
deleted file mode 100644
index c18f4bf213f..00000000000
--- a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
-diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c
---- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:19:19.486731848 +0000
-+++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c 2020-01-15 11:37:33.275445409 +0000
-@@ -295,6 +295,15 @@ void ddxBeforeReset(void)
- }
- #endif
-
-+#if INPUTTHREAD
-+/** This function is called in Xserver/os/inputthread.c when starting
-+ the input thread. */
-+void
-+ddxInputThreadInit(void)
-+{
-+}
-+#endif
-+
- void ddxUseMsg(void)
- {
- vncPrintBanner();
-
diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix
new file mode 100644
index 00000000000..20f4a9a0d07
--- /dev/null
+++ b/pkgs/tools/security/cloudbrute/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule
+, fetchFromGitHub
+, stdenv
+}:
+
+buildGoModule rec {
+ pname = "cloudbrute";
+ version = "1.0.7";
+
+ src = fetchFromGitHub {
+ owner = "0xsha";
+ repo = "CloudBrute";
+ rev = "v${version}";
+ sha256 = "05b9klddk8wvi78j47jyg9pix6qpxyr01l1m7k1j7598siazfv9g";
+ };
+
+ vendorSha256 = "0f3n0wrmg9d2qyn8hlnhf9lsfqd9443myzr04p48v68m8n83j6a9";
+
+ meta = with stdenv.lib; {
+ description = "Cloud enumeration tool";
+ longDescription = ''
+ A tool to find a company (target) infrastructure, files, and apps on
+ the top cloud providers (Amazon, Google, Microsoft, DigitalOcean,
+ Alibaba, Vultr, Linode).
+ '';
+ homepage = "https://github.com/0xsha/CloudBrute";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 297d13ef9f9..6acfec9f3be 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "masscan";
- version = "1.0.5";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "robertdavidgraham";
repo = "masscan";
rev = version;
- sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg";
+ sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf71446231b..16533ce8683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1828,6 +1828,8 @@ in
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
+ cloudbrute = callPackage ../tools/security/cloudbrute { };
+
cloudflared = callPackage ../applications/networking/cloudflared { };
cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
@@ -4973,9 +4975,7 @@ in
ipfs = callPackage ../applications/networking/ipfs { };
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
- ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
- buildGoModule = buildGo114Module;
- };
+ ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
ipget = callPackage ../applications/networking/ipget { };
@@ -6299,6 +6299,8 @@ in
nzbget = callPackage ../tools/networking/nzbget { };
+ nzbhydra2 = callPackage ../servers/nzbhydra2 { };
+
oathToolkit = callPackage ../tools/security/oath-toolkit { };
oatpp = callPackage ../development/libraries/oatpp { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 610e27331cc..f95cdb6d59c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -469,6 +469,8 @@ in {
asyncwhois = callPackage ../development/python-modules/asyncwhois { };
+ asysocks = callPackage ../development/python-modules/asysocks { };
+
atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
atom = callPackage ../development/python-modules/atom { };
@@ -3911,6 +3913,8 @@ in {
minidump = callPackage ../development/python-modules/minidump { };
+ minikerberos = callPackage ../development/python-modules/minikerberos { };
+
minimock = callPackage ../development/python-modules/minimock { };
mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py;
@@ -7971,6 +7975,10 @@ in {
willow = callPackage ../development/python-modules/willow { };
+ winacl = callPackage ../development/python-modules/winacl { };
+
+ winsspi = callPackage ../development/python-modules/winsspi { };
+
wled = callPackage ../development/python-modules/wled { };
word2vec = callPackage ../development/python-modules/word2vec { };