ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-27 18:30:33 +00:00 committed by GitHub
commit c60825a5d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 472 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/electrum/default.nix
View File

@ -19,7 +19,7 @@
}:
let
version = "4.0.7";
version = "4.0.9";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -35,7 +35,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "06vcbj9p96d8v4xjlygzr74lqllb9adn8k0racajzq61ijb0imi2";
sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3";
extraPostFetch = ''
mv $out ./all
@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4";
sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva";
};
postUnpack = ''

24
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype
, pkg-config, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, wrapGAppsHook
, libGLU, libGL, perl, python2, libpulseaudio
@ -11,19 +11,19 @@
let
libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ];
libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ];
gtkVersion = if withGTK3 then "3" else "2";
in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.16.0";
version = "28.17.0";
src = fetchFromGitHub {
githubBase = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56";
sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x";
fetchSubmodules = true;
};
@ -43,11 +43,11 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook
desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook
];
buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype
alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL
libpulseaudio unzip yasm zip zlib
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configurePhase = ''
export MOZCONFIG=$(pwd)/mozconfig
export MOZCONFIG=$PWD/mozconfig
export MOZ_NOSPAM=1
# Keep this similar to the official .mozconfig file,
@ -114,18 +114,18 @@ in stdenv.mkDerivation rec {
'
'';
buildPhase = "$src/mach build";
buildPhase = "./mach build";
installPhase = ''
$src/mach install
./mach install
desktop-file-install --dir=$out/share/applications \
$src/palemoon/branding/official/palemoon.desktop
./palemoon/branding/official/palemoon.desktop
for iconname in default{16,22,24,32,48,256} mozicon128; do
n=''${iconname//[^0-9]/}
size=$n"x"$n
install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
'';

16
pkgs/applications/networking/feedreaders/canto-daemon/default.nix
View File

@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, python3Packages, }:
python3Packages.buildPythonApplication rec {
version = "0.9.7";
version = "0.9.8";
pname = "canto-daemon";
src = fetchFromGitHub {
owner = "themoken";
repo = "canto-next";
rev = "v${version}";
sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
};
propagatedBuildInputs = with python3Packages; [ feedparser ];
meta = {
doCheck = false;
pythonImportsCheck = [ "canto_next" ];
meta = with stdenv.lib; {
description = "Daemon for the canto Atom/RSS feed reader";
longDescription = ''
Canto is an Atom/RSS feed reader for the console that is meant to be
@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec {
and extensibility using the excellent Python programming language.
'';
homepage = "https://codezen.org/canto-ng/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.devhell ];
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers;[ devhell ];
};
}

9
pkgs/applications/science/math/bcal/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, python3Packages, readline }:
{ stdenv, fetchFromGitHub, python3Packages, readline, bc }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bcal";
version = "1.9";
version = "2.2";
src = fetchFromGitHub {
owner = "jarun";
repo = "bcal";
rev = "v${version}";
sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm";
sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A=";
};
nativeBuildInputs = [ python3Packages.pytest ];
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ];
doCheck = true;
checkInputs = [ bc ];
checkPhase = ''
python3 -m pytest test.py
'';
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Storage conversion and expression calculator";
homepage = "https://github.com/jarun/bcal";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
maintainers = with maintainers; [ jfrankenau ];
};

13
pkgs/development/interpreters/lua-5/default.nix
View File

@ -14,6 +14,19 @@ let
};
in rec {
lua5_4 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "4"; patch = "2"; };
hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi";
patches = [
# build lua as a shared library as well, MIT-licensed from
# https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk
./liblua.so.patch
];
};
lua5_4_compat = lua5_4.override({
compat = true;
});
lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "5"; };

60
pkgs/development/interpreters/lua-5/liblua.so.patch Normal file
View File

@ -0,0 +1,60 @@
diff --git a/Makefile b/Makefile
index 416f444..eeaff03 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ R= $V.0
all: $(PLAT)
$(PLATS) help test clean:
- @cd src && $(MAKE) $@
+ @cd src && $(MAKE) $@ V=$(V) R=$(R)
install: dummy
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
diff --git a/src/Makefile b/src/Makefile
index 514593d..372a6dc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,6 +33,7 @@ CMCFLAGS= -Os
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
@@ -44,7 +45,7 @@ LUAC_T= luac
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A)
# Targets start here.
@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
$(AR) $@ $(BASE_O)
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
+
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
diff --git a/src/luaconf.h b/src/luaconf.h
index bdf927e..7e15198 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -227,7 +227,7 @@
#else /* }{ */
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"

