git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115306 from SuperSandro2000/fix-collection22
1aae00aSandro
pkgs/applications/kde/ark/default.nix+18−21
@@ -1,18 +1,12 @@
1−{
2− mkDerivation, lib, config,
1+{ mkDerivation, lib, config
3−
4− extra-cmake-modules, kdoctools,
2+, extra-cmake-modules, kdoctools
5−
6− breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n,
3+, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
7− kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons,
4+, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
8−
9− libarchive, libzip,
5+, libarchive, libzip
10−
11− # Archive tools
6+# Archive tools
12− p7zip, lrzip,
7+, p7zip, lrzip
13−
14− # Unfree tools
8+# Unfree tools
15− unfreeEnableUnrar ? false, unrar,
9+, unfreeEnableUnrar ? false, unrar
16}:
10}:
17
11
18let
12let
@@ -21,20 +15,23 @@ in
21
15
22mkDerivation {
16mkDerivation {
23 pname = "ark";
17 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− };
30
18
31 outputs = [ "out" "dev" ];
19 outputs = [ "out" "dev" ];
20+
32 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
21 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
22+
33 buildInputs = [ libarchive libzip ] ++ extraTools;
23 buildInputs = [ libarchive libzip ] ++ extraTools;
24+
34 propagatedBuildInputs = [
25 propagatedBuildInputs = [
35 breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
26 breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
36 kitemmodels kparts kpty kservice kwidgetsaddons
27 kitemmodels kparts kpty kservice kwidgetsaddons
37 ];
28 ];
38
29
39 qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
30 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+ };
40}
37}
pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix+1−2
@@ -6,8 +6,7 @@ let
6 name = "${pname}-${version}";
6 name = "${pname}-${version}";
7
7
8 src = fetchurl {
8 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";
11 sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
10 sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
12 };
11 };
13
12
pkgs/development/libraries/kde-frameworks/kguiaddons.nix+10−8
@@ -1,17 +1,19 @@
1−{
2− mkDerivation, lib,
1+{ mkDerivation, lib
3− extra-cmake-modules,
2+, extra-cmake-modules
4− qtbase, qtx11extras, wayland,
3+, qtbase, qtx11extras, wayland
5}:
4}:
6
5
7mkDerivation {
6mkDerivation {
8 name = "kguiaddons";
7 name = "kguiaddons";
9− meta = {
8+
10− maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
12− };
13 nativeBuildInputs = [ extra-cmake-modules ];
9 nativeBuildInputs = [ extra-cmake-modules ];
14 buildInputs = [ qtx11extras wayland ];
10 buildInputs = [ qtx11extras wayland ];
15 propagatedBuildInputs = [ qtbase ];
11 propagatedBuildInputs = [ qtbase ];
12+
16 outputs = [ "out" "dev" ];
13 outputs = [ "out" "dev" ];
14+
15+ meta = with lib; {
16+ maintainers = [ maintainers.ttuegel ];
17+ broken = versionOlder qtbase.version "5.14.0";
18+ };
17}
19}
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
2, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
2, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
3−, service-identity
4−, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
3+, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
5−, withManpage ? false }:
4+}:
6−
7
5
8buildPythonPackage rec {
6buildPythonPackage rec {
9 pname = "alot";
7 pname = "alot";
@@ -41,7 +39,7 @@ buildPythonPackage rec {
41 doCheck = false;
39 doCheck = false;
42 postBuild = lib.optionalString withManpage "make -C docs man";
40 postBuild = lib.optionalString withManpage "make -C docs man";
43
41
44− checkInputs = [ awk future mock gnupg procps ];
42+ checkInputs = [ gawk future mock gnupg procps ];
45
43
46 postInstall = let
44 postInstall = let
47 completionPython = python.withPackages (ps: [ ps.configobj ]);
45 completionPython = python.withPackages (ps: [ ps.configobj ]);
pkgs/development/python-modules/crate/default.nix+3
@@ -6,6 +6,7 @@
6, isPy3k
6, isPy3k
7, sqlalchemy
7, sqlalchemy
8, pytestCheckHook
8, pytestCheckHook
9+, stdenv
9}:
10}:
10
11
11buildPythonPackage rec {
12buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
28 pytestCheckHook
29 pytestCheckHook
29 ];
30 ];
30
31
32+ disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
33+
31 meta = with lib; {
34 meta = with lib; {
32 homepage = "https://github.com/crate/crate-python";
35 homepage = "https://github.com/crate/crate-python";
33 description = "A Python client library for CrateDB";
36 description = "A Python client library for CrateDB";
pkgs/development/python-modules/googleapis-common-protos/default.nix−1
@@ -3,7 +3,6 @@
3, fetchPypi
3, fetchPypi
4, grpc
4, grpc
5, protobuf
5, protobuf
6−, pytestCheckHook
7}:
6}:
8
7
9buildPythonPackage rec {
8buildPythonPackage rec {
pkgs/development/python-modules/shap/default.nix+2
@@ -66,5 +66,7 @@ buildPythonPackage rec {
66 license = licenses.mit;
66 license = licenses.mit;
67 maintainers = with maintainers; [ evax ];
67 maintainers = with maintainers; [ evax ];
68 platforms = platforms.unix;
68 platforms = platforms.unix;
69+ # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest'
70+ broken = true;
69 };
71 };
70}
72}
pkgs/development/tools/parsing/tree-sitter/default.nix+3−4
@@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage {
108 };
108 };
109 };
109 };
110
110
111− meta = {
111+ meta = with lib; {
112 homepage = "https://github.com/tree-sitter/tree-sitter";
112 homepage = "https://github.com/tree-sitter/tree-sitter";
113 description = "A parser generator tool and an incremental parsing library";
113 description = "A parser generator tool and an incremental parsing library";
114 longDescription = ''
114 longDescription = ''
@@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage {
122 * Robust enough to provide useful results even in the presence of syntax errors
122 * Robust enough to provide useful results even in the presence of syntax errors
123 * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
123 * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
124 '';
124 '';
125− license = lib.licenses.mit;
125+ license = licenses.mit;
126− maintainers = with lib.maintainers; [ Profpatsch ];
126+ maintainers = with maintainers; [ Profpatsch ];
127 # Aarch has test failures with how tree-sitter compiles the generated C files
127 # Aarch has test failures with how tree-sitter compiles the generated C files
128 broken = stdenv.isAarch64;
128 broken = stdenv.isAarch64;
129 };
129 };
130−
131}
130}
pkgs/tools/audio/beets/default.nix+31−50
@@ -1,24 +1,23 @@
1{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
1{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
2, pythonPackages, imagemagick, gobject-introspection, gst_all_1
2, pythonPackages, imagemagick, gobject-introspection, gst_all_1
3−, runtimeShell
4−, unstableGitUpdater
3+, runtimeShell, unstableGitUpdater
5
4
6# external plugins package set
5# external plugins package set
7, beetsExternalPlugins
6, beetsExternalPlugins
8
7
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
10, enableAcousticbrainz ? true
9, enableAcousticbrainz ? true
11, enableAcoustid ? true
10, enableAcoustid ? true
12−, enableBadfiles ? true, flac ? null, mp3val ? null
11+, enableBadfiles ? true, flac, mp3val
13, enableBeatport ? true
12, enableBeatport ? true
14, enableBpsync ? true
13, enableBpsync ? true
15−, enableConvert ? true, ffmpeg ? null
14+, enableConvert ? true, ffmpeg
16, enableDeezer ? true
15, enableDeezer ? true
17, enableDiscogs ? true
16, enableDiscogs ? true
18, enableEmbyupdate ? true
17, enableEmbyupdate ? true
19, enableFetchart ? true
18, enableFetchart ? true
20, enableGmusic ? true
19, enableGmusic ? true
21−, enableKeyfinder ? true, keyfinder-cli ? null
20+, enableKeyfinder ? true, keyfinder-cli
22, enableKodiupdate ? true
21, enableKodiupdate ? true
23, enableLastfm ? true
22, enableLastfm ? true
24, enableLoadext ? true
23, enableLoadext ? true
@@ -33,32 +32,14 @@
33
32
34# External plugins
33# External plugins
35, enableAlternatives ? false
34, enableAlternatives ? false
36−, enableCheck ? false, liboggz ? null
35+, enableCheck ? false, liboggz
37, enableCopyArtifacts ? false
36, enableCopyArtifacts ? false
38, enableExtraFiles ? false
37, enableExtraFiles ? false
39
38
40, bashInteractive, bash-completion
39, bashInteractive, bash-completion
41}:
40}:
42
41
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;
47assert enableBpsync -> enableBeatport;
42assert 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;
62
43
63let
44let
64 optionalPlugins = {
45 optionalPlugins = {
@@ -99,20 +80,20 @@ let
99 "types" "unimported" "zero"
80 "types" "unimported" "zero"
100 ];
81 ];
101
82
102− enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
83+ enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
103
84
104− allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
85+ allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
105 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
86 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
106
87
107 testShell = "${bashInteractive}/bin/bash --norc";
88 testShell = "${bashInteractive}/bin/bash --norc";
108 completion = "${bash-completion}/share/bash-completion/bash_completion";
89 completion = "${bash-completion}/share/bash-completion/bash_completion";
109
90
110 # This is a stripped down beets for testing of the external plugins.
91 # This is a stripped down beets for testing of the external plugins.
111− externalTestArgs.beets = (beets.override {
92+ externalTestArgs.beets = (lib.beets.override {
112 enableAlternatives = false;
93 enableAlternatives = false;
113 enableCopyArtifacts = false;
94 enableCopyArtifacts = false;
114 enableExtraFiles = false;
95 enableExtraFiles = false;
115− }).overrideAttrs (const {
96+ }).overrideAttrs (lib.const {
116 doInstallCheck = false;
97 doInstallCheck = false;
117 });
98 });
118
99
@@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
147 pythonPackages.confuse
128 pythonPackages.confuse
148 pythonPackages.mediafile
129 pythonPackages.mediafile
149 gobject-introspection
130 gobject-introspection
150− ] ++ optional enableAbsubmit essentia-extractor
131+ ] ++ lib.optional enableAbsubmit essentia-extractor
151− ++ optional enableAcoustid pythonPackages.pyacoustid
132+ ++ lib.optional enableAcoustid pythonPackages.pyacoustid
152− ++ optional enableBeatport pythonPackages.requests_oauthlib
133+ ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
153− ++ optional (enableFetchart
134+ ++ lib.optional (enableFetchart
154 || enableDeezer
135 || enableDeezer
155 || enableEmbyupdate
136 || enableEmbyupdate
156 || enableKodiupdate
137 || enableKodiupdate
@@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
160 || enableSubsonicupdate
141 || enableSubsonicupdate
161 || enableAcousticbrainz)
142 || enableAcousticbrainz)
162 pythonPackages.requests
143 pythonPackages.requests
163− ++ optional enableCheck beetsExternalPlugins.check
144+ ++ lib.optional enableCheck beetsExternalPlugins.check
164− ++ optional enableConvert ffmpeg
145+ ++ lib.optional enableConvert ffmpeg
165− ++ optional enableDiscogs pythonPackages.discogs_client
146+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
166− ++ optional enableGmusic pythonPackages.gmusicapi
147+ ++ lib.optional enableGmusic pythonPackages.gmusicapi
167− ++ optional enableKeyfinder keyfinder-cli
148+ ++ lib.optional enableKeyfinder keyfinder-cli
168− ++ optional enableLastfm pythonPackages.pylast
149+ ++ lib.optional enableLastfm pythonPackages.pylast
169− ++ optional enableMpd pythonPackages.mpd2
150+ ++ lib.optional enableMpd pythonPackages.mpd2
170− ++ optional enableSonosUpdate pythonPackages.soco
151+ ++ lib.optional enableSonosUpdate pythonPackages.soco
171− ++ optional enableThumbnails pythonPackages.pyxdg
152+ ++ lib.optional enableThumbnails pythonPackages.pyxdg
172− ++ optional enableWeb pythonPackages.flask
153+ ++ lib.optional enableWeb pythonPackages.flask
173− ++ optional enableAlternatives beetsExternalPlugins.alternatives
154+ ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
174− ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
155+ ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
175− ++ optional enableExtraFiles beetsExternalPlugins.extrafiles
156+ ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
176 ;
157 ;
177
158
178 buildInputs = [
159 buildInputs = [
@@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
209 # bs1770gain, and set the absolute path there, to avoid impurities.
190 # bs1770gain, and set the absolute path there, to avoid impurities.
210 ++ lib.optional enableReplaygain (substituteAll {
191 ++ lib.optional enableReplaygain (substituteAll {
211 src = ./replaygain-default-ffmpeg.patch;
192 src = ./replaygain-default-ffmpeg.patch;
212− ffmpeg = getBin ffmpeg;
193+ ffmpeg = lib.getBin ffmpeg;
213 })
194 })
214 # Put absolute Nix paths in place
195 # Put absolute Nix paths in place
215 ++ lib.optional enableConvert (substituteAll {
196 ++ lib.optional enableConvert (substituteAll {
216 src = ./convert-plugin-ffmpeg-path.patch;
197 src = ./convert-plugin-ffmpeg-path.patch;
217− ffmpeg = getBin ffmpeg;
198+ ffmpeg = lib.getBin ffmpeg;
218 })
199 })
219 ++ lib.optional enableBadfiles (substituteAll {
200 ++ lib.optional enableBadfiles (substituteAll {
220 src = ./badfiles-plugin-nix-paths.patch;
201 src = ./badfiles-plugin-nix-paths.patch;
@@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
269 EDITOR="${writeScript "beetconfig.sh" ''
250 EDITOR="${writeScript "beetconfig.sh" ''
270 #!${runtimeShell}
251 #!${runtimeShell}
271 cat > "$1" <<CFG
252 cat > "$1" <<CFG
272− plugins: ${concatStringsSep " " allEnabledPlugins}
253+ plugins: ${lib.concatStringsSep " " allEnabledPlugins}
273 CFG
254 CFG
274 ''}" HOME="$tmphome" "$out/bin/beet" config -e
255 ''}" HOME="$tmphome" "$out/bin/beet" config -e
275 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
256 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
@@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
285 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
266 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
286 };
267 };
287
268
288− meta = {
269+ meta = with lib; {
289 description = "Music tagger and library organizer";
270 description = "Music tagger and library organizer";
290 homepage = "http://beets.io";
271 homepage = "http://beets.io";
291 license = licenses.mit;
272 license = licenses.mit;
pkgs/tools/misc/lorri/default.nix+13−16
@@ -1,13 +1,11 @@
1+{ lib
1−{ lib, stdenv
2+, stdenv
2, pkgs
3, pkgs
4+, rustPackages
3, fetchFromGitHub
5, fetchFromGitHub
4, rustPlatform
6, rustPlatform
5− # Updater script
6−, runtimeShell
7, writers
7, writers
8− # Tests
9, nixosTests
8, nixosTests
10− # Apple dependencies
11, CoreServices
9, CoreServices
12, Security
10, Security
13}:
11}:
@@ -23,13 +21,6 @@ in (rustPlatform.buildRustPackage rec {
23 pname = "lorri";
21 pname = "lorri";
24 inherit version;
22 inherit version;
25
23
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−
33 src = fetchFromGitHub {
24 src = fetchFromGitHub {
34 owner = "nix-community";
25 owner = "nix-community";
35 repo = pname;
26 repo = pname;
@@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec {
43 doCheck = false;
34 doCheck = false;
44
35
45 BUILD_REV_COUNT = src.revCount or 1;
36 BUILD_REV_COUNT = src.revCount or 1;
46− RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
37+ RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { };
47
38
48− nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
39+ nativeBuildInputs = [ rustPackages.rustfmt ];
49− buildInputs =
50− lib.optionals stdenv.isDarwin [ CoreServices Security ];
40+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
51
41
52 # copy the docs to the $man and $doc outputs
42 # copy the docs to the $man and $doc outputs
53 postInstall = ''
43 postInstall = ''
@@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec {
70 nixos = nixosTests.lorri;
60 nixos = nixosTests.lorri;
71 };
61 };
72 };
62 };
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+ };
73})
70})
pkgs/tools/security/hashdeep/default.nix+3−2
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
17 description = "A set of cross-platform tools to compute hashes";
17 description = "A set of cross-platform tools to compute hashes";
18 homepage = "https://github.com/jessek/hashdeep";
18 homepage = "https://github.com/jessek/hashdeep";
19 license = licenses.gpl2;
19 license = licenses.gpl2;
20+ maintainers = [ maintainers.karantan ];
21+ platforms = platforms.all;
20 # Build fails on Darwin:
22 # Build fails on Darwin:
21 # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
23 # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
22 # > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
24 # > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
23− platforms = with platforms; linux ++ freebsd ++ openbsd;
25+ broken = stdenv.isDarwin;
24− maintainers = [ maintainers.karantan ];
25 };
26 };
26}
27}