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-10-03 12:01:21 +00:00 committed by GitHub
commit db9657cccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 399 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/cluster/fluxcd/update.sh
View file

@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi
SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
setKV () {
sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
}
setKV version ${VERSION}

2
pkgs/applications/networking/cluster/k3s/update.sh
View file

@ -45,7 +45,7 @@ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
setKV () {
sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
}
setKV k3sVersion ${K3S_VERSION}

16
pkgs/desktops/gnome/extensions/collisions.json
View file

@ -54,6 +54,10 @@
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"system-monitor": [
"system-monitor@paradoxxx.zero.gmail.com",
"System_Monitor@bghome.gmail.com"
],
"hide-activities-button": [
"Hide_Activities@shay.shayel.org",
"hide-activities-button@nmingori.gnome-shell-extensions.org"
@ -67,9 +71,21 @@
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"
],
"extension-list": [
"extension-list@tu.berry",
"screen-lock@garciabaameiro.com"
],
"wireguard-indicator": [
"wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es"
]
}
}

6
pkgs/desktops/gnome/extensions/extensionRenames.nix
View file

@ -29,6 +29,12 @@
"noannoyance@sindex.com" = "noannoyance";
"noannoyance@daase.net" = "noannoyance-2";
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
"wireguard-indicator@atareao.es" = "wireguard-indicator";
"extension-list@tu.berry" = "extension-list";
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug

247
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

6
pkgs/development/beam-modules/mix-release.nix
View file

@ -104,8 +104,12 @@ stdenv.mkDerivation (overridable // {
if [ -e $out/erts-* ]; then
echo "ERTS found in $out - removing references to erlang to reduce closure size"
# there is a link in $out/erts-*/bin/start always
# TODO:
# sometimes there are links in dependencies like bcrypt compiled binaries
for file in $(rg "${erlang}/lib/erlang" "$out" --text --files-with-matches); do
# at the moment those are not removed since substituteInPlace will
# error on binaries
for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do
echo "removing reference to erlang in $file"
substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
done
fi

4
pkgs/development/python-modules/hstspreload/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "hstspreload";
version = "2021.9.1";
version = "2021.10.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = version;
sha256 = "sha256-CZlXnRe4yA6VJF48t73m2PbBRFzg0XTgT7J1N83Ojc4=";
sha256 = "sha256-nd3k2enQvYzASFyLy8chBLGX8dXlLyMyg4yv06VSeUA=";
};
# tests require network connection

4
pkgs/development/python-modules/pynws/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pynws";
version = "1.3.0";
version = "1.3.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "MatthewFlamm";
repo = pname;
rev = "v${version}";
sha256 = "13ipmx60kicwh8qxjazap4vk94x8i3r0lnkdsap7gffaizwgp49d";
sha256 = "sha256-iWg8UsZeVaOxp35rItywTAlQUbCWe4WWDK4VPCRApcM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pysiaalarm/default.nix
View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pysiaalarm";
version = "3.0.1";
version = "3.0.2";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-96LSD1jL4Za7HF9vgplImeY57EQ9qa/hOdjQ/PPBq4A=";
sha256 = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs=";
};
postPatch = ''