21
pkgs/development/libraries/entt/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "entt";
version = "3.5.2";
src = fetchFromGitHub {
owner = "skypjack";
repo = "entt";
rev = "v${version}";
sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0";
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/skypjack/entt";
description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
maintainers = with maintainers; [ twey ];
license = licenses.mit;
};
}

41
pkgs/development/libraries/libraspberrypi/default.nix
View File

@ -1,25 +1,40 @@
{ stdenv, cmake, fetchFromGitHub }:
{ stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
}:
stdenv.mkDerivation rec {
name = "libraspberrypi";
version = "2020-05-28";
pname = "libraspberrypi";
version = "unstable-2020-11-30";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11";
sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7";
};
cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux")
then "-DARM64=ON"
else "-DARM64=OFF";
preConfigure = ''cmakeFlags="$cmakeFlags -DVMCS_INSTALL_PREFIX=$out"'';
nativeBuildInputs = [ cmake ];
patches = [
(fetchpatch {
# https://github.com/raspberrypi/userland/pull/670
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
})
];
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
(if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF")
"-DVMCS_INSTALL_PREFIX=$out"
];
meta = with stdenv.lib; {
description = "Userland libraries for interfacing with Raspberry Pi hardware";
description = "Userland tools & libraries for interfacing with Raspberry Pi hardware";
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ tkerber ];
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc tkerber ];
};
}

20
pkgs/development/misc/rpiboot/unstable.nix
View File

@ -1,16 +1,14 @@
{ stdenv, fetchFromGitHub, libusb1 }:
let
version = "2020-05-11";
name = "rpiboot-unstable-${version}";
in stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation {
pname = "rpiboot";
version = "unstable-2020-10-20";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "usbboot";
rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b";
sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n";
rev = "d3760e119385a179765f43a50a8e051a44127c25";
sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r";
};
nativeBuildInputs = [ libusb1 ];
@ -26,11 +24,11 @@ in stdenv.mkDerivation {
cp -r msd $out/share/rpiboot
'';
meta = {
meta = with stdenv.lib; {
homepage = "https://github.com/raspberrypi/usbboot";
description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB";
maintainers = [ stdenv.lib.maintainers.cartr ];
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
license = licenses.asl20;
maintainers = with maintainers; [ cartr ];
platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ];
};
}

15
pkgs/development/python-modules/pydantic/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, ujson
, email_validator
, typing-extensions
@ -9,28 +8,21 @@
, isPy3k
, pytest
, pytestcov
, pytest-mock
}:
buildPythonPackage rec {
pname = "pydantic";
version = "1.5.1";
version = "1.7.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4";
sha256 = "xihEDmly0vprmA+VdeCoGXg9PjWRPmBWAwk/9f2DLts=";
};
# fix tests, remove on next version bump
patches = [
(fetchpatch {
url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch";
sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1";
})
];
propagatedBuildInputs = [
ujson
email_validator
@ -40,6 +32,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
pytestcov
pytest-mock
];
checkPhase = ''

9
pkgs/development/python-modules/yq/default.nix
View File

@ -2,6 +2,7 @@
, nixosTests
, buildPythonPackage
, fetchPypi
, substituteAll
, pkgs
, argcomplete
, pyyaml
@ -23,6 +24,13 @@ buildPythonPackage rec {
sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
};
patches = [
(substituteAll {
src = ./jq-path.patch;
jq = "${lib.getBin pkgs.jq}/bin/jq";
})
];
postPatch = ''
substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
'';
@ -39,7 +47,6 @@ buildPythonPackage rec {
pytest
coverage
flake8
pkgs.jq
toml
];

26
pkgs/development/python-modules/yq/jq-path.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/test/test.py b/test/test.py
index a81f41b..9e80f04 100755
--- a/test/test.py
+++ b/test/test.py
@@ -112,7 +112,7 @@ class TestYq(unittest.TestCase):
tf2.seek(0)
self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n')
- @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
+ @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
def test_jq16_arg_passthrough(self):
self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]),
"a:\n- a\n- b\n")
diff --git a/yq/__init__.py b/yq/__init__.py
index afeb42c..a0d7970 100755
--- a/yq/__init__.py
+++ b/yq/__init__.py
@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma
try:
# Note: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us
- jq = subprocess.Popen(["jq"] + list(jq_args),
+ jq = subprocess.Popen(["@jq@"] + list(jq_args),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE if converting_output else None,
universal_newlines=True)

5
pkgs/development/tools/lazygit/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.23.7";
version = "0.24.2";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng";
sha256 = "0hy13l1v2kcsn99dswlq1hl0ly18cal387zhnzjfqv51qng2q5kq";
};
vendorSha256 = null;
@ -19,6 +19,7 @@ buildGoModule rec {
meta = with stdenv.lib; {
description = "Simple terminal UI for git commands";
homepage = "https://github.com/jesseduffield/lazygit";
changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ];
};

