Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-08 00:39:05 +00:00 committed by GitHub
commit 3ac57532a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 402 additions and 74 deletions

View file

@ -64,6 +64,12 @@
githubId = 791309; githubId = 791309;
name = "Jan Hrnko"; name = "Jan Hrnko";
}; };
_3699n = {
email = "nicholas@nvk.pm";
github = "3699n";
githubId = 7414843;
name = "Nicholas von Klitzing";
};
a1russell = { a1russell = {
email = "adamlr6+pub@gmail.com"; email = "adamlr6+pub@gmail.com";
github = "a1russell"; github = "a1russell";
@ -7403,6 +7409,12 @@
githubId = 165283; githubId = 165283;
name = "Alexey Kutepov"; name = "Alexey Kutepov";
}; };
rgrunbla = {
email = "remy@grunblatt.org";
github = "rgrunbla";
githubId = 42433779;
name = "Rémy Grünblatt";
};
rht = { rht = {
email = "rhtbot@protonmail.com"; email = "rhtbot@protonmail.com";
github = "rht"; github = "rht";
@ -7743,6 +7755,12 @@
github = "s1341"; github = "s1341";
githubId = 5682183; githubId = 5682183;
}; };
samb96 = {
email = "samb96@gmail.com";
github = "samb96";
githubId = 819426;
name = "Sam Bickley";
};
samdoshi = { samdoshi = {
email = "sam@metal-fish.co.uk"; email = "sam@metal-fish.co.uk";
github = "samdoshi"; github = "samdoshi";
@ -9446,6 +9464,16 @@
githubId = 19174984; githubId = 19174984;
name = "Alex Whitt"; name = "Alex Whitt";
}; };
wildsebastian = {
name = "Sebastian Wild";
email = "sebastian@wild-siena.com";
github = "wildsebastian";
githubId = 1215623;
keys = [{
longkeyid = "rsa4096/0x366A2940479A06FC";
fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC";
}];
};
willibutz = { willibutz = {
email = "willibutz@posteo.de"; email = "willibutz@posteo.de";
github = "willibutz"; github = "willibutz";

View file

@ -39,7 +39,7 @@ in {
--no-daemon \ --no-daemon \
${optionalString cfg.debug "--loglevel=debug"} \ ${optionalString cfg.debug "--loglevel=debug"} \
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
--dbus-enable --dbus-enable \
--adaptive --adaptive
''; '';
}; };

View file

@ -103,6 +103,7 @@ in
ergo = handleTest ./ergo.nix {}; ergo = handleTest ./ergo.nix {};
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
etesync-dav = handleTest ./etesync-dav.nix {};
fancontrol = handleTest ./fancontrol.nix {}; fancontrol = handleTest ./fancontrol.nix {};
fcitx = handleTest ./fcitx {}; fcitx = handleTest ./fcitx {};
ferm = handleTest ./ferm.nix {}; ferm = handleTest ./ferm.nix {};

View file

@ -0,0 +1,21 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "etesync-dav";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ _3699n ];
};
machine = { config, pkgs, ... }: {
environment.systemPackages = [ pkgs.curl pkgs.etesync-dav ];
};
testScript =
''
machine.wait_for_unit("multi-user.target")
machine.succeed("etesync-dav --version")
machine.execute("etesync-dav &")
machine.wait_for_open_port(37358)
with subtest("Check that the web interface is accessible"):
assert "Add User" in machine.succeed("curl -s http://localhost:37358/.web/add/")
'';
})

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "goxel"; pname = "goxel";
version = "0.10.6"; version = "0.10.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guillaumechereau"; owner = "guillaumechereau";
repo = "goxel"; repo = "goxel";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wmxy5wfk1xrqgz0y0zcr4vkddylqc70cv4vzk117x6whjnldsm3"; sha256 = "1v6m6nhl1if8ik5bmblhq46bip6y2qz18a04s8a9awb4yh9ls039";
}; };
patches = [ ./disable-imgui_ini.patch ]; patches = [ ./disable-imgui_ini.patch ];

View file

