dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-27 06:01:12 +00:00 committed by GitHub
commit 7bb1bfbf29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 127 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/web-servers/lighttpd/default.nix
View File

@ -38,10 +38,13 @@ let
"mod_rrdtool"
"mod_accesslog"
# Remaining list of modules, order assumed to be unimportant.
"mod_authn_dbi"
"mod_authn_file"
"mod_authn_gssapi"
"mod_authn_ldap"
"mod_authn_mysql"
"mod_authn_pam"
"mod_authn_sasl"
"mod_cml"
"mod_deflate"
"mod_evasive"
@ -132,6 +135,15 @@ in
'';
};
package = mkOption {
default = pkgs.lighttpd;
defaultText = "pkgs.lighttpd";
type = types.package;
description = ''
lighttpd package to use.
'';
};
port = mkOption {
default = 80;
type = types.port;
@ -240,7 +252,7 @@ in
description = "Lighttpd Web Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";
serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}";
# SIGINT => graceful shutdown
serviceConfig.KillSignal = "SIGINT";
};

4
pkgs/applications/graphics/feh/default.nix
View File

@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "feh";
version = "3.7.1";
version = "3.7.2";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY=";
sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=";
};
outputs = [ "out" "man" "doc" ];

8
pkgs/applications/video/shotcut/default.nix
View File

@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0";
mkDerivation rec {
pname = "shotcut";
version = "21.03.21";
version = "21.09.20";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh";
};
nativeBuildInputs = [ pkg-config qmake ];
@ -57,7 +57,7 @@ mkDerivation rec {
];
prePatch = ''
sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
NICE=$(type -P nice)
@ -94,7 +94,7 @@ mkDerivation rec {
please use the official build from shotcut.org instead.
'';
homepage = "https://shotcut.org";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ goibhniu woffs peti ];
platforms = platforms.linux;
};

4
pkgs/data/themes/greybird/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "greybird";
version = "3.22.14";
version = "3.22.15";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = pname;
rev = "v${version}";
sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9";
sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9";
};
nativeBuildInputs = [

4
pkgs/data/themes/matcha/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
version = "2021-08-23";
version = "2021-09-24";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ=";
sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15";
};
buildInputs = [ gdk-pixbuf librsvg ];

