public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-25 18:52:08 +00:00 committed by GitHub
parent 351b28d469 9ce1caa63c
commit a127deeb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2813 changed files with 3233 additions and 2989 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nixos/modules/services/networking/smokeping.nix
View File

@ -124,7 +124,8 @@ in
}; };
hostName = mkOption { hostName = mkOption {
type = types.str; type = types.str;
default = config.networking.hostName; default = config.networking.fqdn;
defaultText = "\${config.networking.fqdn}";
example = "somewhere.example.com"; example = "somewhere.example.com";
description = "DNS name for the urls generated in the cgi."; description = "DNS name for the urls generated in the cgi.";
}; };
@ -156,6 +157,7 @@ in
ownerEmail = mkOption { ownerEmail = mkOption {
type = types.str; type = types.str;
default = "no-reply@${cfg.hostName}"; default = "no-reply@${cfg.hostName}";
defaultText = "no-reply@\${hostName}";
example = "no-reply@yourdomain.com"; example = "no-reply@yourdomain.com";
description = "Email contact for owner"; description = "Email contact for owner";
}; };
@ -239,18 +241,18 @@ in
targetConfig = mkOption { targetConfig = mkOption {
type = types.lines; type = types.lines;
default = '' default = ''
probe = FPing probe = FPing
menu = Top menu = Top
title = Network Latency Grapher title = Network Latency Grapher
remark = Welcome to the SmokePing website of xxx Company. \ remark = Welcome to the SmokePing website of xxx Company. \
Here you will learn all about the latency of our network. Here you will learn all about the latency of our network.
+ Local + Local
menu = Local menu = Local
title = Local Network title = Local Network
++ LocalMachine ++ LocalMachine
menu = Local Machine menu = Local Machine
title = This host title = This host
host = localhost host = localhost
''; '';
description = "Target configuration"; description = "Target configuration";
}; };

1
nixos/modules/services/web-servers/uwsgi.nix
View File

@ -209,6 +209,7 @@ in {
KillSignal = "SIGQUIT"; KillSignal = "SIGQUIT";
AmbientCapabilities = cfg.capabilities; AmbientCapabilities = cfg.capabilities;
CapabilityBoundingSet = cfg.capabilities; CapabilityBoundingSet = cfg.capabilities;
RuntimeDirectory = mkIf (cfg.runDir == "/run/uwsgi") "uwsgi";
}; };
}; };

4
nixos/modules/system/boot/binfmt.nix
View File

@ -23,7 +23,7 @@ let
activationSnippet = name: { interpreter, ... }: '' activationSnippet = name: { interpreter, ... }: ''
rm -f /run/binfmt/${name} rm -f /run/binfmt/${name}
cat > /run/binfmt/${name} << 'EOF' cat > /run/binfmt/${name} << 'EOF'
#!/usr/bin/env sh #!${pkgs.bash}/bin/sh
exec -- ${interpreter} "$@" exec -- ${interpreter} "$@"
EOF EOF
chmod +x /run/binfmt/${name} chmod +x /run/binfmt/${name}
@ -266,7 +266,7 @@ in {
extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")}
''; '';
nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != [])
([ "/run/binfmt" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); ([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems));
environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));

5
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View File

@ -12,9 +12,6 @@ let
inherit (config.boot.loader.generationsDir) copyKernels; inherit (config.boot.loader.generationsDir) copyKernels;
}; };
# Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
inherit (pkgs.stdenv.hostPlatform) platform;
in in
{ {
@ -59,7 +56,7 @@ in
system.build.installBootLoader = generationsDirBuilder; system.build.installBootLoader = generationsDirBuilder;
system.boot.loader.id = "generationsDir"; system.boot.loader.id = "generationsDir";
system.boot.loader.kernelFile = linux-kernel.target; system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
}; };
} }

4
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View File

@ -5,8 +5,6 @@ with lib;
let let
cfg = config.boot.loader.raspberryPi; cfg = config.boot.loader.raspberryPi;
inherit (pkgs.stdenv.hostPlatform) platform;
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
@ -102,6 +100,6 @@ in
system.build.installBootLoader = builder; system.build.installBootLoader = builder;
system.boot.loader.id = "raspberrypi"; system.boot.loader.id = "raspberrypi";
system.boot.loader.kernelFile = linux-kernel.target; system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
}; };
} }