27
pkgs/development/tools/checkmate/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "checkmate";
version = "0.4.5";
src = fetchFromGitHub {
owner = "adedayo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0s2WyY17xk/tGIKMUoJYcpOm510PtZZMxLLFdYAZAmI=";
};
vendorSha256 = "sha256-AEjSuG5qmsyzkEubxKYF1/MTG91Nxdz83X0ucZmZQxU=";
subPackages = [ "." ];
meta = with lib; {
description = "Pluggable code security analysis tool";
homepage = "https://github.com/adedayo/checkmate";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

48
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -1,33 +1,23 @@
{ lib
, fetchpatch
, kernel
, date ? "2021-07-08"
, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"
, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {}
, ...
} @ args:
{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
(kernel.override ( args // {
buildLinux (args // {
version = "5.13.0-2021.10.01";
modDirVersion = "5.13.0";
argsOverride = {
version = "${kernel.version}-bcachefs-unstable-${date}";
extraMeta = {
branch = "master";
maintainers = with lib.maintainers; [ davidak chiiruno ];
platforms = [ "x86_64-linux" ];
};
} // argsOverride;
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs";
rev = "4114ced1db465b8f4e7f4d6a78aa11416a9ab5d9";
sha256 = "sha256-viFC3HHIcjUTDPvloSKKsz9PuSLyvxfYnrtkVUB79mQ=";
};
kernelPatches = [ {
name = "bcachefs-${commit}";
patch = fetchpatch {
name = "bcachefs-${commit}.diff";
url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}";
sha256 = diffHash;
};
extraConfig = "BCACHEFS_FS m";
} ] ++ kernelPatches;
extraConfig = "BCACHEFS_FS m";
})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })
extraMeta = {
branch = "master";
hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
maintainers = with lib.maintainers; [ davidak chiiruno ];
platforms = [ "x86_64-linux" ];
};
} // (args.argsOverride or {}))

59
pkgs/servers/mapcache/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, apacheHttpd, apr, aprutil, curl, db, fcgi, gdal, geos
, libgeotiff, libjpeg, libpng, libtiff, pcre, pixman, proj, sqlite, zlib
}:
stdenv.mkDerivation rec {
pname = "mapcache";
version = "1.10.0";
src = fetchFromGitHub {
owner = "MapServer";
repo = pname;
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-HrvcJAf0a6tu8AKKuW5TaCtqPMgzH21fGMBxIfUzdgY=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
apacheHttpd
apr
aprutil
curl
db
fcgi
gdal
geos
libgeotiff
libjpeg
libpng
libtiff
pcre
pixman
proj
sqlite
zlib
];
cmakeFlags = [
"-DWITH_BERKELEY_DB=ON"
"-DWITH_MEMCACHE=ON"
"-DWITH_TIFF=ON"
"-DWITH_GEOTIFF=ON"
"-DWITH_PCRE=ON"
"-DAPACHE_MODULE_DIR=${placeholder "out"}/modules"
];
meta = with lib; {
description = "A server that implements tile caching to speed up access to WMS layers";
homepage = "https://mapserver.org/mapcache/";
changelog = "https://www.mapserver.org/development/changelog/mapcache/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}

60
pkgs/servers/mapserver/default.nix Normal file
View file

@ -0,0 +1,60 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz
, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib
, withPython ? true, swig, python
}:
stdenv.mkDerivation rec {
pname = "mapserver";
version = "7.6.4";
src = fetchFromGitHub {
owner = "MapServer";
repo = "MapServer";
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-NMo/7CtWYIP1oPKki09oDWLCbj2vPk3xCU4rkHq8YKY=";
};
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optional withPython swig;
buildInputs = [
cairo
curl
fcgi
freetype
fribidi
gdal
geos
giflib
harfbuzz
libjpeg
libpng
librsvg
libxml2
postgresql
proj
protobufc
zlib
] ++ lib.optional withPython python;
cmakeFlags = [
"-DWITH_KML=ON"
"-DWITH_SOS=ON"
"-DWITH_RSVG=ON"
"-DWITH_CURL=ON"
"-DWITH_CLIENT_WMS=ON"
"-DWITH_CLIENT_WFS=ON"
] ++ lib.optional withPython "-DWITH_PYTHON=ON";
meta = with lib; {
description = "Platform for publishing spatial data and interactive mapping applications to the web";
homepage = "https://mapserver.org/";
changelog = "https://mapserver.org/development/changelog/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}

2
pkgs/servers/matrix-synapse/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? false
, enableRedis ? true
, callPackage
}:

97
pkgs/servers/web-apps/lemmy/ui.nix
View file

@ -4,7 +4,6 @@
, nodejs
, python3
, pkg-config
, writeShellScriptBin
, fetchFromGitHub
}:
@ -22,53 +21,53 @@ let
name = "lemmy-ui";
version = "0.12.2";
unwrapped = mkYarnPackage {
src = fetchFromGitHub {
owner = "LemmyNet";
repo = name;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=";
};
inherit pkgConfig name version;
extraBuildInputs = [ libsass ];
yarnNix = ./yarn.nix;
# Fails mysteriously on source/package.json
# Upstream package.json is missing a newline at the end
packageJSON = ./package.json;
yarnPreBuild = ''
export npm_config_nodedir=${nodejs}
'';
buildPhase = ''
# Yarn writes cache directories etc to $HOME.
export HOME=$PWD/yarn_home
ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/
yarn --offline build:prod
'';
distPhase = "true";
meta = with lib; {
description = "Building a federated alternative to reddit in rust";
homepage = "https://join-lemmy.org/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ happysalada billewanick ];
platforms = platforms.linux;
};
};
in
(writeShellScriptBin "lemmy-ui" ''
${nodejs}/bin/node ${unwrapped}/libexec/lemmy-ui/node_modules/lemmy-ui/dist/js/server.js
'').overrideAttrs (oldAttrs: {
passthru = { inherit unwrapped; };
})
mkYarnPackage {
src = fetchFromGitHub {
owner = "LemmyNet";
repo = name;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=";
};
inherit pkgConfig name version;
extraBuildInputs = [ libsass ];
yarnNix = ./yarn.nix;
# Fails mysteriously on source/package.json
# Upstream package.json is missing a newline at the end
packageJSON = ./package.json;
yarnPreBuild = ''
export npm_config_nodedir=${nodejs}
'';
buildPhase = ''
# Yarn writes cache directories etc to $HOME.
export HOME=$PWD/yarn_home
ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/
yarn --offline build:prod
'';
preInstall = ''
mkdir $out
cp -R ./deps/lemmy-ui/dist/assets $out
'';
distPhase = "true";
meta = with lib; {
description = "Building a federated alternative to reddit in rust";
homepage = "https://join-lemmy.org/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ happysalada billewanick ];
platforms = platforms.linux;
};
}

6
pkgs/tools/networking/amass/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
version = "3.13.4";
version = "3.14.0";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31";
sha256 = "sha256-DlWfiJiBgXhPzl8RlMu4mlvd9kiSBI5LRPntv8XieXc=";
};
vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45";
vendorSha256 = "sha256-3+ORdF5CBrYYpn69ddtMfSyOwXIEB3NS8zQ+NUdDWqA=";
outputs = [ "out" "wordlists" ];

