ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-08 12:01:07 +00:00 committed by GitHub
commit eaaed3f1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 181 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View File

@ -530,9 +530,9 @@
githubId = 782180;
name = "Alex Vorobiev";
};
alex-eyre = {
alexeyre = {
email = "A.Eyre@sms.ed.ac.uk";
github = "alex-eyre";
github = "alexeyre";
githubId = 38869148;
name = "Alex Eyre";
};

2
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -46,5 +46,5 @@ with lib;
done
'';
system.stateVersion = mkDefault "18.03";
system.stateVersion = lib.mkDefault lib.trivial.release;
}

5
nixos/modules/services/backup/borgmatic.nix
View File

@ -4,7 +4,8 @@ with lib;
let
cfg = config.services.borgmatic;
cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings);
settingsFormat = pkgs.formats.yaml { };
cfgfile = settingsFormat.generate "config.yaml" cfg.settings;
in {
options.services.borgmatic = {
enable = mkEnableOption "borgmatic";
@ -14,7 +15,7 @@ in {
See https://torsion.org/borgmatic/docs/reference/configuration/
'';
type = types.submodule {
freeformType = with lib.types; attrsOf anything;
freeformType = settingsFormat.type;
options.location = {
source_directories = mkOption {
type = types.listOf types.str;

2
pkgs/applications/misc/nimbo/default.nix
View File

@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Run machine learning jobs on AWS with a single command";
homepage = "https://github.com/nimbo-sh/nimbo";
license = licenses.bsl11;
maintainers = with maintainers; [ alex-eyre noreferences ];
maintainers = with maintainers; [ alexeyre noreferences ];
};
}

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

@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "scli";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "isamert";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo=";
sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Simple terminal user interface for Signal";
homepage = "https://github.com/isamert/scli";
license = licenses.gpl3Only;
maintainers = with maintainers; [ alex-eyre ];
maintainers = with maintainers; [ alexeyre ];
};
}

20
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "11.0.10";
version = "11.0.11";
lang = "en-US";
@ -98,7 +98,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp";
sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd";
};
i686-linux = fetchurl {
@ -107,7 +107,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3";
sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5";
};
};
in
@ -357,7 +357,7 @@ stdenv.mkDerivation rec {
TMPDIR="\''${TMPDIR:-/tmp}" \
HOME="\$HOME" \
XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \
DISPLAY="\$DISPLAY" \
DISPLAY="\''${DISPLAY:-}" \
DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\
\
XDG_DATA_HOME="\$HOME/.local/share" \
@ -366,10 +366,10 @@ stdenv.mkDerivation rec {
PULSE_SERVER="\''${PULSE_SERVER:-}" \
PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
\
MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \
WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \
XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \
XCURSOR_PATH="\$XCURSOR_PATH" \
MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \
WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \
XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \
XCURSOR_PATH="\''${XCURSOR_PATH:-}" \
\
APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
\
@ -409,9 +409,7 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
echo "Checking tor-browser wrapper ..."
DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \
XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \
DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
TBB_HOME=$(mktemp -d) \
$out/bin/tor-browser --version >/dev/null
'';

12
pkgs/applications/networking/instant-messengers/freetalk/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool
, libunwind, ncurses, curl, jansson, texinfo
, automake, autoconf }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
};
patches = [
# Pull pending patch for -fno-common tuulchain support:
# https://github.com/GNUFreetalk/freetalk/pull/39
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch";
sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf";
})
];
preConfigure = ''
./autogen.sh
'';

11
pkgs/applications/version-management/fnc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }:
{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }:
stdenv.mkDerivation rec {
pname = "fnc";
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk";
};
patches = [
(fetchpatch {
name = "sqlite3-upgrade.patch";
url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d";
sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s=";
})
];
patchFlags = [ "-p0" ];
buildInputs = [ libiconv ncurses zlib ];
makeFlags = [ "PREFIX=$(out)" ];

12
pkgs/desktops/rox/rox-filer/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, wrapGAppsHook
, libxml2
@ -27,13 +28,20 @@ stdenv.mkDerivation rec {
patches = [
./rox-filer-2.11-in-source-build.patch
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
# https://github.com/rox-desktop/rox-filer/pull/15
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch";
sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69";
})
];
# go to the source directory after unpacking the sources
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
# patch source with defined patches
patchFlags = [ "-p0" ];
# account for 'setSourceRoot' offset
patchFlags = [ "-p2" ];
# patch the main.c to disable the lookup of the APP_DIR environment variable,
# which is used to lookup the location for certain images when rox-filer

4
pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
View File

@ -1,5 +1,5 @@
--- src/configure 2011-10-09 16:32:14.000000000 +0200
+++ src/configure2 2016-03-20 09:26:31.640891863 +0100
--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200
+++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100
@@ -2132,13 +2132,6 @@