18
nixos/modules/tasks/network-interfaces.nix
View File

@ -398,6 +398,24 @@ in
''; '';
}; };
networking.fqdn = mkOption {
readOnly = true;
type = types.str;
default = if (cfg.hostName != "" && cfg.domain != null)
then "${cfg.hostName}.${cfg.domain}"
else throw ''
The FQDN is required but cannot be determined. Please make sure that
both networking.hostName and networking.domain are set properly.
'';
defaultText = literalExample ''''${networking.hostName}.''${networking.domain}'';
description = ''
The fully qualified domain name (FQDN) of this host. It is the result
of combining networking.hostName and networking.domain. Using this
option will result in an evaluation error if the hostname is empty or
no domain is specified.
'';
};
networking.hostId = mkOption { networking.hostId = mkOption {
default = null; default = null;
example = "4e98920d"; example = "4e98920d";

14
nixos/tests/hostname.nix
View File

@ -7,9 +7,12 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib; with pkgs.lib;
let let
makeHostNameTest = hostName: domain: makeHostNameTest = hostName: domain: fqdnOrNull:
let let
fqdn = hostName + (optionalString (domain != null) ".${domain}"); fqdn = hostName + (optionalString (domain != null) ".${domain}");
getStr = str: # maybeString2String
let res = builtins.tryEval str;
in if (res.success && res.value != null) then res.value else "null";
in in
makeTest { makeTest {
name = "hostname-${fqdn}"; name = "hostname-${fqdn}";
@ -26,13 +29,16 @@ let
]; ];
}; };
testScript = '' testScript = { nodes, ... }: ''
start_all() start_all()
machine = ${hostName} machine = ${hostName}
machine.wait_for_unit("network-online.target") machine.wait_for_unit("network-online.target")
# Test if NixOS computes the correct FQDN (either a FQDN or an error/null):
assert "${getStr nodes.machine.config.networking.fqdn}" == "${getStr fqdnOrNull}"
# The FQDN, domain name, and hostname detection should work as expected: # The FQDN, domain name, and hostname detection should work as expected:
assert "${fqdn}" == machine.succeed("hostname --fqdn").strip() assert "${fqdn}" == machine.succeed("hostname --fqdn").strip()
assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip() assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip()
@ -60,7 +66,7 @@ let
in in
{ {
noExplicitDomain = makeHostNameTest "ahost" null; noExplicitDomain = makeHostNameTest "ahost" null null;
explicitDomain = makeHostNameTest "ahost" "adomain"; explicitDomain = makeHostNameTest "ahost" "adomain" "ahost.adomain";
} }

5
nixos/tests/searx.nix
View File

@ -81,8 +81,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
base.wait_for_unit("searx-init") base.wait_for_unit("searx-init")
base.wait_for_file("/run/searx/settings.yml") base.wait_for_file("/run/searx/settings.yml")
output = base.succeed( output = base.succeed(
"${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" "${pkgs.yq-go}/bin/yq eval"
" 'engines.(name==startpage).shortcut'" " '.engines[] | select(.name==\"startpage\") | .shortcut'"
" /run/searx/settings.yml"
).strip() ).strip()
assert output == "start", "Settings not merged" assert output == "start", "Settings not merged"

1
nixos/tests/smokeping.nix
View File

@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
sm = sm =
{ ... }: { ... }:
{ {
networking.domain = "example.com"; # FQDN: sm.example.com
services.smokeping = { services.smokeping = {
enable = true; enable = true;
port = 8081; port = 8081;

2
pkgs/applications/accessibility/contrast/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, fetchFromGitLab , fetchFromGitLab
, cairo , cairo
, dbus , dbus

3
pkgs/applications/audio/cadence/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { lib
, a2jmidid , a2jmidid
, coreutils , coreutils
, lib
, libjack2 , libjack2
, fetchpatch , fetchpatch
, fetchzip , fetchzip

2
pkgs/applications/audio/clementine/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm { lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qtbase, qtx11extras , qtbase, qtx11extras
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf

2
pkgs/applications/audio/cozy-audiobooks/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, fetchFromGitHub
, ninja , ninja
, meson , meson
, pkg-config , pkg-config

2
pkgs/applications/audio/curseradio/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: { lib, fetchFromGitHub, substituteAll, python3Packages, mpv }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "0.2"; version = "0.2";

2
pkgs/applications/audio/dfasma/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: { mkDerivation, lib, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
let let

2
pkgs/applications/audio/dr14_tmeter/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }: { lib, fetchFromGitHub, python3Packages, pkgs }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dr14_tmeter"; pname = "dr14_tmeter";

3
pkgs/applications/audio/faust/faust2jackrust.nix
View File

@ -1,5 +1,4 @@
{ stdenv { faust
, faust
, libjack2 , libjack2
, cargo , cargo
, binutils , binutils

2
pkgs/applications/audio/fmit/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook { lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:

2
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, rustPlatform , rustPlatform
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch

2
pkgs/applications/audio/gpodder/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool { lib, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook , glibcLocales, gnome3, gtk3, wrapGAppsHook
, gobject-introspection , gobject-introspection
}: }:

2
pkgs/applications/audio/greg/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages }: { lib, fetchFromGitHub, pythonPackages }:
with pythonPackages; buildPythonApplication rec { with pythonPackages; buildPythonApplication rec {
pname = "greg"; pname = "greg";

2
pkgs/applications/audio/gtklick/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pythonPackages, gettext, klick}: { lib, fetchurl, pythonPackages, gettext, klick}:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "gtklick"; pname = "gtklick";

2
pkgs/applications/audio/jamulus/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 { mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
}: }:
mkDerivation rec { mkDerivation rec {

2
pkgs/applications/audio/librespot/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null }: , withPortAudio ? false, portaudio ? null }:

2
pkgs/applications/audio/lmms/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 { lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13
, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:

2
pkgs/applications/audio/mimms/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, pythonPackages, libmms }: { fetchurl, lib, pythonPackages, libmms }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mimms"; pname = "mimms";

2
pkgs/applications/audio/mixxx/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint { lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint
, fftw, flac, faad2, glibcLocales, mp4v2 , fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile , libGLU, libxcb, lilv, lv2, opusfile

2
pkgs/applications/audio/mopidy/gmusic.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-gmusic"; pname = "mopidy-gmusic";

2
pkgs/applications/audio/mopidy/iris.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris"; pname = "Mopidy-Iris";

2
pkgs/applications/audio/mopidy/moped.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: { lib, pythonPackages, mopidy, glibcLocales }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Moped"; pname = "Mopidy-Moped";

2
pkgs/applications/audio/mopidy/mopify.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, pythonPackages, mopidy }: { lib, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Mopify"; pname = "Mopidy-Mopify";

2
pkgs/applications/audio/mopidy/mpd.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-MPD"; pname = "Mopidy-MPD";

2
pkgs/applications/audio/mopidy/mpris.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-mpris"; pname = "mopidy-mpris";

2
pkgs/applications/audio/mopidy/scrobbler.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Scrobbler"; pname = "Mopidy-Scrobbler";

2
pkgs/applications/audio/mopidy/somafm.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-somafm"; pname = "mopidy-somafm";

2
pkgs/applications/audio/mopidy/soundcloud.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: { lib, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mopidy-soundcloud"; pname = "mopidy-soundcloud";

2
pkgs/applications/audio/mopidy/spotify-tunigo.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: { lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mopidy-spotify-tunigo"; pname = "mopidy-spotify-tunigo";

2
pkgs/applications/audio/mopidy/spotify.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pythonPackages, mopidy }: { lib, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mopidy-spotify"; pname = "mopidy-spotify";

2
pkgs/applications/audio/mopidy/tunein.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-tunein"; pname = "mopidy-tunein";

2
pkgs/applications/audio/mopidy/youtube.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, mopidy }: { lib, python3Packages, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-youtube"; pname = "mopidy-youtube";

2
pkgs/applications/audio/munt/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: { lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }:
let let
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {

2
pkgs/applications/audio/musescore/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools , qtquickcontrols2, qtscript, qtsvg, qttools

2
pkgs/applications/audio/noisetorch/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: { lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }:
buildGoModule rec { buildGoModule rec {
pname = "NoiseTorch"; pname = "NoiseTorch";

2
pkgs/applications/audio/padthv1/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: { lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
mkDerivation rec { mkDerivation rec {
pname = "padthv1"; pname = "padthv1";

2
pkgs/applications/audio/picard/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 { lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5
, enablePlayback ? true , enablePlayback ? true
, gst_all_1 , gst_all_1
}: }:

2
pkgs/applications/audio/pithos/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib { lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection
, libnotify, libsecret, gst_all_1 }: , libnotify, libsecret, gst_all_1 }:

2
pkgs/applications/audio/polyphone/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: { lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
mkDerivation rec { mkDerivation rec {
version = "2.2.0"; version = "2.2.0";

2
pkgs/applications/audio/puddletag/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: { lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "puddletag"; pname = "puddletag";

2
pkgs/applications/audio/pulseaudio-dlna/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, pythonPackages { fetchFromGitHub, lib, pythonPackages
, mp3Support ? true, lame ? null , mp3Support ? true, lame ? null
, opusSupport ? true, opusTools ? null , opusSupport ? true, opusTools ? null
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null

2
pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, ifaddr , ifaddr

2
pkgs/applications/audio/qjackctl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub { lib, mkDerivation, fetchFromGitHub
, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras
# Enable jack session support # Enable jack session support
, jackSession ? false , jackSession ? false

2
pkgs/applications/audio/qmmp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper { lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper
, qtbase, qttools, qtmultimedia, qtx11extras , qtbase, qttools, qtmultimedia, qtx11extras
# transports # transports
, curl, libmms , curl, libmms

2
pkgs/applications/audio/qsampler/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools { lib, fetchurl, autoconf, automake, libtool, pkg-config, qttools
, liblscp, libgig, qtbase, mkDerivation }: , liblscp, libgig, qtbase, mkDerivation }:
mkDerivation rec { mkDerivation rec {

2
pkgs/applications/audio/qsynth/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config { lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config
, mkDerivation, qtbase, qttools, qtx11extras , mkDerivation, qtbase, qttools, qtx11extras
}: }:

2
pkgs/applications/audio/qtractor/default.nix
View File

@ -24,7 +24,7 @@
, serd , serd
, sord , sord
, sratom , sratom
, lib, stdenv , lib
, suil , suil
}: }:

2
pkgs/applications/audio/shortwave/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, fetchFromGitLab , fetchFromGitLab
, cargo , cargo
, dbus , dbus

2
pkgs/applications/audio/sonata/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, gettext { lib, fetchFromGitHub, wrapGAppsHook, gettext
, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let let

2
pkgs/applications/audio/spotify-cli-linux/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, dbus }: { lib, python3Packages, dbus }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "spotify-cli-linux"; pname = "spotify-cli-linux";
version = "1.6.0"; version = "1.6.0";

2
pkgs/applications/audio/synthv1/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: { mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
mkDerivation rec { mkDerivation rec {
pname = "synthv1"; pname = "synthv1";

2
pkgs/applications/audio/traverso/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config { mkDerivation, lib, fetchurl, cmake, pkg-config
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}: }:

2
pkgs/applications/audio/whipper/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac { lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {

54
pkgs/applications/blockchains/clightning.nix
View File

@ -1,28 +1,34 @@
{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake, { lib
autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: , stdenv
, fetchurl
with lib; , autoconf
, automake
, autogen
, gettext
, libtool
, pkg-config
, unzip
, which
, gmp
, python3
, sqlite
, zlib
}:
let
py3 = python3.withPackages (p: [ p.Mako ]);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clightning"; pname = "clightning";
version = "0.9.2"; version = "0.9.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy"; sha256 = "b4563921ed8bccd59d32b031f81825dc57fbe90882f0ecd5da89e48b59ff18b2";
}; };
enableParallelBuilding = true; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ]; buildInputs = [ gmp sqlite zlib ];
buildInputs =
let py3 = python3.withPackages (p: [ p.Mako ]);
in [ sqlite gmp zlib py3 ];
makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
configurePhase = ''
./configure --prefix=$out --disable-developer --disable-valgrind
'';
postPatch = '' postPatch = ''
patchShebangs \ patchShebangs \
@ -32,18 +38,24 @@ stdenv.mkDerivation rec {
devtools/sql-rewrite.py devtools/sql-rewrite.py
''; '';
doCheck = false; configurePhase = ''
./configure --prefix=$out --disable-developer --disable-valgrind
'';
meta = { makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
enableParallelBuilding = true;
meta = with lib; {
description = "A Bitcoin Lightning Network implementation in C"; description = "A Bitcoin Lightning Network implementation in C";
longDescription= '' longDescription = ''
c-lightning is a standard compliant implementation of the Lightning c-lightning is a standard compliant implementation of the Lightning
Network protocol. The Lightning Network is a scalability solution for Network protocol. The Lightning Network is a scalability solution for
Bitcoin, enabling secure and instant transfer of funds between any two Bitcoin, enabling secure and instant transfer of funds between any two
parties for any amount. parties for any amount.
''; '';
homepage = "https://github.com/ElementsProject/lightning"; homepage = "https://github.com/ElementsProject/lightning";
maintainers = with maintainers; [ jb55 ]; maintainers = with maintainers; [ jb55 prusnak ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
}; };

2
pkgs/applications/blockchains/ethabi.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform }: { lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ethabi"; pname = "ethabi";

2
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: { lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";

2
pkgs/applications/blockchains/quorum.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: { lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }:
buildGoPackage rec { buildGoPackage rec {
pname = "quorum"; pname = "quorum";

2
pkgs/applications/blockchains/turbo-geth.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "turbo-geth"; pname = "turbo-geth";

2
pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, trivialBuild }: { fetchurl, lib, trivialBuild }:
trivialBuild { trivialBuild {
pname = "sv-kalender"; pname = "sv-kalender";

2
pkgs/applications/editors/featherpad/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: { lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
mkDerivation rec { mkDerivation rec {
pname = "featherpad"; pname = "featherpad";
version = "0.10.0"; version = "0.10.0";

2
pkgs/applications/editors/focuswriter/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: { lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
mkDerivation rec { mkDerivation rec {
pname = "focuswriter"; pname = "focuswriter";

2
pkgs/applications/editors/hecate/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
version = "0.0.1"; version = "0.0.1";

2
pkgs/applications/editors/hexdino/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }: { lib, fetchFromGitHub, rustPlatform, ncurses }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "hexdino"; pname = "hexdino";

2
pkgs/applications/editors/kibi/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
}: }:

2
pkgs/applications/editors/manuskript/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: { lib, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "manuskript"; pname = "manuskript";

2
pkgs/applications/editors/mindforger/default.nix
View File

@ -4,7 +4,7 @@
, qmake , qmake
, qtbase , qtbase
, qtwebkit , qtwebkit
, lib, stdenv , lib
, wrapGAppsHook , wrapGAppsHook
}: }:

2
pkgs/applications/editors/neovim/gnvim/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: { lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gnvim-unwrapped"; pname = "gnvim-unwrapped";

2
pkgs/applications/editors/neovim/neovim-remote.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages }: { lib, fetchFromGitHub, pythonPackages }:
with lib; with lib;

2
pkgs/applications/editors/okteta/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig { mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
, qca-qt5, shared-mime-info }: , qca-qt5, shared-mime-info }:

2
pkgs/applications/editors/retext/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts { lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
# available. # available.
, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]

2
pkgs/applications/editors/sigil/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
, boost, xercesc, hunspell, zlib, pcre16 , boost, xercesc, hunspell, zlib, pcre16
, qtbase, qttools, qtwebengine, qtxmlpatterns , qtbase, qttools, qtwebengine, qtxmlpatterns
, python3Packages , python3Packages

10
pkgs/applications/editors/standardnotes/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, runtimeShell }: , fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
let let
version = "3.5.11"; version = "3.5.11";
@ -30,6 +30,14 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = pkgs: with pkgs; [
libsecret
];
extraInstallCommands = '' extraInstallCommands = ''
# directory in /nix/store so readonly # directory in /nix/store so readonly
cp -r ${appimageContents}/* $out cp -r ${appimageContents}/* $out

2
pkgs/applications/editors/texmacs/common.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: { lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }:
rec { rec {
extraFontsSrc = fetchurl { extraFontsSrc = fetchurl {
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";

2
pkgs/applications/editors/thonny/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3 }: { lib, fetchFromGitHub, python3 }:
with python3.pkgs; with python3.pkgs;

2
pkgs/applications/editors/tiled/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
, python, qtbase, qttools }: , python, qtbase, qttools }:
mkDerivation rec { mkDerivation rec {

2
pkgs/applications/graphics/displaycal/default.nix
View File

@ -1,5 +1,5 @@
{ python2 { python2
, lib, stdenv , lib
, fetchurl , fetchurl
, pkg-config , pkg-config
, libXext , libXext

2
pkgs/applications/graphics/dosage/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3Packages, fetchFromGitHub }: { lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dosage"; pname = "dosage";

2
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, { lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }:

2
pkgs/applications/graphics/gimp/wrapper.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: { lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
let let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);

2
pkgs/applications/graphics/gscan2pdf/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perlPackages, wrapGAppsHook, { lib, fetchurl, perlPackages, wrapGAppsHook,
# libs # libs
librsvg, sane-backends, sane-frontends, librsvg, sane-backends, sane-frontends,
# runtime dependencies # runtime dependencies

2
pkgs/applications/graphics/hydrus/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, fetchFromGitHub , fetchFromGitHub
, lzma , lzma
, qt5 , qt5

2
pkgs/applications/graphics/ipe/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript { lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, libpng, qtbase, mkDerivation , libjpeg, libpng, qtbase, mkDerivation
}: }:

2
pkgs/applications/graphics/kgraphviewer/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook { lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook
, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons
, qtbase, qtsvg , qtbase, qtsvg
, boost, graphviz , boost, graphviz

2
pkgs/applications/graphics/krop/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: { lib, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "krop"; pname = "krop";

2
pkgs/applications/graphics/luminance-hdr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config { lib, mkDerivation, cmake, fetchFromGitHub, pkg-config
, boost, exiv2, fftwFloat, gsl , boost, exiv2, fftwFloat, gsl
, ilmbase, lcms2, libraw, libtiff, openexr , ilmbase, lcms2, libraw, libtiff, openexr
, qtbase, qtdeclarative, qttools, qtwebengine, eigen , qtbase, qtdeclarative, qttools, qtwebengine, eigen

3
pkgs/applications/graphics/mcomix3/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv { lib
, lib
, fetchFromGitHub , fetchFromGitHub
, wrapGAppsHook , wrapGAppsHook
, installShellFiles , installShellFiles

2
pkgs/applications/graphics/meme/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, unstableGitUpdater , unstableGitUpdater
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub

2
pkgs/applications/graphics/mypaint/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, fetchFromGitHub , fetchFromGitHub
, gtk3 , gtk3
, gettext , gettext

2
pkgs/applications/graphics/nomacs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch

2
pkgs/applications/graphics/paraview/default.nix
View File

@ -1,6 +1,6 @@
{ boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras,
qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper,
mkDerivation, ninja, mpi, python3, lib, stdenv, tbb, libGLU, libGL }: mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }:
mkDerivation rec { mkDerivation rec {
pname = "paraview"; pname = "paraview";

2
pkgs/applications/graphics/pdfcpu/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "pdfcpu"; pname = "pdfcpu";

2
pkgs/applications/graphics/photoflare/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools { mkDerivation, lib, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools
}: }:
mkDerivation rec { mkDerivation rec {

Some files were not shown because too many files have changed in this diff Show More