4
pkgs/development/libraries/libarchive-qt/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libarchive-qt";
version = "2.0.4";
version = "2.0.6";
src = fetchFromGitLab {
owner = "marcusbritanicus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-onTV9dgk6Yl9H35EvA6/8vk1IrYH8vg9OQNVgzkt4q4";
sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA=";
};
nativeBuildInputs = [

6
pkgs/development/ocaml-modules/batteries/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
}:
let version = "3.3.0"; in
@ -14,7 +16,7 @@ stdenv.mkDerivation {
checkInputs = [ qtest ];
propagatedBuildInputs = [ num ];
doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
inherit doCheck;
checkTarget = "test";
createFindlibDestdir = true;

3
pkgs/development/ocaml-modules/containers/data.nix
View File

@ -6,10 +6,9 @@
buildDunePackage {
pname = "containers-data";
inherit (containers) src version useDune2;
inherit (containers) src version doCheck useDune2;
buildInputs = [ dune-configurator ];
doCheck = true;
checkInputs = [ gen iter qcheck ];
propagatedBuildInputs = [ containers ];

2
pkgs/development/ocaml-modules/containers/default.nix
View File

@ -22,7 +22,7 @@ buildDunePackage rec {
checkInputs = [ gen iter ounit qcheck uutf ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://github.com/c-cube/ocaml-containers";

17
pkgs/development/ocaml-modules/gen/default.nix
View File

@ -1,9 +1,8 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
let version = "0.5"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-gen-${version}";
stdenv.mkDerivation rec {
version = "0.5";
pname = "ocaml${ocaml.version}-gen";
src = fetchFromGitHub {
owner = "c-cube";
@ -13,14 +12,12 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ qtest ounit ];
buildInputs = lib.optionals doCheck [ qtest ounit ];
strictDeps = true;
configureFlags = [
"--enable-tests"
];
configureFlags = lib.optional doCheck "--enable-tests";
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkTarget = "test";
createFindlibDestdir = true;
@ -29,6 +26,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/c-cube/gen";
description = "Simple, efficient iterators for OCaml";
license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/iter/default.nix
View File

@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ result ];
doCheck = lib.versionAtLeast ocaml.version "4.07";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ mdx.bin qtest ];
meta = {

2
pkgs/development/ocaml-modules/lru/default.nix
View File

@ -13,7 +13,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ psq ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ qcheck-alcotest ];
meta = {

2
pkgs/development/ocaml-modules/psq/default.nix
View File

@ -14,7 +14,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ seq ];
doCheck = lib.versionAtLeast ocaml.version "4.07";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ qcheck-alcotest ];
meta = {

8
pkgs/development/ocaml-modules/qcheck/core.nix
View File

@ -2,17 +2,17 @@
buildDunePackage rec {
pname = "qcheck-core";
version = "0.17";
version = "0.18";
useDune2 = true;
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "c-cube";
repo = "qcheck";
rev = version;
sha256 = "0qfyqhfg98spmfci9z6f527a16gwjnx2lrbbgw67p37ys5acrfar";
rev = "v${version}";
sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x";
};
meta = {

1
pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
View File

@ -16,5 +16,6 @@
meta = {
description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
broken = true;
};
}

4
pkgs/development/ocaml-modules/stdint/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, fetchpatch, buildDunePackage, qcheck }:
{ lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }:
buildDunePackage rec {
pname = "stdint";
@ -35,7 +35,7 @@ buildDunePackage rec {
'let pos_int = QCheck.int_range 0 maxi'
'';
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ qcheck ];
meta = {

2
pkgs/development/ocaml-modules/stringext/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, ocaml, buildDunePackage, ounit, qtest
# Optionally enable tests; test script use OCaml-4.01+ features
, doCheck ? lib.versionAtLeast ocaml.version "4.04"
, doCheck ? lib.versionAtLeast ocaml.version "4.08"
}:
let version = "1.6.0"; in

3
pkgs/development/ocaml-modules/syslog-message/default.nix
View File

@ -1,4 +1,5 @@
{ lib, buildDunePackage, fetchurl
, ocaml
, astring, ptime, rresult, qcheck
}:
@ -21,7 +22,7 @@ buildDunePackage rec {
rresult
];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [
qcheck
];

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.32";
version = "8.12.33";
src = fetchPypi {
inherit pname version;
sha256 = "c52c9c3607483072303ba8d8759063edc44d2f8fe7b85afef40bd8d1aafb6483";
sha256 = "de3d5a3cb421c7421f584bb13cb9287e23ee2dd97d832fc35c9b55b96a576a3c";
};
checkInputs = [

2
pkgs/development/python-modules/python3-application/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
# Apply bugfix commit that is not yet part of a release
(fetchpatch {
name = "fix-time-import.patch";
url = "https://github.com/AGProjects/${pname}/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch";
url = "https://github.com/AGProjects/python3-application/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch";
sha256 = "sha256-MGs8uUIFXkPXStOn5oCNNEMVmcKrq8YPl8Xvl3OTOUM=";
})
];

22
pkgs/development/tools/misc/bashdb/default.nix
View File

@ -1,14 +1,30 @@
{ lib, stdenv, fetchurl, makeWrapper, python3Packages }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, makeWrapper
, python3Packages
}:
stdenv.mkDerivation rec {
pname = "bashdb";
version = "4.4-1.0.0";
version = "5.0-1.1.2";
src = fetchurl {
url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2";
sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";
sha256 = "sha256-MBdtKtKMWwCy4tIcXqGu+PuvQKj52fcjxnxgUx87czA=";
};
patches = [
# Enable building with bash 5.1/5.2
# Remove with any upstream 5.1-x.y.z release
(fetchpatch {
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/569fbb806d9ee813afa8b27d2098a44f93433922/devel/bashdb/files/patch-configure";
sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr";
})
];
patchFlags = "-p0";
nativeBuildInputs = [
makeWrapper
];

1
pkgs/development/tools/sumneko-lua-language-server/default.nix
View File

@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ mjlbach ];
platforms = platforms.linux;
mainProgram = "lua-language-server";
};
}