4
pkgs/development/libraries/libsolv/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
version = "0.7.21";
version = "0.7.22";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0=";
sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE=";
};
cmakeFlags = [

4
pkgs/development/python-modules/devolo-home-control-api/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "devolo-home-control-api";
version = "0.18.1";
version = "0.18.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q=";
sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/devolo-plc-api/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "devolo-plc-api";
version = "0.7.1";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "v${version}";
sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk=";
sha256 = "sha256-LMwvIwbP/nRFby295ur6QTgyXLLJ8ip30V9bti27qKQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.7.1";
version = "1.7.4";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw=";
hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU=";
};
postPatch = ''

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "9.0.4";
version = "9.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "py-mine";
repo = pname;
rev = "v${version}";
hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0=";
hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic=";
};
nativeBuildInputs = [

44
pkgs/development/python-modules/oscrypto/default.nix
View File

@ -1,24 +1,25 @@
{ lib
, stdenv
, buildPythonPackage
, asn1crypto
, fetchPypi
, buildPythonPackage
, fetchFromGitHub
, openssl
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "oscrypto";
version = "1.2.1";
version = "1.3.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x";
};
disabled = pythonOlder "3.7";
testSources = fetchPypi {
inherit version;
pname = "oscrypto_tests";
sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks";
src = fetchFromGitHub {
owner = "wbond";
repo = pname;
rev = version;
hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";
};
propagatedBuildInputs = [
@ -26,21 +27,26 @@ buildPythonPackage rec {
openssl
];
preCheck = ''
tar -xf ${testSources}
mv oscrypto_tests-${version} tests
checkInputs = [
pytestCheckHook
];
# remove tests that require network
sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py
'';
pythonImportsCheck = [ "oscrypto" ];
pythonImportsCheck = [
"oscrypto"
];
doCheck = !stdenv.isDarwin;
disabledTests = [
# Tests require network access
"TLSTests"
"TrustListTests"
];
meta = with lib; {
description = "Encryption library for Python";
homepage = "https://github.com/wbond/oscrypto";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

12
pkgs/development/python-modules/py-canary/default.nix
View File

@ -10,14 +10,16 @@
buildPythonPackage rec {
pname = "py-canary";
version = "0.5.1";
version = "0.5.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "snjoetw";
repo = pname;
rev = version;
sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr";
rev = "refs/tags/${version}";
hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ=";
};
propagatedBuildInputs = [
@ -30,7 +32,9 @@ buildPythonPackage rec {
requests-mock
];
pythonImportsCheck = [ "canary" ];
pythonImportsCheck = [
"canary"
];
meta = with lib; {
description = "Python package for Canary Security Camera";

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyzerproc";
version = "0.4.10";
version = "0.4.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "sha256-sfxyHpJzYYwxLsvfJpqI6cC/CKS7Jx0vXSLL3QD9qV4=";
sha256 = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8=";
};
postPatch = ''

4
pkgs/development/python-modules/total-connect-client/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2022.3";
version = "2022.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";
hash = "sha256-S+xki1Bj+wvKhbl2vRRa8gULyxTsH4fyypkrHj3JwH0=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-python-dateutil";
version = "2.8.14";
version = "2.8.15";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Nnwf+hpSpLKlNMmzC0CwHyt/LqR6l/2CH2x20ceuMSk=";
sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE=";
};
pythonImportsCheck = [ "dateutil-stubs" ];

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2021.3.7";
version = "2021.3.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EdW6BiaBZ5U8zEo+7hksJLQtANKu9FbBYKh5iJPLIIE=";
sha256 = "sha256-QSU6OivwKLaj8XtYdJppLZVa8PdOl13pT29NLTzQHb0=";
};
# Modules doesn't have tests

5
pkgs/development/python-modules/urwid/default.nix
View File

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, isPy3k
, isPy27
, glibcLocales
}:
@ -11,8 +10,6 @@ buildPythonPackage rec {
version = "2.1.2";
format = "setuptools";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae";
@ -33,6 +30,6 @@ buildPythonPackage rec {
description = "A full-featured console (xterm et al.) user interface library";
homepage = "https://urwid.org/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.23";
version = "1.1.24";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0=";
sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY=";
};
propagatedBuildInputs = [

4
pkgs/os-specific/linux/dropwatch/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "dropwatch";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "nhorman";
repo = pname;
rev = "v${version}";
sha256 = "0axx0zzrs7apqnl0r70jyvmgk7cs5wk185id479mapgngibwkyxy";
sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ=";
};
nativeBuildInputs = [

7
pkgs/os-specific/linux/firejail/default.nix
View File

@ -37,9 +37,16 @@ stdenv.mkDerivation rec {
# Adds the /nix directory when using an overlay.
# Required to run any programs under this mode.
./mount-nix-dir-on-overlay.patch
# By default fbuilder hardcodes the firejail binary to the install path.
# On NixOS the firejail binary is a setuid wrapper available in $PATH.
./fbuilder-call-firejail-on-path.patch
# NixOS specific whitelist to resolve binary paths in user environment
# Fixes https://github.com/NixOS/nixpkgs/issues/170784
# Upstream fix https://github.com/netblue30/firejail/pull/5131
# Upstream hopefully fixed in later versions > 0.9.68
./whitelist-nix-profile.patch
];
prePatch = ''

9
pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch Normal file
View File

@ -0,0 +1,9 @@
--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200
+++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200
@@ -83,3 +83,6 @@
whitelist ${HOME}/.kde4/share/config/oxygenrc
whitelist ${HOME}/.kde4/share/icons
whitelist ${HOME}/.local/share/qt5ct
+
+# NixOS specific to resolve binary paths
+whitelist ${HOME}/.nix-profile

12
pkgs/tools/X11/xwinmosaic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }:
stdenv.mkDerivation rec {
version = "0.4.2";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
};
patches = [
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
# https://github.com/soulthreads/xwinmosaic/pull/33
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch";
sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q";
})
];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ gtk2 libXdamage ];