@ -2,31 +2,22 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "etesync-dav"; pname = "etesync-dav";
version = "0.20.0"; version = "0.30.6";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1q8h89hqi4kxphn1g5nbcia0haz5k57is9rycwaabm55mj9s9fah"; sha256 = "0cjz4p3a750fwvrxbzwda0sidw7nscahvppdshbsx49i6qrczpbg";
}; };
postPatch = ''
substituteInPlace setup.py --replace "Radicale==" "Radicale>="
'';
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
etebase
etesync etesync
flask flask
flask_wtf flask_wtf
radicale3 radicale3
]; ];
checkInputs = with python3Packages; [ doCheck = false;
pytest
];
checkPhase = ''
pytest
'';
meta = with lib; { meta = with lib; {
homepage = "https://www.etesync.com/"; homepage = "https://www.etesync.com/";

View file

@ -1,35 +1,30 @@
{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config, fetchpatch }: { lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config }:
mkDerivation rec { mkDerivation rec {
pname = "openrgb"; pname = "openrgb";
version = "0.4"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "CalcProgrammer1"; owner = "CalcProgrammer1";
repo = "OpenRGB"; repo = "OpenRGB";
rev = "release_${version}"; rev = "release_${version}";
sha256 = "sha256-tHrRG2Zx7NYqn+WPiRpAlWA/QmxuAYidENanTkC1XVw"; sha256 = "001x2ycfmlb9s21sp91aw5gxizcn6kzm8x7bvkps4b1iq0ap5fzv";
}; };
nativeBuildInputs = [ qmake pkg-config ]; nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ libusb1 hidapi ]; buildInputs = [ libusb1 hidapi ];
patches = [
# Make build SOURCE_DATE_EPOCH aware, merged in master
(fetchpatch {
url = "https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/f1b7b8ba900db58a1119d8d3e21c1c79de5666aa.patch";
sha256 = "17m1hn1kjxfcmd4p3zjhmr5ar9ng0zfbllq78qxrfcq1a0xrkybx";
})
];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp OpenRGB $out/bin cp openrgb $out/bin
mkdir -p $out/etc/udev/rules.d
cp 60-openrgb.rules $out/etc/udev/rules.d
''; '';
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/OpenRGB --help > /dev/null HOME=$TMPDIR $out/bin/openrgb --help > /dev/null
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -3,7 +3,9 @@
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, libGLU , libGLU
, makeDesktopItem
, qtbase , qtbase
, wrapQtAppsHook
}: }:
mkDerivation rec { mkDerivation rec {
@ -17,9 +19,24 @@ mkDerivation rec {
sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4"; sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ libGLU qtbase ]; buildInputs = [ libGLU qtbase ];
desktopItem = makeDesktopItem {
name = pname;
exec = pname;
icon = pname;
desktopName = "Ideamaker";
genericName = meta.description;
categories = "Utility;Engineering;";
};
postInstall = ''
mkdir -p $out/share/pixmaps
ln -s ${desktopItem}/share/applications $out/share/
cp $src/gui/img/plater.png $out/share/pixmaps/${pname}.png
'';
meta = with lib; { meta = with lib; {
description = "3D-printer parts placer and plate generator"; description = "3D-printer parts placer and plate generator";
homepage = "https://github.com/Rhoban/Plater"; homepage = "https://github.com/Rhoban/Plater";

View file

@ -1,4 +1,4 @@
{ stdenv { stdenvNoCC
, coreutils , coreutils
}: }:
@ -7,10 +7,10 @@
, patches ? [ ] , patches ? [ ]
}: }:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
inherit patches src version; inherit patches src version;
pname = "fedora${stdenv.lib.versions.major version}-backgrounds"; pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds";
dontBuild = true; dontBuild = true;
@ -32,7 +32,7 @@ stdenv.mkDerivation {
"DESTDIR=$(out)" "DESTDIR=$(out)"
]; ];
meta = with stdenv.lib; { meta = with stdenvNoCC.lib; {
homepage = "https://github.com/fedoradesign/backgrounds"; homepage = "https://github.com/fedoradesign/backgrounds";
description = "A set of default and supplemental wallpapers for Fedora"; description = "A set of default and supplemental wallpapers for Fedora";
license = licenses.cc-by-sa-40; license = licenses.cc-by-sa-40;

View file

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "cmark-gfm";
version = "0.29.0.gfm.0";
src = fetchFromGitHub {
owner = "github";
repo = "cmark-gfm";
rev = version;
sha256 = "0wfr3xwl4wria8vld71flv6vpsdj9aj81yqvj0azidyb8p229a1l";
};
nativeBuildInputs = [ cmake ];
# tests load the library dynamically which for unknown reason failed
doCheck = false;
meta = with stdenv.lib; {
description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C";
homepage = "https://github.com/github/cmark-gfm";
maintainers = with maintainers; [ cyplo ];
platforms = platforms.unix;
license = licenses.bsd2;
};
}

View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl, pkg-config, libusb1 }:
stdenv.mkDerivation rec {
pname = "libinklevel";
version = "0.9.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1zwkicjznkzw81ax745inv4n29y20vq82w8249vizaal76739n19";
};
buildInputs = [
pkg-config
libusb1
];
outputs = [ "out" "dev" "doc" ];
meta = with stdenv.lib; {
description = "A library for checking the ink level of your printer";
longDescription = ''
Libinklevel is a library for checking the ink level of your printer on a
system which runs Linux or FreeBSD. It supports printers attached via
USB. Currently printers of the following brands are supported: HP, Epson
and Canon. Canon BJNP network printers are supported too. This is not
official software from the printer manufacturers. The goal of this
project is to create a vendor independent API for retrieving the ink
level of a printer connected to a Linux or FreeBSD box.
'';
homepage = "http://libinklevel.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux ++ platforms.freebsd;
maintainers = with maintainers; [ samb96 ];
};
}

View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, configobj , configobj
, patiencediff
, six , six
, fastimport , fastimport
, dulwich , dulwich
@ -18,7 +19,7 @@ buildPythonPackage rec {
sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be";
}; };
propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ]; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];
checkInputs = [ testtools ]; checkInputs = [ testtools ];