6
pkgs/tools/security/step-cli/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "step-cli";
version = "0.17.2";
version = "0.17.6";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-w+1iL/Y1OKksIqGJvft734NmjLbxm2yebV/xjhzOubM=";
sha256 = "sha256-xkdn6e8He/yVvTubi88tVpU8I0XNEeJSzosbkCUZODk=";
};
ldflags = [
@ -25,7 +25,7 @@ buildGoModule rec {
rm command/certificate/remote_test.go
'';
vendorSha256 = "sha256-71DH7/kU/nZqbsrRWkxa3JV3pevGjjOKDjn8gIWSDkE=";
vendorSha256 = "sha256-/aN3lXc3mPk3wIpNVjBXz35NlWNg8tob8q2oJ7Az2Bs=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

2
pkgs/tools/virtualization/linode-cli/update.sh
View file

@ -21,7 +21,7 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz)
setKV () {
sed -i "s/$1 = \".*\"/$1 = \"$2\"/" default.nix
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
}
setKV specVersion ${SPEC_VERSION}

6
pkgs/top-level/all-packages.nix
View file

@ -4058,6 +4058,8 @@ with pkgs;
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
checkmate = callPackage ../development/tools/checkmate { };
civetweb = callPackage ../development/libraries/civetweb { };
ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
@ -6711,6 +6713,10 @@ with pkgs;
makebootfat = callPackage ../tools/misc/makebootfat { };
mapcache = callPackage ../servers/mapcache { };
mapserver = callPackage ../servers/mapserver { };
martin = callPackage ../servers/martin {
inherit (darwin.apple_sdk.frameworks) Security;
};