Merge master into staging-next

launchpad/nixpkgs/master
github-actions[bot] 3 years ago committed by GitHub
commit a127deeb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      nixos/modules/services/networking/smokeping.nix
  2. 1
      nixos/modules/services/web-servers/uwsgi.nix
  3. 4
      nixos/modules/system/boot/binfmt.nix
  4. 5
      nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
  5. 4
      nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
  6. 18
      nixos/modules/tasks/network-interfaces.nix
  7. 14
      nixos/tests/hostname.nix
  8. 5
      nixos/tests/searx.nix
  9. 1
      nixos/tests/smokeping.nix
  10. 2
      pkgs/applications/accessibility/contrast/default.nix
  11. 3
      pkgs/applications/audio/cadence/default.nix
  12. 2
      pkgs/applications/audio/clementine/default.nix
  13. 2
      pkgs/applications/audio/cozy-audiobooks/default.nix
  14. 2
      pkgs/applications/audio/curseradio/default.nix
  15. 2
      pkgs/applications/audio/dfasma/default.nix
  16. 2
      pkgs/applications/audio/dr14_tmeter/default.nix
  17. 3
      pkgs/applications/audio/faust/faust2jackrust.nix
  18. 2
      pkgs/applications/audio/fmit/default.nix
  19. 2
      pkgs/applications/audio/gnome-podcasts/default.nix
  20. 2
      pkgs/applications/audio/gpodder/default.nix
  21. 2
      pkgs/applications/audio/greg/default.nix
  22. 2
      pkgs/applications/audio/gtklick/default.nix
  23. 2
      pkgs/applications/audio/jamulus/default.nix
  24. 2
      pkgs/applications/audio/librespot/default.nix
  25. 2
      pkgs/applications/audio/lmms/default.nix
  26. 2
      pkgs/applications/audio/mimms/default.nix
  27. 2
      pkgs/applications/audio/mixxx/default.nix
  28. 2
      pkgs/applications/audio/mopidy/gmusic.nix
  29. 2
      pkgs/applications/audio/mopidy/iris.nix
  30. 2
      pkgs/applications/audio/mopidy/moped.nix
  31. 2
      pkgs/applications/audio/mopidy/mopify.nix
  32. 2
      pkgs/applications/audio/mopidy/mpd.nix
  33. 2
      pkgs/applications/audio/mopidy/mpris.nix
  34. 2
      pkgs/applications/audio/mopidy/scrobbler.nix
  35. 2
      pkgs/applications/audio/mopidy/somafm.nix
  36. 2
      pkgs/applications/audio/mopidy/soundcloud.nix
  37. 2
      pkgs/applications/audio/mopidy/spotify-tunigo.nix
  38. 2
      pkgs/applications/audio/mopidy/spotify.nix
  39. 2
      pkgs/applications/audio/mopidy/tunein.nix
  40. 2
      pkgs/applications/audio/mopidy/youtube.nix
  41. 2
      pkgs/applications/audio/munt/default.nix
  42. 2
      pkgs/applications/audio/musescore/default.nix
  43. 2
      pkgs/applications/audio/noisetorch/default.nix
  44. 2
      pkgs/applications/audio/padthv1/default.nix
  45. 2
      pkgs/applications/audio/picard/default.nix
  46. 2
      pkgs/applications/audio/pithos/default.nix
  47. 2
      pkgs/applications/audio/polyphone/default.nix
  48. 2
      pkgs/applications/audio/puddletag/default.nix
  49. 2
      pkgs/applications/audio/pulseaudio-dlna/default.nix
  50. 2
      pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
  51. 2
      pkgs/applications/audio/qjackctl/default.nix
  52. 2
      pkgs/applications/audio/qmmp/default.nix
  53. 2
      pkgs/applications/audio/qsampler/default.nix
  54. 2
      pkgs/applications/audio/qsynth/default.nix
  55. 2
      pkgs/applications/audio/qtractor/default.nix
  56. 2
      pkgs/applications/audio/shortwave/default.nix
  57. 2
      pkgs/applications/audio/sonata/default.nix
  58. 2
      pkgs/applications/audio/spotify-cli-linux/default.nix
  59. 2
      pkgs/applications/audio/synthv1/default.nix
  60. 2
      pkgs/applications/audio/traverso/default.nix
  61. 2
      pkgs/applications/audio/whipper/default.nix
  62. 54
      pkgs/applications/blockchains/clightning.nix
  63. 2
      pkgs/applications/blockchains/ethabi.nix
  64. 2
      pkgs/applications/blockchains/ledger-live-desktop/default.nix
  65. 2
      pkgs/applications/blockchains/quorum.nix
  66. 2
      pkgs/applications/blockchains/turbo-geth.nix
  67. 2
      pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
  68. 2
      pkgs/applications/editors/featherpad/default.nix
  69. 2
      pkgs/applications/editors/focuswriter/default.nix
  70. 2
      pkgs/applications/editors/hecate/default.nix
  71. 2
      pkgs/applications/editors/hexdino/default.nix
  72. 2
      pkgs/applications/editors/kibi/default.nix
  73. 2
      pkgs/applications/editors/manuskript/default.nix
  74. 2
      pkgs/applications/editors/mindforger/default.nix
  75. 2
      pkgs/applications/editors/neovim/gnvim/default.nix
  76. 2
      pkgs/applications/editors/neovim/neovim-remote.nix
  77. 2
      pkgs/applications/editors/okteta/default.nix
  78. 2
      pkgs/applications/editors/retext/default.nix
  79. 2
      pkgs/applications/editors/sigil/default.nix
  80. 10
      pkgs/applications/editors/standardnotes/default.nix
  81. 2
      pkgs/applications/editors/texmacs/common.nix
  82. 2
      pkgs/applications/editors/thonny/default.nix
  83. 2
      pkgs/applications/editors/tiled/default.nix
  84. 2
      pkgs/applications/graphics/displaycal/default.nix
  85. 2
      pkgs/applications/graphics/dosage/default.nix
  86. 2
      pkgs/applications/graphics/freecad/default.nix
  87. 2
      pkgs/applications/graphics/gimp/wrapper.nix
  88. 2
      pkgs/applications/graphics/gscan2pdf/default.nix
  89. 2
      pkgs/applications/graphics/hydrus/default.nix
  90. 2
      pkgs/applications/graphics/ipe/default.nix
  91. 2
      pkgs/applications/graphics/kgraphviewer/default.nix
  92. 2
      pkgs/applications/graphics/krop/default.nix
  93. 2
      pkgs/applications/graphics/luminance-hdr/default.nix
  94. 3
      pkgs/applications/graphics/mcomix3/default.nix
  95. 2
      pkgs/applications/graphics/meme/default.nix
  96. 2
      pkgs/applications/graphics/mypaint/default.nix
  97. 2
      pkgs/applications/graphics/nomacs/default.nix
  98. 2
      pkgs/applications/graphics/paraview/default.nix
  99. 2
      pkgs/applications/graphics/pdfcpu/default.nix
  100. 2
      pkgs/applications/graphics/photoflare/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

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

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

