Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-08-29 00:06:33 +00:00 committed by GitHub
commit e96f5aea47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 152 additions and 74 deletions

View file

@ -82,6 +82,25 @@ in {
'';
};
jre = mkOption {
type = types.package;
default = pkgs.jre8;
defaultText = literalExample "pkgs.jre8";
description = ''
JRE package to use.
Airsonic only supports Java 8, airsonic-advanced requires at least
Java 11.
'';
};
war = mkOption {
type = types.path;
default = "${pkgs.airsonic}/webapps/airsonic.war";
defaultText = "\${pkgs.airsonic}/webapps/airsonic.war";
description = "Airsonic war file to use.";
};
jvmOptions = mkOption {
description = ''
Extra command line options for the JVM running AirSonic.
@ -118,7 +137,7 @@ in {
'';
serviceConfig = {
ExecStart = ''
${pkgs.jre8}/bin/java -Xmx${toString cfg.maxMemory}m \
${cfg.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
-Dairsonic.home=${cfg.home} \
-Dserver.address=${cfg.listenAddress} \
-Dserver.port=${toString cfg.port} \
@ -128,7 +147,7 @@ in {
"-Dserver.use-forward-headers=true"} \
${toString cfg.jvmOptions} \
-verbose:gc \
-jar ${pkgs.airsonic}/webapps/airsonic.war
-jar ${cfg.war}
'';
Restart = "always";
User = "airsonic";

View file

@ -128,7 +128,7 @@ in {
# https://github.com/tulir/mautrix-telegram/issues/584
[ -f ${settingsFile} ] && rm -f ${settingsFile}
old_umask=$(umask)
umask 0277
umask 0177
${pkgs.envsubst}/bin/envsubst \
-o ${settingsFile} \
-i ${settingsFileUnsubstituted}

View file

@ -502,8 +502,6 @@ in {
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
"--database-pass" = dbpass;
${if c.dbtableprefix != null
then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
"--admin-user" = ''"${c.adminuser}"'';
"--admin-pass" = adminpass;
"--data-dir" = ''"${cfg.home}/data"'';

View file

@ -37,6 +37,7 @@ in {
config = {
# Don't inherit adminuser since "root" is supposed to be the default
inherit adminpass;
dbtableprefix = "nixos_";
};
autoUpdateApps = {
enable = true;

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws";
sha256 = "1cj8ggahnbn55wlkxzf5b9n8rvm30mc95vgcw8b60pzs47q6vncp";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -1,4 +1,7 @@
{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
{ lib, mkChromiumDerivation
, channel, chromiumVersionAtLeast
, enableWideVine, ungoogled
}:
with lib;
@ -16,8 +19,8 @@ mkChromiumDerivation (base: rec {
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
# Swiftshader

View file

@ -1,6 +1,8 @@
{ stdenv, lib, fetchurl, fetchpatch
# Channel data:
, channel, upstream-info
# Helper functions:
, chromiumVersionAtLeast, versionRange
# Native build inputs:
, ninja, pkg-config
@ -106,18 +108,6 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";
warnObsoleteVersionConditional = min-version: result:
let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
in warnIf (versionAtLeast ungoogled-version min-version) "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
result;
chromiumVersionAtLeast = min-version:
let result = versionAtLeast upstream-info.version min-version;
in warnObsoleteVersionConditional min-version result;
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
in warnObsoleteVersionConditional upto-version result;
ungoogler = ungoogled-chromium {
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
};

View file

@ -22,15 +22,31 @@ let
llvmPackages = llvmPackages_12;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
# Helper functions for changes that depend on specific versions:
warnObsoleteVersionConditional = min-version: result:
let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version;
in lib.warnIf
(lib.versionAtLeast ungoogled-version min-version)
"chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
result;
chromiumVersionAtLeast = min-version:
let result = lib.versionAtLeast upstream-info.version min-version;
in warnObsoleteVersionConditional min-version result;
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = lib.versionAtLeast version min-version && lib.versionOlder version upto-version;
in warnObsoleteVersionConditional upto-version result;
callPackage = newScope chromium;
chromium = rec {
inherit stdenv llvmPackages;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
inherit stdenv llvmPackages upstream-info;
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
inherit channel chromiumVersionAtLeast versionRange;
inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
@ -38,12 +54,14 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec {
} // lib.optionalAttrs (chromiumVersionAtLeast "93") rec {
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
});
browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };
browser = callPackage ./browser.nix {
inherit channel chromiumVersionAtLeast enableWideVine ungoogled;
};
ungoogled-chromium = callPackage ./ungoogled.nix {};
};

View file

@ -79,8 +79,14 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["
print('Updating default.nix...')
with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f:
for line in f:
if match := re.search(r'^ rev-version = "unstable-(.+)";', line):
old_date = match.group(1)
result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line)
result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result)
result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result)
result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result)
print(result, end='')
# Commit the result:
commit_message = f"llvmPackages_git: {old_date} -> {date}"
subprocess.run(['git', 'add', DEFAULT_NIX], check=True)
subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True)

View file

@ -19,6 +19,12 @@ sed -Ei \
"$FILE"
readonly ATTRSET="llvmPackages_$VERSION_MAJOR"
if [ "$VERSION_MAJOR" -ge "13" ]; then
readonly SOURCES=(
"llvm.src"
)
else
readonly SOURCES=(
"clang-unwrapped.src"
"compiler-rt.src"
@ -32,6 +38,7 @@ readonly SOURCES=(
"llvm.polly_src"
"openmp.src"
)
fi
for SOURCE in "${SOURCES[@]}"; do
echo "Updating the hash of $SOURCE:"

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stm32flash";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk=";
};
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

View file

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "2.0.3";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "2ce0ab89fea37e5b2311bc7d163955e84f73f6beeac3942e17e9d51ad7cc9ffa";
sha256 = "72094f05df39bb1463f61f928f3a7fa0dd236cab185cb8b7e8eb6c85e09acdc4";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ntc-templates";
version = "2.2.2";
version = "2.3.0";
format = "pyproject";
disabled = isPy27;
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "networktocode";
repo = pname;
rev = "v${version}";
sha256 = "1f2hmayj95j3fzkyh9qvl58z0l9j9mlsi8b2r9aa2fy753y5a73b";
sha256 = "1a9v2j9s7niyacglhgp58zg1wcynakacz9zg4zcv2q85hb87m2m9";
};
nativeBuildInputs = [

View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "tldextract";
version = "3.1.0";
version = "3.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
sha256 = "sha256-HViDxJbaOoqnHR9NpIYs43TcfM9F5Ltn3rIBbsNPjTM=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.58.4";
version = "0.58.5";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8=";
sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA=";
};
goPackagePath = "github.com/aquasecurity/tfsec";

View file

@ -0,0 +1,31 @@
{ fetchCrate, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "inferno";
version = "0.10.6";
# github version doesn't have a Cargo.lock
src = fetchCrate {
inherit pname version;
sha256 = "1pn3ask36mv8byd62xhm8bjv59k12i1s533jgb5syml64w1cnn12";
};
cargoSha256 = "0w5w9pyv34x0iy9knr79491kb9bgbcagh6251pq72mv4pvx0axip";
# these tests depend on a patched version of flamegraph which is included in
# the github repository as a submodule, but absent from the crates version
checkFlags = [
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace"
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple"
"--skip=collapse::perf::tests::test_collapse_multi_perf"
"--skip=collapse::perf::tests::test_collapse_multi_perf_simple"
];
meta = with lib; {
description = "A port of parts of the flamegraph toolkit to Rust";
homepage = "https://github.com/jonhoo/inferno";
changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md";
license = licenses.cddl;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -2,11 +2,11 @@
tcl.mkTclDerivation rec {
pname = "scid-vs-pc";
version = "4.21";
version = "4.22";
src = fetchurl {
url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz";
sha256 = "1lsm5s2hlhqbmwm6f38jlg2kc4j6lwp86lg6z3w6nc3jibzgvsay";
sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
version = "6.2.7";
version = "6.4.1";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-JPX7MfxdlI6jLHVybAR4xtd/IiVGDrhrYUSlXohhpGc=";
sha256 = "sha256-tVmjBfRvQQ1+VtARP1lN8Fu06tujZhZj9IpGVF0mKqA=";
};
inherit subPackages postInstall;
vendorSha256 = "sha256-bGQADjT9SMxZnWb3k7wVSsF7VWWuESBL/VDG76vj+Tk=";
vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU=";
doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.175.0";
version = "0.176.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4mdQTcaIIGNZ0pgVNfy3LBtc1te2dpkMA29nAUzg9aE=";
sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs=";
};
vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk=";
vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4=";
ldflags = [
"-s"

View file

@ -1,12 +1,11 @@
{ lib, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
, fetchFromGitHub
{ lib, buildPythonPackage, fetchPypi
, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome
, websockets, mutagen
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
, hlsEncryptedSupport ? true
, installShellFiles, makeWrapper }:
}:
buildPythonPackage rec {
pname = "yt-dlp";
@ -15,15 +14,18 @@ buildPythonPackage rec {
# to the latest stable release.
version = "2021.08.10";
src = fetchFromGitHub {
owner = "yt-dlp";
repo = "yt-dlp";
rev = version;
sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms=";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "8da1bf4dc4641d37d137443c4783109ee8393caad5e0d270d9d1d534e8f25240";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ zip pandoc ];
# build_lazy_extractors assumes this directory exists but it is not present in
# the PyPI package
postPatch = ''
mkdir -p ytdlp_plugins/extractor
'';
propagatedBuildInputs = [ websockets mutagen ]
++ lib.optional hlsEncryptedSupport pycryptodome;
@ -48,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/yt-dlp/yt-dlp/";
description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";
changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md";
longDescription = ''
yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc.
@ -56,7 +59,7 @@ buildPythonPackage rec {
youtube-dl is released to the public domain, which means
you can modify it, redistribute it or use it however you like.
'';
license = licenses.publicDomain;
license = licenses.unlicense;
maintainers = with maintainers; [ mkg20001 ];
};
}

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8=";
sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ=";
};
postPatch = lib.optionalString (batchSize != null) ''
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
homepage = "https://www.djcbsoftware.nl/code/mu/";
changelog = "https://github.com/djcb/mu/releases/tag/${version}";
maintainers = with maintainers; [ antono peterhoeg ];
maintainers = with maintainers; [ antono chvp peterhoeg ];
platforms = platforms.mesaPlatforms;
};
}

View file

@ -6086,6 +6086,8 @@ with pkgs;
inetutils = callPackage ../tools/networking/inetutils { };
inferno = callPackage ../development/tools/inferno { };
inform6 = callPackage ../development/compilers/inform6 { };
inform7 = callPackage ../development/compilers/inform7 { };