Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-07-23 12:03:20 +00:00 committed by GitHub
commit 3da4cec89e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -701,7 +701,6 @@ in {
};
extraConfig = ''
index index.php index.html /index.php$request_uri;
expires 1m;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;

View File

@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8=";
sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
};
nativeBuildInputs = [ pkg-config pcre ];

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squashfs-tools-ng";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq";
sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja";
};
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];