18
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -1,22 +1,24 @@
{ lib, stdenv, fetchurl
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto
, pkg-config, python3, sphinx
, zstd
, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib
, runCommand, btrfs-progs
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "5.16.2";
version = "5.17";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I=";
sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4=";
};
nativeBuildInputs = [
pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
pkg-config
python3 python3.pkgs.setuptools
sphinx
];
buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ];
@ -47,6 +49,14 @@ stdenv.mkDerivation rec {
[ -e $out/success ]
'';
};
passthru.updateScript = gitUpdater {
inherit pname version;
# No nicer place to find latest release.
url = "https://github.com/kdave/btrfs-progs.git";
rev-prefix = "v";
};
meta = with lib; {
description = "Utilities for the btrfs filesystem";
homepage = "https://btrfs.wiki.kernel.org/";

18
pkgs/tools/misc/mmake/default.nix
View File

@ -1,19 +1,21 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "mmake";
version = "1.2.0";
goPackagePath = "github.com/tj/mmake";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tj";
repo = "mmake";
rev = "v${version}";
sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f";
sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8=";
};
goDeps = ./deps.nix;
vendorSha256 = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU=";
ldflags = [ "-s" "-w" ];
checkFlags = [ "-short" ];
meta = with lib; {
homepage = "https://github.com/tj/mmake";
@ -23,7 +25,7 @@ buildGoPackage rec {
functionality, such as user-friendly help output, remote
includes, and eventually more. It otherwise acts as a
pass-through to standard make.
'';
'';
license = licenses.mit;
maintainers = [ maintainers.gabesoft ];
};

30
pkgs/tools/misc/mmake/deps.nix generated
View File

@ -1,30 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/apex/log";
fetch = {
type = "git";
url = "https://github.com/apex/log";
rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be";
sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "c605e284fe17294bda444b34710735b29d1a9d90";
sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
};
}
{
goPackagePath = "github.com/segmentio/go-env";
fetch = {
type = "git";
url = "https://github.com/segmentio/go-env";
rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876";
sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq";
};
}
]

4
pkgs/tools/networking/tgt/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tgt";
version = "1.0.81";
version = "1.0.82";
src = fetchFromGitHub {
owner = "fujita";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU=";
sha256 = "sha256-uVd1qPNBIqs9+pRnRP/Q8Z5sXpRdcwBejKjt0BJbXWA=";
};
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];

6
pkgs/tools/security/kube-hunter/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "kube-hunter";
version = "0.6.5";
version = "0.6.7";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA=";
rev = "refs/tags/v${version}";
sha256 = "sha256-W7jW0V91o164EIAzZ7ODWeqTmUaUFDIqlE37x/AycqY=";
};
nativeBuildInputs = with python3.pkgs; [

12
pkgs/tools/security/ncrack/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "ncrack";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g";
};
patches = [
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
# https://github.com/nmap/ncrack/pull/83
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch";
sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3";
})
];
buildInputs = [ openssl zlib ];
meta = with lib; {

2
pkgs/tools/security/rustscan/default.nix
View File

@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
description = "Faster Nmap Scanning with Rust";
homepage = "https://github.com/RustScan/RustScan";
license = licenses.gpl3Only;
maintainers = [ maintainers.SuperSandro2000 ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/tools/text/xml/html-xml-utils/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "html-xml-utils";
version = "8.3";
version = "8.4";
src = fetchurl {
url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw=";
sha256 = "sha256-QbubFOH0zWEC4/jft55xRqJMCWk4aYcxZcQhdppX0Tc=";
};
buildInputs = [curl libiconv];

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

@ -22910,7 +22910,9 @@ with pkgs;
drbd = callPackage ../os-specific/linux/drbd { };
dropwatch = callPackage ../os-specific/linux/dropwatch { };
dropwatch = callPackage ../os-specific/linux/dropwatch {
readline = readline81;
};
dsd = callPackage ../applications/radio/dsd { };