JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-20 00:01:21 +00:00 committed by GitHub
commit 7495684853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 269 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/networking/networkmanager.nix
View File

@ -527,7 +527,6 @@ in {
{
networkmanager.connectionConfig = {
"ipv6.ip6-privacy" = 2;
"ethernet.cloned-mac-address" = cfg.ethernet.macAddress;
"wifi.cloned-mac-address" = cfg.wifi.macAddress;
"wifi.powersave" =

2
nixos/modules/tasks/network-interfaces.nix
View File

@ -1233,6 +1233,8 @@ in
"net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
"net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
# networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"
"net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;
} // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
(i: [(nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)]))
// listToAttrs (forEach interfaces

2
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -845,7 +845,7 @@ in
''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
])
(mkIf cfg.useEFIBoot [
"-drive if=pflash,format=raw,unit=0,readonly,file=${efiFirmware}"
"-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
"-drive if=pflash,format=raw,unit=1,file=$NIX_EFI_VARS"
])
(mkIf (cfg.bios != null) [

2
pkgs/applications/networking/irc/catgirl/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libressl ncurses ];
strictDeps = true;
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://git.causal.agency/catgirl/about/";
license = licenses.gpl3Plus;

114
pkgs/applications/version-management/bcompare/default.nix
View File

@ -1,54 +1,82 @@
{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }:
{ lib, autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice
, stdenv, runtimeShell, unzip
}:
stdenv.mkDerivation rec {
let
pname = "bcompare";
version = "4.4.0.25886";
src = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko=";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko=";
};
x86_64-darwin = fetchurl {
url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip";
sha256 = "sha256-dez30a1sp+4XuBBYhu07Vpn1+AUmX0Ni7aad7hy2ajQ=";
};
aarch64-darwin = srcs.x86_64-darwin;
};
unpackPhase = ''
ar x $src
tar xfz data.tar.gz
'';
src = srcs.${stdenv.hostPlatform.system} or throwSystem;
installPhase = ''
mkdir -p $out/bin $out/lib $out/share
cp -R usr/share $out/
cp -R usr/lib $out/
cp -R usr/bin $out/
linux = stdenv.mkDerivation {
inherit pname version src meta;
unpackPhase = ''
ar x $src
tar xfz data.tar.gz
'';
# Remove library that refuses to be autoPatchelf'ed
rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
installPhase = ''
mkdir -p $out/{bin,lib,share}
substituteInPlace $out/bin/bcompare \
--replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
--replace "/bin/bash" "${runtimeShell}"
cp -R usr/{bin,lib,share} $out/
# Create symlink bzip2 library
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0
'';
# Remove library that refuses to be autoPatchelf'ed
rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
nativeBuildInputs = [ autoPatchelfHook ];
substituteInPlace $out/bin/${pname} \
--replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
--replace "ldd" "${glibc.out}/bin/ldd" \
--replace "/bin/bash" "${runtimeShell}"
buildInputs = [
stdenv.cc.cc.lib
gtk2
pango
cairo
kio
kservice
ki18n
kcoreaddons
gdk-pixbuf
bzip2
];
# Create symlink bzip2 library
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0
'';
dontBuild = true;
dontConfigure = true;
dontWrapQtApps = true;
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
stdenv.cc.cc.lib
gtk2
pango
cairo
kio
kservice
ki18n
kcoreaddons
gdk-pixbuf
bzip2
];
dontBuild = true;
dontConfigure = true;
dontWrapQtApps = true;
};
darwin = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/Applications/BCompare.app
cp -R . $out/Applications/BCompare.app
'';
};
meta = with lib; {
description = "GUI application that allows to quickly and easily compare files and folders";
@ -59,8 +87,10 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.scootersoftware.com";
license = licenses.unfree;
maintainers = [ maintainers.ktor ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ktor arkivm ];
platforms = builtins.attrNames srcs;
};
}
in
if stdenv.isDarwin
then darwin
else linux

6
pkgs/development/libraries/cogl/default.nix
View File

@ -3,14 +3,12 @@
, mesa, automake, autoconf
, gstreamerSupport ? true, gst_all_1 }:
let
stdenv.mkDerivation rec {
pname = "cogl";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.22.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/cogl-${version}.tar.xz";
sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
};

