git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit51bf815af051805413a39cbc4bf427701f6751cf authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateThu 17 Jun 2021, 00:09 (5 years ago) parent2d104c971a97e0
63 files changed+484−313
maintainers/maintainer-list.nix+10 pkgs/applications/audio/hqplayer-desktop/default.nix+10−7 pkgs/applications/editors/jetbrains/common.nix+10−8 pkgs/applications/misc/electrum/default.nix+3−3 pkgs/applications/misc/gallery-dl/default.nix+2−2 pkgs/applications/misc/usql/default.nix+56 pkgs/applications/networking/cluster/fn-cli/default.nix+2−2 pkgs/applications/office/gnumeric/default.nix+2−2 pkgs/applications/science/electronics/fritzing/default.nix+31−42 pkgs/applications/science/logic/gappa/default.nix+3−3 pkgs/applications/version-management/git-and-tools/git/default.nix+1−1 pkgs/applications/version-management/rcs/default.nix+11−45 pkgs/applications/version-management/rcs/disable-t810.patch−10 pkgs/applications/window-managers/i3/lock-color.nix+2−2 pkgs/data/fonts/dina/default.nix+26−20 pkgs/data/fonts/spleen/default.nix+2−2 pkgs/development/compilers/jetbrains-jdk/default.nix+1−2 pkgs/development/compilers/kotlin/default.nix+2−2 pkgs/development/compilers/openjdk/11.nix+1−8 pkgs/development/compilers/openjdk/12.nix+1−8 pkgs/development/compilers/openjdk/13.nix+1−8 pkgs/development/compilers/openjdk/14.nix+1−8 pkgs/development/compilers/openjdk/15.nix+1−8 pkgs/development/compilers/openjdk/16.nix+1−8 pkgs/development/compilers/openjdk/darwin/11.nix+1−5 pkgs/development/compilers/openjdk/darwin/8.nix+1−5 pkgs/development/compilers/openjdk/darwin/default.nix+1−5 pkgs/development/compilers/openjdk/darwin/meta.nix+4 pkgs/development/compilers/openjdk/meta.nix+8 pkgs/development/interpreters/janet/default.nix+2−2 pkgs/development/interpreters/jruby/default.nix+2−2 pkgs/development/interpreters/rakudo/default.nix+2−2 pkgs/development/interpreters/rakudo/moarvm.nix+2−2 pkgs/development/interpreters/rakudo/nqp.nix+2−2 pkgs/development/libraries/alembic/default.nix+2−2 pkgs/development/libraries/gensio/default.nix+2−2 pkgs/development/libraries/goffice/default.nix+2−2 pkgs/development/libraries/leatherman/default.nix+2−2 pkgs/development/libraries/libwpe/default.nix+2−2 pkgs/development/libraries/zimlib/default.nix+2−2 pkgs/development/python-modules/foxdot/default.nix+2−2 pkgs/development/python-modules/pybids/default.nix+2−2 pkgs/development/tools/parsing/byacc/default.nix+2−2 pkgs/development/tools/rust/bindgen/default.nix+2−2 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix+2−2 pkgs/misc/emulators/ppsspp/default.nix+10 pkgs/misc/vim-plugins/generated.nix+18−6 pkgs/misc/vim-plugins/overrides.nix+12 pkgs/misc/vim-plugins/vim-plugin-names+1 pkgs/servers/home-assistant/default.nix+1−2 pkgs/servers/hqplayerd/default.nix+12−7 pkgs/servers/jackett/default.nix+2−2 pkgs/servers/ldap/389/default.nix+120−32 pkgs/servers/mail/postfix/default.nix+2−2 pkgs/tools/backup/mastodon-archive/default.nix+32 pkgs/tools/bluetooth/bluez-alsa/default.nix+2−2 pkgs/tools/filesystems/gcsfuse/default.nix+2−2 pkgs/tools/misc/esphome/dashboard.nix+20 pkgs/tools/misc/esphome/default.nix+12−2 pkgs/tools/misc/vivid/default.nix+3−3 pkgs/tools/networking/croc/default.nix+3−3 pkgs/tools/networking/croc/test-local-relay.nix+1−2 pkgs/top-level/all-packages.nix+4
maintainers/maintainer-list.nix+10
@@ -3745,6 +3745,16 @@
37453745 githubId = 1176131;
37463746 name = "George Whewell";
37473747 };
3748+ georgyo = {
3749+ email = "george@shamm.as";
3750+ github = "georgyo";
3751+ githubId = 19374;
3752+ name = "George Shammas";
3753+ keys = [{
3754+ longkeyid = "rsa4096/0x82BB70D541AE2DB4";
3755+ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
3756+ }];
3757+ };
37483758 gerschtli = {
37493759 email = "tobias.happ@gmx.de";
37503760 github = "Gerschtli";
pkgs/applications/audio/hqplayer-desktop/default.nix+10−7
@@ -17,11 +17,13 @@
1717
1818mkDerivation rec {
1919 pname = "hqplayer-desktop";
20− version = "4.12.0-34";
20+ version = "4.12.1-35";
2121
2222 src = fetchurl {
23+ # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
24+ # c.f. https://github.com/NixOS/nixpkgs/pull/111616
2325 url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
24− sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE=";
26+ sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
2527 };
2628
2729 unpackPhase = ''
@@ -47,6 +49,8 @@ mkDerivation rec {
4749 dontBuild = true;
4850
4951 installPhase = ''
52+ runHook preInstall
53+
5054 # main executable
5155 mkdir -p $out/bin
5256 cp ./usr/bin/* $out/bin
@@ -62,16 +66,16 @@ mkDerivation rec {
6266 # pixmaps
6367 mkdir -p $out/share/pixmaps
6468 cp ./usr/share/pixmaps/* $out/share/pixmaps
69+
70+ runHook postInstall
6571 '';
6672
6773 postInstall = ''
6874 for desktopFile in $out/share/applications/*; do
6975 substituteInPlace "$desktopFile" \
70− --replace '/usr/bin/' '$out/bin/' \
71− --replace '/usr/share/doc/' '$out/share/doc/'
76+ --replace /usr/bin/ $out/bin/ \
77+ --replace /usr/share/doc/ $out/share/doc/
7278 done
73−
74− gunzip $out/share/doc/${pname}/*.gz
7579 '';
7680
7781 postFixup = ''
@@ -81,7 +85,6 @@ mkDerivation rec {
8185 meta = with lib; {
8286 homepage = "https://www.signalyst.com/custom.html";
8387 description = "High-end upsampling multichannel software HD-audio player";
84− changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes";
8588 license = licenses.unfree;
8689 maintainers = with maintainers; [ lovesegfault ];
8790 };
pkgs/applications/editors/jetbrains/common.nix+10−8
@@ -3,13 +3,13 @@
33, vmopts ? null
44}:
55
6−{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
6+{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args:
77
88with lib;
99
1010let loName = toLower product;
1111 hiName = toUpper product;
12− execName = concatStringsSep "-" (init (splitString "-" name));
12+ mainProgram = concatStringsSep "-" (init (splitString "-" name));
1313 vmoptsName = loName
1414 + ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
1515 then ""
@@ -18,15 +18,17 @@ let loName = toLower product;
1818in
1919
2020with stdenv; lib.makeOverridable mkDerivation rec {
21− inherit name src meta;
21+ inherit name src;
22+ meta = args.meta // { inherit mainProgram; };
23+
2224 desktopItem = makeDesktopItem {
23− name = execName;
24− exec = execName;
25+ name = mainProgram;
26+ exec = mainProgram;
2527 comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
2628 desktopName = product;
2729 genericName = meta.description;
2830 categories = "Development;";
29− icon = execName;
31+ icon = mainProgram;
3032 extraEntries = ''
3133 StartupWMClass=${wmClass}
3234 '';
@@ -64,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
6466 installPhase = ''
6567 mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
6668 cp -a . $out/$name
67− ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
69+ ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
6870 mv bin/fsnotifier* $out/libexec/${name}/.
6971
7072 jdk=${jdk.home}
7173 item=${desktopItem}
7274
73− makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
75+ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
7476 --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
7577 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
7678 # Some internals want libstdc++.so.6
pkgs/applications/misc/electrum/default.nix+3−3
@@ -20,7 +20,7 @@
2020}:
2121
2222let
23− version = "4.1.2";
23+ version = "4.1.3";
2424
2525 libsecp256k1_name =
2626 if stdenv.isLinux then "libsecp256k1.so.0"
@@ -36,7 +36,7 @@ let
3636 owner = "spesmilo";
3737 repo = "electrum";
3838 rev = version;
39− sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5";
39+ sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781";
4040
4141 extraPostFetch = ''
4242 mv $out ./all
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication {
5151
5252 src = fetchurl {
5353 url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
54− sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk";
54+ sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf";
5555 };
5656
5757 postUnpack = ''
pkgs/applications/misc/gallery-dl/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonApplication rec {
44 pname = "gallery_dl";
5− version = "1.17.4";
5+ version = "1.17.5";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293";
9+ sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/applications/misc/usql/default.nixnew file+56
@@ -0,0 +1,56 @@
1+{ lib
2+, fetchFromGitHub
3+, buildGoModule
4+, unixODBC
5+, icu
6+}:
7+
8+buildGoModule rec {
9+ pname = "usql";
10+ version = "0.9.1";
11+
12+ src = fetchFromGitHub {
13+ owner = "xo";
14+ repo = "usql";
15+ rev = "v${version}";
16+ sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU=";
17+ };
18+
19+ vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus=";
20+
21+ buildInputs = [ unixODBC icu ];
22+
23+ # These tags and flags are copied from build-release.sh
24+ buildFlags = [ "-tags" ];
25+ buildFlagsArray = [
26+ "most"
27+ "sqlite_app_armor"
28+ "sqlite_fts5"
29+ "sqlite_introspect"
30+ "sqlite_json1"
31+ "sqlite_stat4"
32+ "sqlite_userauth"
33+ "sqlite_vtable"
34+ "sqlite_icu"
35+ "no_adodb"
36+ ];
37+
38+ ldflags = [
39+ "-s"
40+ "-w"
41+ "-X github.com/xo/usql/text.CommandVersion=${version}"
42+ ];
43+
44+ # All the checks currently require docker instances to run the databases.
45+ doCheck = false;
46+
47+ meta = with lib; {
48+ description = "Universal command-line interface for SQL databases";
49+ homepage = "https://github.com/xo/usql";
50+ license = licenses.mit;
51+ maintainers = with maintainers; [ georgyo ];
52+ # usql does not build on ARM.
53+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
54+ };
55+
56+}
pkgs/applications/networking/cluster/fn-cli/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "fn";
5− version = "0.6.6";
5+ version = "0.6.7";
66
77 src = fetchFromGitHub {
88 owner = "fnproject";
99 repo = "cli";
1010 rev = version;
11− sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7";
11+ sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/applications/office/gnumeric/default.nix+2−2
@@ -7,11 +7,11 @@ let
77 inherit (python3Packages) python pygobject3;
88in stdenv.mkDerivation rec {
99 pname = "gnumeric";
10− version = "1.12.49";
10+ version = "1.12.50";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc=";
14+ sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg=";
1515 };
1616
1717 configureFlags = [ "--disable-component" ];
pkgs/applications/science/electronics/fritzing/default.nix+31−42
@@ -1,86 +1,75 @@
1−{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config
2−, qtbase, qtsvg, qttools, qtserialport, boost, libgit2
1+{ mkDerivation
2+, lib
3+, fetchFromGitHub
4+, qmake
5+, pkg-config
6+, qtbase
7+, qtsvg
8+, qttools
9+, qtserialport
10+, boost
11+, libgit2
312}:
413
514let
615 # build number corresponding to a release, has no further relation
716 # see https://github.com/fritzing/fritzing-app/releases/tag/CD-498
8− fritzingBuild = "498";
17+ # fritzingBuild = "498";
18+ # version 0.9.6 is properly tagged, hope it continues
19+
920 # SHA256 of the fritzing-parts HEAD on the master branch,
1021 # which contains the latest stable parts definitions
11− partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62";
22+ partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb";
1223in
1324
1425mkDerivation rec {
1526 pname = "fritzing";
16− version = "0.9.4-${fritzingBuild}";
27+ version = "0.9.6";
1728
1829 src = fetchFromGitHub {
19− owner = "fritzing";
30+ owner = pname;
2031 repo = "fritzing-app";
21− rev = "CD-${fritzingBuild}";
22− sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34";
32+ rev = version;
33+ sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs";
2334 };
2435
2536 parts = fetchFromGitHub {
26− owner = "fritzing";
37+ owner = pname;
2738 repo = "fritzing-parts";
2839 name = "fritzing-parts";
2940 rev = partsSha;
30− sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc";
41+ sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs";
3142 };
3243
3344 buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
34−
3545 nativeBuildInputs = [ qmake pkg-config qttools ];
3646
37− patches = [(fetchpatch {
38− name = "fix-libgit2-version.patch";
39− url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch";
40− sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak";
41− })];
42−
4347 postPatch = ''
4448 substituteInPlace phoenix.pro \
4549 --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false'
4650
47− substituteInPlace tools/linux_release_script/release.sh \
48− --replace 'git status' 'echo >/dev/null' \
49− --replace 'git clean' 'echo >/dev/null' \
50− --replace 'git clone' 'echo >/dev/null' \
51− --replace 'release_folder="' 'release_folder="$out" #' \
52− --replace './Fritzing -db' '# run after fixup'
53−
5451 substituteInPlace src/fapplication.cpp \
5552 --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";'
56− '';
57−
58− buildPhase = ''
59− bash tools/linux_release_script/release.sh ${version}
60− '';
6153
62− installPhase = ''
63− rm "$out/Fritzing" # remove script file
64− mkdir "$out/bin"
65− mv "$out/lib/Fritzing" "$out/bin/Fritzing"
66− mkdir --parents "$out/share/applications" "$out/share/metainfo"
67− mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop"
68− mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml"
69− cp --recursive --no-target-directory "$parts" "$out/fritzing-parts"
54+ mkdir parts
55+ cp -a ${parts}/* parts/
7056 '';
7157
7258 postFixup = ''
7359 # generate the parts.db file
74− QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out"
60+ QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \
61+ -db "$out/share/fritzing/parts/parts.db" \
62+ -pp "$out/fritzing/parts" \
63+ -folder "$out/share/fritzing"
7564 '';
7665
7766 qmakeFlags = [ "phoenix.pro" ];
7867
79− meta = {
68+ meta = with lib; {
8069 description = "An open source prototyping tool for Arduino-based projects";
8170 homepage = "https://fritzing.org/";
82− license = lib.licenses.gpl3;
83− maintainers = [ lib.maintainers.robberer ];
84− platforms = lib.platforms.linux;
71+ license = with licenses; [ gpl3 cc-by-sa-30 ];
72+ maintainers = with maintainers; [ robberer ];
73+ platforms = platforms.linux;
8574 };
8675}
pkgs/applications/science/logic/gappa/default.nix+3−3
@@ -1,11 +1,11 @@
11{ lib, stdenv, fetchurl, gmp, mpfr, boost }:
22
33stdenv.mkDerivation {
4− name = "gappa-1.3.5";
4+ name = "gappa-1.4.0";
55
66 src = fetchurl {
7− url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz";
8− sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w";
7+ url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz";
8+ sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA=";
99 };
1010
1111 buildInputs = [ gmp mpfr boost.dev ];
pkgs/applications/version-management/git-and-tools/git/default.nix+1−1
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
7878 ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
7979
8080 # required to support pthread_cancel()
81− NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
81+ NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
8282 + lib.optionalString (stdenv.isFreeBSD) "-lthr";
8383
8484 configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
pkgs/applications/version-management/rcs/default.nix+11−45
@@ -1,55 +1,21 @@
1−{ lib, stdenv, fetchurl, fetchpatch, ed }:
1+{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
22
33stdenv.mkDerivation rec {
4− name = "rcs-5.9.4";
4+ pname = "rcs";
5+ version = "5.10.0";
56
67 src = fetchurl {
7− url = "mirror://gnu/rcs/${name}.tar.xz";
8− sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
8+ url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
9+ sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU";
910 };
1011
11− buildInputs = [ ed ];
12+ ac_cv_path_ED = "${ed}/bin/ed";
13+ DIFF = "${diffutils}/bin/diff";
14+ DIFF3 = "${diffutils}/bin/diff3";
1215
13− patches = lib.optionals stdenv.isDarwin [
14− # This failure appears unrelated to the subject of the test. This
15− # test seems to rely on a bash bug where `test $x -nt $y` ignores
16− # subsecond values in timetamps. This bug has been fixed in Bash
17− # 5, and seemingly doesn't affect Darwin.
18− ./disable-t810.patch
19−
20− (fetchpatch {
21− url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
22− extraPrefix = "";
23− sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
24− })
25−
26− # Expected to appear in the next release
27− (fetchpatch {
28− url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
29− sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
30− })
31− ];
32−
33− doCheck = true;
34−
35− checkFlags = [ "VERBOSE=1" ];
36−
37− checkPhase = ''
38− # If neither LOGNAME or USER are set, rcs will default to
39− # getlogin(), which is unreliable on macOS. It will often return
40− # things like `_spotlight`, or `_mbsetupuser`. macOS sets both
41− # environment variables in user sessions, so this is unlikely to
42− # affect regular usage.
43−
44− export LOGNAME=$(id -un)
45−
46− print_logs_and_fail() {
47− grep -nH -e . -r tests/*.d/{out,err}
48− return 1
49− }
50−
51− make $checkFlags check || print_logs_and_fail
52− '';
16+ disallowedReferences =
17+ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
18+ [ buildPackages.diffutils buildPackages.ed ];
5319
5420 NIX_CFLAGS_COMPILE = "-std=c99";
5521
pkgs/applications/version-management/rcs/disable-t810.patchdeleted−10
@@ -1,10 +0,0 @@
1−--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
2−+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
3−@@ -1372,7 +1372,6 @@
4− t803 \
5− t804 \
6− t805 \
7−- t810 \
8− t900 \
9− t999
10−
pkgs/applications/window-managers/i3/lock-color.nix+2−2
@@ -4,14 +4,14 @@
44}:
55
66stdenv.mkDerivation rec {
7− version = "2.13.c.3";
7+ version = "2.13.c.4";
88 pname = "i3lock-color";
99
1010 src = fetchFromGitHub {
1111 owner = "PandorasFox";
1212 repo = "i3lock-color";
1313 rev = version;
14− sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k";
14+ sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI=";
1515 };
1616
1717 nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/data/fonts/dina/default.nix+26−20
@@ -1,53 +1,59 @@
11{ lib, stdenv, fetchurl, unzip
2−, bdftopcf, mkfontscale, fontforge
2+, bdftopcf, mkfontscale, fonttosfnt
33}:
44
55stdenv.mkDerivation {
66 pname = "dina-font";
77 version = "2.92";
88
9+ outputs = [ "out" "bdf" ];
10+
911 src = fetchurl {
1012 url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
1113 sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
1214 };
1315
1416 nativeBuildInputs =
15− [ unzip bdftopcf mkfontscale fontforge ];
17+ [ unzip bdftopcf mkfontscale fonttosfnt ];
1618
17− patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
19+ postPatch = ''
20+ sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
21+ '';
1822
1923 buildPhase = ''
24+ runHook preBuild
25+
2026 newName() {
21− test "''${1:5:1}" = i && _it=Italic || _it=
22− case ''${1:6:3} in
23− 400) test -z $it && _weight=Medium ;;
24− 700) _weight=Bold ;;
25− esac
26− _pt=''${1%.bdf}
27− _pt=''${_pt#*-}
28− echo "Dina$_weight$_it$_pt"
27+ test "''${1:5:1}" = i && _it=Italic || _it=
28+ case ''${1:6:3} in
29+ 400) test -z $it && _weight=Medium ;;
30+ 700) _weight=Bold ;;
31+ esac
32+ _pt=''${1%.bdf}
33+ _pt=''${_pt#*-}
34+ echo "Dina$_weight$_it$_pt"
2935 }
3036
31− # convert bdf fonts to pcf
32− for i in *.bdf; do
33− bdftopcf -t -o $(newName "$i").pcf "$i"
37+ for f in *.bdf; do
38+ name=$(newName "$f")
39+ bdftopcf -t -o "$name.pcf" "$f"
40+ fonttosfnt -v -o "$name.otb" "$f"
3441 done
3542 gzip -n -9 *.pcf
3643
37− # convert bdf fonts to otb
38− for i in *.bdf; do
39− fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")"
40− done
44+ runHook postBuild
4145 '';
4246
4347 installPhase = ''
48+ runHook preInstall
49+
4450 install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb
4551 install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
4652 mkfontdir "$out/share/fonts/misc"
4753 mkfontdir "$bdf/share/fonts/misc"
48− '';
4954
50− outputs = [ "out" "bdf" ];
55+ runHook postInstall
56+ '';
5157
5258 meta = with lib; {
5359 description = "A monospace bitmap font aimed at programmers";
pkgs/data/fonts/spleen/default.nix+2−2
@@ -2,7 +2,7 @@
22
33let
44 pname = "spleen";
5− version = "1.9.0";
5+ version = "1.9.1";
66in fetchurl {
77 name = "${pname}-${version}";
88 url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -19,7 +19,7 @@ in fetchurl {
1919 # create fonts.dir so NixOS xorg module adds to fp
2020 ${mkfontscale}/bin/mkfontdir "$d"
2121 '';
22− sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM=";
22+ sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";
2323
2424 meta = with lib; {
2525 description = "Monospaced bitmap fonts";
pkgs/development/compilers/jetbrains-jdk/default.nix+1−2
@@ -24,9 +24,8 @@ openjdk11.overrideAttrs (oldAttrs: rec {
2424 your own risk.
2525 '';
2626 homepage = "https://bintray.com/jetbrains/intellij-jdk/";
27− license = licenses.gpl2;
27+ inherit (openjdk11.meta) license platforms mainProgram;
2828 maintainers = with maintainers; [ edwtjo petabyteboy ];
29− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
3029 };
3130 passthru = oldAttrs.passthru // {
3231 home = "${jetbrains.jdk}/lib/openjdk";
pkgs/development/compilers/kotlin/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "kotlin";
5− version = "1.5.0";
5+ version = "1.5.10";
66
77 src = fetchurl {
88 url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
9− sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3";
9+ sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g";
1010 };
1111
1212 propagatedBuildInputs = [ jre ] ;
pkgs/development/compilers/openjdk/11.nix+1−8
@@ -136,14 +136,7 @@ let
136136
137137 disallowedReferences = [ openjdk11-bootstrap ];
138138
139− meta = with lib; {
140− homepage = "http://openjdk.java.net/";
141− license = licenses.gpl2;
142− description = "The open-source Java Development Kit";
143− maintainers = with maintainers; [ edwtjo asbachb ];
144− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
145− mainProgram = "java";
146− };
139+ meta = import ./meta.nix lib;
147140
148141 passthru = {
149142 architecture = "";
pkgs/development/compilers/openjdk/12.nix+1−8
@@ -145,14 +145,7 @@ let
145145
146146 disallowedReferences = [ openjdk11 ];
147147
148− meta = with lib; {
149− homepage = "http://openjdk.java.net/";
150− license = licenses.gpl2;
151− description = "The open-source Java Development Kit";
152− maintainers = with maintainers; [ edwtjo ];
153− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
154− mainProgram = "java";
155− };
148+ meta = import ./meta.nix lib;
156149
157150 passthru = {
158151 architecture = "";
pkgs/development/compilers/openjdk/13.nix+1−8
@@ -145,14 +145,7 @@ let
145145
146146 disallowedReferences = [ openjdk13-bootstrap ];
147147
148− meta = with lib; {
149− homepage = "http://openjdk.java.net/";
150− license = licenses.gpl2;
151− description = "The open-source Java Development Kit";
152− maintainers = with maintainers; [ edwtjo ];
153− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
154− mainProgram = "java";
155− };
148+ meta = import ./meta.nix lib;
156149
157150 passthru = {
158151 architecture = "";
pkgs/development/compilers/openjdk/14.nix+1−8
@@ -141,14 +141,7 @@ let
141141
142142 disallowedReferences = [ openjdk14-bootstrap ];
143143
144− meta = with lib; {
145− homepage = "https://openjdk.java.net/";
146− license = licenses.gpl2;
147− description = "The open-source Java Development Kit";
148− maintainers = with maintainers; [ edwtjo ];
149− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
150− mainProgram = "java";
151− };
144+ meta = import ./meta.nix lib;
152145
153146 passthru = {
154147 architecture = "";
pkgs/development/compilers/openjdk/15.nix+1−8
@@ -141,14 +141,7 @@ let
141141
142142 disallowedReferences = [ openjdk15-bootstrap ];
143143
144− meta = with lib; {
145− homepage = "https://openjdk.java.net/";
146− license = licenses.gpl2;
147− description = "The open-source Java Development Kit";
148− maintainers = with maintainers; [ edwtjo ];
149− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
150− mainProgram = "java";
151− };
144+ meta = import ./meta.nix lib;
152145
153146 passthru = {
154147 architecture = "";
pkgs/development/compilers/openjdk/16.nix+1−8
@@ -147,14 +147,7 @@ let
147147
148148 disallowedReferences = [ openjdk16-bootstrap ];
149149
150− meta = with lib; {
151− homepage = "https://openjdk.java.net/";
152− license = licenses.gpl2;
153− description = "The open-source Java Development Kit";
154− maintainers = with maintainers; [ edwtjo ];
155− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
156− mainProgram = "java";
157− };
150+ meta = import ./meta.nix lib;
158151
159152 passthru = {
160153 architecture = "";
pkgs/development/compilers/openjdk/darwin/11.nix+1−5
@@ -69,10 +69,6 @@ let
6969 home = jdk;
7070 };
7171
72− meta = with lib; {
73− license = licenses.gpl2;
74− platforms = platforms.darwin;
75− };
76−
72+ meta = import ./meta.nix lib;
7773 };
7874in jdk
pkgs/development/compilers/openjdk/darwin/8.nix+1−5
@@ -73,10 +73,6 @@ let
7373 home = jdk;
7474 };
7575
76− meta = with lib; {
77− license = licenses.gpl2;
78− platforms = platforms.darwin;
79− };
80−
76+ meta = import ./meta.nix lib;
8177 };
8278in jdk
pkgs/development/compilers/openjdk/darwin/default.nix+1−5
@@ -69,10 +69,6 @@ let
6969 home = jdk;
7070 };
7171
72− meta = with lib; {
73− license = licenses.gpl2;
74− platforms = platforms.darwin;
75− };
76−
72+ meta = import ./meta.nix lib;
7773 };
7874in jdk
pkgs/development/compilers/openjdk/darwin/meta.nixnew file+4
@@ -0,0 +1,4 @@
1+lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // {
2+ platforms = lib.platforms.darwin;
3+ homepage = "https://www.azul.com/";
4+}
pkgs/development/compilers/openjdk/meta.nixnew file+8
@@ -0,0 +1,8 @@
1+lib: with lib; {
2+ homepage = "https://openjdk.java.net/";
3+ license = licenses.gpl2Only;
4+ description = "The open-source Java Development Kit";
5+ maintainers = with maintainers; [ edwtjo asbachb ];
6+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
7+ mainProgram = "java";
8+}
pkgs/development/interpreters/janet/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "janet";
5− version = "1.16.0";
5+ version = "1.16.1";
66
77 src = fetchFromGitHub {
88 owner = "janet-lang";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems=";
11+ sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg=";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja ];
pkgs/development/interpreters/jruby/default.nix+2−2
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
66jruby = stdenv.mkDerivation rec {
77 pname = "jruby";
88
9− version = "9.2.17.0";
9+ version = "9.2.18.0";
1010
1111 src = fetchurl {
1212 url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
13− sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI=";
13+ sha256 = "sha256-QlpclwptkYrlMSdYUGNNEhaeNVd1SyuBf7+3mHoywac=";
1414 };
1515
1616 nativeBuildInputs = [ makeWrapper ];
pkgs/development/interpreters/rakudo/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "rakudo";
5− version = "2021.02.1";
5+ version = "2021.05";
66
77 src = fetchurl {
88 url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
9− sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
9+ sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk";
1010 };
1111
1212 buildInputs = [ icu zlib gmp perl ];
pkgs/development/interpreters/rakudo/moarvm.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "moarvm";
6− version = "2021.02";
6+ version = "2021.05";
77
88 src = fetchurl {
99 url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
10− sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
10+ sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i";
1111 };
1212
1313 buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
pkgs/development/interpreters/rakudo/nqp.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "nqp";
5− version = "2021.02";
5+ version = "2021.05";
66
77 src = fetchurl {
88 url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
9− sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
9+ sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l";
1010 };
1111
1212 buildInputs = [ perl ];
pkgs/development/libraries/alembic/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec
44{
55 pname = "alembic";
6− version = "1.8.1";
6+ version = "1.8.2";
77
88 src = fetchFromGitHub {
99 owner = "alembic";
1010 repo = "alembic";
1111 rev = version;
12− sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo=";
12+ sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo=";
1313 };
1414
1515 outputs = [ "bin" "dev" "out" "lib" ];
pkgs/development/libraries/gensio/default.nix+2−2
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 pname = "gensio";
11− version = "2.2.5";
11+ version = "2.2.7";
1212
1313 src = fetchFromGitHub {
1414 owner = "cminyard";
1515 repo = pname;
1616 rev = "v${version}";
17− sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s=";
17+ sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g=";
1818 };
1919
2020 passthru = {
pkgs/development/libraries/goffice/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "goffice";
6− version = "0.10.49";
6+ version = "0.10.50";
77
88 outputs = [ "out" "dev" "devdoc" ];
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
12+ sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w=";
1313 };
1414
1515 nativeBuildInputs = [ pkg-config intltool ];
pkgs/development/libraries/leatherman/default.nix+2−2
@@ -2,10 +2,10 @@
22
33stdenv.mkDerivation rec {
44 pname = "leatherman";
5− version = "1.12.4";
5+ version = "1.12.5";
66
77 src = fetchFromGitHub {
8− sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU=";
8+ sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4=";
99 rev = version;
1010 repo = "leatherman";
1111 owner = "puppetlabs";
pkgs/development/libraries/libwpe/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "libwpe";
13− version = "1.10.0";
13+ version = "1.10.1";
1414
1515 src = fetchurl {
1616 url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
17− sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0=";
17+ sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA=";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/development/libraries/zimlib/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "zimlib";
14− version = "6.3.0";
14+ version = "6.3.2";
1515
1616 src = fetchFromGitHub {
1717 owner = "openzim";
1818 repo = "libzim";
1919 rev = version;
20− sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s";
20+ sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI=";
2121 };
2222
2323 nativeBuildInputs = [
pkgs/development/python-modules/foxdot/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "FoxDot";
5− version = "0.8.11";
5+ version = "0.8.12";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb";
9+ sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
1010 };
1111
1212 propagatedBuildInputs = [ tkinter supercollider ];
pkgs/development/python-modules/pybids/default.nix+2−2
@@ -14,12 +14,12 @@
1414}:
1515
1616buildPythonPackage rec {
17− version = "0.13";
17+ version = "0.13.1";
1818 pname = "pybids";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "sha256-zVFaGAKgTP9UiUdmO4+Tut8Qc64xuGyB26cQLRHOqYw=";
22+ sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o=";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/tools/parsing/byacc/default.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 pname = "byacc";
5− version = "20210109";
5+ version = "20210520";
66
77 src = fetchurl {
88 urls = [
99 "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
1010 "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
1111 ];
12− sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c=";
12+ sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4=";
1313 };
1414
1515 configureFlags = [
pkgs/development/tools/rust/bindgen/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
1+{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin
22, runtimeShell
33, bash
44}:
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
1919 cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw";
2020
2121 #for substituteAll
22− libclang = llvmPackages.libclang.lib;
22+ libclang = llvmPackages_latest.libclang.lib;
2323 inherit bash;
2424
2525 buildInputs = [ libclang ];
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "dwarf-therapist";
6− version = "41.1.5";
6+ version = "41.2.2";
77
88 src = fetchFromGitHub {
99 owner = "Dwarf-Therapist";
1010 repo = "Dwarf-Therapist";
1111 rev = "v${version}";
12− sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4";
12+ sha256 = "sha256-zsEG68ioSw64UfmqlTLO1i5sObg8C4zxvdPxdQGMhhU=";
1313 };
1414
1515 nativeBuildInputs = [ texlive cmake ninja ];
pkgs/misc/emulators/ppsspp/default.nix+10
@@ -1,5 +1,6 @@
11{ mkDerivation
22, fetchFromGitHub
3+, fetchpatch
34, SDL2
45, cmake
56, ffmpeg
@@ -26,6 +27,15 @@ mkDerivation rec {
2627 sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
2728 };
2829
30+ patches = [
31+ # fix compability with ffmpeg 4.4, remove on next release after 1.11
32+ (fetchpatch {
33+ name = "fix_ffmpeg_4.4.patch";
34+ url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch";
35+ sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo=";
36+ })
37+ ];
38+
2939 postPatch = ''
3040 substituteInPlace git-version.cmake --replace unknown ${src.rev}
3141 substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
pkgs/misc/vim-plugins/generated.nix+18−6
@@ -714,12 +714,12 @@ final: prev:
714714
715715 completion-nvim = buildVimPluginFrom2Nix {
716716 pname = "completion-nvim";
717− version = "2021-06-01";
717+ version = "2021-06-16";
718718 src = fetchFromGitHub {
719719 owner = "nvim-lua";
720720 repo = "completion-nvim";
721− rev = "c8db953a8e9f4bc8183e31831297cf84d6f521b8";
722− sha256 = "0p35msrh7g100ayl0g8285q43v20n6hlv1grdb0rmw8sil0j881a";
721+ rev = "d62fff879b29fa1ce915887a75305af0fff57d32";
722+ sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20";
723723 };
724724 meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
725725 };
@@ -3336,12 +3336,12 @@ final: prev:
33363336
33373337 nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
33383338 pname = "nvcode-color-schemes-vim";
3339− version = "2021-06-02";
3339+ version = "2021-06-16";
33403340 src = fetchFromGitHub {
33413341 owner = "ChristianChiarulli";
33423342 repo = "nvcode-color-schemes.vim";
3343− rev = "7c85366c9d457ed0e3c3532ee312307476afbbdc";
3344− sha256 = "02hxjwi8g07zhx6xagma5m3sa0j4ljg79377zfn2vy4snnib452p";
3343+ rev = "2afb852177a28e579c1348033dbc043a99ca6dc7";
3344+ sha256 = "1aghwwcwsh4dka8jwq254pdb9l9c193iwnax9ab8s0zzcyk0x4bq";
33453345 };
33463346 meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
33473347 };
@@ -4512,6 +4512,18 @@ final: prev:
45124512 meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
45134513 };
45144514
4515+ snap = buildVimPluginFrom2Nix {
4516+ pname = "snap";
4517+ version = "2021-06-16";
4518+ src = fetchFromGitHub {
4519+ owner = "camspiers";
4520+ repo = "snap";
4521+ rev = "8628478288bb64ed59989910e736879054facda3";
4522+ sha256 = "0sq7wv07hckk8qfg39qv507i33vg1c6nr5gjrjl5126i1h5afa8j";
4523+ };
4524+ meta.homepage = "https://github.com/camspiers/snap/";
4525+ };
4526+
45154527 snippets-nvim = buildVimPluginFrom2Nix {
45164528 pname = "snippets-nvim";
45174529 version = "2020-09-09";
pkgs/misc/vim-plugins/overrides.nix+12
@@ -755,6 +755,10 @@ self: super: {
755755 dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
756756 });
757757
758+ vim-speeddating = super.vim-speeddating.overrideAttrs (old: {
759+ dependencies = with self; [ vim-repeat ];
760+ });
761+
758762 vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
759763 postPatch = old.postPatch or "" + ''
760764 substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \
@@ -763,6 +767,14 @@ self: super: {
763767 '';
764768 });
765769
770+ vim-surround = super.vim-surround.overrideAttrs (old: {
771+ dependencies = with self; [ vim-repeat ];
772+ });
773+
774+ vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: {
775+ dependencies = with self; [ vim-repeat ];
776+ });
777+
766778 vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
767779 buildInputs = [ python ];
768780 });
pkgs/misc/vim-plugins/vim-plugin-names+1
@@ -47,6 +47,7 @@ bronson/vim-trailing-whitespace
4747brooth/far.vim
4848buoto/gotests-vim
4949camspiers/lens.vim
50+camspiers/snap@main
5051carlitux/deoplete-ternjs
5152ccarpita/rtorrent-syntax-file
5253cespare/vim-toml
pkgs/servers/home-assistant/default.nix+1−2
@@ -192,8 +192,6 @@ in with py.pkgs; buildPythonApplication rec {
192192 # don't try and fail to strip 6600+ python files, it takes minutes!
193193 dontStrip = true;
194194
195− inherit availableComponents;
196−
197195 # PyPI tarball is missing tests/ directory
198196 src = fetchFromGitHub {
199197 owner = "home-assistant";
@@ -805,6 +803,7 @@ in with py.pkgs; buildPythonApplication rec {
805803 '';
806804
807805 passthru = {
806+ inherit availableComponents;
808807 python = py;
809808 tests = {
810809 inherit (nixosTests) home-assistant;
pkgs/servers/hqplayerd/default.nix+12−7
@@ -16,11 +16,13 @@
1616
1717stdenv.mkDerivation rec {
1818 pname = "hqplayerd";
19− version = "4.24.0-61";
19+ version = "4.24.1-62";
2020
2121 src = fetchurl {
22+ # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
23+ # c.f. https://github.com/NixOS/nixpkgs/pull/111616
2224 url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
23− sha256 = "sha256-VouqkWRu9lcbCQNmXJayrsZZnhvM5xEZlUyBEkURBOQ=";
25+ sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
2426 };
2527
2628 unpackPhase = ''
@@ -45,6 +47,8 @@ stdenv.mkDerivation rec {
4547 dontBuild = true;
4648
4749 installPhase = ''
50+ runHook preInstall
51+
4852 # main executable
4953 mkdir -p $out/bin
5054 cp ./usr/bin/hqplayerd $out/bin
@@ -62,12 +66,14 @@ stdenv.mkDerivation rec {
6266 cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system
6367
6468 # documentation
65− mkdir -p $out/share/doc/${pname}
66− cp ./usr/share/doc/${pname}/* $out/share/doc/${pname}
69+ mkdir -p $out/share/doc/hqplayerd
70+ cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd
6771
6872 # misc service support files
69− mkdir -p $out/var/lib/${pname}
70− cp -r ./var/hqplayer/web $out/var/lib/${pname}
73+ mkdir -p $out/var/lib/hqplayerd
74+ cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
75+
76+ runHook postInstall
7177 '';
7278
7379 postInstall = ''
@@ -82,7 +88,6 @@ stdenv.mkDerivation rec {
8288 meta = with lib; {
8389 homepage = "https://www.signalyst.com/custom.html";
8490 description = "High-end upsampling multichannel software embedded HD-audio player";
85− changelog = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.changes";
8691 license = licenses.unfree;
8792 maintainers = with maintainers; [ lovesegfault ];
8893 };
pkgs/servers/jackett/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "jackett";
5− version = "0.18.231";
5+ version = "0.18.234";
66
77 src = fetchurl {
88 url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
9− sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4=";
9+ sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8=";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/servers/ldap/389/default.nix+120−32
@@ -1,32 +1,107 @@
1−{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
2−, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3
1+{ stdenv
2+, autoreconfHook
3+, fetchFromGitHub
4+, lib
5+
6+, bzip2
7+, cmocka
8+, cracklib
9+, cyrus_sasl
10+, db
11+, doxygen
12+, icu
13+, libevent
14+, libkrb5
15+, lm_sensors
16+, net-snmp
17+, nspr
18+, nss
19+, openldap
20+, openssl
21+, pcre
22+, perl
23+, perlPackages
24+, pkg-config
25+, python3
26+, svrcore
27+, zlib
28+
29+, enablePamPassthru ? true
30+, pam
31+
32+, enableCockpit ? true
33+, rsync
34+
35+, enableDna ? true
36+, enableLdapi ? true
37+, enableAutobind ? false
38+, enableAutoDnSuffix ? false
39+, enableBitwise ? true
40+, enableAcctPolicy ? true
41+, enablePosixWinsync ? true
342}:
443
544stdenv.mkDerivation rec {
645 pname = "389-ds-base";
7− version = "1.3.9.1";
46+ version = "2.0.5";
847
9− src = fetchurl {
10− url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
11− sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6";
48+ src = fetchFromGitHub {
49+ owner = "389ds";
50+ repo = pname;
51+ rev = "${pname}-${version}";
52+ sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8=";
1253 };
1354
1455 nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
56+
1557 buildInputs = [
16− perl pam nspr nss openldap db cyrus_sasl svrcore icu
17− net-snmp libkrb5 pcre libevent openssl python3
18− ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
19−
20− patches = [
21− (fetchpatch {
22− name = "389-ds-nss.patch";
23− url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9";
24− sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk";
25− })
26− ];
58+ bzip2
59+ cracklib
60+ cyrus_sasl
61+ db
62+ icu
63+ libevent
64+ libkrb5
65+ lm_sensors
66+ net-snmp
67+ nspr
68+ nss
69+ openldap
70+ openssl
71+ pcre
72+ perl
73+ python3
74+ svrcore
75+ zlib
76+
77+ # tests
78+ cmocka
79+ libevent
80+
81+ # lib389
82+ (python3.withPackages (ps: with ps; [
83+ setuptools
84+ ldap
85+ six
86+ pyasn1
87+ pyasn1-modules
88+ dateutil
89+ argcomplete
90+ libselinux
91+ ]))
92+
93+ # logconv.pl
94+ perlPackages.DBFile
95+ perlPackages.ArchiveTar
96+ ]
97+ ++ lib.optional enableCockpit rsync
98+ ++ lib.optional enablePamPassthru pam;
99+
27100 postPatch = ''
28101 substituteInPlace Makefile.am \
29102 --replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g'
103+
104+ patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py
30105 '';
31106
32107 preConfigure = ''
@@ -38,21 +113,37 @@ stdenv.mkDerivation rec {
38113 export PERLPATH
39114 '';
40115
41− configureFlags = [
42− "--sysconfdir=/etc"
43− "--localstatedir=/var"
44− "--with-openldap"
45− "--with-db"
46− "--with-db-inc=${db.dev}/include"
47− "--with-db-lib=${db.out}/lib"
48− "--with-sasl=${cyrus_sasl.dev}"
49− "--with-netsnmp=yes"
50− "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
51− "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
52− ];
116+ configureFlags =
117+ let
118+ mkEnable = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
119+ in
120+ [
121+ "--enable-cmocka"
122+ "--localstatedir=/var"
123+ "--sysconfdir=/etc"
124+ "--with-db-inc=${db.dev}/include"
125+ "--with-db-lib=${db.out}/lib"
126+ "--with-db=yes"
127+ "--with-netsnmp-inc=${lib.getDev net-snmp}/include"
128+ "--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
129+ "--with-netsnmp=yes"
130+ "--with-openldap"
131+
132+ "${mkEnable enableCockpit "cockpit"}"
133+ "${mkEnable enablePamPassthru "pam-passthru"}"
134+ "${mkEnable enableDna "dna"}"
135+ "${mkEnable enableLdapi "ldapi"}"
136+ "${mkEnable enableAutobind "autobind"}"
137+ "${mkEnable enableAutoDnSuffix "auto-dn-suffix"}"
138+ "${mkEnable enableBitwise "bitwise"}"
139+ "${mkEnable enableAcctPolicy "acctpolicy"}"
140+ "${mkEnable enablePosixWinsync "posix-winsync"}"
141+ ];
53142
54143 enableParallelBuilding = true;
55144
145+ doCheck = true;
146+
56147 installFlags = [
57148 "sysconfdir=${placeholder "out"}/etc"
58149 "localstatedir=${placeholder "TMPDIR"}"
@@ -65,8 +156,5 @@ stdenv.mkDerivation rec {
65156 description = "Enterprise-class Open Source LDAP server for Linux";
66157 license = licenses.gpl3Plus;
67158 platforms = platforms.linux;
68− knownVulnerabilities = [
69− "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514
70− ];
71159 };
72160}
pkgs/servers/mail/postfix/default.nix+2−2
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
2626
2727 pname = "postfix";
2828
29− version = "3.6.0";
29+ version = "3.6.1";
3030
3131 src = fetchurl {
3232 url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
33− sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4=";
33+ sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw=";
3434 };
3535
3636 nativeBuildInputs = [ makeWrapper m4 ];
pkgs/tools/backup/mastodon-archive/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ lib
2+, fetchFromGitHub
3+, python3
4+}:
5+
6+python3.pkgs.buildPythonApplication rec {
7+ pname = "mastodon-archive";
8+ version = "1.3.1";
9+
10+ src = fetchFromGitHub {
11+ owner = "kensanata";
12+ repo = "mastodon-backup";
13+ rev = "v${version}";
14+ sha256 = "1dlrkygywxwm6xbn0pnfwd3f7641wnvxdyb5qihbsf62w1w08x8r";
15+ };
16+
17+ propagatedBuildInputs = with python3.pkgs; [
18+ html2text
19+ mastodon-py
20+ progress
21+ ];
22+
23+ # There is no test
24+ doCheck = false;
25+
26+ meta = with lib; {
27+ description = "Utility for backing up your Mastodon content";
28+ homepage = "https://alexschroeder.ch/software/Mastodon_Archive";
29+ license = licenses.gpl3Plus;
30+ maintainers = with maintainers; [ julm ];
31+ };
32+}
pkgs/tools/bluetooth/bluez-alsa/default.nix+2−2
@@ -13,13 +13,13 @@ with lib;
1313
1414stdenv.mkDerivation rec {
1515 pname = "bluez-alsa";
16− version = "3.0.0";
16+ version = "3.1.0";
1717
1818 src = fetchFromGitHub {
1919 owner = "Arkq";
2020 repo = "bluez-alsa";
2121 rev = "v${version}";
22− sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
22+ sha256 = "sha256-bohc/0hUr1mcV2JbFy71TjY8MXOU3oBBPCcupgkWsWY=";
2323 };
2424
2525 nativeBuildInputs = [ pkg-config autoreconfHook ];
pkgs/tools/filesystems/gcsfuse/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "gcsfuse";
5− version = "0.35.0";
5+ version = "0.35.1";
66
77 src = fetchFromGitHub {
88 owner = "googlecloudplatform";
99 repo = "gcsfuse";
1010 rev = "v${version}";
11− sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564=";
11+ sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM=";
1212 };
1313
1414 goPackagePath = "github.com/googlecloudplatform/gcsfuse";
pkgs/tools/misc/esphome/dashboard.nixnew file+20
@@ -0,0 +1,20 @@
1+{ lib
2+, python3
3+}:
4+
5+with python3.pkgs; buildPythonPackage rec {
6+ pname = "esphome-dashboard";
7+ version = "20210615.0";
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9";
12+ };
13+
14+ meta = with lib; {
15+ description = "ESPHome dashboard";
16+ homepage = "https://esphome.io/";
17+ license = with licenses; [ asl20 ];
18+ maintainers = with maintainers; [ hexa ];
19+ };
20+}
pkgs/tools/misc/esphome/default.nix+12−2
@@ -1,4 +1,5 @@
11{ lib
2+, pkgs
23, python3
34, fetchFromGitHub
45, platformio
@@ -6,15 +7,18 @@
67, git
78}:
89
10+let
11+ esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
12+in
913python3.pkgs.buildPythonApplication rec {
1014 pname = "esphome";
11− version = "1.18.0";
15+ version = "1.19.0";
1216
1317 src = fetchFromGitHub {
1418 owner = pname;
1519 repo = pname;
1620 rev = "v${version}";
17− sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq";
21+ sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi";
1822 };
1923
2024 postPatch = ''
@@ -44,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
4448 click
4549 colorama
4650 cryptography
51+ esphome-dashboard
4752 ifaddr
4853 paho-mqtt
4954 pillow
@@ -66,6 +71,7 @@ python3.pkgs.buildPythonApplication rec {
6671 checkInputs = with python3.pkgs; [
6772 hypothesis
6873 mock
74+ pytest-asyncio
6975 pytest-mock
7076 pytest-sugar
7177 pytestCheckHook
@@ -75,6 +81,10 @@ python3.pkgs.buildPythonApplication rec {
7581 $out/bin/esphome --help > /dev/null
7682 '';
7783
84+ passthru = {
85+ dashboard = esphome-dashboard;
86+ };
87+
7888 meta = with lib; {
7989 description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
8090 homepage = "https://esphome.io/";
pkgs/tools/misc/vivid/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "vivid";
5− version = "0.6.0";
5+ version = "0.7.0";
66
77 src = fetchFromGitHub {
88 owner = "sharkdp";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla";
11+ sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA=";
1212 };
1313
14− cargoSha256 = "1sn1cq3kaswnz2z9q5h84qipp64ha7jv5kix31lm7v6nam0f5awz";
14+ cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg=";
1515
1616 meta = with lib; {
1717 description = "A generator for LS_COLORS with support for multiple color themes";
pkgs/tools/networking/croc/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "croc";
5− version = "9.1.5";
5+ version = "9.1.6";
66
77 src = fetchFromGitHub {
88 owner = "schollz";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc=";
11+ sha256 = "sha256-FMx2Siw1J7UKtuwLcSkgMhs4Dl0erQcRb5FGkq2hFv0=";
1212 };
1313
14− vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4=";
14+ vendorSha256 = "sha256-tPBPmZLcBR16RxqvL3UYlIAwK8IeV+DYkRrVOgBkm58=";
1515
1616 doCheck = false;
1717
pkgs/tools/networking/croc/test-local-relay.nix+1−2
@@ -12,8 +12,7 @@ stdenv.mkDerivation {
1212 ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
1313 # wait for things to settle
1414 sleep 1
15− # receive, as of croc 9 --overwrite is required for noninteractive use
16− MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
15+ MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
1716 # compare
1817 [ "$MSG" = "$MSG2" ] && touch $out
1918 '';
pkgs/top-level/all-packages.nix+4
@@ -13671,6 +13671,8 @@ in
1367113671
1367213672 massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
1367313673
13674+ mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
13675+
1367413676 maven = maven3;
1367513677 maven3 = callPackage ../development/tools/build-managers/apache-maven { };
1367613678
@@ -31343,6 +31345,8 @@ in
3134331345
3134431346 urbit = callPackage ../misc/urbit { };
3134531347
31348+ usql = callPackage ../applications/misc/usql { };
31349+
3134631350 utf8cpp = callPackage ../development/libraries/utf8cpp { };
3134731351
3134831352 utf8proc = callPackage ../development/libraries/utf8proc { };