git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115306 from SuperSandro2000/fix-collection22
commit1aae00a12f66355ec02199a37da5004f50dd0e7a authorSandro <sandro.jaeckel@gmail.com> dateSun 7 Mar 2021, 15:58 (6 years ago) parent1875033473906d
11 files changed+88−110
pkgs/applications/kde/ark/default.nix+18−21 pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix+1−2 pkgs/development/libraries/kde-frameworks/kguiaddons.nix+10−8 pkgs/development/python-modules/alot/default.nix+4−6 pkgs/development/python-modules/crate/default.nix+3 pkgs/development/python-modules/googleapis-common-protos/default.nix−1 pkgs/development/python-modules/shap/default.nix+2 pkgs/development/tools/parsing/tree-sitter/default.nix+3−4 pkgs/tools/audio/beets/default.nix+31−50 pkgs/tools/misc/lorri/default.nix+13−16 pkgs/tools/security/hashdeep/default.nix+3−2
pkgs/applications/kde/ark/default.nix+18−21
@@ -1,18 +1,12 @@
1−{
2− mkDerivation, lib, config,
3−
4− extra-cmake-modules, kdoctools,
5−
6− breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n,
7− kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons,
8−
9− libarchive, libzip,
10−
11− # Archive tools
12− p7zip, lrzip,
13−
14− # Unfree tools
15− unfreeEnableUnrar ? false, unrar,
1+{ mkDerivation, lib, config
2+, extra-cmake-modules, kdoctools
3+, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
4+, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
5+, libarchive, libzip
6+# Archive tools
7+, p7zip, lrzip
8+# Unfree tools
9+, unfreeEnableUnrar ? false, unrar
1610}:
1711
1812let
@@ -21,20 +15,23 @@ in
2115
2216mkDerivation {
2317 pname = "ark";
24− meta = {
25− description = "Graphical file compression/decompression utility";
26− license = with lib.licenses;
27− [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
28− maintainers = [ lib.maintainers.ttuegel ];
29− };
3018
3119 outputs = [ "out" "dev" ];
20+
3221 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
22+
3323 buildInputs = [ libarchive libzip ] ++ extraTools;
24+
3425 propagatedBuildInputs = [
3526 breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
3627 kitemmodels kparts kpty kservice kwidgetsaddons
3728 ];
3829
3930 qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
31+
32+ meta = with lib; {
33+ description = "Graphical file compression/decompression utility";
34+ license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;
35+ maintainers = [ maintainers.ttuegel ];
36+ };
4037}
pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix+1−2
@@ -6,8 +6,7 @@ let
66 name = "${pname}-${version}";
77
88 src = fetchurl {
9− url =
10− "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
9+ url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
1110 sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
1211 };
1312
pkgs/development/libraries/kde-frameworks/kguiaddons.nix+10−8
@@ -1,17 +1,19 @@
1−{
2− mkDerivation, lib,
3− extra-cmake-modules,
4− qtbase, qtx11extras, wayland,
1+{ mkDerivation, lib
2+, extra-cmake-modules
3+, qtbase, qtx11extras, wayland
54}:
65
76mkDerivation {
87 name = "kguiaddons";
9− meta = {
10− maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
12− };
8+
139 nativeBuildInputs = [ extra-cmake-modules ];
1410 buildInputs = [ qtx11extras wayland ];
1511 propagatedBuildInputs = [ qtbase ];
12+
1613 outputs = [ "out" "dev" ];
14+
15+ meta = with lib; {
16+ maintainers = [ maintainers.ttuegel ];
17+ broken = versionOlder qtbase.version "5.14.0";
18+ };
1719}
pkgs/development/python-modules/alot/default.nix+4−6
@@ -1,9 +1,7 @@
1−{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
1+{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
22, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
3−, service-identity
4−, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
5−, withManpage ? false }:
6−
3+, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
4+}:
75
86buildPythonPackage rec {
97 pname = "alot";
@@ -41,7 +39,7 @@ buildPythonPackage rec {
4139 doCheck = false;
4240 postBuild = lib.optionalString withManpage "make -C docs man";
4341
44− checkInputs = [ awk future mock gnupg procps ];
42+ checkInputs = [ gawk future mock gnupg procps ];
4543
4644 postInstall = let
4745 completionPython = python.withPackages (ps: [ ps.configobj ]);
pkgs/development/python-modules/crate/default.nix+3
@@ -6,6 +6,7 @@
66, isPy3k
77, sqlalchemy
88, pytestCheckHook
9+, stdenv
910}:
1011
1112buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
2829 pytestCheckHook
2930 ];
3031
32+ disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
33+
3134 meta = with lib; {
3235 homepage = "https://github.com/crate/crate-python";
3336 description = "A Python client library for CrateDB";
pkgs/development/python-modules/googleapis-common-protos/default.nix−1
@@ -3,7 +3,6 @@
33, fetchPypi
44, grpc
55, protobuf
6−, pytestCheckHook
76}:
87
98buildPythonPackage rec {
pkgs/development/python-modules/shap/default.nix+2
@@ -66,5 +66,7 @@ buildPythonPackage rec {
6666 license = licenses.mit;
6767 maintainers = with maintainers; [ evax ];
6868 platforms = platforms.unix;
69+ # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest'
70+ broken = true;
6971 };
7072}
pkgs/development/tools/parsing/tree-sitter/default.nix+3−4
@@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage {
108108 };
109109 };
110110
111− meta = {
111+ meta = with lib; {
112112 homepage = "https://github.com/tree-sitter/tree-sitter";
113113 description = "A parser generator tool and an incremental parsing library";
114114 longDescription = ''
@@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage {
122122 * Robust enough to provide useful results even in the presence of syntax errors
123123 * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
124124 '';
125− license = lib.licenses.mit;
126− maintainers = with lib.maintainers; [ Profpatsch ];
125+ license = licenses.mit;
126+ maintainers = with maintainers; [ Profpatsch ];
127127 # Aarch has test failures with how tree-sitter compiles the generated C files
128128 broken = stdenv.isAarch64;
129129 };
130−
131130}
pkgs/tools/audio/beets/default.nix+31−50
@@ -1,24 +1,23 @@
11{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
22, pythonPackages, imagemagick, gobject-introspection, gst_all_1
3−, runtimeShell
4−, unstableGitUpdater
3+, runtimeShell, unstableGitUpdater
54
65# external plugins package set
76, beetsExternalPlugins
87
9−, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
8+, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
109, enableAcousticbrainz ? true
1110, enableAcoustid ? true
12−, enableBadfiles ? true, flac ? null, mp3val ? null
11+, enableBadfiles ? true, flac, mp3val
1312, enableBeatport ? true
1413, enableBpsync ? true
15−, enableConvert ? true, ffmpeg ? null
14+, enableConvert ? true, ffmpeg
1615, enableDeezer ? true
1716, enableDiscogs ? true
1817, enableEmbyupdate ? true
1918, enableFetchart ? true
2019, enableGmusic ? true
21−, enableKeyfinder ? true, keyfinder-cli ? null
20+, enableKeyfinder ? true, keyfinder-cli
2221, enableKodiupdate ? true
2322, enableLastfm ? true
2423, enableLoadext ? true
@@ -33,32 +32,14 @@
3332
3433# External plugins
3534, enableAlternatives ? false
36−, enableCheck ? false, liboggz ? null
35+, enableCheck ? false, liboggz
3736, enableCopyArtifacts ? false
3837, enableExtraFiles ? false
3938
4039, bashInteractive, bash-completion
4140}:
4241
43−assert enableAbsubmit -> essentia-extractor != null;
44−assert enableAcoustid -> pythonPackages.pyacoustid != null;
45−assert enableBadfiles -> flac != null && mp3val != null;
46−assert enableBeatport -> pythonPackages.requests_oauthlib != null;
4742assert enableBpsync -> enableBeatport;
48−assert enableCheck -> flac != null && mp3val != null && liboggz != null;
49−assert enableConvert -> ffmpeg != null;
50−assert enableDiscogs -> pythonPackages.discogs_client != null;
51−assert enableFetchart -> pythonPackages.responses != null;
52−assert enableGmusic -> pythonPackages.gmusicapi != null;
53−assert enableKeyfinder -> keyfinder-cli != null;
54−assert enableLastfm -> pythonPackages.pylast != null;
55−assert enableMpd -> pythonPackages.mpd2 != null;
56−assert enableReplaygain -> ffmpeg != null;
57−assert enableSonosUpdate -> pythonPackages.soco != null;
58−assert enableThumbnails -> pythonPackages.pyxdg != null;
59−assert enableWeb -> pythonPackages.flask != null;
60−
61−with lib;
6243
6344let
6445 optionalPlugins = {
@@ -99,20 +80,20 @@ let
9980 "types" "unimported" "zero"
10081 ];
10182
102− enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
83+ enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
10384
104− allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
85+ allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
10586 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
10687
10788 testShell = "${bashInteractive}/bin/bash --norc";
10889 completion = "${bash-completion}/share/bash-completion/bash_completion";
10990
11091 # This is a stripped down beets for testing of the external plugins.
111− externalTestArgs.beets = (beets.override {
92+ externalTestArgs.beets = (lib.beets.override {
11293 enableAlternatives = false;
11394 enableCopyArtifacts = false;
11495 enableExtraFiles = false;
115− }).overrideAttrs (const {
96+ }).overrideAttrs (lib.const {
11697 doInstallCheck = false;
11798 });
11899
@@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
147128 pythonPackages.confuse
148129 pythonPackages.mediafile
149130 gobject-introspection
150− ] ++ optional enableAbsubmit essentia-extractor
151− ++ optional enableAcoustid pythonPackages.pyacoustid
152− ++ optional enableBeatport pythonPackages.requests_oauthlib
153− ++ optional (enableFetchart
131+ ] ++ lib.optional enableAbsubmit essentia-extractor
132+ ++ lib.optional enableAcoustid pythonPackages.pyacoustid
133+ ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
134+ ++ lib.optional (enableFetchart
154135 || enableDeezer
155136 || enableEmbyupdate
156137 || enableKodiupdate
@@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
160141 || enableSubsonicupdate
161142 || enableAcousticbrainz)
162143 pythonPackages.requests
163− ++ optional enableCheck beetsExternalPlugins.check
164− ++ optional enableConvert ffmpeg
165− ++ optional enableDiscogs pythonPackages.discogs_client
166− ++ optional enableGmusic pythonPackages.gmusicapi
167− ++ optional enableKeyfinder keyfinder-cli
168− ++ optional enableLastfm pythonPackages.pylast
169− ++ optional enableMpd pythonPackages.mpd2
170− ++ optional enableSonosUpdate pythonPackages.soco
171− ++ optional enableThumbnails pythonPackages.pyxdg
172− ++ optional enableWeb pythonPackages.flask
173− ++ optional enableAlternatives beetsExternalPlugins.alternatives
174− ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
175− ++ optional enableExtraFiles beetsExternalPlugins.extrafiles
144+ ++ lib.optional enableCheck beetsExternalPlugins.check
145+ ++ lib.optional enableConvert ffmpeg
146+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
147+ ++ lib.optional enableGmusic pythonPackages.gmusicapi
148+ ++ lib.optional enableKeyfinder keyfinder-cli
149+ ++ lib.optional enableLastfm pythonPackages.pylast
150+ ++ lib.optional enableMpd pythonPackages.mpd2
151+ ++ lib.optional enableSonosUpdate pythonPackages.soco
152+ ++ lib.optional enableThumbnails pythonPackages.pyxdg
153+ ++ lib.optional enableWeb pythonPackages.flask
154+ ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
155+ ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
156+ ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
176157 ;
177158
178159 buildInputs = [
@@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
209190 # bs1770gain, and set the absolute path there, to avoid impurities.
210191 ++ lib.optional enableReplaygain (substituteAll {
211192 src = ./replaygain-default-ffmpeg.patch;
212− ffmpeg = getBin ffmpeg;
193+ ffmpeg = lib.getBin ffmpeg;
213194 })
214195 # Put absolute Nix paths in place
215196 ++ lib.optional enableConvert (substituteAll {
216197 src = ./convert-plugin-ffmpeg-path.patch;
217− ffmpeg = getBin ffmpeg;
198+ ffmpeg = lib.getBin ffmpeg;
218199 })
219200 ++ lib.optional enableBadfiles (substituteAll {
220201 src = ./badfiles-plugin-nix-paths.patch;
@@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
269250 EDITOR="${writeScript "beetconfig.sh" ''
270251 #!${runtimeShell}
271252 cat > "$1" <<CFG
272− plugins: ${concatStringsSep " " allEnabledPlugins}
253+ plugins: ${lib.concatStringsSep " " allEnabledPlugins}
273254 CFG
274255 ''}" HOME="$tmphome" "$out/bin/beet" config -e
275256 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
@@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
285266 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
286267 };
287268
288− meta = {
269+ meta = with lib; {
289270 description = "Music tagger and library organizer";
290271 homepage = "http://beets.io";
291272 license = licenses.mit;
pkgs/tools/misc/lorri/default.nix+13−16
@@ -1,13 +1,11 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, pkgs
4+, rustPackages
35, fetchFromGitHub
46, rustPlatform
5− # Updater script
6−, runtimeShell
77, writers
8− # Tests
98, nixosTests
10− # Apple dependencies
119, CoreServices
1210, Security
1311}:
@@ -23,13 +21,6 @@ in (rustPlatform.buildRustPackage rec {
2321 pname = "lorri";
2422 inherit version;
2523
26− meta = with lib; {
27− description = "Your project's nix-env";
28− homepage = "https://github.com/nix-community/lorri";
29− license = licenses.asl20;
30− maintainers = with maintainers; [ grahamc Profpatsch ];
31− };
32−
3324 src = fetchFromGitHub {
3425 owner = "nix-community";
3526 repo = pname;
@@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec {
4334 doCheck = false;
4435
4536 BUILD_REV_COUNT = src.revCount or 1;
46− RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
37+ RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { };
4738
48− nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
49− buildInputs =
50− lib.optionals stdenv.isDarwin [ CoreServices Security ];
39+ nativeBuildInputs = [ rustPackages.rustfmt ];
40+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
5141
5242 # copy the docs to the $man and $doc outputs
5343 postInstall = ''
@@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec {
7060 nixos = nixosTests.lorri;
7161 };
7262 };
63+
64+ meta = with lib; {
65+ description = "Your project's nix-env";
66+ homepage = "https://github.com/target/lorri";
67+ license = licenses.asl20;
68+ maintainers = with maintainers; [ grahamc Profpatsch ];
69+ };
7370})
pkgs/tools/security/hashdeep/default.nix+3−2
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
1717 description = "A set of cross-platform tools to compute hashes";
1818 homepage = "https://github.com/jessek/hashdeep";
1919 license = licenses.gpl2;
20+ maintainers = [ maintainers.karantan ];
21+ platforms = platforms.all;
2022 # Build fails on Darwin:
2123 # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
2224 # > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
23− platforms = with platforms; linux ++ freebsd ++ openbsd;
24− maintainers = [ maintainers.karantan ];
25+ broken = stdenv.isDarwin;
2526 };
2627}