cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-08-06 18:01:00 +00:00 committed by GitHub
commit e33c60b72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/traefik.nix
View file

@ -74,6 +74,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
client.wait_for_unit("multi-user.target") 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"): with subtest("Check that a container can be reached via Traefik"):
assert "Hello from NGINX" in client.succeed( assert "Hello from NGINX" in client.succeed(
"curl -sSf -H Host:nginx.traefik.test http://traefik/" "curl -sSf -H Host:nginx.traefik.test http://traefik/"

4
pkgs/applications/misc/rofi-file-browser/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rofi-file-browser-extended"; pname = "rofi-file-browser-extended";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marvinkreis"; owner = "marvinkreis";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm";
fetchSubmodules = true; fetchSubmodules = true;
}; };

7
pkgs/development/libraries/libgrss/default.nix
View file

@ -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 }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
let stdenv.mkDerivation rec {
version = "0.7.0";
pname = "libgrss"; pname = "libgrss";
in version = "0.7.0";
stdenv.mkDerivation {
name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/tools/butane/default.nix
View file

@ -4,13 +4,13 @@ with lib;
buildGoModule rec { buildGoModule rec {
pname = "butane"; pname = "butane";
version = "0.13.0"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coreos"; owner = "coreos";
repo = "butane"; repo = "butane";
rev = "v${version}"; rev = "v${version}";
sha256 = "0z1cq43dnj73k0idjhc310h00a1mryk2297w3yy6k1sa95swlz9m"; sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/os-specific/linux/extrace/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "extrace"; pname = "extrace";
version = "0.7"; version = "0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leahneukirchen"; owner = "leahneukirchen";
repo = "extrace"; repo = "extrace";
rev = "v${version}"; rev = "v${version}";
sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; sha256 = "sha256-Kg5yzVg9sqlOCzAq/HeFUPZ89Enfkt/r7EunCfOqdA0=";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/servers/corosync/default.nix
View file

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "corosync"; pname = "corosync";
version = "3.1.4"; version = "3.1.5";
src = fetchurl { src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; sha256 = "sha256-O7o+PtgasrCAcRsu4kEC+7530GCwXUvi2jEAgghPC7w=";
}; };
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [ makeWrapper pkg-config ];

6
pkgs/servers/traefik/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "traefik"; pname = "traefik";
version = "2.4.8"; version = "2.4.13";
src = fetchzip { src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; 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; stripRoot = false;
}; };
vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ="; vendorSha256 = "sha256-jn4Ud+MrX7no+s69LAAbDOoFg1yIQ2lmoy8r37JIVz8=";
doCheck = false; doCheck = false;

8
pkgs/servers/xmpp/prosody/default.nix
View file

@ -15,7 +15,7 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.11.9"; # also update communityModules version = "0.11.10"; # also update communityModules
pname = "prosody"; pname = "prosody";
# The following community modules are necessary for the nixos module # The following community modules are necessary for the nixos module
# prosody module to comply with XEP-0423 and provide a working # prosody module to comply with XEP-0423 and provide a working
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; 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 # A note to all those merging automated updates: Please also update this
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
# version. # version.
communityModules = fetchhg { communityModules = fetchhg {
url = "https://hg.prosody.im/prosody-modules"; url = "https://hg.prosody.im/prosody-modules";
rev = "c149edb37349"; rev = "64fafbeba14d";
sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1";
}; };
buildInputs = [ buildInputs = [

2
pkgs/tools/text/ispell/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.4.00"; version = "3.4.00";
src = fetchurl { 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"; sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x";
}; };