View file

@ -0,0 +1,61 @@
{ stdenv
, wheel
, rustPlatform
, pipInstallHook
, setuptools-rust
, python
, msgpack
, requests
, openssl
, perl
, rustfmt
, fetchFromGitHub
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "etebase";
version = "0.31.1";
src = fetchFromGitHub {
owner = "etesync";
repo = "etebase-py";
rev = "v${version}";
sha256 = "163iw64l8lwawf84qswcjsq9p8qddv9ysjrr3dzqpqxb2yb0sy39";
};
cargoSha256 = "0w8ypl6kj1mf6ahbdiwbd4jw6ldxdaig47zwk91jjsww5lbyx4lf";
nativeBuildInputs = [
rustfmt
perl
openssl
pipInstallHook
setuptools-rust
wheel
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
propagatedBuildInputs = [
python
msgpack
];
doCheck = true;
buildPhase = ''
${python.interpreter} setup.py bdist_wheel
'';
installPhase = ''
pipInstallPhase
'';
meta = with stdenv.lib; {
homepage = "https://www.etebase.com/";
description = "A Python client library for Etebase";
license = licenses.bsd3;
maintainers = with maintainers; [ _3699n ];
};
}

View file

@ -0,0 +1,41 @@
{ stdenv
, fetchFromGitHub
, buildPythonPackage
, cryptography
, click
, construct
, ecdsa
, hidapi
, intelhex
, pillow
, protobuf
, requests
, tabulate
, AppKit
}:
buildPythonPackage rec {
pname = "ledgerwallet";
version = "0.1.2";
src = fetchFromGitHub {
owner = "LedgerHQ";
repo = "ledgerctl";
rev = "v${version}";
sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
propagatedBuildInputs = [
cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate
];
pythonImportsCheck = [ "ledgerwallet" ];
meta = with stdenv.lib; {
homepage = "https://github.com/LedgerHQ/ledgerctl";
description = "A library to control Ledger devices";
license = licenses.mit;
maintainers = with maintainers; [ xwvvvvwx ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which { stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest_5, fuse, attr, which
, contextlib2, osxfuse , contextlib2, osxfuse
}: }:
@ -31,7 +31,7 @@ buildPythonPackage rec {
buildInputs = buildInputs =
optionals stdenv.isLinux [ fuse ] optionals stdenv.isLinux [ fuse ]
++ optionals stdenv.isDarwin [ osxfuse ]; ++ optionals stdenv.isDarwin [ osxfuse ];
checkInputs = [ pytest which ] ++ checkInputs = [ pytest_5 which ] ++
optionals stdenv.isLinux [ attr ]; optionals stdenv.isLinux [ attr ];
propagatedBuildInputs = [ contextlib2 ]; propagatedBuildInputs = [ contextlib2 ];

View file

@ -0,0 +1,18 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "patiencediff";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0nm2242xgg59l06m54rzxp41aly3lxjh0a1s7h6dk7ryxjh002lv";
};
meta = with lib; {
description = "C implementation of patiencediff algorithm for Python";
homepage = "https://github.com/breezy-team/patiencediff";
license = licenses.gpl2Plus;
maintainers = [ maintainers.wildsebastian ];
};
}

View file

@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 { lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -12,11 +12,11 @@ buildPythonPackage rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config SDL pkg-config SDL2
]; ];
buildInputs = [ buildInputs = [
SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg
portmidi libX11 freetype portmidi libX11 freetype
]; ];
@ -27,8 +27,7 @@ buildPythonPackage rec {
sed \ sed \
-e "s/origincdirs = .*/origincdirs = []/" \ -e "s/origincdirs = .*/origincdirs = []/" \
-e "s/origlibdirs = .*/origlibdirs = []/" \ -e "s/origlibdirs = .*/origlibdirs = []/" \
-e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ -e "/linux-gnu/d" \
-e "/\/include\/smpeg/d" \
-i buildconfig/config_unix.py -i buildconfig/config_unix.py
${lib.concatMapStrings (dep: '' ${lib.concatMapStrings (dep: ''
sed \ sed \

View file

@ -1,6 +1,4 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi, cython, alsaLib }:
, alsaLib
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rtmidi-python"; pname = "rtmidi-python";
@ -11,8 +9,15 @@ buildPythonPackage rec {
sha256 = "1wpcaxfpbmsjc78g8841kpixr0a3v6zn0ak058s3mm25kcysp4m0"; sha256 = "1wpcaxfpbmsjc78g8841kpixr0a3v6zn0ak058s3mm25kcysp4m0";
}; };
postPatch = ''
rm rtmidi_python.cpp
'';
nativeBuildInputs = [ cython ];
buildInputs = [ alsaLib ]; buildInputs = [ alsaLib ];
setupPyBuildFlags = [ "--from-cython" ];
# package has no tests # package has no tests
doCheck = false; doCheck = false;

View file

@ -1,5 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, isPy27
, fetchPypi , fetchPypi
, glibcLocales , glibcLocales
, pytest , pytest
@ -14,6 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "traitlets"; pname = "traitlets";
version = "5.0.5"; version = "5.0.5";
disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
@ -27,8 +29,6 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8" py.test LC_ALL="en_US.UTF-8" py.test
''; '';
# doCheck = false;
meta = { meta = {
description = "Traitlets Python config system"; description = "Traitlets Python config system";
homepage = "http://ipython.org/"; homepage = "http://ipython.org/";

View file

@ -13,13 +13,13 @@ let
in in
buildBazelPackage rec { buildBazelPackage rec {
name = "bazel-watcher-${version}"; name = "bazel-watcher-${version}";
version = "0.13.1"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "bazel-watcher"; repo = "bazel-watcher";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n28q27510ymg5d455hrbk7z8wawszgjmqjjhb4zximqhvxks7kh"; sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r";
}; };
nativeBuildInputs = [ go git python ]; nativeBuildInputs = [ go git python ];
@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
''; '';
sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9";
}; };
buildAttrs = { buildAttrs = {
@ -64,6 +64,8 @@ buildBazelPackage rec {
preBuild = '' preBuild = ''
patchShebangs . patchShebangs .
substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version}
''; '';
installPhase = '' installPhase = ''
@ -77,5 +79,7 @@ buildBazelPackage rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.all; platforms = platforms.all;
# broken on darwin, see https://github.com/NixOS/nixpkgs/issues/105573
broken = stdenv.isDarwin;
}; };
} }

View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "gauge"; pname = "gauge";
version = "1.1.5"; version = "1.1.6";
goPackagePath = "github.com/getgauge/gauge"; goPackagePath = "github.com/getgauge/gauge";
excludedPackages = ''\(build\|man\)''; excludedPackages = ''\(build\|man\)'';
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "getgauge"; owner = "getgauge";
repo = "gauge"; repo = "gauge";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jijw9x1ccqbb9kkzx1bj3wsq6v1415hvlbiihswqbb559bcmira"; sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,18 +1,18 @@
{ {
"4.14": { "4.14": {
"name": "linux-hardened-4.14.208.a.patch", "name": "linux-hardened-4.14.210.a.patch",
"sha256": "09lmbfp6d4wpr2l7x1njq8q3sdiqz3rrjzkh6dqsdgwd9sdammb3", "sha256": "1dzcxbby15r8k2xm0f4k0rz4j4jxx6br2h5hzfg6j5r07533vavg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.210.a/linux-hardened-4.14.210.a.patch"
}, },
"4.19": { "4.19": {
"name": "linux-hardened-4.19.159.a.patch", "name": "linux-hardened-4.19.161.a.patch",
"sha256": "0ma4lf97l625474xha5pfb8kph2lm3892g6z63fwd5s1vmva6ni6", "sha256": "0xb29ybmw1gj186hn4q6hq3dnw3pljgmv4yd3xjf462hhb35pwsv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.161.a/linux-hardened-4.19.161.a.patch"
}, },
"5.4": { "5.4": {
"name": "linux-hardened-5.4.79.a.patch", "name": "linux-hardened-5.4.81.a.patch",
"sha256": "154i6ggj27qgsw562jcd93abcd54b4jllkr87h4k2ia6c0mfq4yb", "sha256": "1dm2rb7wwwi9s4zx2dbldamn85g98zvxq4r1c6icljyzkjk49wjh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.79.a/linux-hardened-5.4.79.a.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.81.a/linux-hardened-5.4.81.a.patch"
}, },
"5.8": { "5.8": {
"name": "linux-hardened-5.8.18.a.patch", "name": "linux-hardened-5.8.18.a.patch",
@ -20,8 +20,8 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
}, },
"5.9": { "5.9": {
"name": "linux-hardened-5.9.10.a.patch", "name": "linux-hardened-5.9.12.a.patch",
"sha256": "08gdr5sq156lap08nirw4gjq26vr8k65kbjh4js2ndrb0v49f2lk", "sha256": "18w35spv6lxniidnj0zw8gp02knhm3af3qif46plxcplyjbys6bw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.10.a/linux-hardened-5.9.10.a.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.12.a/linux-hardened-5.9.12.a.patch"
} }
} }

View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17768"; rev = "17788";
sha256 = "0j85bjxylvl88xzf3nji1xadz3ws1kfbyhbn47haipigncvccndj"; sha256 = "0cjzsgg8cgqy5s3hsh1v5hspl2i64s45zhcszn04m6ibrm1sd4fk";
} }
, ... , ...
}: }:

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jackett"; pname = "jackett";
version = "0.16.2291"; version = "0.16.2347";
src = fetchurl { src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "1ybjssrj73qf34v66cv32gnlpvppp8kg2bwdv0r7qdy2vj5dx14a"; sha256 = "0xqmkcwlgic38frf1myybj34fp9qpabagxcbmbxvmjb1knw19lrm";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -0,0 +1,41 @@
{ stdenv, fetchFromGitHub, docutils, installShellFiles }:
stdenv.mkDerivation {
pname = "netevent";
version = "20201018";
src = fetchFromGitHub {
owner = "Blub";
repo = "netevent";
rev = "ddd330f0dc956a95a111c58ad10546071058e4c1";
sha256 = "0myk91pmim0m51h4b8hplkbxvns0icvfmv0401r0hw8md828nh5c";
};
buildInputs = [ docutils ];
nativeBuildInputs = [ installShellFiles ];
outputs = [ "out" "doc" "man" ];
configurePhase = ''
export RST2MAN=rst2man
./configure
'';
installPhase = ''
mkdir -p $out/bin
install -m 0755 netevent $out/bin/
installManPage doc/netevent.1
mkdir -p $doc/share/doc/netevent
cp doc/netevent.rst $doc/share/doc/netevent/netevent.rst
'';
meta = with stdenv.lib; {
description = "Share linux event devices with other machines";
homepage = "https://github.com/Blub/netevent";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ rgrunbla ];
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, libinklevel }:
stdenv.mkDerivation rec {
pname = "ink";
version = "0.5.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1fk0b8vic04a3i3vmq73hbk7mzbi57s8ks6ighn3mvr6m2v8yc9d";
};
buildInputs = [
libinklevel
];
outputs = [ "out" "man" ];
meta = with stdenv.lib; {
description = "A command line tool for checking the ink level of your locally connected printer";
longDescription = ''
Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too.
'';
homepage = "http://ink.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux ++ platforms.freebsd;
maintainers = with maintainers; [ samb96 ];
};
}

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gping"; pname = "gping";
version = "1.1.0"; version = "1.2.0-post";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "orf"; owner = "orf";
repo = "gping"; repo = "gping";
rev = "v${version}"; rev = "v${version}";
sha256 = "10hvzgn98qbzs7mmql9wlbll814mkki29lvg71lbvr81wlbdn6mr"; sha256 = "0h4cd36lrhr64p3m2l7yvkq22h8fzzm3g61m39d303s1viibm6dg";
}; };
cargoSha256 = "0kkfrdzyy5068k8nz08pfc4cl1dvn0vd6i01gax5dblk122ybbag"; cargoSha256 = "0aadalgs5p7wqbbkidm49ccfl716xairb4pirrgm3749zdg55bi9";
meta = with lib; { meta = with lib; {
description = "Ping, but with a graph"; description = "Ping, but with a graph";

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "htop"; pname = "htop";
version = "3.0.2"; version = "3.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "htop-dev"; owner = "htop-dev";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7"; sha256 = "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View file

@ -182,6 +182,8 @@ in
cmark = callPackage ../development/libraries/cmark { }; cmark = callPackage ../development/libraries/cmark { };
cmark-gfm = callPackage ../development/libraries/cmark-gfm { };
cm256cc = callPackage ../development/libraries/cm256cc { }; cm256cc = callPackage ../development/libraries/cm256cc { };
conftest = callPackage ../development/tools/conftest { }; conftest = callPackage ../development/tools/conftest { };
@ -2310,6 +2312,8 @@ in
ifm = callPackage ../tools/graphics/ifm {}; ifm = callPackage ../tools/graphics/ifm {};
ink = callPackage ../tools/misc/ink { };
interlock = callPackage ../servers/interlock {}; interlock = callPackage ../servers/interlock {};
jellyfin = callPackage ../servers/jellyfin { }; jellyfin = callPackage ../servers/jellyfin { };
@ -3017,6 +3021,8 @@ in
inherit (xorg) libXaw; inherit (xorg) libXaw;
}; };
netevent = callPackage ../tools/inputmethods/netevent { };
skktools = callPackage ../tools/inputmethods/skk/skktools { }; skktools = callPackage ../tools/inputmethods/skk/skktools { };
skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { };
@ -14016,6 +14022,8 @@ in
libinjection = callPackage ../development/libraries/libinjection { }; libinjection = callPackage ../development/libraries/libinjection { };
libinklevel = callPackage ../development/libraries/libinklevel { };
libnats-c = callPackage ../development/libraries/libnats-c { libnats-c = callPackage ../development/libraries/libnats-c {
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
}; };

