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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-23 18:01:18 +00:00
committed by GitHub
parent 9179666d33 58e0d95c3a
commit 8f206d92d9
34 changed files with 1464 additions and 1290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/ymuse/default.nix
+71
View File
@@ -0,0 +1,71 @@
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule
, wrapGAppsHook
, pkg-config
, glib
, gobject-introspection
, gtk3
, gdk-pixbuf
, gettext
, librsvg
}:
buildGoModule rec {
pname = "ymuse";
version = "0.20";
src = fetchFromGitHub {
owner = "yktoo";
repo = "ymuse";
rev = "v${version}";
sha256 = "sha256-wDQjNBxwxFVFdSswubp4AVD35aXKJ8i0ahk/tgRsDRc=";
};
vendorSha256 = "sha256-Ap/nf0NT0VkP2k9U1HzEiptDfLjKkBopP5h0czP3vis=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook
glib
gobject-introspection
gdk-pixbuf
gettext
];
buildInputs = [
gtk3
librsvg
];
postInstall = ''
install -Dm644 ./resources/ymuse.desktop -t $out/share/applications
cp -r ./resources/icons $out/share
app_id="ymuse"
find ./resources/i18n -type f -name '*.po' |
while read file; do
# Language is the filename without the extension
lang="$(basename "$file")"
lang="''${lang%.*}"
# Create the target dir if needed
target_dir="$out/share/locale/$lang/LC_MESSAGES"
mkdir -p "$target_dir"
# Compile the .po into a .mo
echo "Compiling $file" into "$target_dir/$app_id.mo"
msgfmt "$file" -o "$target_dir/$app_id.mo"
done
'';
# IDK how to deal with tests that open up display.
doCheck = false;
meta = with lib; {
homepage = "https://yktoo.com/en/software/ymuse/";
description = "GTK client for Music Player Daemon (MPD)";
license = licenses.asl20;
maintainers = with maintainers; [ foo-dogsquared ];
};
}
pkgs/applications/misc/buku/default.nix
+6 -34
View File
@@ -1,26 +1,7 @@
{ lib, python3, fetchFromGitHub, withServer ? false }:
let
python3' = python3.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
doCheck = false;
});
sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec {
version = "0.36.6";
src = oldAttrs.src.override {
inherit version;
sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs";
};
});
};
};
serverRequire = with python3'.pkgs; [
serverRequire = with python3.pkgs; [
requests
flask
flask-admin
@@ -36,7 +17,7 @@ let
toml
];
in
with python3'.pkgs; buildPythonApplication rec {
with python3.pkgs; buildPythonApplication rec {
version = "4.7";
pname = "buku";
@@ -54,6 +35,10 @@ with python3'.pkgs; buildPythonApplication rec {
pyyaml
mypy-extensions
click
pylint
flake8
pytest-cov
pyyaml
];
propagatedBuildInputs = [
@@ -64,20 +49,7 @@ with python3'.pkgs; buildPythonApplication rec {
html5lib
] ++ lib.optionals withServer serverRequire;
postPatch = ''
# Jailbreak problematic dependencies
sed -i \
-e "s,'PyYAML.*','PyYAML',g" \
-e "/'pytest-cov/d" \
-e "/'pylint/d" \
-e "/'flake8/d" \
setup.py
'';
preCheck = ''
# Fixes two tests for wrong encoding
export PYTHONIOENCODING=utf-8
# Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
pkgs/applications/misc/charm/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "charm";
version = "0.12.3";
version = "0.12.4";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "charm";
rev = "v${version}";
sha256 = "sha256-FQNOU75mZqeXAVFOxTXri6bfkJZx4A/YhXMf8bFAKxs=";
sha256 = "sha256-1uxgiVJGdTE8R0gEQ515zxoKXSs5lTGAURNlgJYMuMI=";
};
vendorSha256 = "sha256-6Grg6/q4idhWk6slxV2GBblmOA5dclFh/PcGtPXUTd4=";
vendorSha256 = "sha256-ouqA4Rg03M9dAUu2Uxmvez7LJTcrqYvqPNVQQmqwoFQ=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
pkgs/applications/misc/cubiomes-viewer/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
version = "2.2.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
sha256 = "sha256-jwYmgA2JtWpEbuuFPwGdKKaSZ2uAs3t7CCCeu6eD9nI=";
sha256 = "sha256-QNNKfL2pLdOqbjd6t7SLaLcHmyEmmB7vFvj1g6FSTBo=";
fetchSubmodules = true;
};
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+393 -393
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/packages.nix
+6 -6
View File
@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "103.0.2";
version = "104.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a";
sha512 = "8778650ffa3c2d18802c348e27789f00cff143c7ca0ae01b1bcd050b6942c149db25696b48f3c702fbde901c15fcae976ac731a456f641637cae3eb56d0077d3";
};
meta = {
@@ -28,11 +28,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.1.0esr";
version = "102.2.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2505b87ce4115445568eb6b7d8af41678bd787fd07f3f79e9f0a22d90cdf752ae5d4371856cf9c56e2d9da7d5b7c3939dc2aab5753fcc017398e7d65260f6f03";
sha512 = "06d753867ccfe1b2c79148cc60bc816b47a2abfa98219808868e9028bef1763d982ef7012698d06b8959cce79163d7926baf5f9d5ca9daa18c51fbf0efc59993";
};
meta = {
@@ -55,11 +55,11 @@ rec {
firefox-esr-91 = buildMozillaMach rec {
pname = "firefox-esr-91";
version = "91.12.0esr";
version = "91.13.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042";
sha512 = "38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516";
};
meta = {
pkgs/applications/virtualization/ecs-agent/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "amazon-ecs-agent";
version = "1.62.1";
version = "1.62.2";
goPackagePath = "github.com/aws/${pname}";
subPackages = [ "agent" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "aws";
repo = pname;
sha256 = "sha256-p3o5Z6NIieBoEjxN8NnDYCSD4IQs2daxCwg4ndp5TTk=";
sha256 = "sha256-pxlszIIxq86Dnz+lnD8s9QUJSbx6lpMutHd7gXeqcJ4=";
};
meta = with lib; {
pkgs/development/libraries/babl/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "babl";
version = "0.1.92";
version = "0.1.94";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-9mdzUCiUS2N1rRjxYKZM65P1x9zKqdh1HeNZd3SIosE=";
sha256 = "sha256-tqiyj1XgwX9QMft5Wecv/g+/gZbRlorW78mNG0ksO74=";
};
patches = [
pkgs/development/ocaml-modules/domain-name/default.nix
+6 -11
View File
@@ -1,26 +1,21 @@
{ lib, buildDunePackage, fetchurl
{ lib, buildDunePackage, ocaml, fetchurl
, alcotest
, astring, fmt
}:
buildDunePackage rec {
pname = "domain-name";
version = "0.3.0";
useDune2 = true;
version = "0.4.0";
src = fetchurl {
url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz";
sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad";
url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-${version}.tbz";
sha256 = "sha256-pcBuIoRYlSAZc+gS/jAZJ00duBwKeHPabIAHxK0hCMU=";
};
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.04";
checkInputs = [ alcotest ];
propagatedBuildInputs = [ astring fmt ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.05";
meta = {
homepage = "https://github.com/hannesm/domain-name";
pkgs/development/python-modules/Nikola/default.nix
+3 -3
View File
@@ -41,12 +41,12 @@
buildPythonPackage rec {
pname = "Nikola";
version = "8.2.2";
disabled = pythonOlder "3.5";
version = "8.2.3";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lfSrBRwkWMHTFEJ4KmrWIx9XIMO5I9XxcuJe7zTxJsE=";
sha256 = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/aesedb/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "aesedb";
version = "0.0.5";
version = "0.0.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2m4VxqTD9zvUpZ1O8/SBprAzG4vUX4z3LthMpP5Hc8g=";
hash = "sha256-zDzTQ7drq2jFvTO170GKbY76HjnWcFbcw9YSfDnltGQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/allure-python-commons/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "allure-python-commons";
version = "2.9.45";
version = "2.10.0";
disabled = pythonOlder "3.4";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "17alymsivw8fs89j6phbqgrbprasw8kj72kxa5y8qpn3xa5d4f62";
sha256 = "sha256-1NMTRLDwA3pKEeFrkbKM8O6yP/oOUMJ/z8aqvnIhLTw=";
};
nativeBuildInputs = [
pkgs/development/python-modules/asdf-transform-schemas/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "asdf-transform-schemas";
version = "0.2.2";
version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "asdf_transform_schemas";
inherit version;
hash = "sha256-9xqTCe0+vQmxk3roV8lM7JKIeHBEDrPphou77XJlaxU=";
hash = "sha256-DPL/eyLMtAj+WN3ZskQaWbpz/jI+QW1ZueCkcop9LdY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/bc-python-hcl2/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "bc-python-hcl2";
version = "0.3.45";
version = "0.3.46";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-OmUN6wpsVP9/CS+JkEhirDBp1MqeA3oEcU77T5nJ9GU=";
hash = "sha256-At8K/eTXZ8CYDflI7Z7sBhE0VeElPUDk8KYfRJTl1v0=";
};
# Nose is required during build process, so can not use `checkInputs`.
pkgs/development/python-modules/robotsuite/default.nix
+19 -9
View File
@@ -1,5 +1,10 @@
{ lib, buildPythonPackage, fetchPypi
, unittest2, lxml, robotframework
{ lib
, buildPythonPackage
, fetchPypi
, unittest2
, lxml
, robotframework
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -11,17 +16,22 @@ buildPythonPackage rec {
sha256 = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas=";
};
buildInputs = [ unittest2 ];
propagatedBuildInputs = [ robotframework lxml ];
buildInputs = [
unittest2
];
postPatch = ''
substituteInPlace setup.py \
--replace robotframework-python3 robotframework
'';
propagatedBuildInputs = [
robotframework
lxml
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Python unittest test suite for Robot Framework";
homepage = "https://github.com/collective/robotsuite/";
license = licenses.gpl3;
license = licenses.gpl3Only;
};
}
pkgs/development/python-modules/scikit-fmm/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scikit-fmm";
version = "2022.3.26";
version = "2022.8.15";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wxVfltcz3qh5FRS3CXYsYdL3z94x7Y0rjCbKFnNW3o4=";
sha256 = "sha256-BgDmxoB1QzZ/DlqIB0m66Km+fbAo5RcpjmX0BZ9985w=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/zcs/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "zcs";
version = "0.1.18";
version = "0.1.21";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4=";
sha256 = "sha256-Zs2aK+RR84uKjh+ZF/3gulS78zbb+XahTVSTJAArKHA=";
};
patches = [
pkgs/development/tools/ktlint/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.46.1";
version = "0.47.0";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "sha256-RcXhEESQsvKjQtO33dlImOp24mfJmRAL5AeR/3JCdq0=";
sha256 = "sha256-NuNkEBjFWUkiFKud1sMFdYkO2z2EA03XPaylC0YxY4Q=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/development/tools/oh-my-posh/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "oh-my-posh";
version = "8.33.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7sK5Gv0EFa2ljkERYgDBwKffSv5xGaDBVAqP38Smyz4=";
};
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
sourceRoot = "source/src";
ldflags = [ "-s" "-w" "-X" "main.Version=${version}" ];
meta = with lib; {
description = "A prompt theme engine for any shell";
homepage = "https://ohmyposh.dev";
license = licenses.mit;
maintainers = with maintainers; [ lucperkins ];
};
}
pkgs/development/tools/zprint/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "zprint";
version = "1.2.3";
version = "1.2.4";
src = fetchurl {
url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
sha256 = "sha256-DIiUFHlK9NNQeUcfzp4N/+14ejZ9+LRx+5FUjtCa9RM=";
sha256 = "sha256-PgmaKxTOZPgHhEfFA5FdHrKHHpfieoK2QZBYR3f0J8s=";
};
extraNativeImageBuildArgs = [
pkgs/games/quake2/yquake2/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@ let
yquake2 = stdenv.mkDerivation rec {
pname = "yquake2";
version = "8.01";
version = "8.10";
src = fetchFromGitHub {
owner = "yquake2";
repo = "yquake2";
rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "1dll5lx4bnls5w5f2zwjhwpcpxa97rjn6ymb2v3vrjm19jbd16yd";
sha256 = "sha256-/BbMR/ZPjHbKzQ+I1+Vgh3/zenLjW3TnmrKhKPR6Gdk=";
};
postPatch = ''
pkgs/os-specific/linux/cifs-utils/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "cifs-utils";
version = "6.15";
version = "7.0";
src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
sha256 = "sha256-p7aUDpMlDBZ2pvpmturZG3jNQ6X+6ZzEYkWci5zx5vQ=";
sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE=";
};
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
pkgs/os-specific/linux/kernel/zen-kernels.nix
+4 -4
View File
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.19.2"; #zen
version = "5.19.3"; #zen
suffix = "zen1"; #zen
sha256 = "0n21karcw9f861h26jxh29yiyg67kcxja7wh1xpdgx957avazacp"; #zen
sha256 = "0qkkbj7sifc0vqy4q8fdnadqjh2vcv41rbm90abbrnnqiyanc01g"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.19.2"; #lqx
version = "5.19.3"; #lqx
suffix = "lqx1"; #lqx
sha256 = "00rssb305yxv085jhy642m8iyrbz5lvi4ynkc8vqr83y9w6ilf8y"; #lqx
sha256 = "1g4kgcqmwrmrxh7s07md74mpd24i1fmrns5m9k140wzjykcv8n7z"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
pkgs/os-specific/linux/rtl8821au/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rtl8821au";
version = "${kernel.version}-unstable-2022-03-08";
version = "${kernel.version}-unstable-2022-08-22";
src = fetchFromGitHub {
owner = "morrownr";
repo = "8821au-20210708";
rev = "2c0c6fef81c0c7dcf8fa06fc4ab72168abc4f7bb";
sha256 = "sha256-Hdzi3pGqH71O0Jenjd/myG4+rZDLC/CcWHkjDoXBxS0=";
rev = "ac275a0ed806fb1c714d8f9194052d4638a68fca";
sha256 = "sha256-N86zyw5Ap07vk38OfjGfzP7++ysZCIUVnLuwxeY8yws=So";
};
nativeBuildInputs = [ bc nukeReferences ];
pkgs/os-specific/linux/rtl8821ce/default.nix
+6 -1
View File
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM=";
};
patches = fetchpatch {
url = "https://github.com/tomaspinho/rtl8821ce/pull/291.patch";
sha256 = "sha256-GCZ/iPtzF7PP0ZgagBev6r7IVQ2VenPoLKL9GnPSt+U=";
};
hardeningDisable = [ "pic" ];
nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tomaspinho/rtl8821ce";
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = stdenv.isAarch64;
maintainers = with maintainers; [ hhm ivar ];
broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
};
}
pkgs/servers/invidious/versions.json
+3 -3
View File
@@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "cbcf31a4f98706ea675cafb7509b37dc2b0ceace",
"sha256": "sha256-RliUNAOsU3ewyUl8hz4hvtlk7ztexW9Bl/N1vKLc6Dg=",
"version": "unstable-2022-07-10"
"rev": "9e58bc19c4baf7ca7da97c2f8b164789d041d9b8",
"sha256": "sha256-LXCwVcjXx0JQ9yOyiZCqWYkMmD5iCEe4vcuCZTX+S/Y=",
"version": "unstable-2022-08-13"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
pkgs/tools/networking/dropbear/default.nix
+24 -4
View File
@@ -1,8 +1,19 @@
{ stdenv, lib, fetchurl, glibc, zlib
{ lib, stdenv, fetchurl, glibc, zlib
, enableStatic ? stdenv.hostPlatform.isStatic
, enableSCP ? false
, sftpPath ? "/run/current-system/sw/libexec/sftp-server"
}:
let
# NOTE: DROPBEAR_PATH_SSH_PROGRAM is only necessary when enableSCP is true,
# but it is enabled here always anyways for consistency
dflags = {
SFTPSERVER_PATH = sftpPath;
DROPBEAR_PATH_SSH_PROGRAM = "${placeholder "out"}/bin/dbclient";
};
in
stdenv.mkDerivation rec {
pname = "dropbear";
version = "2020.81";
@@ -13,14 +24,23 @@ stdenv.mkDerivation rec {
};
dontDisableStatic = enableStatic;
configureFlags = lib.optional enableStatic "LDFLAGS=-static";
CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
CFLAGS = lib.pipe (lib.attrNames dflags) [
(builtins.map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
(lib.concatStringsSep " ")
];
# https://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
preConfigure = ''
makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib
makeFlagsArray=(
VPATH=$(cat $NIX_CC/nix-support/orig-libc)/lib
PROGRAMS="${lib.concatStringsSep " " ([ "dropbear" "dbclient" "dropbearkey" "dropbearconvert" ] ++ lib.optionals enableSCP ["scp"])}"
)
'';
postInstall = lib.optionalString enableSCP ''
ln -rs $out/bin/scp $out/bin/dbscp
'';
patches = [
pkgs/tools/networking/onetun/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "onetun";
version = "0.3.3";
src = fetchFromGitHub {
owner = "aramperes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TYDSAJxWwNF/e42KR9656vrWfIanFMaJKvof0gcZ80U=";
};
cargoSha256 = "sha256-aki3jL+0ETPa/0eMyxuBKdF3K1wM86BZx8FrOkaUAFQ=";
meta = with lib; {
description = "A cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations";
homepage = "https://github.com/aramperes/onetun";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}
pkgs/tools/security/plecost/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ lib, python3Packages, fetchFromGitHub, fetchpatch }:
python3Packages.buildPythonApplication rec {
pname = "plecost";
version = "1.1.4";
src = fetchFromGitHub {
owner = "iniqua";
repo = pname;
# Release is untagged
rev = "aa40e504bee95cf731f0cc9f228bcf5fdfbe6194";
sha256 = "K8ESI2EOqH9zBDfSKgVcTKjCMdRhBiwltIbXDt1vF+M=";
};
patches = [
# Fix compatability with aiohttp 3.x
# Merged - pending next release
(fetchpatch {
url = "https://github.com/iniqua/plecost/pull/34/commits/c09e7fab934f136f8fbc5f219592cf5fec151cf9.patch";
sha256 = "sha256-G7Poo3+d+PQTrg8PCrmsG6nMHt8CXgiuAu+ZNvK8oiw=";
})
];
propagatedBuildInputs = with python3Packages; [
aiohttp
async-timeout
termcolor
lxml
];
# Project has no tests
doCheck = false;
meta = with lib; {
description = "Vulnerability fingerprinting and vulnerability finder for Wordpress blog engine";
homepage = "https://github.com/iniqua/plecost";
license = licenses.bsd3;
maintainers = with maintainers; [ emilytrau ];
};
}
pkgs/tools/system/smartmontools/default.nix
+2 -1
View File
@@ -18,6 +18,7 @@ let
sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI=";
name = "smartmontools-drivedb.h";
};
scriptPath = lib.makeBinPath ([ gnused ] ++ lib.optional enableMail [ inetutils mailutils ]);
in
stdenv.mkDerivation rec {
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
cp -v ${driverdb} drivedb.h
'';
configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ gnused inetutils mailutils ]}";
configureFlags = [ "--with-scriptpath=${scriptPath}" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ];
pkgs/tools/text/xml/basex/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "basex";
version = "10.0";
version = "10.1";
src = fetchurl {
url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip";
hash = "sha256-3NWmgvMEWdj3h7b/kg4u3EdQupgldYc/SiPO2vzF140=";
hash = "sha256-d11kqwsLsHopFi7w+wTDWx9h+UVM7Z5kY7vKXsBrvuo=";
};
nativeBuildInputs = [ unzip copyDesktopItems ];
pkgs/top-level/all-packages.nix
+8
View File
@@ -9326,6 +9326,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
onetun = callPackage ../tools/networking/onetun { };
opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
@@ -9359,6 +9361,8 @@ with pkgs;
ogdf = callPackage ../development/libraries/ogdf { };
oh-my-posh = callPackage ../development/tools/oh-my-posh {};
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
ola = callPackage ../applications/misc/ola { };
@@ -9867,6 +9871,8 @@ with pkgs;
playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
plecost = callPackage ../tools/security/plecost { };
plujain-ramp = callPackage ../applications/audio/plujain-ramp { };
inherit (callPackage ../servers/plik { })
@@ -36614,6 +36620,8 @@ with pkgs;
xmcp = callPackage ../tools/X11/xmcp { };
ymuse = callPackage ../applications/audio/ymuse { };
zk = callPackage ../applications/office/zk {};
zktree = callPackage ../applications/misc/zktree {};