git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115197 from SuperSandro2000/fix-collection21
commit96754844622c38d17d7500809b6f7d495e00247e authorSandro <sandro.jaeckel@gmail.com> dateSat 6 Mar 2021, 04:56 (6 years ago) parentc147c27773aa44
56 files changed+244−223
maintainers/maintainer-list.nix+18−18 pkgs/applications/audio/spotifyd/default.nix+4−4 pkgs/applications/audio/tuijam/default.nix+1−1 pkgs/applications/misc/gcalcli/default.nix+1−1 pkgs/applications/misc/prusa-slicer/super-slicer.nix+1−3 pkgs/applications/networking/instant-messengers/blink/default.nix+1−1 pkgs/applications/networking/lieer/default.nix+1−1 pkgs/build-support/writers/test.nix+10−11 pkgs/data/fonts/julia-mono/default.nix+4−4 pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix+1−1 pkgs/development/compilers/arachne-pnr/default.nix+13−15 pkgs/development/libraries/bootil/default.nix+20−17 pkgs/development/libraries/cpputest/default.nix+6−6 pkgs/development/libraries/gstreamer/bad/default.nix+25−22 pkgs/development/libraries/gstreamer/base/default.nix+5−4 pkgs/development/libraries/gstreamer/core/default.nix+1−1 pkgs/development/libraries/gstreamer/default.nix+5−5 pkgs/development/libraries/gstreamer/devtools/default.nix+1−1 pkgs/development/libraries/gstreamer/ges/default.nix+1−1 pkgs/development/libraries/gstreamer/good/default.nix+19−23 pkgs/development/libraries/gstreamer/libav/default.nix+1−1 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+1−1 pkgs/development/libraries/gstreamer/ugly/default.nix+6−4 pkgs/development/libraries/gstreamer/vaapi/default.nix+1−1 pkgs/development/libraries/libimagequant/default.nix+2 pkgs/development/libraries/vtk/generic.nix+2−2 pkgs/development/python-modules/beancount/default.nix+2−2 pkgs/development/python-modules/descartes/default.nix+2 pkgs/development/python-modules/gdrivefs/default.nix+2−2 pkgs/development/python-modules/goobook/default.nix+2−2 pkgs/development/python-modules/google-api-core/default.nix+2−2 pkgs/development/python-modules/googleapis_common_protos/default.nix → pkgs/development/python-modules/googleapis-common-protos/default.nix pkgs/development/python-modules/grpc_google_iam_v1/default.nix+2−2 pkgs/development/python-modules/oauthenticator/default.nix+2−2 pkgs/development/python-modules/proto-plus/default.nix+2−2 pkgs/development/python-modules/pydrive/default.nix+2−2 pkgs/development/python-modules/pyopenuv/default.nix−1 pkgs/development/python-modules/pyside/shiboken.nix+4−4 pkgs/development/python-modules/pyte/default.nix+8−6 pkgs/development/python-modules/requests/default.nix+1−1 pkgs/development/python-modules/weboob/default.nix+2−2 pkgs/development/tools/fmbt/default.nix+2−2 pkgs/development/tools/wrangler/default.nix+4−8 pkgs/development/web/nodejs/nodejs.nix+1−1 pkgs/servers/dns/pdns-recursor/default.nix+2−5 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/tools/misc/expect/default.nix+15−7 pkgs/tools/misc/gti/default.nix+5−1 pkgs/tools/networking/httpie/default.nix+4−2 pkgs/tools/package-management/nix-prefetch-scripts/default.nix+4−4 pkgs/tools/security/hashdeep/default.nix+4−4 pkgs/tools/system/safe-rm/default.nix+4−1 pkgs/tools/text/fanficfare/default.nix−1 pkgs/tools/text/wdiff/default.nix+5 pkgs/top-level/all-packages.nix+4−2 pkgs/top-level/python-packages.nix+5−5
maintainers/maintainer-list.nix+18−18
@@ -1096,6 +1096,12 @@
10961096 githubId = 1432730;
10971097 name = "Benjamin Staffin";
10981098 };
1099+ benneti = {
1100+ name = "Benedikt Tissot";
1101+ email = "benedikt.tissot@googlemail.com";
1102+ github = "benneti";
1103+ githubId = 11725645;
1104+ };
10991105 bennofs = {
11001106 email = "benno.fuenfstueck@gmail.com";
11011107 github = "bennofs";
@@ -3095,6 +3101,12 @@
30953101 githubId = 9959940;
30963102 name = "Andreas Fehn";
30973103 };
3104+ felixscheinost = {
3105+ name = "Felix Scheinost";
3106+ email = "felix.scheinost@posteo.de";
3107+ github = "felixscheinost";
3108+ githubId = 31761492;
3109+ };
30983110 felixsinger = {
30993111 email = "felixsinger@posteo.net";
31003112 github = "felixsinger";
@@ -7255,6 +7267,12 @@
72557267 githubId = 13225611;
72567268 name = "Nicolas Martin";
72577269 };
7270+ p3psi = {
7271+ name = "Elliot Boo";
7272+ email = "p3psi.boo@gmail.com";
7273+ github = "p3psi-boo";
7274+ githubId = 43925055;
7275+ };
72587276 periklis = {
72597277 email = "theopompos@gmail.com";
72607278 github = "periklis";
@@ -10826,22 +10844,4 @@
1082610844 github = "zupo";
1082710845 githubId = 311580;
1082810846 };
10829− felixscheinost = {
10830− name = "Felix Scheinost";
10831− email = "felix.scheinost@posteo.de";
10832− github = "felixscheinost";
10833− githubId = 31761492;
10834− };
10835− benneti = {
10836− name = "Benedikt Tissot";
10837− email = "benedikt.tissot@googlemail.com";
10838− github = "benneti";
10839− githubId = 11725645;
10840− };
10841− p3psi = {
10842− name = "Elliot Boo";
10843− email = "p3psi.boo@gmail.com";
10844− github = "p3psi-boo";
10845− githubId = 43925055;
10846− };
1084710847}
pkgs/applications/audio/spotifyd/default.nix+4−4
@@ -1,10 +1,10 @@
11{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
2−, withALSA ? true, alsaLib ? null
3−, withPulseAudio ? false, libpulseaudio ? null
4−, withPortAudio ? false, portaudio ? null
2+, withALSA ? true, alsaLib
3+, withPulseAudio ? false, libpulseaudio
4+, withPortAudio ? false, portaudio
55, withMpris ? false
66, withKeyring ? false
7−, dbus ? null
7+, dbus
88}:
99
1010rustPackages.rustPlatform.buildRustPackage rec {
pkgs/applications/audio/tuijam/default.nix+1−1
@@ -22,7 +22,7 @@ buildPythonApplication rec {
2222
2323 propagatedBuildInputs = with python3Packages; [
2424 gmusicapi
25− google_api_python_client
25+ google-api-python-client
2626 mpv
2727 pydbus
2828 pygobject3
pkgs/applications/misc/gcalcli/default.nix+1−1
@@ -21,7 +21,7 @@ buildPythonApplication rec {
2121
2222 propagatedBuildInputs = [
2323 dateutil gflags httplib2 parsedatetime six vobject
24− google_api_python_client oauth2client uritemplate
24+ google-api-python-client oauth2client uritemplate
2525 libnotify
2626 ] ++ lib.optional (!isPy3k) futures;
2727
pkgs/applications/misc/prusa-slicer/super-slicer.nix+1−3
@@ -1,6 +1,4 @@
1−{
2− lib, fetchFromGitHub, makeDesktopItem, prusa-slicer
3−}:
1+{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
42let
53 appname = "SuperSlicer";
64 version = "2.2.54.2";
pkgs/applications/networking/instant-messengers/blink/default.nix+1−1
@@ -22,7 +22,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
2222 cjson
2323 sipsimple
2424 twisted
25− google_api_python_client
25+ google-api-python-client
2626 ];
2727
2828 buildInputs = [
pkgs/applications/networking/lieer/default.nix+1−1
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
1414 propagatedBuildInputs = with python3Packages; [
1515 notmuch
1616 oauth2client
17− google_api_python_client
17+ google-api-python-client
1818 tqdm
1919 setuptools
2020 ];
pkgs/build-support/writers/test.nix+10−11
@@ -1,14 +1,13 @@
1−{
2− glib,
3− haskellPackages,
4− lib,
5− nodePackages,
6− perlPackages,
7− python2Packages,
8− python3Packages,
9− runCommand,
10− writers,
11− writeText
1+{ glib
2+, haskellPackages
3+, lib
4+, nodePackages
5+, perlPackages
6+, python2Packages
7+, python3Packages
8+, runCommand
9+, writers
10+, writeText
1211}:
1312with writers;
1413let
pkgs/data/fonts/julia-mono/default.nix+4−4
@@ -13,14 +13,14 @@ in fetchzip {
1313 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
1414 '';
1515
16− meta = {
16+ meta = with lib; {
1717 description = "A monospaced font for scientific and technical computing";
1818 longDescription = ''
1919 JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online).
2020 '';
21− maintainers = with lib.maintainers; [ suhr ];
22− platforms = with lib.platforms; all;
21+ maintainers = with maintainers; [ suhr ];
22+ platforms = with platforms; all;
2323 homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/";
24− license = lib.licenses.ofl;
24+ license = licenses.ofl;
2525 };
2626}
pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }:
1+{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-taskwhisperer";
pkgs/development/compilers/arachne-pnr/default.nix+13−15
@@ -1,30 +1,28 @@
11{ lib, stdenv, fetchFromGitHub, icestorm }:
22
3−with builtins;
4−
53stdenv.mkDerivation rec {
64 pname = "arachne-pnr";
75 version = "2019.07.29";
86
97 src = fetchFromGitHub {
10− owner = "yosyshq";
11− repo = "arachne-pnr";
12− rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
8+ owner = "yosyshq";
9+ repo = "arachne-pnr";
10+ rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
1311 sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc";
1412 };
1513
1614 enableParallelBuilding = true;
17− makeFlags =
18− [ "PREFIX=$(out)"
19− "ICEBOX=${icestorm}/share/icebox"
20− ];
15+ makeFlags = [
16+ "PREFIX=$(out)"
17+ "ICEBOX=${icestorm}/share/icebox"
18+ ];
2119
22− patchPhase = ''
20+ postPatch = ''
2321 substituteInPlace ./Makefile \
24− --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}'
22+ --replace 'echo UNKNOWN' 'echo ${lib.substring 0 10 src.rev}'
2523 '';
2624
27− meta = {
25+ meta = with lib; {
2826 description = "Place and route tool for FPGAs";
2927 longDescription = ''
3028 Arachne-pnr implements the place and route step of
@@ -37,8 +35,8 @@ stdenv.mkDerivation rec {
3735 the IceStorm [2] icepack command.
3836 '';
3937 homepage = "https://github.com/cseed/arachne-pnr";
40− license = lib.licenses.mit;
41− maintainers = with lib.maintainers; [ shell thoughtpolice ];
42− platforms = lib.platforms.unix;
38+ license = licenses.mit;
39+ maintainers = with maintainers; [ shell thoughtpolice ];
40+ platforms = platforms.unix;
4341 };
4442}
pkgs/development/libraries/bootil/default.nix+20−17
@@ -1,18 +1,8 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
22
33stdenv.mkDerivation {
4− name = "bootil-unstable-2015-12-17";
5−
6− meta = {
7− description = "Garry Newman's personal utility library";
8− homepage = "https://github.com/garrynewman/bootil";
9− # License unsure - see https://github.com/garrynewman/bootil/issues/21
10− license = lib.licenses.free;
11− maintainers = [ lib.maintainers.abigailbuccaneer ];
12− platforms = lib.platforms.all;
13− # Build uses `-msse` and `-mfpmath=sse`
14− badPlatforms = [ "aarch64-linux" ];
15− };
4+ pname = "bootil";
5+ version = "unstable-2015-12-17";
166
177 src = fetchFromGitHub {
188 owner = "garrynewman";
@@ -21,11 +11,13 @@ stdenv.mkDerivation {
2111 sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
2212 };
2313
24− patches = [ (fetchpatch {
25− url = "https://github.com/garrynewman/bootil/pull/22.patch";
26− name = "github-pull-request-22.patch";
27− sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
28− }) ];
14+ patches = [
15+ (fetchpatch {
16+ url = "https://github.com/garrynewman/bootil/pull/22.patch";
17+ name = "github-pull-request-22.patch";
18+ sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
19+ })
20+ ];
2921
3022 # Avoid guessing where files end up. Just use current directory.
3123 postPatch = ''
@@ -42,4 +34,15 @@ stdenv.mkDerivation {
4234 install -D libbootil_static.a $out/lib/libbootil_static.a
4335 cp -r include $out
4436 '';
37+
38+ meta = with lib; {
39+ description = "Garry Newman's personal utility library";
40+ homepage = "https://github.com/garrynewman/bootil";
41+ # License unsure - see https://github.com/garrynewman/bootil/issues/21
42+ license = licenses.free;
43+ maintainers = [ maintainers.abigailbuccaneer ];
44+ platforms = platforms.all;
45+ # Build uses `-msse` and `-mfpmath=sse`
46+ badPlatforms = [ "aarch64-linux" ];
47+ };
4548}
pkgs/development/libraries/cpputest/default.nix+6−6
@@ -1,19 +1,19 @@
11{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
4− version = "4.0";
54 pname = "cpputest";
5+ version = "4.0";
66
77 src = fetchurl {
88 url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
99 sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1";
1010 };
1111
12− meta = {
13− homepage = "http://cpputest.github.io/";
12+ meta = with lib; {
13+ homepage = "https://cpputest.github.io/";
1414 description = "Unit testing and mocking framework for C/C++";
15− platforms = lib.platforms.linux ;
16− license = lib.licenses.bsd3;
17− maintainers = [ lib.maintainers.juliendehos ];
15+ platforms = platforms.linux ;
16+ license = licenses.bsd3;
17+ maintainers = [ maintainers.juliendehos ];
1818 };
1919}
pkgs/development/libraries/gstreamer/bad/default.nix+25−22
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, meson
45, ninja
@@ -10,7 +11,7 @@
1011, gobject-introspection
1112, enableZbar ? false
1213, faacSupport ? false
13−, faac ? null
14+, faac
1415, faad2
1516, libass
1617, libkate
@@ -34,7 +35,6 @@
3435, bluez
3536, chromaprint
3637, curl
37−, darwin
3838, directfb
3939, fdk_aac
4040, flite
@@ -80,20 +80,23 @@
8080, libxml2
8181, srt
8282, vo-aacenc
83+, VideoToolbox
84+, AudioToolbox
85+, AVFoundation
86+, CoreMedia
87+, CoreVideo
88+, Foundation
89+, MediaToolbox
8390}:
8491
85−assert faacSupport -> faac != null;
86−
87−let
88− inherit (lib) optional optionals;
89−in stdenv.mkDerivation rec {
92+stdenv.mkDerivation rec {
9093 pname = "gst-plugins-bad";
9194 version = "1.18.2";
9295
9396 outputs = [ "out" "dev" ];
9497
9598 src = fetchurl {
96− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
99+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
97100 sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
98101 };
99102
@@ -110,7 +113,7 @@ in stdenv.mkDerivation rec {
110113 python3
111114 gettext
112115 gobject-introspection
113− ] ++ optionals stdenv.isLinux [
116+ ] ++ lib.optionals stdenv.isLinux [
114117 wayland # for wayland-scanner
115118 ];
116119
@@ -166,16 +169,16 @@ in stdenv.mkDerivation rec {
166169 libintl
167170 srt
168171 vo-aacenc
169− ] ++ optionals enableZbar [
172+ ] ++ lib.optionals enableZbar [
170173 zbar
171− ] ++ optionals faacSupport [
174+ ] ++ lib.optionals faacSupport [
172175 faac
173− ] ++ optionals stdenv.isLinux [
176+ ] ++ lib.optionals stdenv.isLinux [
174177 bluez
175178 libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
176179 wayland
177180 wayland-protocols
178− ] ++ optionals (!stdenv.isDarwin) [
181+ ] ++ lib.optionals (!stdenv.isDarwin) [
179182 # wildmidi requires apple's OpenAL
180183 # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
181184 wildmidi
@@ -202,7 +205,7 @@ in stdenv.mkDerivation rec {
202205 serd
203206 sord
204207 sratom
205− ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
208+ ] ++ lib.optionals stdenv.isDarwin [
206209 # For unknown reasons the order is important, e.g. if
207210 # VideoToolbox is last, we get:
208211 # fatal error: 'VideoToolbox/VideoToolbox.h' file not found
@@ -213,7 +216,7 @@ in stdenv.mkDerivation rec {
213216 CoreVideo
214217 Foundation
215218 MediaToolbox
216− ]);
219+ ];
217220
218221 mesonFlags = [
219222 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
@@ -251,10 +254,10 @@ in stdenv.mkDerivation rec {
251254 "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
252255 "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
253256 ]
254− ++ optionals (!stdenv.isLinux) [
257+ ++ lib.optionals (!stdenv.isLinux) [
255258 "-Dva=disabled" # see comment on `libva` in `buildInputs`
256259 ]
257− ++ optionals stdenv.isDarwin [
260+ ++ lib.optionals stdenv.isDarwin [
258261 "-Dbluez=disabled"
259262 "-Dchromaprint=disabled"
260263 "-Ddirectfb=disabled"
@@ -271,11 +274,11 @@ in stdenv.mkDerivation rec {
271274 "-Dladspa=disabled" # requires lrdf
272275 "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
273276 "-Dwildmidi=disabled" # see dependencies above
274− ] ++ optionals (!gst-plugins-base.glEnabled) [
275− "-Dgl=disabled"]
276− ++ optionals (!gst-plugins-base.waylandEnabled) [
277+ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
278+ "-Dgl=disabled"
279+ ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
277280 "-Dwayland=disabled"
278− ] ++ optionals (!gst-plugins-base.glEnabled) [
281+ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
279282 # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
280283 # but its meson build system does not declare the dependency.
281284 "-Dapplemedia=disabled"
pkgs/development/libraries/gstreamer/base/default.nix+5−4
@@ -31,7 +31,8 @@
3131# errors. Suspected is that a newer version than clang
3232# is needed than 5.0 but it is not clear.
3333, enableCocoa ? false
34−, darwin
34+, Cocoa
35+, OpenGL
3536, enableGl ? (enableX11 || enableWayland || enableCocoa)
3637, enableCdparanoia ? (!stdenv.isDarwin)
3738, cdparanoia
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
4546 outputs = [ "out" "dev" ];
4647
4748 src = fetchurl {
48− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
49+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
4950 sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
5051 };
5152
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
8182 libvisual
8283 ] ++ lib.optionals stdenv.isDarwin [
8384 pango
84− darwin.apple_sdk.frameworks.OpenGL
85+ OpenGL
8586 ] ++ lib.optionals enableAlsa [
8687 alsaLib
8788 ] ++ lib.optionals enableX11 [
@@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
9192 ] ++ lib.optionals enableWayland [
9293 wayland
9394 wayland-protocols
94− ] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
95+ ] ++ lib.optional enableCocoa Cocoa
9596 ++ lib.optional enableCdparanoia cdparanoia;
9697
9798 propagatedBuildInputs = [
pkgs/development/libraries/gstreamer/core/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 outputBin = "dev";
3434
3535 src = fetchurl {
36− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
36+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
3737 sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
3838 };
3939
pkgs/development/libraries/gstreamer/default.nix+5−5
@@ -1,17 +1,17 @@
1−{ callPackage, CoreServices }:
1+{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }:
22
33rec {
44 gstreamer = callPackage ./core { inherit CoreServices; };
55
66 gstreamermm = callPackage ./gstreamermm { };
77
8− gst-plugins-base = callPackage ./base { inherit gstreamer; };
8+ gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; };
99
10− gst-plugins-good = callPackage ./good { inherit gst-plugins-base; };
10+ gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; };
1111
12− gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; };
12+ gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
1313
14− gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
14+ gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; };
1515
1616 gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; };
1717
pkgs/development/libraries/gstreamer/devtools/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 version = "1.18.2";
1616
1717 src = fetchurl {
18− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
18+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
1919 sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
2020 };
2121
pkgs/development/libraries/gstreamer/ges/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ];
2626
2727 src = fetchurl {
28− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
28+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
2929 sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
3030 };
3131
pkgs/development/libraries/gstreamer/good/default.nix+19−23
@@ -25,13 +25,13 @@
2525, libsoup
2626, libpulseaudio
2727, libintl
28−, darwin
28+, Cocoa
2929, lame
3030, mpg123
3131, twolame
32−, gtkSupport ? false, gtk3 ? null
33−, qt5Support ? false, qt5 ? null
34−, raspiCameraSupport ? false, libraspberrypi ? null
32+, gtkSupport ? false, gtk3
33+, qt5Support ? false, qt5
34+, raspiCameraSupport ? false, libraspberrypi
3535, enableJack ? true, libjack2
3636, libXdamage
3737, libXext
@@ -44,12 +44,8 @@
4444, wavpack
4545}:
4646
47−assert gtkSupport -> gtk3 != null;
48−assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
47+assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
4948
50−let
51− inherit (lib) optionals;
52−in
5349stdenv.mkDerivation rec {
5450 pname = "gst-plugins-good";
5551 version = "1.18.2";
@@ -57,7 +53,7 @@ stdenv.mkDerivation rec {
5753 outputs = [ "out" "dev" ];
5854
5955 src = fetchurl {
60− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
56+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
6157 sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
6258 };
6359
@@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
6864 ninja
6965 gettext
7066 nasm
71− ] ++ optionals stdenv.isLinux [
67+ ] ++ lib.optionals stdenv.isLinux [
7268 wayland-protocols
7369 ];
7470
@@ -98,39 +94,39 @@ stdenv.mkDerivation rec {
9894 xorg.libXfixes
9995 xorg.libXdamage
10096 wavpack
101− ] ++ optionals raspiCameraSupport [
97+ ] ++ lib.optionals raspiCameraSupport [
10298 libraspberrypi
103− ] ++ optionals gtkSupport [
99+ ] ++ lib.optionals gtkSupport [
104100 # for gtksink
105101 gtk3
106− ] ++ optionals qt5Support (with qt5; [
102+ ] ++ lib.optionals qt5Support (with qt5; [
107103 qtbase
108104 qtdeclarative
109105 qtwayland
110106 qtx11extras
111− ]) ++ optionals stdenv.isDarwin [
112− darwin.apple_sdk.frameworks.Cocoa
113− ] ++ optionals stdenv.isLinux [
107+ ]) ++ lib.optionals stdenv.isDarwin [
108+ Cocoa
109+ ] ++ lib.optionals stdenv.isLinux [
114110 libv4l
115111 libpulseaudio
116112 libavc1394
117113 libiec61883
118114 libgudev
119115 wayland
120− ] ++ optionals enableJack [
116+ ] ++ lib.optionals enableJack [
121117 libjack2
122118 ];
123119
124120 mesonFlags = [
125121 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
126122 "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
127− ] ++ optionals (!qt5Support) [
123+ ] ++ lib.optionals (!qt5Support) [
128124 "-Dqt5=disabled"
129− ] ++ optionals (!gtkSupport) [
125+ ] ++ lib.optionals (!gtkSupport) [
130126 "-Dgtk3=disabled"
131− ] ++ optionals (!enableJack) [
127+ ] ++ lib.optionals (!enableJack) [
132128 "-Djack=disabled"
133− ] ++ optionals (!stdenv.isLinux) [
129+ ] ++ lib.optionals (!stdenv.isLinux) [
134130 "-Ddv1394=disabled" # Linux only
135131 "-Doss4=disabled" # Linux only
136132 "-Doss=disabled" # Linux only
@@ -138,7 +134,7 @@ stdenv.mkDerivation rec {
138134 "-Dv4l2-gudev=disabled" # Linux-only
139135 "-Dv4l2=disabled" # Linux-only
140136 "-Dximagesrc=disabled" # Linux-only
141− ] ++ optionals (!raspiCameraSupport) [
137+ ] ++ lib.optionals (!raspiCameraSupport) [
142138 "-Drpicamsrc=disabled"
143139 ];
144140
pkgs/development/libraries/gstreamer/libav/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 version = "1.18.2";
1919
2020 src = fetchurl {
21− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
21+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
2222 sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
2323 };
2424
pkgs/development/libraries/gstreamer/rtsp-server/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 version = "1.18.2";
1616
1717 src = fetchurl {
18− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
18+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
1919 sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
2020 };
2121
pkgs/development/libraries/gstreamer/ugly/default.nix+6−4
@@ -16,7 +16,9 @@
1616, libintl
1717, lib
1818, opencore-amr
19−, darwin
19+, IOKit
20+, CoreFoundation
21+, DiskArbitration
2022}:
2123
2224stdenv.mkDerivation rec {
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
2628 outputs = [ "out" "dev" ];
2729
2830 src = fetchurl {
29− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
31+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
3032 sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
3133 };
3234
@@ -49,11 +51,11 @@ stdenv.mkDerivation rec {
4951 x264
5052 libintl
5153 opencore-amr
52− ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
54+ ] ++ lib.optionals stdenv.isDarwin [
5355 IOKit
5456 CoreFoundation
5557 DiskArbitration
56− ]);
58+ ];
5759
5860 mesonFlags = [
5961 "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
pkgs/development/libraries/gstreamer/vaapi/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 version = "1.18.2";
2525
2626 src = fetchurl {
27− url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
27+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
2828 sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
2929 };
3030
pkgs/development/libraries/libimagequant/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 patchShebangs ./configure
1616 '';
1717
18+ configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ];
19+
1820 meta = with lib; {
1921 homepage = "https://pngquant.org/lib/";
2022 description = "Image quantization library";
pkgs/development/libraries/vtk/generic.nix+2−2
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
1818 version = "${majorVersion}.${minorVersion}";
1919
2020 src = fetchurl {
21− url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
21+ url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz";
2222 sha256 = sourceSha256;
2323 };
2424
@@ -94,6 +94,6 @@ in stdenv.mkDerivation rec {
9494 maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
9595 platforms = with platforms; unix;
9696 # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
97− broken = if stdenv.isDarwin && (majorVersion == 7 || majorVersion == 8) then true else false;
97+ broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8");
9898 };
9999}
pkgs/development/python-modules/beancount/default.nix+2−2
@@ -6,7 +6,7 @@
66, bottle
77, chardet
88, dateutil
9−, google_api_python_client
9+, google-api-python-client
1010, lxml
1111, oauth2client
1212, ply
@@ -34,7 +34,7 @@ buildPythonPackage rec {
3434 bottle
3535 chardet
3636 dateutil
37− google_api_python_client
37+ google-api-python-client
3838 lxml
3939 oauth2client
4040 ply
pkgs/development/python-modules/descartes/default.nix+2
@@ -21,5 +21,7 @@ buildPythonPackage rec {
2121 homepage = "https://bitbucket.org/sgillies/descartes/";
2222 license = licenses.bsd3;
2323 maintainers = with maintainers; [ knedlsepp ];
24+ # all tests are failing
25+ broken = true;
2426 };
2527}
pkgs/development/python-modules/gdrivefs/default.nix+2−2
@@ -8,7 +8,7 @@
88, six
99, dateutil
1010, fusepy
11−, google_api_python_client
11+, google-api-python-client
1212}:
1313
1414buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
2222 };
2323
2424 buildInputs = [ gipc greenlet httplib2 six ];
25− propagatedBuildInputs = [ dateutil fusepy google_api_python_client ];
25+ propagatedBuildInputs = [ dateutil fusepy google-api-python-client ];
2626
2727 patchPhase = ''
2828 substituteInPlace gdrivefs/resources/requirements.txt \
pkgs/development/python-modules/goobook/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, buildPythonPackage, fetchPypi, isPy3k
22, docutils, installShellFiles
3−, google_api_python_client, simplejson, oauth2client, setuptools, xdg
3+, google-api-python-client, simplejson, oauth2client, setuptools, xdg
44}:
55
66buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515
1616 nativeBuildInputs = [ docutils installShellFiles ];
1717 propagatedBuildInputs = [
18− google_api_python_client simplejson oauth2client setuptools xdg
18+ google-api-python-client simplejson oauth2client setuptools xdg
1919 ];
2020
2121 postInstall = ''
pkgs/development/python-modules/google-api-core/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, google-auth
5−, googleapis_common_protos
5+, googleapis-common-protos
66, grpcio
77, protobuf
88, pytz
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 };
2424
2525 propagatedBuildInputs = [
26− googleapis_common_protos
26+ googleapis-common-protos
2727 google-auth
2828 grpcio
2929 protobuf
pkgs/development/python-modules/googleapis_common_protos/default.nix → pkgs/development/python-modules/googleapis-common-protos/default.nixrenamed

The content is the same.

pkgs/development/python-modules/grpc_google_iam_v1/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, grpcio
5−, googleapis_common_protos
5+, googleapis-common-protos
66, pytest
77}:
88
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72";
1616 };
1717
18− propagatedBuildInputs = [ grpcio googleapis_common_protos ];
18+ propagatedBuildInputs = [ grpcio googleapis-common-protos ];
1919
2020 # non-standard test format, and python3 will load local google folder first
2121 # but tests cannot be ran if google folder is removed or moved
pkgs/development/python-modules/oauthenticator/default.nix+2−2
@@ -2,7 +2,7 @@
22, buildPythonPackage
33, pythonOlder
44, fetchPypi
5−, google_api_python_client
5+, google-api-python-client
66, google-auth-oauthlib
77, jupyterhub
88, mwoauth
@@ -29,7 +29,7 @@ buildPythonPackage rec {
2929 pytestFlagsArray = [ "oauthenticator/tests" ];
3030
3131 checkInputs = [
32− google_api_python_client
32+ google-api-python-client
3333 google-auth-oauthlib
3434 mwoauth
3535 pyjwt
pkgs/development/python-modules/proto-plus/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchPypi
44, isPy3k
55, protobuf
6−, googleapis_common_protos
6+, googleapis-common-protos
77, pytestCheckHook
88, pytz
99}:
@@ -20,7 +20,7 @@ buildPythonPackage rec {
2020
2121 propagatedBuildInputs = [ protobuf ];
2222
23− checkInputs = [ pytestCheckHook pytz googleapis_common_protos ];
23+ checkInputs = [ pytestCheckHook pytz googleapis-common-protos ];
2424
2525 pythonImportsCheck = [ "proto" ];
2626
pkgs/development/python-modules/pydrive/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, google_api_python_client
4+, google-api-python-client
55, oauth2client
66, pyyaml
77}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 };
1818
1919 propagatedBuildInputs = [
20− google_api_python_client
20+ google-api-python-client
2121 oauth2client
2222 pyyaml
2323 ];
pkgs/development/python-modules/pyopenuv/default.nix−1
@@ -1,7 +1,6 @@
11{ lib
22, aiohttp
33, aresponses
4−, async-timeout
54, asynctest
65, buildPythonPackage
76, fetchFromGitHub
pkgs/development/python-modules/pyside/shiboken.nix+4−4
@@ -48,11 +48,11 @@ buildPythonPackage rec {
4848 "-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
4949 ];
5050
51− meta = {
51+ meta = with lib; {
5252 description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
53− license = lib.licenses.gpl2;
54− homepage = "http://www.pyside.org/docs/shiboken/";
53+ license = licenses.gpl2;
54+ homepage = "http://www.pyside.org/";
5555 maintainers = [ ];
56− platforms = lib.platforms.all;
56+ platforms = platforms.all;
5757 };
5858}
pkgs/development/python-modules/pyte/default.nix+8−6
@@ -1,21 +1,23 @@
1−{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
1+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-runner, wcwidth }:
22
33buildPythonPackage rec {
44 pname = "pyte";
55 version = "0.8.0";
6+
67 src = fetchPypi {
78 inherit pname version;
89 sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5";
910 };
1011
12+ nativeBuildInputs = [ pytest-runner ];
13+
1114 propagatedBuildInputs = [ wcwidth ];
1215
13− checkInputs = [ pytest pytestrunner ];
16+ checkInputs = [ pytestCheckHook ];
1417
15− # tries to write to os.path.dirname(__file__) in test_input_output
16− checkPhase = ''
17− py.test -k "not test_input_output"
18− '';
18+ disabledTests = [
19+ "test_input_output"
20+ ];
1921
2022 meta = with lib; {
2123 description = "Simple VTXXX-compatible linux terminal emulator";
pkgs/development/python-modules/requests/default.nix+1−1
@@ -34,7 +34,7 @@ buildPythonPackage rec {
3434 ];
3535
3636 # AttributeError: 'KeywordMapping' object has no attribute 'get'
37− doCheck = ! isPy27;
37+ doCheck = !isPy27;
3838
3939 disabledTests = [
4040 # Disable tests that require network access and use httpbin
pkgs/development/python-modules/weboob/default.nix+2−2
@@ -6,7 +6,7 @@
66, futures
77, gdata
88, gnupg
9−, google_api_python_client
9+, google-api-python-client
1010, html2text
1111, libyaml
1212, lxml
@@ -56,7 +56,7 @@ buildPythonPackage rec {
5656 feedparser
5757 gdata
5858 gnupg
59− google_api_python_client
59+ google-api-python-client
6060 html2text
6161 libyaml
6262 lxml
pkgs/development/tools/fmbt/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
22, flex
3−, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
3+, gettext, libedit, glib, imagemagick6, libxml2, boost, gnuplot, graphviz
44, tesseract, gts, libXtst
55}:
66stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
1818 python.pkgs.wrapPython ];
1919
20− buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
20+ buildInputs = [ python gettext libedit glib imagemagick6 libxml2 boost
2121 gnuplot graphviz tesseract gts
2222 ];
2323
pkgs/development/tools/wrangler/default.nix+4−8
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "wrangler";
@@ -13,15 +13,11 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
1515
16− nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
16+ nativeBuildInputs = [ perl ]
17+ ++ lib.optionals stdenv.isLinux [ pkg-config ];
1718
1819 buildInputs = lib.optionals stdenv.isLinux [ openssl ]
19− ++ lib.optionals stdenv.isDarwin [
20− curl
21− darwin.apple_sdk.frameworks.Security
22− darwin.apple_sdk.frameworks.CoreServices
23− darwin.apple_sdk.frameworks.CoreFoundation
24− ];
20+ ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
2521
2622 # tries to use "/homeless-shelter" and fails
2723 doCheck = false;
pkgs/development/web/nodejs/nodejs.nix+1−1
@@ -60,7 +60,7 @@ in
6060
6161 configureFlags = let
6262 isCross = stdenv.hostPlatform != stdenv.buildPlatform;
63− inherit (stdenv.hostPlatform) gcc isArch32;
63+ inherit (stdenv.hostPlatform) gcc isAarch32;
6464 in sharedConfigureFlags ++ [
6565 "--without-dtrace"
6666 ] ++ (optionals isCross [
pkgs/servers/dns/pdns-recursor/default.nix+2−5
@@ -2,9 +2,6 @@
22, openssl, systemd, lua, luajit, protobuf
33, enableProtoBuf ? false
44}:
5−assert enableProtoBuf -> protobuf != null;
6−
7−with lib;
85
96stdenv.mkDerivation rec {
107 pname = "pdns-recursor";
@@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
1916 buildInputs = [
2017 boost openssl systemd
2118 lua luajit
22− ] ++ optional enableProtoBuf protobuf;
19+ ] ++ lib.optional enableProtoBuf protobuf;
2320
2421 configureFlags = [
2522 "--enable-reproducible"
@@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
3229 nixos = nixosTests.pdns-recursor;
3330 };
3431
35− meta = {
32+ meta = with lib; {
3633 description = "A recursive DNS server";
3734 homepage = "https://www.powerdns.com/";
3835 platforms = platforms.linux;
pkgs/servers/home-assistant/component-packages.nix+1−1
@@ -309,7 +309,7 @@
309309 "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
310310 "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
311311 "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
312− "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
312+ "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
313313 "google_assistant" = ps: with ps; [ aiohttp-cors ];
314314 "google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
315315 "google_domains" = ps: with ps; [ ];
pkgs/tools/misc/expect/default.nix+15−7
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
1+{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "expect";
@@ -9,19 +9,27 @@ stdenv.mkDerivation rec {
99 sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9";
1010 };
1111
12− buildInputs = [ tcl ];
13− nativeBuildInputs = [ makeWrapper autoreconfHook ];
14−
15− hardeningDisable = [ "format" ];
12+ patches = [
13+ (fetchpatch {
14+ url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/expect/0001-enable-cross-compilation.patch";
15+ sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b";
16+ })
17+ ];
1618
1719 postPatch = ''
1820 sed -i "s,/bin/stty,$(type -p stty),g" configure.in
1921 '';
2022
23+ nativeBuildInputs = [ autoreconfHook makeWrapper tcl ];
24+ buildInputs = [ tcl ];
25+
26+ strictDeps = true;
27+ hardeningDisable = [ "format" ];
28+
2129 configureFlags = [
22− "--with-tcl=${tcl}/lib"
30+ "--with-tcl=${buildPackages.tcl}/lib"
2331 "--with-tclinclude=${tcl}/include"
24− "--exec-prefix=\${out}"
32+ "--exec-prefix=${placeholder "out"}"
2533 ];
2634
2735 postInstall = ''
pkgs/tools/misc/gti/default.nix+5−1
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
1111 sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9";
1212 };
1313
14+ postPatch = ''
15+ substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc'
16+ '';
17+
1418 installPhase = ''
1519 mkdir -p $out/bin $out/share/man/man6
1620 cp gti $out/bin
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
1822 '';
1923
2024 meta = with lib; {
21− homepage = "http://r-wos.org/hacks/gti";
25+ homepage = "https://r-wos.org/hacks/gti";
2226 license = licenses.mit;
2327 description = "Humorous typo-based git runner; drives a car over the terminal";
2428 maintainers = with maintainers; [ fadenb ];
pkgs/tools/networking/httpie/default.nix+4−2
@@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec {
1717
1818 outputs = [ "out" "doc" "man" ];
1919
20+ nativeBuildInputs = [ docutils ];
21+
2022 propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ];
2123
2224 checkInputs = with python3Packages; [
@@ -49,7 +51,7 @@ python3Packages.buildPythonApplication rec {
4951 sed -e 's/^|build|//g' -i README.rst
5052
5153 toHtml() {
52− ${docutils}/bin/rst2html5 \
54+ rst2html5 \
5355 --strip-elements-with-class=no-web \
5456 --title=http \
5557 --no-generator \
@@ -63,7 +65,7 @@ python3Packages.buildPythonApplication rec {
6365 toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html
6466 toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html
6567
66− ${docutils}/bin/rst2man \
68+ rst2man \
6769 --strip-elements-with-class=no-web \
6870 --title=http \
6971 --no-generator \
pkgs/tools/package-management/nix-prefetch-scripts/default.nix+4−4
@@ -1,5 +1,5 @@
1−{ lib, stdenv, makeWrapper, buildEnv,
2− breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
1+{ lib, stdenv, makeWrapper, buildEnv
2+, breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
33}:
44
55let mkPrefetchScript = tool: src: deps:
@@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps:
2222 meta = with lib; {
2323 description = "Script used to obtain source hashes for fetch${tool}";
2424 maintainers = with maintainers; [ bennofs ];
25− platforms = lib.platforms.unix;
25+ platforms = platforms.unix;
2626 };
2727 };
2828in rec {
@@ -40,7 +40,7 @@ in rec {
4040 meta = with lib; {
4141 description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
4242 maintainers = with maintainers; [ bennofs ];
43− platforms = lib.platforms.unix;
43+ platforms = platforms.unix;
4444 };
4545 };
4646}
pkgs/tools/security/hashdeep/default.nix+4−4
@@ -1,8 +1,8 @@
11{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
3−let version = "4.4";
4−in stdenv.mkDerivation {
5− name = "hashdeep-${version}";
3+stdenv.mkDerivation rec {
4+ pname = "hashdeep";
5+ version = "4.4";
66
77 src = fetchFromGitHub {
88 owner = "jessek";
@@ -18,6 +18,6 @@ in stdenv.mkDerivation {
1818 homepage = "https://github.com/jessek/hashdeep";
1919 license = licenses.gpl2;
2020 platforms = with platforms; linux ++ freebsd ++ openbsd;
21− maintainers = [ lib.maintainers.karantan ];
21+ maintainers = [ maintainers.karantan ];
2222 };
2323}
pkgs/tools/system/safe-rm/default.nix+4−1
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
1010 sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
1111 };
1212
13− propagatedBuildInputs = [ perl coreutils ];
13+ # pod2man
14+ nativeBuildInputs = [ perl ];
15+
16+ propagatedBuildInputs = [ coreutils perl ];
1417
1518 postFixup = ''
1619 sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm
pkgs/tools/text/fanficfare/default.nix−1
@@ -24,6 +24,5 @@ python3Packages.buildPythonApplication rec {
2424 license = licenses.gpl3;
2525 platforms = platforms.linux;
2626 maintainers = with maintainers; [ dwarfmaster ];
27− inherit version;
2827 };
2928}
pkgs/tools/text/wdiff/default.nix+5
@@ -9,10 +9,15 @@ stdenv.mkDerivation rec {
99 sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
1010 };
1111
12+ # for makeinfo
13+ nativeBuildInputs = [ texinfo ];
14+
1215 buildInputs = [ texinfo ];
1316
1417 checkInputs = [ which ];
1518
19+ strictDeps = true;
20+
1621 meta = with lib; {
1722 homepage = "https://www.gnu.org/software/wdiff/";
1823 description = "Comparing files on a word by word basis";
pkgs/top-level/all-packages.nix+4−2
@@ -3942,7 +3942,9 @@ in
39423942
39433943 wallutils = callPackage ../tools/graphics/wallutils { };
39443944
3945− wrangler = callPackage ../development/tools/wrangler { };
3945+ wrangler = callPackage ../development/tools/wrangler {
3946+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
3947+ };
39463948
39473949 wsl-open = callPackage ../tools/misc/wsl-open { };
39483950
@@ -14183,7 +14185,7 @@ in
1418314185
1418414186 gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
1418514187 callPackage = newScope { libav = pkgs.ffmpeg; };
14186− inherit (darwin.apple_sdk.frameworks) CoreServices;
14188+ inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
1418714189 });
1418814190
1418914191 gusb = callPackage ../development/libraries/gusb { };
pkgs/top-level/python-packages.nix+5−5
@@ -2655,12 +2655,12 @@ in {
26552655
26562656 google-api-core = callPackage ../development/python-modules/google-api-core { };
26572657
2658− google_api_python_client =
2659− let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { };
2658+ google-api-python-client =
2659+ let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
26602660 in if isPy3k then
2661− google_api_python_client
2661+ google-api-python-client
26622662 else # Python 2.7 support was deprecated but is still needed by weboob and duplicity
2663− google_api_python_client.overridePythonAttrs (old: rec {
2663+ google-api-python-client.overridePythonAttrs (old: rec {
26642664 version = "1.7.6";
26652665 src = old.src.override {
26662666 inherit version;
@@ -2668,7 +2668,7 @@ in {
26682668 };
26692669 });
26702670
2671− googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { };
2671+ googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { };
26722672
26732673 google-apputils = callPackage ../development/python-modules/google-apputils { };
26742674