59
pkgs/development/python-modules/devolo-plc-api/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, httpx
, protobuf
, pytest-asyncio
, pytest-httpx
, pytest-mock
, pytestCheckHook
, pythonOlder
, setuptools-scm
, zeroconf
}:
buildPythonPackage rec {
pname = "devolo-plc-api";
version = "0.6.3";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "v${version}";
sha256 = "6EIT6ifC4M4qj/2dZYVZ3fb3bPs25R7IEh/MduYTTkU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
httpx
protobuf
zeroconf
];
checkInputs = [
pytest-asyncio
pytest-httpx
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [
"devolo_plc_api"
];
meta = with lib; {
description = "Python module to interact with Devolo PLC devices";
homepage = "https://github.com/2Fake/devolo_plc_api";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/ipykernel/default.nix
View File

@ -2,6 +2,8 @@
, buildPythonPackage
, callPackage
, fetchPypi
, pythonOlder
, argcomplete
, debugpy
, ipython
, jupyter-client
@ -24,6 +26,8 @@ buildPythonPackage rec {
jupyter-client
tornado
traitlets
] ++ lib.optionals (pythonOlder "3.8") [
argcomplete
];
# check in passthru.tests.pytest to escape infinite recursion with ipyparallel

42
pkgs/development/python-modules/libversion/default.nix
View File

@ -1,23 +1,41 @@
{ lib, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, libversion
, pkg-config
, pythonOlder
}:
buildPythonPackage rec {
pname = "libversion";
version = "1.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "e6e903cc6307c3eda90401373eb81bfd0dd2dc93772ddab3d23705bed0c6f6e9";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libversion ];
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "repology";
repo = "py-libversion";
rev = version;
sha256 = "sha256-p0wtSB+QXAERf+57MMb8cqWoy1bG3XaCpR9GPwYYvJM=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libversion
];
pythonImportsCheck = [
"libversion"
];
meta = with lib; {
homepage = "https://github.com/repology/py-libversion";
description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm";
homepage = "https://github.com/repology/py-libversion";
license = licenses.mit;
maintainers = [ maintainers.ryantm ];
maintainers = with maintainers; [ ryantm ];
};
}

25
pkgs/development/python-modules/m3u8/default.nix
View File

@ -1,24 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }:
{ lib, buildPythonPackage, fetchFromGitHub, requests, iso8601, bottle, pytestCheckHook }:
buildPythonPackage rec {
pname = "m3u8";
version = "0.6.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "globocom";
repo = pname;
rev = version;
sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p";
sha256 = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA=";
};
checkInputs = [ bottle pytest pytest-cov ];
checkPhase = ''
pytest tests/test_{parser,model,variant_m3u8}.py
'';
propagatedBuildInputs = [ requests iso8601 ];
checkInputs = [ bottle pytestCheckHook ];
pytestFlagsArray = [
"tests/test_parser.py"
"tests/test_model.py"
"tests/test_variant_m3u8.py"
];
preCheck = ''
# Fix test on Hydra
substituteInPlace tests/test_model.py --replace "/tmp/d.m3u8" "$TMPDIR/d.m3u8"
'';
meta = with lib; {
homepage = "https://github.com/globocom/m3u8";
description = "Python m3u8 parser";

36
pkgs/os-specific/linux/crda/default.nix
View File

@ -2,35 +2,42 @@
stdenv.mkDerivation rec {
pname = "crda";
version = "3.18";
version = "4.14";
src = fetchurl {
sha256 = "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23";
url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-${version}.tar.gz";
sha256 = "sha256-Wo81u4snR09Gaw511FG6kXQz2KqxiJZ4pk2cTnKouMI=";
};
patches = [
# Switch to Python 3
# https://lore.kernel.org/linux-wireless/1437542484-23409-1-git-send-email-ahmed.taahir@gmail.com/
# Fix python 3 build: except ImportError, e: SyntaxError: invalid syntax
(fetchpatch {
url = "https://lore.kernel.org/linux-wireless/1437542484-23409-2-git-send-email-ahmed.taahir@gmail.com/raw";
sha256 = "0s2n340cgaasvg1k8g9v8xjrbh4y2mcgrhdmv97ja2fs8xjcjbf1";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d234fddf451fab0f4fc412e2769f54e11f10d7d8/trunk/crda-4.14-python-3.patch";
sha256 = "sha256-KEezEKrfizq9k4ZiE2mf3Nl4JiBayhXeVnFl7wYh28Y=";
})
(fetchpatch {
url = "https://lore.kernel.org/linux-wireless/1437542484-23409-3-git-send-email-ahmed.taahir@gmail.com/raw";
sha256 = "01dlfw7kqhyx025jxq2l75950b181p9r7i9zkflcwvbzzdmx59md";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d48ec843222b0d74c85bce86fa6f087c7dfdf952/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch";
sha256 = "sha256-j93oydi209f22OF8aXZ/NczuUOnlhkdSeYvy2WRRvm0=";
})
];
buildInputs = [ libgcrypt libnl ];
strictDeps = true;
nativeBuildInputs = [
pkg-config
python3Packages.pycrypto
python3Packages.m2crypto # only used for a build time script
];
buildInputs = [
libgcrypt
libnl
];
postPatch = ''
patchShebangs utils/
substituteInPlace Makefile \
--replace 'gzip' 'gzip -n' \
--replace ldconfig true \
--replace pkg-config $PKG_CONFIG
sed -i crda.c \
@ -45,19 +52,12 @@ stdenv.mkDerivation rec {
"REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"
];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-const-variable";
buildFlags = [ "all_noverify" ];
enableParallelBuilding = true;
doCheck = true;
checkTarget = "verify";
postInstall = ''
# The patch installs build header
rm $out/include/reglib/keys-gcrypt.h
'';
meta = with lib; {
description = "Linux wireless Central Regulatory Domain Agent";
longDescription = ''

6
pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, gnugrep, findutils }:
let
version = "22-1.1ubuntu1"; # Zesty
version = "28-1ubuntu4"; # impish 2021-06-24
in stdenv.mkDerivation {
pname = "kmod-blacklist";
@ -9,7 +9,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
sha256 = "sha256-K8tWpaLmCm3Jcxw3OZ+D7Koiug7epooRn1YMfqjGAiw=";
};
installPhase = ''
@ -31,7 +31,7 @@ in stdenv.mkDerivation {
'';
meta = with lib; {
homepage = "https://packages.ubuntu.com/source/zesty/kmod";
homepage = "https://launchpad.net/ubuntu/+source/kmod";
description = "Linux kernel module blacklists from Ubuntu";
platforms = platforms.linux;
license = with licenses; [ gpl2Plus lgpl21Plus ];

26
pkgs/servers/http/quark/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchgit, patches ? null }:
stdenv.mkDerivation {
pname = "quark";
version = "unstable-2021-02-22";
src = fetchgit {
url = "git://git.suckless.org/quark";
rev = "68b4f733b2755762e43df90f73db5a6ec8d14104";
sha256 = "sha256-Jtu5zJfHd+6Oq572nVem5msMDCOjdqDNH4SQck8/O5A=";
};
inherit patches;
makeFlags = [ "CC:=$(CC)" ];
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Extremely small and simple HTTP GET/HEAD-only web server for static content";
homepage = "http://tools.suckless.org/quark";
license = licenses.isc;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}

2
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -103,6 +103,8 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/zsh/site-functions
mv $out/google-cloud-sdk/completion.zsh.inc $out/share/zsh/site-functions/_gcloud
ln -s $out/share/zsh/site-functions/_gcloud $out/share/zsh/site-functions/_gsutil
# zsh doesn't load completions from $FPATH without #compdef as the first line
sed -i '1 i #compdef gcloud' $out/share/zsh/site-functions/_gcloud
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.

26
pkgs/tools/misc/gotify-desktop/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config}:
rustPlatform.buildRustPackage rec {
pname = "gotify-desktop";
version = "1.2.0";
src = fetchFromGitHub {
owner = "desbma";
repo = pname;
rev = version;
sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE=";
};
cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
meta = with lib; {
description = "Small Gotify daemon to send messages as desktop notifications";
homepage = "https://github.com/desbma/gotify-desktop";
license = licenses.gpl3Plus;
maintainers = [ maintainers.bryanasdev000 ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -3076,6 +3076,8 @@ with pkgs;
gotify-cli = callPackage ../tools/misc/gotify-cli { };
gotify-desktop = callPackage ../tools/misc/gotify-desktop { };
gping = callPackage ../tools/networking/gping { };
gpu-burn = callPackage ../applications/misc/gpu-burn { };
@ -21069,6 +21071,8 @@ with pkgs;
pshs = callPackage ../servers/http/pshs { };
quark = callPackage ../servers/http/quark { };
sympa = callPackage ../servers/mail/sympa { };
system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });

2
pkgs/top-level/python-packages.nix
View File

@ -2026,6 +2026,8 @@ in {
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
devolo-plc-api = callPackage ../development/python-modules/devolo-plc-api { };
devpi-common = callPackage ../development/python-modules/devpi-common { };
devtools = callPackage ../development/python-modules/devtools { };