ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

treewide: remove unused variables (#63177)

Browse Source 
* treewide: remove unused variables

* making ofborg happy
This commit is contained in:
volth 2019-06-16 19:59:06 +00:00 committed by Alyssa Ross
parent ccee4117be
commit f3282c8d1e
765 changed files with 661 additions and 959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/systems/parse.nix
View File

@ -428,7 +428,7 @@ rec {
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
doubleFromSystem = { cpu, vendor, kernel, abi, ... }: doubleFromSystem = { cpu, kernel, abi, ... }:
/**/ if abi == abis.cygnus then "${cpu.name}-cygwin" /**/ if abi == abis.cygnus then "${cpu.name}-cygwin"
else if kernel.families ? darwin then "${cpu.name}-darwin" else if kernel.families ? darwin then "${cpu.name}-darwin"
else "${cpu.name}-${kernel.name}"; else "${cpu.name}-${kernel.name}";

2
nixos/modules/hardware/video/nvidia.nix
View File

@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers. # This module provides the proprietary NVIDIA X11 / OpenGL drivers.
{ stdenv, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
View File

@ -1,7 +1,7 @@
# This module contains the basic configuration for building a graphical NixOS # This module contains the basic configuration for building a graphical NixOS
# installation CD. # installation CD.
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -1,7 +1,7 @@
# This module defines a NixOS installation CD that contains X11 and # This module defines a NixOS installation CD that contains X11 and
# GNOME 3. # GNOME 3.
{ config, lib, pkgs, ... }: { lib, ... }:
with lib; with lib;

1
nixos/modules/misc/nixops-autoluks.nix
View File

@ -1,7 +1,6 @@
{ config, options, lib, ... }: { config, options, lib, ... }:
let let
path = [ "deployment" "autoLuks" ]; path = [ "deployment" "autoLuks" ];
hasAutoLuksOption = lib.hasAttrByPath path options;
hasAutoLuksConfig = lib.hasAttrByPath path config && (lib.attrByPath path {} config) != {}; hasAutoLuksConfig = lib.hasAttrByPath path config && (lib.attrByPath path {} config) != {};
inherit (config.nixops) enableDeprecatedAutoLuks; inherit (config.nixops) enableDeprecatedAutoLuks;

2
nixos/modules/misc/version.nix
View File

@ -1,4 +1,4 @@
{ options, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;

1
nixos/modules/services/audio/snapserver.nix
View File

@ -4,7 +4,6 @@ with lib;
let let
package = "snapcast";
name = "snapserver"; name = "snapserver";
cfg = config.services.snapserver; cfg = config.services.snapserver;

7
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -72,13 +72,6 @@ let
default = null; default = null;
}; };
}; };
kubeConfigDefaults = {
server = mkDefault cfg.kubeconfig.server;
caFile = mkDefault cfg.kubeconfig.caFile;
certFile = mkDefault cfg.kubeconfig.certFile;
keyFile = mkDefault cfg.kubeconfig.keyFile;
};
in { in {
###### interface ###### interface

7
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -28,13 +28,6 @@ let
kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
manifests = pkgs.buildEnv {
name = "kubernetes-manifests";
paths = mapAttrsToList (name: manifest:
pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest)
) cfg.manifests;
};
manifestPath = "kubernetes/manifests"; manifestPath = "kubernetes/manifests";
taintOptions = with lib.types; { name, ... }: { taintOptions = with lib.types; { name, ... }: {

1
nixos/modules/services/cluster/kubernetes/pki.nix
View File

@ -118,7 +118,6 @@ in
cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl"; cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl";
cfsslCert = "${cfsslCertPathPrefix}.pem"; cfsslCert = "${cfsslCertPathPrefix}.pem";
cfsslKey = "${cfsslCertPathPrefix}-key.pem"; cfsslKey = "${cfsslCertPathPrefix}-key.pem";
cfsslPort = toString config.services.cfssl.port;
certmgrPaths = [ certmgrPaths = [
top.caFile top.caFile

2
nixos/modules/services/hardware/triggerhappy.nix
View File

@ -17,7 +17,7 @@ let
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
bindingCfg = { config, ... }: { bindingCfg = { ... }: {
options = { options = {
keys = mkOption { keys = mkOption {

1
nixos/modules/services/mail/rspamd.nix
View File

@ -5,7 +5,6 @@ with lib;
let let
cfg = config.services.rspamd; cfg = config.services.rspamd;
opts = options.services.rspamd;
postfixCfg = config.services.postfix; postfixCfg = config.services.postfix;
bindSocketOpts = {options, config, ... }: { bindSocketOpts = {options, config, ... }: {

2
nixos/modules/services/monitoring/alerta.nix
View File

@ -1,4 +1,4 @@
{ options, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/services/monitoring/grafana-reporter.nix
View File

@ -1,4 +1,4 @@
{ options, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/services/monitoring/kapacitor.nix
View File

@ -1,4 +1,4 @@
{ options, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/services/networking/bitcoind.nix
View File

@ -28,7 +28,7 @@ let
"-datadir=${cfg.dataDir}" "-datadir=${cfg.dataDir}"
"-pid=${pidFile}" "-pid=${pidFile}"
]; ];
hexStr = types.strMatching "[0-9a-f]+";
rpcUserOpts = { name, ... }: { rpcUserOpts = { name, ... }: {
options = { options = {
name = mkOption { name = mkOption {

2
nixos/modules/services/system/kerberos/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, config, lib, ...}: {config, lib, ...}:
let let
inherit (lib) mkOption mkIf types length attrNames; inherit (lib) mkOption mkIf types length attrNames;

2
nixos/modules/services/system/kerberos/heimdal.nix
View File

@ -2,7 +2,7 @@
let let
inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs
mapAttrsToList attrValues; mapAttrsToList;
cfg = config.services.kerberos_server; cfg = config.services.kerberos_server;
kerberos = config.krb5.kerberos; kerberos = config.krb5.kerberos;
stateDir = "/var/heimdal"; stateDir = "/var/heimdal";

2
nixos/modules/services/system/kerberos/mit.nix
View File

@ -2,7 +2,7 @@
let let
inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList
mapAttrs mapAttrsToList attrValues; mapAttrs mapAttrsToList;
cfg = config.services.kerberos_server; cfg = config.services.kerberos_server;
kerberos = config.krb5.kerberos; kerberos = config.krb5.kerberos;
stateDir = "/var/lib/krb5kdc"; stateDir = "/var/lib/krb5kdc";

2
nixos/modules/services/web-apps/limesurvey.nix
View File

@ -2,7 +2,7 @@
let let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; inherit (lib) mkDefault mkEnableOption mkForce mkIf mkOption;
inherit (lib) mapAttrs optional optionalString types; inherit (lib) mapAttrs optional optionalString types;
cfg = config.services.limesurvey; cfg = config.services.limesurvey;

2
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }@args: { config, lib, pkgs, ... }:
with lib; with lib;

1
nixos/modules/services/web-apps/tt-rss.nix
View File

@ -15,7 +15,6 @@ let
else cfg.database.port; else cfg.database.port;
poolName = "tt-rss"; poolName = "tt-rss";
phpfpmSocketName = "/run/phpfpm/${poolName}.sock";
tt-rss-config = pkgs.writeText "config.php" '' tt-rss-config = pkgs.writeText "config.php" ''
<?php <?php

11
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -269,17 +269,6 @@ let
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
} }
'') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
mkBasicAuth = vhostName: authDef: let
htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" (
concatStringsSep "\n" (mapAttrsToList (user: password: ''
${user}:{PLAIN}${password}
'') authDef)
);
in ''
auth_basic secured;
auth_basic_user_file ${htpasswdFile};
'';
mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" ( mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
concatStringsSep "\n" (mapAttrsToList (user: password: '' concatStringsSep "\n" (mapAttrsToList (user: password: ''
${user}:{PLAIN}${password} ${user}:{PLAIN}${password}

2
nixos/modules/services/x11/xserver.nix
View File

@ -4,8 +4,6 @@ with lib;
let let
kernelPackages = config.boot.kernelPackages;
# Abbreviations. # Abbreviations.
cfg = config.services.xserver; cfg = config.services.xserver;
xorg = pkgs.xorg; xorg = pkgs.xorg;

1
nixos/modules/system/boot/kernel_config.nix
View File

@ -9,7 +9,6 @@ let
mergeAnswer = winners: locs: defs: mergeAnswer = winners: locs: defs:
let let
values = map (x: x.value) defs; values = map (x: x.value) defs;
freeformAnswer = intersectLists values winners;
inter = intersectLists values winners; inter = intersectLists values winners;
winner = head winners; winner = head winners;
in in

7
nixos/modules/virtualisation/anbox.nix
View File

@ -100,12 +100,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ];
preStart = let preStart = let
initsh = let initsh = pkgs.writeText "nixos-init" (''
ip = cfg.ipv4.container.address;
gw = cfg.ipv4.gateway.address;
dns = cfg.ipv4.dns;
in
pkgs.writeText "nixos-init" (''
#!/system/bin/sh #!/system/bin/sh
setprop nixos.version ${config.system.nixos.version} setprop nixos.version ${config.system.nixos.version}

2
nixos/modules/virtualisation/cloudstack-config.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
with lib; with lib;

2
nixos/modules/virtualisation/docker-containers.nix
View File

@ -5,7 +5,7 @@ let
cfg = config.docker-containers; cfg = config.docker-containers;
dockerContainer = dockerContainer =
{ name, config, ... }: { { ... }: {
options = { options = {

1
nixos/modules/virtualisation/google-compute-config.nix
View File

@ -2,7 +2,6 @@
with lib; with lib;
let let
gce = pkgs.google-compute-engine; gce = pkgs.google-compute-engine;
cfg = config.virtualisation.googleComputeImage;
in in
{ {
imports = [ imports = [

2
pkgs/applications/altcoins/btc1.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 { stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent , boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent
, AppKit , AppKit
, withGui ? !stdenv.isDarwin , withGui ? !stdenv.isDarwin
}: }:

2
pkgs/applications/altcoins/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: { callPackage, boost155, boost165, openssl_1_1, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }:
rec { rec {

2
pkgs/applications/altcoins/exodus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, makeWrapper, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio }: cups, vivaldi-ffmpeg-codecs, libpulseaudio }:

2
pkgs/applications/audio/ams-lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig
, wafHook }: , wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, bitwig-studio1, { fetchurl, bitwig-studio1,
xdg_utils, zenity, ffmpeg, pulseaudio }: pulseaudio }:
bitwig-studio1.overrideAttrs (oldAttrs: rec { bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}"; name = "bitwig-studio-${version}";

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

@ -3,9 +3,7 @@
, pkgconfig , pkgconfig
, qtbase , qtbase
, makeWrapper , makeWrapper
, jack2Full
, python3Packages , python3Packages
, a2jmidid
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, cairo, expat, fftwSinglePrec, fluidsynth, glib { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
, qtbase, qtmultimedia, qtsvg, qttools , qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that # Cantata doesn't build with cdparanoia enabled so we disable that

4
pkgs/applications/audio/carla/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, fftw, jack2, { stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2,
liblo, libpulseaudio, libsndfile, makeWrapper, pkgconfig, python3Packages, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages,
which, withFrontend ? true, which, withFrontend ? true,
withQt ? true, qtbase ? null, withQt ? true, qtbase ? null,
withGtk2 ? true, gtk2 ? null, withGtk2 ? true, gtk2 ? null,

1
pkgs/applications/audio/chuck/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which { stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel , AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel
, xcbuild
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, ninja , ninja
, boost
, meson , meson
, pkgconfig , pkgconfig
, wrapGAppsHook , wrapGAppsHook
@ -12,7 +11,6 @@
, python3Packages , python3Packages
, file , file
, cairo , cairo
, sqlite
, gettext , gettext
, gnome3 , gnome3
}: }:

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3 { stdenv, fetchurl, fetchpatch, meson, ninja, gettext, cargo, rustc, python3, pkgconfig, gnome3
, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }: , glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
# TODO: build from git for easier updates # TODO: build from git for easier updates

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch { stdenv, fetchFromGitHub, makeWrapper, 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/parlatype/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: { stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "parlatype"; pname = "parlatype";

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

@ -3,7 +3,6 @@
, fetchPypi , fetchPypi
, ifaddr , ifaddr
, typing , typing
, isPy27
, pythonOlder , pythonOlder
, netifaces , netifaces
, six , six

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper { stdenv, fetchurl, autoPatchelfHook, makeWrapper
, alsaLib, xorg , alsaLib, xorg
, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype , gtk3, pango, gdk_pixbuf, cairo, glib, freetype
, libpulseaudio, xdg_utils , libpulseaudio, xdg_utils
}: }:

1
pkgs/applications/audio/vocal/default.nix
View File

@ -14,7 +14,6 @@
, libnotify , libnotify
, sqlite , sqlite
, gst_all_1 , gst_all_1
, libsoup
, json-glib , json-glib
, libgee , libgee
, wrapGAppsHook , wrapGAppsHook

2
pkgs/applications/editors/android-studio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, makeFontsConf, gnome2 }: { callPackage, makeFontsConf, gnome2 }:
let let
mkStudio = opts: callPackage (import ./common.nix opts) { mkStudio = opts: callPackage (import ./common.nix opts) {

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

@ -1,4 +1,4 @@
{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: { stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }:
let let
versions = { versions = {

2
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View File

@ -12,7 +12,7 @@ To update the list of packages from MELPA,
*/ */
{ fetchurl, lib, stdenv, texinfo }: { lib, stdenv, texinfo }:
self: self:

4
pkgs/applications/editors/emacs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchpatch, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf
@ -7,7 +7,7 @@
, withNS ? stdenv.isDarwin , withNS ? stdenv.isDarwin
, withGTK2 ? false, gtk2-x11 ? null , withGTK2 ? false, gtk2-x11 ? null
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null
, withCsrc ? true , withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
, siteStart ? ./site-start.el , siteStart ? ./site-start.el

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }: { stdenv, pkgconfig, qt5, fetchFromGitHub }:
with qt5; with qt5;

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

@ -1,5 +1,5 @@
{ avahiSupport ? false # build support for Avahi in libinfinity { avahiSupport ? false # build support for Avahi in libinfinity
, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook , stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
let let

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3 { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
, libgee, discount, wrapGAppsHook }: , libgee, discount, wrapGAppsHook }:

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

@ -1,4 +1,4 @@
{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts { stdenv, python3, fetchFromGitHub, makeWrapper, 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/texmacs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, callPackage, { stdenv, callPackage,
fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype, fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype,
tex ? null, tex ? null,
aspell ? null, aspell ? null,
ghostscriptX ? null, ghostscriptX ? null,

2
pkgs/applications/editors/vim/configurable.nix
View File

@ -1,6 +1,6 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc # but I have gvim with python support now :) - Marc
{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext
, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE , libICE

2
pkgs/applications/editors/vscode/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, makeDesktopItem { stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, wrapGAppsHook , unzip, libsecret, libXScrnSaver, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig , systemd, fontconfig

2
pkgs/applications/editors/vscode/vscode.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, callPackage, fetchurl, fetchpatch, isInsiders ? false }: { stdenv, lib, callPackage, fetchurl, isInsiders ? false }:
let let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;

2
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, callPackage, fetchurl, fetchpatch }: { stdenv, callPackage, fetchurl }:
let let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;

2
pkgs/applications/editors/vscode/with-extensions.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, runCommand, buildEnv, vscode, makeWrapper { lib, runCommand, buildEnv, vscode, makeWrapper
, vscodeExtensions ? [] }: , vscodeExtensions ? [] }:
/* /*

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, aspell, boost, expat, expect, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: { stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xmlcopyeditor-${version}"; name = "xmlcopyeditor-${version}";

2
pkgs/applications/gis/qgis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, makeWrapper, symlinkJoin { lib, makeWrapper, symlinkJoin
, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) , qgis-unwrapped, extraPythonPackages ? (ps: [ ])
}: }:
with lib; with lib;

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, qt4, file, gcc }: { stdenv, lib, fetchurl, cmake, qt4, file }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "animbar"; pname = "animbar";

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch , hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran
, soqt, libf2c, makeWrapper, makeDesktopItem , soqt, libf2c, makeWrapper
, mpi ? null }: , mpi ? null }:
assert mpi != null; assert mpi != null;

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
let let
version = "2.3.1"; version = "2.3.1";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, makeWrapper, wrapGAppsHook, { stdenv, fetchurl, perlPackages, wrapGAppsHook,
librsvg, sane-backends, sane-frontends, librsvg, sane-backends, sane-frontends,
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper,
xvfb_run, hicolor-icon-theme, liberation_ttf, file, pdftk }: xvfb_run, hicolor-icon-theme, liberation_ttf, file, pdftk }:

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

@ -1,4 +1,4 @@
{ lib, bundlerApp, fetchurl, ruby, makeWrapper, { lib, bundlerApp, ruby, makeWrapper,
withPngcrush ? true, pngcrush ? null, withPngcrush ? true, pngcrush ? null,
withPngout ? true, pngout ? null, withPngout ? true, pngout ? null,
withAdvpng ? true, advancecomp ? null, withAdvpng ? true, advancecomp ? null,

2
pkgs/applications/graphics/jpeg-archive/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jpeg-archive-${version}"; name = "jpeg-archive-${version}";

1
pkgs/applications/graphics/krita/default.nix
View File

@ -12,7 +12,6 @@ let
major = "4.2"; major = "4.2";
minor = "1"; minor = "1";
patch = null;
in in

1
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch
, meson , meson
, ninja , ninja
, gtk3 , gtk3

2
pkgs/applications/graphics/tesseract/tesseract3.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, leptonica, libpng, libtiff, icu, pango, opencl-headers }: , leptonica, libpng, libtiff, icu, pango, opencl-headers }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/kde/knotes.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, mkDerivation,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels, kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels,

2
pkgs/applications/misc/buku/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, python3, fetchFromGitHub, fetchpatch }: { stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec { with python3.pkgs; buildPythonApplication rec {
version = "4.2.2"; version = "4.2.2";

2
pkgs/applications/misc/cardpeek/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook, { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
glib, gtk3, pcsclite, lua5_2, curl, readline }: glib, gtk3, pcsclite, lua5_2, curl, readline }:
let let
version = "0.8.4"; version = "0.8.4";

2
pkgs/applications/misc/curaengine/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }: { stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curaengine-${version}"; name = "curaengine-${version}";

2
pkgs/applications/misc/ddgr/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchpatch, fetchFromGitHub, python3}: {stdenv, fetchFromGitHub, python3}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.6";

1
pkgs/applications/misc/digitalbitbox/default.nix
View File

@ -3,7 +3,6 @@
, curl , curl
, fetchFromGitHub , fetchFromGitHub
, git , git
, libcap
, libevent , libevent
, libtool , libtool
, qrencode , qrencode

6
pkgs/applications/misc/electron-cash/default.nix
View File

@ -1,11 +1,5 @@
{ lib, fetchurl, python3Packages, qtbase, makeWrapper }: { lib, fetchurl, python3Packages, qtbase, makeWrapper }:
let
python = python3Packages.python;
in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "electron-cash"; pname = "electron-cash";
version = "4.0.2"; version = "4.0.2";

2
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, { stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}: }:

4
pkgs/applications/misc/gImageReader/default.nix
View File

@ -6,8 +6,8 @@
# Gtk deps # Gtk deps
# upstream gImagereader supports Qt too # upstream gImagereader supports Qt too
, gtk3, gobject-introspection, wrapGAppsHook , gobject-introspection, wrapGAppsHook
, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm , gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm
}: }:
let let

2
pkgs/applications/misc/ganttproject-bin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, makeDesktopItem, makeWrapper { stdenv, fetchzip, makeDesktopItem, makeWrapper
, jre , jre
}: }:

2
pkgs/applications/misc/gremlin-console/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, fetchzip, stdenv, makeWrapper, openjdk }: { fetchzip, stdenv, makeWrapper, openjdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gremlin-console-${version}"; name = "gremlin-console-${version}";

2
pkgs/applications/misc/k2pdfopt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig { stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
, zlib, libpng, openjpeg , zlib, libpng
, enableGSL ? true, gsl , enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript , enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf , enableMuPDF ? true, mupdf

2
pkgs/applications/misc/kitty/default.nix
View File

@ -2,7 +2,7 @@
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland, libxkbcommon, libXi, libXext, wayland-protocols, wayland,
which, dbus, fetchpatch, which, dbus,
Cocoa, Cocoa,
CoreGraphics, CoreGraphics,
Foundation, Foundation,

4
pkgs/applications/misc/lutris/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub, fetchpatch { stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub
, wrapGAppsHook, python2Packages, python3Packages }: , wrapGAppsHook, python3Packages }:
let let
qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ]; qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ];

2
pkgs/applications/misc/taskell/default.nix
View File

@ -1,4 +1,4 @@
{ haskell, lib, haskellPackages, fetchFromGitHub }: { lib, haskellPackages, fetchFromGitHub }:
let let
version = "1.4.3"; version = "1.4.3";

2
pkgs/applications/misc/termite/wrapper.nix
View File

@ -1,4 +1,4 @@
{ makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }: { makeWrapper, symlinkJoin, configFile ? null, termite }:
if configFile == null then termite else symlinkJoin { if configFile == null then termite else symlinkJoin {
name = "termite-with-config-${termite.version}"; name = "termite-with-config-${termite.version}";

3
pkgs/applications/misc/ulauncher/default.nix
View File

@ -1,12 +1,9 @@
{ stdenv { stdenv
, fetchFromGitHub
, fetchurl , fetchurl
, python27Packages , python27Packages
, substituteAll
, gnome3 , gnome3
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
, gtk3
, webkitgtk , webkitgtk
, libnotify , libnotify
, keybinder3 , keybinder3

2
pkgs/applications/misc/xcruiser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gccmakedep, xorg, imake, libXt, libXaw, libXpm, libXext }: { stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xcruiser-0.30"; name = "xcruiser-0.30";

6
pkgs/applications/misc/yubioath-desktop/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub { stdenv, fetchurl
, qmake, qtbase, qtquickcontrols, qtsvg , qmake, qtbase, qtquickcontrols
, python3, pyotherside, ncurses , python3, pyotherside
, pcsclite, yubikey-personalization , pcsclite, yubikey-personalization
, yubikey-manager, makeWrapper }: , yubikey-manager, makeWrapper }:

2
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, meson, ninja, fetchurl, fetchFromGitHub { stdenv, lib, meson, ninja, fetchFromGitHub
, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -1,4 +1,4 @@
{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar { stdenv, llvmPackages, gn, ninja, which, nodejs, fetchpatch, gnutar
# default dependencies # default dependencies
, bzip2, flac, speex, libopus , bzip2, flac, speex, libopus

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,5 +1,5 @@
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8 { newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
, makeWrapper, makeDesktopItem, ed , makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas , glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null , libva ? null

3
pkgs/applications/networking/browsers/firefox-bin/update.nix
View File

@ -1,5 +1,4 @@
{ stdenv { name
, name
, channel , channel
, writeScript , writeScript
, xidel , xidel

2
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3, overrideCC, gccStdenv, gcc6 }: { lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }:
let let

1
pkgs/applications/networking/browsers/firefox/update.nix
View File

@ -1,5 +1,4 @@
{ writeScript { writeScript
, stdenv
, lib , lib
, xidel , xidel
, common-updater-scripts , common-updater-scripts

2
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas { stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View File

@ -21,8 +21,6 @@
, mediaSupport ? false , mediaSupport ? false
, ffmpeg , ffmpeg
, gmp
# Extensions, common # Extensions, common
, zip , zip

3
pkgs/applications/networking/charles/default.nix
View File

@ -20,8 +20,7 @@ let
startupNotify = "true"; startupNotify = "true";
}; };
attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
name = "charles-${version}"; name = "charles-${version}";
inherit version; inherit version;

2
pkgs/applications/networking/cluster/docker-machine/kvm2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, minikube }: { stdenv, buildGoPackage, libvirt, pkgconfig, minikube }:
buildGoPackage rec { buildGoPackage rec {
pname = "docker-machine-kvm2"; pname = "docker-machine-kvm2";

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