@ -23,7 +23,7 @@ let
activationSnippet = name: { interpreter, ... }: ''
rm -f /run/binfmt/${name}
cat > /run/binfmt/${name} << 'EOF'
#!/usr/bin/env sh
#!${pkgs.bash}/bin/sh
exec -- ${interpreter} "$@"
EOF
chmod +x /run/binfmt/${name}
@ -266,7 +266,7 @@ in {
extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")}
'';
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"
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));

@ -12,9 +12,6 @@ let
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
{
@ -59,7 +56,7 @@ in
system.build.installBootLoader = generationsDirBuilder;
system.boot.loader.id = "generationsDir";
system.boot.loader.kernelFile = linux-kernel.target;
system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
};
}

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

@ -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 {
default = null;
example = "4e98920d";

@ -7,9 +7,12 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
makeHostNameTest = hostName: domain:
makeHostNameTest = hostName: domain: fqdnOrNull:
let
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
makeTest {
name = "hostname-${fqdn}";
@ -26,13 +29,16 @@ let
];
};
testScript = ''
testScript = { nodes, ... }: ''
start_all()
machine = ${hostName}
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:
assert "${fqdn}" == machine.succeed("hostname --fqdn").strip()
assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip()
@ -60,7 +66,7 @@ let
in
{
noExplicitDomain = makeHostNameTest "ahost" null;
noExplicitDomain = makeHostNameTest "ahost" null null;
explicitDomain = makeHostNameTest "ahost" "adomain";
explicitDomain = makeHostNameTest "ahost" "adomain" "ahost.adomain";
}

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

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

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

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

@ -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
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf

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

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

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

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

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

@ -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
, jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }:

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

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

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

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

@ -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 {

@ -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
, withPortAudio ? false, portaudio ? null }:

@ -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
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools

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

@ -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 {
pname = "padthv1";

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

@ -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
, libnotify, libsecret, gst_all_1 }:

@ -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 {
version = "2.2.0";

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

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

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

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

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

@ -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 }:
mkDerivation rec {

@ -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
}:

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

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

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

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

@ -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 {
pname = "synthv1";

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

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

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

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

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

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

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

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

@ -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 {
pname = "featherpad";
version = "0.10.0";

@ -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 {
pname = "focuswriter";

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

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

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

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

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

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

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

@ -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
, qca-qt5, shared-mime-info }:

@ -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
# available.
, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]

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

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, runtimeShell }:
, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
let
version = "3.5.11";
@ -30,6 +30,14 @@ let
in appimageTools.wrapType2 rec {
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 = ''
# directory in /nix/store so readonly
cp -r ${appimageContents}/* $out

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

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

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

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

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

@ -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,
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }:

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

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

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

@ -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
}:

@ -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
, qtbase, qtsvg
, boost, graphviz

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

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

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

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

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

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

@ -1,6 +1,6 @@
{ boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras,
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 {
pname = "paraview";

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

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

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

Loading…
Cancel
Save