15
pkgs/games/banner/default.nix
View File

@ -1,17 +1,20 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "banner-1.3.4";
pname = "banner";
version = "1.3.5";
src = fetchurl {
url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz";
sha256 = "04q5ribr0r9s8waky3nk356l0qdhfxw15ipz7lsfgv1fxq3qk6bz";
src = fetchFromGitHub {
owner = "pronovic";
repo = "banner";
rev = "BANNER_V${version}";
sha256 = "ISSnGzrFSzSj/+KxgeFtaw4H+4Ea5x5S5C8xjcjKWqQ=";
};
meta = with stdenv.lib; {
homepage = "http://software.cedar-solutions.com/utilities.html";
description = "Print large banners to ASCII terminals";
license = licenses.gpl2;
license = licenses.gpl2Only;
longDescription = ''
An implementation of the traditional Unix-program used to display

30
pkgs/misc/beep/default.nix
View File

@ -1,25 +1,25 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub }:
# this package is working only as root
# in order to work as a non privileged user you would need to suid the bin
stdenv.mkDerivation {
name = "beep-1.3";
src = fetchurl {
url = "http://www.johnath.com/beep/beep-1.3.tar.gz";
sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r";
stdenv.mkDerivation rec {
pname = "beep";
version = "1.4.9";
src = fetchFromGitHub {
owner = "spkr-beep";
repo = "beep";
rev = "v${version}";
sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o=";
};
makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ];
makeFlags = [ "DESTDIR=\${out}" "prefix="];
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/man/man1
'';
meta = {
meta = with stdenv.lib; {
description = "The advanced PC speaker beeper";
homepage = "http://www.johnath.com/beep/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/spkr-beep/beep";
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}

4
pkgs/misc/tmux-plugins/default.nix
View File

@ -208,6 +208,10 @@ in rec {
rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb";
sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz";
};
postInstall = ''
sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh
'';
dependencies = [ pkgs.ruby ];
meta = with stdenv.lib; {
homepage = "https://github.com/schasse/tmux-jump";

84
pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch Normal file
View File

@ -0,0 +1,84 @@
From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 27 Dec 2020 13:03:12 +0100
Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
This allows running the unit tests in environments where `dbus-daemon`
isn't in /usr/bin, but in $PATH.
Signed-off-by: Florian Klink <flokli@flokli.de>
---
unit/test-dbus-message-fds.c | 4 ++--
unit/test-dbus-properties.c | 4 ++--
unit/test-dbus.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
index 6f68bae..4b5662e 100644
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
index b435062..049f0f4 100644
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus.c b/unit/test-dbus.c
index 67f0a7b..582847e 100644
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
--
2.29.2

3
pkgs/os-specific/linux/ell/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
};
patches = [
./fix-dbus-tests.patch
# Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
];
nativeBuildInputs = [

65
pkgs/os-specific/linux/ell/fix-dbus-tests.patch
View File

@ -1,65 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,7 @@
ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES)
AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \
+ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \
-DCERTDIR=\""$(top_builddir)/unit/"\"
pkgconfigdir = $(libdir)/pkgconfig
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,8 @@
AC_PREFIX_DEFAULT(/usr/local)
+PKG_PROG_PKG_CONFIG
+
COMPILER_FLAGS
AC_LANG_C
@@ -131,6 +133,10 @@
AC_CHECK_PROG(have_xxd, [xxd], [yes], [no])
fi
+PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes,
+ AC_MSG_ERROR(D-Bus is required for running tests))
+PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir)
+
AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes")
AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes")
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -48,7 +48,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = DBUS_DAEMON;
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";

14
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
View File

@ -2,22 +2,22 @@
stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2019-08-16";
version = "2020-12-01";
srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "96eefffcccc725425fd83be5e0704a5c32b79e54";
sha256 = "05h57gcxhb2c84h99cyxxx4mzi6kd5fm8pjqkz3nq5vs3nv8cqhr";
rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc";
sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "130cb86fa30cafbd575d38865fa546350d4c5f9c";
sha256 = "0jmhgbpldzz8n8lncpzwfl5ym8zgss05y952rfpwcf9v5c7vgabx";
rev = "b66ab26cebff689d0d3257f56912b9bb03c20567";
sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f";
})
];
@ -41,10 +41,10 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1r4alf1fbj6vkkf54d0anm47ymb6gn2ykl4a2hhd34b0hnf1dnhn";
outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h";
meta = with stdenv.lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";
homepage = "https://github.com/RPi-Distro/firmware-nonfree";
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;

