From 08f68313a47a2093dc0f408a706b2c125bc59c95 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: treewide: remove redundant rec --- pkgs/applications/audio/a2jmidid/default.nix | 2 +- pkgs/applications/audio/cantata/default.nix | 2 +- pkgs/applications/audio/caudec/default.nix | 2 +- pkgs/applications/audio/cmusfm/default.nix | 2 +- pkgs/applications/audio/csound/csound-manual/default.nix | 2 +- pkgs/applications/audio/deadbeef/plugins/lyricbar.nix | 2 +- pkgs/applications/audio/dirt/default.nix | 2 +- pkgs/applications/audio/faust/faustlive.nix | 2 +- pkgs/applications/audio/fluidsynth/default.nix | 2 +- pkgs/applications/audio/fmsynth/default.nix | 2 +- pkgs/applications/audio/foo-yc20/default.nix | 2 +- pkgs/applications/audio/gnome-podcasts/default.nix | 2 +- pkgs/applications/audio/gradio/default.nix | 2 +- pkgs/applications/audio/helm/default.nix | 2 +- pkgs/applications/audio/iannix/default.nix | 2 +- pkgs/applications/audio/jackmix/default.nix | 2 +- pkgs/applications/audio/lv2bm/default.nix | 2 +- pkgs/applications/audio/mod-distortion/default.nix | 2 +- pkgs/applications/audio/muse/default.nix | 2 +- pkgs/applications/audio/musly/default.nix | 2 +- pkgs/applications/audio/non/default.nix | 2 +- pkgs/applications/audio/nova-filters/default.nix | 2 +- pkgs/applications/audio/openmpt123/default.nix | 2 +- pkgs/applications/audio/patchage/default.nix | 2 +- pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 2 +- pkgs/applications/audio/pd-plugins/mrpeach/default.nix | 2 +- pkgs/applications/audio/pianobooster/default.nix | 2 +- pkgs/applications/audio/plugin-torture/default.nix | 2 +- pkgs/applications/audio/pulseaudio-dlna/default.nix | 2 +- pkgs/applications/audio/rhvoice/default.nix | 2 +- pkgs/applications/audio/shntool/default.nix | 2 +- pkgs/applications/audio/soundscape-renderer/default.nix | 2 +- pkgs/applications/audio/speech-denoiser/default.nix | 4 ++-- pkgs/applications/audio/spotifywm/default.nix | 2 +- pkgs/applications/audio/svox/default.nix | 2 +- pkgs/applications/audio/traverso/default.nix | 2 +- pkgs/applications/audio/uade123/default.nix | 2 +- pkgs/applications/audio/zam-plugins/default.nix | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index b94fed41341..28331720048 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -4,7 +4,7 @@ let inherit (python2Packages) python dbus-python; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "a2jmidid"; version = "8"; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 292f28554d0..bdbf6a45a6d 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -35,7 +35,7 @@ let withUdisks = (withTaglib && withDevices); -in mkDerivation rec { +in mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 9c2f17c5cc9..1ab39311258 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -4,7 +4,7 @@ let version = "1.7.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "caudec"; inherit version; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 51b88607208..54f1050da46 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-10-11"; pname = "cmusfm-unstable"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index df0fcb0ee9c..5cc8d71383b 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -4,7 +4,7 @@ libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "csound-manual"; version = "unstable-2019-02-22"; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index 97e054bda64..699f9d86f68 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; version = "unstable-2019-01-29"; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 6d56f53bd16..1fcdda40896 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dirt-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 4268a783c8d..3b6ca9e4053 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -3,7 +3,7 @@ , bc, coreutils, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "faustlive"; version = "2017-12-05"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 404c9cc825e..bb86787a3cf 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -19,7 +19,7 @@ in with versionMap.${version}; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fluidsynth-${fluidsynthVersion}"; version = fluidsynthVersion; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index dc163de8ade..5e95d717968 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 330ae56f13f..b17561e1567 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 3406f317884..eeafdc80344 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -3,7 +3,7 @@ # TODO: build from git for easier updates # rustPlatform.buildRustPackage rec { -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.6"; pname = "gnome-podcasts"; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 94d0f5eb50f..c4a8f2fce02 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -18,7 +18,7 @@ let version = "7.2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gradio"; inherit version; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index d32c55122c5..64de722afe9 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 , lv2, pkgconfig, libGLU_combined }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { version = "0.9.0"; pname = "helm"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 1fd8531fb7f..a893390d74e 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 83644dd5ea5..fe7c83dd56f 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jackmix-0.5.2"; src = fetchurl { url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 7288d39ce77..f1eddb62624 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2bm"; version = "git-2015-11-29"; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 3fbe927be4b..c20f04ec947 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lv2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mod-distortion-git"; version = "2016-08-19"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 8582fd78192..02b1d8ea511 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -16,7 +16,7 @@ , gitAndTools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "muse-sequencer"; version = "3.1pre1"; diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 47370d4bc2f..e7a9e22c2d6 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, eigen, libav_all }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 94cf32f8f82..5f8c82b98d0 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -2,7 +2,7 @@ , libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "non"; version = "2018-02-15"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 91443bb1ef7..0bb970500bd 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2-2"; pname = "nova-filters"; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 8116bcaf0bd..c9d69b5c7f2 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -3,7 +3,7 @@ let version = "0.4.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openmpt123"; inherit version; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 4f76aefb5ed..e7c4cab9af1 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -2,7 +2,7 @@ , gtkmm2, libjack2, pkgconfig, python2, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "patchage"; version = "1.0.1"; src = fetchsvn { diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index faa914e1328..6c7a4b03ef5 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "helmholtz"; src = fetchurl { diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 9e7de39218d..028a4667cb2 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mrpeach"; version = "1.1"; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index c2c4672be12..448b219a1af 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pianobooster"; version = "0.6.4b"; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 346387be7e3..f444ad6cb32 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plugin-torture"; version = "2016-07-25"; diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index d414cb75611..a9f56cca001 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { pname = "pulseaudio-dlna"; version = "2017-11-01"; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index c34b27edd96..e3eb750496b 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -3,7 +3,7 @@ let version = "unstable-2018-02-10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "rhvoice"; inherit version; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index dc8d95d2c49..e3bfc60a40a 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flac }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.0.10"; pname = "shntool"; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 01f0708d115..30ff41da369 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -14,7 +14,7 @@ , libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soundscape-renderer-unstable"; version = "2016-11-03"; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 2401dc60b09..6598d24fb07 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -8,7 +8,7 @@ let sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"; }; - rnnoise-nu = stdenv.mkDerivation rec { + rnnoise-nu = stdenv.mkDerivation { pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; @@ -18,7 +18,7 @@ let installTargets = [ "install-rnnoise-nu" ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "speech-denoiser"; version = "unstable-07-10-2019"; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index 3447049099b..2380c8e5d9e 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spotifywm-unstable"; version = "2016-11-28"; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index d25e61c37f5..8acd8e0b88b 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "svox"; version = "2017-07-18"; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 0f70f956713..9188003ce66 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -2,7 +2,7 @@ , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "traverso"; version = "0.49.6"; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index b5ff8e41fe0..844eea11f51 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -2,7 +2,7 @@ let version = "2.13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "uade123"; inherit version; src = fetchurl { diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index cc04632cfb5..eeeb8ae2ea4 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zam-plugins"; version = "3.11"; -- cgit 1.4.1