From b6b3dd5bfe89d77ba6b0e395d531a78705ebfa32 Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Wed, 4 Aug 2021 09:58:59 +0200 Subject: [PATCH 1/9] rofi-file-browser: 1.1.1 -> 1.2.0 --- pkgs/applications/misc/rofi-file-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 0f9067a7e39d..3de8a94b6264 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; + sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm"; fetchSubmodules = true; }; From 4a97603613ae0c9ef776517f287a45c185eb33c8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 28 Jul 2021 21:38:23 +0200 Subject: [PATCH 2/9] traefik: 2.4.8 -> 2.4.13 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index ca8d7d7412dc..c3f9aa13cc6b 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.8"; + version = "2.4.13"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU="; + sha256 = "sha256-kGCzw8B7fCh6oh0ziB1eBedWEeGOBJVBvUf++TK/Lo0="; stripRoot = false; }; - vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ="; + vendorSha256 = "sha256-jn4Ud+MrX7no+s69LAAbDOoFg1yIQ2lmoy8r37JIVz8="; doCheck = false; From 34add8ca5994dd594e1070ae93c0f503fd0661bc Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 4 Aug 2021 23:55:51 +0200 Subject: [PATCH 3/9] nixos/traefik: wait for first success possible fix for #115418 --- nixos/tests/traefik.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix index f27f6e1e6d69..1d6c0a479ef6 100644 --- a/nixos/tests/traefik.nix +++ b/nixos/tests/traefik.nix @@ -74,6 +74,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { client.wait_for_unit("multi-user.target") + client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/") + with subtest("Check that a container can be reached via Traefik"): assert "Hello from NGINX" in client.succeed( "curl -sSf -H Host:nginx.traefik.test http://traefik/" From 8242356aba3687963c84fd74405c683909fb1586 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Thu, 5 Aug 2021 16:34:39 +0200 Subject: [PATCH 4/9] ispell: switch to working src url --- pkgs/tools/text/ispell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index b3dac1c48fd4..6c92983585b3 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.4.00"; src = fetchurl { - url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz"; + url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; }; From b977d45922c2a64290b62d0725619caf12e00f78 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Aug 2021 13:16:33 +0200 Subject: [PATCH 5/9] prosody: 0.11.9 -> 0.11.10 fix CVE-2021-37601 annoucement: https://blog.prosody.im/prosody-0.11.10-released/ --- pkgs/servers/xmpp/prosody/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 190f396009a6..43e77d918e1c 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.9"; # also update communityModules + version = "0.11.10"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; + sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "c149edb37349"; - sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; + rev = "64fafbeba14d"; + sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; }; buildInputs = [ From 56e6f8277a7cb9ce2328ea40445196adc9ae6657 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Aug 2021 12:23:46 +0000 Subject: [PATCH 6/9] butane: 0.13.0 -> 0.13.1 --- pkgs/development/tools/butane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index f5eafd4a90f8..ccb011360e5b 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "0z1cq43dnj73k0idjhc310h00a1mryk2297w3yy6k1sa95swlz9m"; + sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo="; }; vendorSha256 = null; From 2d64bb92c3b5ef5505c3f571c278ccf148c39040 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Aug 2021 12:28:59 +0000 Subject: [PATCH 7/9] corosync: 3.1.4 -> 3.1.5 --- pkgs/servers/corosync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index b4926e75b524..9df679bf6bce 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; + sha256 = "sha256-O7o+PtgasrCAcRsu4kEC+7530GCwXUvi2jEAgghPC7w="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From 87fa42c9378b29112875fa0beb85bb505a911315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Aug 2021 10:29:44 +0200 Subject: [PATCH 8/9] libgrss: pname + version --- pkgs/development/libraries/libgrss/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 5e1c2b17858d..ab8346990feb 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: -let - version = "0.7.0"; +stdenv.mkDerivation rec { pname = "libgrss"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; From 4f9977b4fe2d930d93a7e41887f7f40aa67d82b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Aug 2021 16:25:59 +0000 Subject: [PATCH 9/9] extrace: 0.7 -> 0.8 --- pkgs/os-specific/linux/extrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 8a02d9c67b14..1eac5997bf3b 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "extrace"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "extrace"; rev = "v${version}"; - sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; + sha256 = "sha256-Kg5yzVg9sqlOCzAq/HeFUPZ89Enfkt/r7EunCfOqdA0="; }; makeFlags = [ "PREFIX=$(out)" ];