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-11-12 00:01:22 +00:00 committed by GitHub
commit 026e6c328a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 120 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/hydrus/default.nix
View file

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "460";
version = "461";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-cIvidbvMAWVs/XnS7I5ZQkuya9lfuRPNCRSTbFnKhSw=";
sha256 = "sha256-fVqMSzQ4VhiRh6gDFApln1jioIDs80ceyV+ClNRhjKA=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/anytype/default.nix
View file

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.20.9";
version = "0.21.1";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8=";
sha256 = "sha256-5QsbB48g11TyfWCbR7Sz2AETEwdyG+bSJQNGRHrIueE=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

2
pkgs/applications/misc/bklk/default.nix
View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-R3H6tv6fzQG41Y2rui0K8fdQ/+Ywnc5hqTPFjktrhF8=";
};
makeFlags = [ "CC=$$CXX" ];
buildInputs = [ ncurses ];
installPhase = ''

23
pkgs/applications/science/electronics/librepcb/default.nix
View file

@ -1,37 +1,22 @@
{ stdenv, lib, fetchFromGitHub
, qtbase, qttools, qmake, wrapQtAppsHook
, qtbase, qttools, cmake, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
pname = "librepcb";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";
sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
buildInputs = [ qtbase ];
qmakeFlags = ["-r"];
# the build system tries to use 'git' at build time to find the HEAD hash.
# that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
# at the end of the line to remove the git call.
postPatch = ''
substituteInPlace ./libs/librepcb/common/common.pro \
--replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
'';
postInstall = ''
mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
'';
meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://librepcb.org/";

6
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.5";
version = "0.20.6";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7KEG4akn6tOUrgQUZFX0Wiz8YAKFUAr8AN16Xg8CLO4=";
sha256 = "sha256-FLMfXloAAIz/9KAtKFfB8uokQz/J8R+WsGarq/5cblo=";
};
cargoSha256 = "sha256-GTE1KJ/ZpiqwmmKYx6kNzPNNmz0QHYWrIyKN49uzdZA=";
cargoSha256 = "sha256-UVAF2rz0y6h3/rcTJ+31mMyJDLG7q40n6vBK8Wxultg=";
nativeBuildInputs = [ pkg-config makeWrapper ];

2
pkgs/build-support/vm/default.nix
View file