30
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -1,21 +1,21 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.246-hardened1.patch",
"sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch"
"name": "linux-hardened-4.14.247-hardened1.patch",
"sha256": "0k3ii26ry0cszxs5n4ljll61p1kdi3dn5cvzjr8zb78bfrk7lbra",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.247-hardened1/linux-hardened-4.14.247-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.206-hardened1.patch",
"sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch"
"name": "linux-hardened-4.19.207-hardened1.patch",
"sha256": "1yn6c8axvnmck1ignw4k3pi458x0m2qm7g5vjwf2rw8cnzskrs48",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.207-hardened1/linux-hardened-4.19.207-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.67-hardened1.patch",
"sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch"
"name": "linux-hardened-5.10.68-hardened1.patch",
"sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch"
},
"5.13": {
"extra": "-hardened1",
@ -25,14 +25,14 @@
},
"5.14": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.6-hardened1.patch",
"sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch"
"name": "linux-hardened-5.14.7-hardened1.patch",
"sha256": "18i0qxhzga2vg0kal5ifsks0vra6gj21q6whcjry9sglxandn2vg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.7-hardened1/linux-hardened-5.14.7-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.147-hardened1.patch",
"sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch"
"name": "linux-hardened-5.4.148-hardened1.patch",
"sha256": "0kb2d9csm8bbjark2ii0n1jpfcr6avdr8r5g97awzbg9jxkfs0j4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.148-hardened1/linux-hardened-5.4.148-hardened1.patch"
}
}

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.247";
version = "4.14.248";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7";
sha256 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.207";
version = "4.19.208";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym";
sha256 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.284";
version = "4.4.285";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf";
sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.283";
version = "4.9.284";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm";
sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.68";
version = "5.10.69";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv";
sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.14.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.14.7";
version = "5.14.8";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg";
sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.148";
version = "5.4.149";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6";
sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7";
};
} // (args.argsOverride or {}))

29
pkgs/servers/http/lighttpd/default.nix
View File

@ -1,19 +1,16 @@
{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file
, openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, libmysqlclient ? null
, enableLdap ? false, openldap ? null
, enableWebDAV ? false, sqlite ? null, libuuid ? null
, enableExtendedAttrs ? false, attr ? null
, openssl
, enableDbi ? false, libdbi
, enableMagnet ? false, lua5_1
, enableMysql ? false, libmysqlclient
, enableLdap ? false, openldap
, enablePam ? false, linux-pam
, enableSasl ? false, cyrus_sasl
, enableWebDAV ? false, sqlite, libuuid
, enableExtendedAttrs ? false, attr
, perl
}:
assert enableMagnet -> lua5_1 != null;
assert enableMysql -> libmysqlclient != null;
assert enableLdap -> openldap != null;
assert enableWebDAV -> sqlite != null;
assert enableWebDAV -> libuuid != null;
assert enableExtendedAttrs -> attr != null;
stdenv.mkDerivation rec {
pname = "lighttpd";
version = "1.4.59";
@ -33,16 +30,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
++ lib.optional enableDbi libdbi
++ lib.optional enableMagnet lua5_1
++ lib.optional enableMysql libmysqlclient
++ lib.optional enableLdap openldap
++ lib.optional enablePam linux-pam
++ lib.optional enableSasl cyrus_sasl
++ lib.optional enableWebDAV sqlite
++ lib.optional enableWebDAV libuuid;
configureFlags = [ "--with-openssl" ]
++ lib.optional enableDbi "--with-dbi"
++ lib.optional enableMagnet "--with-lua"
++ lib.optional enableMysql "--with-mysql"
++ lib.optional enableLdap "--with-ldap"
++ lib.optional enablePam "--with-pam"
++ lib.optional enableSasl "--with-sasl"
++ lib.optional enableWebDAV "--with-webdav-props"
++ lib.optional enableWebDAV "--with-webdav-locks"
++ lib.optional enableExtendedAttrs "--with-attr";
@ -69,6 +72,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.lighttpd.net/";
license = lib.licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor brecht ];
};
}

6
pkgs/tools/filesystems/apfsprogs/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2021-05-07";
version = "unstable-2021-08-24";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "d360211a30608a907e3ee8ad4468d606c40ec2d7";
sha256 = "sha256-SeFs/GQfIEvnxERyww+mnynjR7E02DdtBA6JsknEM+Q=";
rev = "5efac5a701bcb56e23cfc182b5b3901bff27d343";
sha256 = "sha256-vQE586HwrPkF0uaTKrJ7yXb24ntRI0QmBla7N2ErAU8=";
};
buildPhase = ''

6
pkgs/tools/misc/fclones/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "fclones";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc=";
sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE=";
};
cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk=";
cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw=";
buildInputs = lib.optionals stdenv.isDarwin [
AppKit

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

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ytcc";
version = "2.3.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "woefe";
repo = "ytcc";
rev = "v${version}";
sha256 = "1q0w3b7r93416s28qra608n0d7cjh95nwkzgg23z5hp5sq3w3izr";
sha256 = "00fx1zlfz4gj46ahgvawc21rx6s49qrzd8am3p2yzmc12ibfqyhv";
};
nativeBuildInputs = [ gettext ];