View file

@ -1957,6 +1957,10 @@ in {
etelemetry = callPackage ../development/python-modules/etelemetry { }; etelemetry = callPackage ../development/python-modules/etelemetry { };
etebase = callPackage ../development/python-modules/etebase {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};
etesync = callPackage ../development/python-modules/etesync { }; etesync = callPackage ../development/python-modules/etesync { };
eth-hash = callPackage ../development/python-modules/eth-hash { }; eth-hash = callPackage ../development/python-modules/eth-hash { };
@ -3384,6 +3388,10 @@ in {
ledgerblue = callPackage ../development/python-modules/ledgerblue { }; ledgerblue = callPackage ../development/python-modules/ledgerblue { };
ledgerwallet = callPackage ../development/python-modules/ledgerwallet {
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
};
lektor = callPackage ../development/python-modules/lektor { }; lektor = callPackage ../development/python-modules/lektor { };
leveldb = callPackage ../development/python-modules/leveldb { }; leveldb = callPackage ../development/python-modules/leveldb { };
@ -4478,6 +4486,8 @@ in {
pathtools = callPackage ../development/python-modules/pathtools { }; pathtools = callPackage ../development/python-modules/pathtools { };
patiencediff = callPackage ../development/python-modules/patiencediff { };
patool = callPackage ../development/python-modules/patool { }; patool = callPackage ../development/python-modules/patool { };
patsy = callPackage ../development/python-modules/patsy { }; patsy = callPackage ../development/python-modules/patsy { };