@ -390,7 +390,7 @@ rec {
diskImage=$(pwd)/disk-image.qcow2
origImage=${attrs.diskImage}
if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
${qemu}/bin/qemu-img create -F ${attrs.diskImageFormat} -b "$origImage" -f qcow2 $diskImage
'';
/* Inside the VM, run the stdenv setup script normally, but at the

6
pkgs/build-support/vm/test.nix
View file

@ -28,10 +28,10 @@ with vmTools;
buildInDebian = runInLinuxImage (stdenv.mkDerivation {
name = "deb-compile";
src = patchelf.src;
diskImage = diskImages.ubuntu1204i386;
diskImage = diskImages.ubuntu1804i386;
diskImageFormat = "qcow2";
memSize = 512;
prePhases = [ sysInfoPhase ];
sysInfoPhase = ''
postHook = ''
dpkg-query --list
'';
});

2
pkgs/development/libraries/pcre2/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
pname = "pcre2";
version = "10.37";
src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA=";
};

13
pkgs/development/libraries/pipewire/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, removeReferencesTo
, python3
, meson
@ -63,7 +62,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.39";
version = "0.3.40";
outputs = [
"out"
@ -81,7 +80,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-peTS1+NuQxZg1rrv8DrnJW5BR9yReleqooIwhZWHLjM=";
sha256 = "sha256-eY6uQa4+sC6yUWhF4IpAgRoppwhHO4s5fIMXOkS0z7A=";
};
patches = [
@ -97,12 +96,6 @@ let
./0090-pipewire-config-template-paths.patch
# Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch
# Fix compilation on some architectures
# XXX: REMOVE ON NEXT RELEASE
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.diff";
sha256 = "1bmpi5qn750mcspaw7m57ww0503sl9781jswqby4gr0f7c5wmqvj";
})
];
nativeBuildInputs = [
@ -188,7 +181,7 @@ let
'';
passthru = {
updateScript = ./update.sh;
updateScript = ./update-pipewire.sh;
tests = {
installedTests = nixosTests.installed-tests.pipewire;

5
pkgs/development/libraries/pipewire/media-session.nix
View file

@ -20,14 +20,14 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire-media-session";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "media-session";
rev = version;
sha256 = "sha256-zhOvBlG7DuQkJ+ZZBhBhfKwk+bbLljpt3w4JlK3cJLk=";
sha256 = "sha256-e537gTkiNYMz2YJrOff/MXYWVDgHZDkqkSn8Qh+7Wr4=";
};
nativeBuildInputs = [
@ -67,6 +67,7 @@ let
'';
passthru = {
updateScript = ./update-media-session.sh;
tests = {
test-paths = callPackage ./test-paths.nix { package = self; } {
paths-out = [

13
pkgs/development/libraries/pipewire/update.sh → pkgs/development/libraries/pipewire/update-media-session.sh
View file

@ -10,19 +10,6 @@ IFS=$'\n'
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"
cd "$NIXPKGS_ROOT"
nix-update pipewire
outputs=$(nix-build . -A pipewire)
for p in $outputs; do
conf_files=$(find "$p/nix-support/" -name '*.conf.json')
for c in $conf_files; do
file_name=$(basename "$c")
if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then
echo "New file $file_name found! Add it to the module config and passthru tests!"
fi
install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/"
done
done
nix-update pipewire-media-session
outputs=$(nix-build . -A pipewire-media-session)
for p in $outputs; do

25
pkgs/development/libraries/pipewire/update-pipewire.sh Executable file
View file

@ -0,0 +1,25 @@
#!/usr/bin/env nix-shell
#!nix-shell -p nix-update -i bash
# shellcheck shell=bash
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
shopt -s nullglob
IFS=$'\n'
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"
cd "$NIXPKGS_ROOT"
nix-update pipewire
outputs=$(nix-build . -A pipewire)
for p in $outputs; do
conf_files=$(find "$p/nix-support/" -name '*.conf.json')
for c in $conf_files; do
file_name=$(basename "$c")
if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then
echo "New file $file_name found! Add it to the module config and passthru tests!"
fi
install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/"
done
done

17
pkgs/development/python-modules/goalzero/default.nix
View file

@ -1,31 +1,32 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, aiohttp
, ratelimit
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "goalzero";
version = "0.2.0";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "6cb67cf772a758225b2e23b394feb697e8cbfb1aff5a2d7a17a0d4ccf61e55cd";
sha256 = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ=";
};
propagatedBuildInputs = [
aiohttp
ratelimit
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "goalzero" ];
pythonImportsCheck = [
"goalzero"
];
meta = with lib; {
description = "Goal Zero Yeti REST Api Library";

10
pkgs/development/python-modules/pytautulli/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, aiohttp
, aresponses
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
@ -11,7 +10,7 @@
buildPythonPackage rec {
pname = "pytautulli";
version = "21.10.1";
version = "21.11.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +19,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-ckDqKPseOrGyWGvcPyj99cvQS+w4AHUkO4FHOIo9MDM=";
sha256 = "sha256-zODU3aN+8Fdw/GQ/EfZhn6kOuLDARKgLULzRw2+b2BM=";
};
postPatch = ''
@ -32,7 +31,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
async-timeout
];
checkInputs = [
@ -41,7 +39,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "pytautulli" ];
pythonImportsCheck = [
"pytautulli"
];
meta = with lib; {
description = "Python module to get information from Tautulli";

46
pkgs/development/python-modules/sievelib/default.nix
View file

@ -1,37 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, mock
, future, six, setuptools-scm }:
{ lib
, buildPythonPackage
, fetchPypi
, mock
, pytestCheckHook
, setuptools-scm
}:
buildPythonPackage rec {
pname = "sievelib";
version = "1.1.1";
version = "1.2.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1sl1fnwr5jdacrrnq2rvzh4vv1dyxd3x31vnqga36gj8h546h7mz";
sha256 = "sha256-7cubQWqYWjzFt9f01+wBPjcuv5DmTJ2eAOIDEpmvOP0=";
};
patches = [
(fetchpatch {
name = "pip-10-pip-req.patch";
url = "https://github.com/tonioo/sievelib/commit/1deef0e2bf039a0e817ea6f19aaf1947dc9fafbc.patch";
sha256 = "0vaj73mcij9dism8vfaai82irh8j1b2n8gf9jl1a19d2l26jrflk";
})
(fetchpatch {
name = "requirements-in-setup-py.patch";
url = "https://github.com/tonioo/sievelib/commit/91f40ec226ea288e98379da01672a46dabd89fc9.patch";
sha256 = "0hph89xn16r353rg6f05bh0cgigmwdc736bya089qc03jhssrgns";
})
nativeBuildInputs = [
setuptools-scm
];
buildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ future six ];
checkInputs = [ mock ];
checkInputs = [
mock
pytestCheckHook
];
meta = {
pythonImportsCheck = [
"sievelib"
];
meta = with lib; {
description = "Client-side Sieve and Managesieve library written in Python";
homepage = "https://github.com/tonioo/sievelib";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ leenaars ];
longDescription = ''
A library written in Python that implements RFC 5228 (Sieve: An Email
Filtering Language) and RFC 5804 (ManageSieve: A Protocol for
@ -43,5 +42,8 @@ buildPythonPackage rec {
* Vacation (RFC 5230)
* Imap4flags (RFC 5232)
'';
homepage = "https://github.com/tonioo/sievelib";
license = licenses.mit;
maintainers = with maintainers; [ leenaars ];
};
}

4
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -56,13 +56,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.563";
version = "2.0.566";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-f1rD1Xal/86q7hRR+6XneiVEYGH1TFHVXzFLOQDO17Y=";
sha256 = "sha256-Eah4dK23jdHK7s0VF8FLd6KJzHP5YpdLGcM7IXgB880=";
};
nativeBuildInputs = with py.pkgs; [

2
pkgs/development/tools/build-managers/dub/default.nix
View file

@ -150,6 +150,6 @@ stdenv.mkDerivation rec {
homepage = "https://code.dlang.org/";
license = licenses.mit;
maintainers = with maintainers; [ ThomasMader ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

32
pkgs/os-specific/linux/waydroid/default.nix
View file

@ -3,24 +3,31 @@
, fetchFromGitHub
, python3Packages
, dnsmasq
, getent
, kmod
, lxc
, iproute2
, iptables
, nftables
, python
, util-linux
, which
, xclip
}:
python3Packages.buildPythonApplication rec {
pname = "waydroid";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0cabh7rysh2v15wrxg250370mw26s5d073yxmczxsarbp4ri2pl4";
sha256 = "03d87sh443kn0j2mpih1g909khkx3wgb04h605f9jhd0znskkbmw";
};
propagatedBuildInputs = with python3Packages; [
gbinder-python
pyclip
pygobject3
];
@ -36,20 +43,33 @@ python3Packages.buildPythonApplication rec {
cp -ra data $out/${python3Packages.python.sitePackages}/data
wrapProgram $out/${python3Packages.python.sitePackages}/data/scripts/waydroid-net.sh \
--prefix PATH ":" ${lib.makeBinPath [ dnsmasq nftables ]}
--prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables nftables ]}
mkdir -p $out/share/waydroid/gbinder.d
cp gbinder/anbox.conf $out/share/waydroid/gbinder.d/anbox.conf
mkdir -p $out/share/applications
ln -s $out/${python3Packages.python.sitePackages}/data/Waydroid.desktop $out/share/applications/Waydroid.desktop
mkdir $out/bin
cp -a waydroid.py $out/${python3Packages.python.sitePackages}/waydroid.py
ln -s $out/${python3Packages.python.sitePackages}/waydroid.py $out/bin/waydroid
wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "$out ${python3Packages.gbinder-python} ${python3Packages.pygobject3} ${lxc}"
wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "${lib.concatStringsSep " " [
"$out"
python3Packages.gbinder-python
python3Packages.pygobject3
python3Packages.pyclip
kmod
lxc
util-linux
which
xclip
]}"
'';
meta = with lib; {
description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu.";
description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu";
homepage = "https://github.com/waydroid/waydroid";
license = licenses.gpl3;
platforms = platforms.linux;

4
pkgs/tools/misc/steampipe/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "steampipe";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-wG5KvyY40CNxIScuQHQdJ4u8fzNU+oV7iNe9VAvTQMg=";
sha256 = "sha256-asAqRCJdy8HmzWzuE9nSvxqo6EVY8tkljzEFAClogrs=";
};
vendorSha256 = "sha256-3JBCiF1gxGCVn81s7abGvNIAy+eP7orAnSBOXUNImao=";

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-11-09";
version = "2021-11-11";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-V/iQvA2jxeddzmzoVNJ4eoyEjkrkfws7pLw6akbBDaA=";
sha256 = "sha256-ImYbGaKnUizIJjYdiiX2X7O6uxo+ZHskcv9DcL51wY8=";
};
nativeBuildInputs = [ makeWrapper ];