13
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchFromGitHub }:
{ stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20201022";
version = "1.20201201";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0j5m50cmmr11m3h8kk89j1pqkdqr7mzdzg04ayiqvfhvy32qqlg8";
sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n";
};
installPhase = ''
@ -16,9 +17,11 @@ stdenv.mkDerivation rec {
cp -R boot/* $out/share/raspberrypi/boot
'';
dontConfigure = true;
dontBuild = true;
dontFixup = true;
meta = with stdenv.lib; {
meta = with stdenvNoCC.lib; {
description = "Firmware for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/firmware";
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom

37
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
View File

@ -1,37 +0,0 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
stdenv.mkDerivation {
pname = "raspberrypi-tools";
version = "2020-05-28";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
};
nativeBuildInputs = [ cmake pkgconfig ];
patches = [
(fetchpatch {
# https://github.com/raspberrypi/userland/pull/670
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
})
];
preConfigure = ''
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
cmakeFlagsArray+=("-DARM64=1")
'';
meta = with stdenv.lib; {
description = "Userland tools for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc ];
};
}

12
pkgs/os-specific/linux/iwd/default.nix
View File

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2";
};
outputs = [ "out" "man" "test" ];
outputs = [ "out" "man" ]
++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
nativeBuildInputs = [
autoreconfHook
@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
checkInputs = [ openssl ];
pythonPath = [
# wrapPython wraps the scripts in $test. They pull in gobject-introspection,
# which doesn't cross-compile.
pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
python3Packages.dbus-python
python3Packages.pygobject3
];
@ -61,11 +64,12 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
mkdir -p $test/bin
cp -a test/* $test/bin/
mkdir -p $out/share
cp -a doc $out/share/
cp -a README AUTHORS TODO $out/share/doc/
'' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p $test/bin
cp -a test/* $test/bin/
'';
preFixup = ''

12
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -1,8 +1,9 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args:
let
modDirVersion = "4.19.118";
tag = "1.20200601";
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.4.79";
tag = "1.20201201";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@ -12,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp";
sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9";
};
defconfig = {
@ -22,6 +23,11 @@ lib.overrideDerivation (buildLinux (args // {
"4" = "bcm2711_defconfig";
}.${toString rpiVersion};
extraConfig = ''
# ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources'
PCIE_ALTERA n
'';
features = {
efiBootStub = false;
} // (args.features or {});

12
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
View File

@ -1,15 +1,15 @@
{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper
, python3, binutils-unwrapped, findutils, kmod, pciutils, raspberrypi-tools
, python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi
}:
stdenvNoCC.mkDerivation {
pname = "raspberrypi-eeprom";
version = "unstable-2020-10-05";
version = "2020-12-11";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "718820bcebd21d4a619fa262d9b9cf3acbf110f8";
sha256 = "1277jsiyv34dqpandva8kxy1s0y5ql344pl9gk84avzp1mqjnv4g";
rev = "54a9796abbee59067bff9da6b90c1014178f2c21";
sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk";
};
buildInputs = [ python3 ];
@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation {
patchShebangs $out/bin
wrapProgram $out/bin/rpi-eeprom-update \
--set FIRMWARE_ROOT $out/share/rpi-eeprom \
${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${raspberrypi-tools}/bin/vcmailbox"} \
${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \
--prefix PATH : "${lib.makeBinPath ([
binutils-unwrapped
findutils
@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
pciutils
(placeholder "out")
] ++ lib.optionals stdenvNoCC.isAarch64 [
raspberrypi-tools
libraspberrypi
])}"
'';

3
pkgs/tools/X11/xwallpaper/default.nix
View File

@ -5,6 +5,7 @@
, pixman
, xcbutil
, xcbutilimage
, libseccomp
, libjpeg
, libpng
, libXpm
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ pixman xcbutilimage xcbutil libjpeg libpng libXpm ];
buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ];
meta = with stdenv.lib; {
homepage = "https://github.com/stoeckmann/xwallpaper";

4
pkgs/tools/misc/barman/default.nix
View File

@ -4,12 +4,12 @@
buildPythonApplication rec {
pname = "barman";
version = "2.11";
version = "2.12";
outputs = [ "out" "man" ];
src = fetchurl {
url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz";
sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr";
sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE=";
};
propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ];

15
pkgs/tools/misc/clac/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "clac";
version = "0.0.0.20170503";
version = "0.3.3";
src = fetchFromGitHub {
owner = "soveran";
repo = "clac";
rev = "e92bd5cbab0d694cef945e3478820c9505e06f04";
sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv";
rev = version;
sha256 = "rsag8MWl/udwXC0Gj864fAuQ6ts1gzrN2N/zelazqjE=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -17,12 +18,12 @@ stdenv.mkDerivation rec {
cp README* LICENSE "$out/share/doc/${pname}"
'';
meta = {
meta = with stdenv.lib; {
inherit version;
description = "Interactive stack-based calculator";
license = stdenv.lib.licenses.bsd2;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
homepage = "https://github.com/soveran/clac";
license = licenses.bsd2;
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
};
}

31
pkgs/tools/networking/proxify/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "proxify";
version = "0.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "v${version}";
sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn";
};
vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig";
meta = with stdenv.lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";
longDescription = ''
This tool supports multiple operations such as request/response dump, filtering
and manipulation via DSL language, upstream HTTP/Socks5 proxy. Additionally a
replay utility allows to import the dumped traffic (request/responses with correct
domain name) into other tools by simply setting the upstream proxy to proxify.
'';
homepage = "https://github.com/projectdiscovery/proxify";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

29
pkgs/tools/security/gau/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "gau";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lc";
repo = pname;
rev = "v${version}";
sha256 = "1srbql603vvlxc6p1ibw0982icdq9kcr1iamxlr8bmgldbm8215w";
};
vendorSha256 = "17ag2wvaxv2dyx3yx3fvlf36ww4a44660pn4gvpbrwacsan9as5s";
meta = with stdenv.lib; {
description = "Tool to fetch known URLs";
longDescription = ''
getallurls (gau) fetches known URLs from various sources for any
given domain.
'';
homepage = "https://github.com/lc/gau";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

33
pkgs/tools/security/gospider/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "gospider";
version = "1.1.4";
src = fetchFromGitHub {
owner = "jaeles-project";
repo = pname;
rev = "${version}";
sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86";
};
vendorSha256 = "0dc4ddi26i38c5rvy9zbal27a7qvn17h64w1yhbig4iyb79b18ym";
# tests require internet access and API keys
doCheck = false;
meta = with stdenv.lib; {
description = "Fast web spider written in Go";
longDescription = ''
GoSpider is a fast web crawler that parses sitemap.xml and robots.txt file.
It can generate and verify link from JavaScript files, extract URLs from
various sources and can detect subdomains from the response source.
'';
homepage = "https://github.com/jaeles-project/gospider";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

1
pkgs/top-level/aliases.nix
View File

@ -500,6 +500,7 @@ mapAliases ({
qtcurve = libsForQt5.qtcurve; # added 2020-11-07
qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19

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

@ -1313,6 +1313,8 @@ in
gopass = callPackage ../tools/security/gopass { };
gospider = callPackage ../tools/security/gospider { };
browserpass = callPackage ../tools/security/browserpass { };
passff-host = callPackage ../tools/security/passff-host { };
@ -4159,6 +4161,8 @@ in
garmintools = callPackage ../development/libraries/garmintools {};
gau = callPackage ../tools/security/gau { };
gauge = callPackage ../development/tools/gauge { };
gawk = callPackage ../tools/text/gawk {
@ -6765,6 +6769,8 @@ in
proxychains = callPackage ../tools/networking/proxychains { };
proxify = callPackage ../tools/networking/proxify { };
proxytunnel = callPackage ../tools/misc/proxytunnel {
openssl = openssl_1_0_2;
};
@ -10581,7 +10587,7 @@ in
### LUA interpreters
luaInterpreters = callPackage ./../development/interpreters/lua-5 {};
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat luajit_2_1 luajit_2_0;
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0;
lua5 = lua5_2_compat;
lua = lua5;
@ -12871,6 +12877,8 @@ in
enet = callPackage ../development/libraries/enet { };
entt = callPackage ../development/libraries/entt { };
epoxy = callPackage ../development/libraries/epoxy {};
libesmtp = callPackage ../development/libraries/libesmtp { };
@ -19228,8 +19236,6 @@ in
raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {};
raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {};
regionset = callPackage ../os-specific/linux/regionset { };
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };