treewide: remove redundant rec

This commit is contained in:
volth 2019-08-13 21:52:01 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions

View file

@ -24,7 +24,7 @@ rec {
let arg = (merger init (defaultMergeArg init x)); let arg = (merger init (defaultMergeArg init x));
# now add the function with composed args already applied to the final attrs # now add the function with composed args already applied to the final attrs
base = (setAttrMerge "passthru" {} (f arg) base = (setAttrMerge "passthru" {} (f arg)
( z: z // rec { ( z: z // {
function = foldArgs merger f arg; function = foldArgs merger f arg;
args = (lib.attrByPath ["passthru" "args"] {} z) // x; args = (lib.attrByPath ["passthru" "args"] {} z) // x;
} )); } ));

View file

@ -1,7 +1,7 @@
{ lib, version }: { lib, version }:
with lib; with lib;
rec { {
# Common patterns/legacy # Common patterns/legacy
whenAtLeast = ver: mkIf (versionAtLeast version ver); whenAtLeast = ver: mkIf (versionAtLeast version ver);
whenOlder = ver: mkIf (versionOlder version ver); whenOlder = ver: mkIf (versionOlder version ver);

View file

@ -7,7 +7,7 @@ let
in in
lib.mapAttrs (n: v: v // { shortName = n; }) rec { lib.mapAttrs (n: v: v // { shortName = n; }) {
/* License identifiers from spdx.org where possible. /* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or * If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration. * add it to this list. The URL mentioned above is a good source for inspiration.

View file

@ -33,7 +33,7 @@ let
filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed); filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
in rec { in {
inherit all; inherit all;
none = []; none = [];

View file

@ -24,27 +24,27 @@ rec {
platform = platforms.powernv; platform = platforms.powernv;
}; };
sheevaplug = rec { sheevaplug = {
config = "armv5tel-unknown-linux-gnueabi"; config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.sheevaplug; platform = platforms.sheevaplug;
}; };
raspberryPi = rec { raspberryPi = {
config = "armv6l-unknown-linux-gnueabihf"; config = "armv6l-unknown-linux-gnueabihf";
platform = platforms.raspberrypi; platform = platforms.raspberrypi;
}; };
armv7l-hf-multiplatform = rec { armv7l-hf-multiplatform = {
config = "armv7l-unknown-linux-gnueabihf"; config = "armv7l-unknown-linux-gnueabihf";
platform = platforms.armv7l-hf-multiplatform; platform = platforms.armv7l-hf-multiplatform;
}; };
aarch64-multiplatform = rec { aarch64-multiplatform = {
config = "aarch64-unknown-linux-gnu"; config = "aarch64-unknown-linux-gnu";
platform = platforms.aarch64-multiplatform; platform = platforms.aarch64-multiplatform;
}; };
armv7a-android-prebuilt = rec { armv7a-android-prebuilt = {
config = "armv7a-unknown-linux-androideabi"; config = "armv7a-unknown-linux-androideabi";
sdkVer = "24"; sdkVer = "24";
ndkVer = "18b"; ndkVer = "18b";
@ -52,7 +52,7 @@ rec {
useAndroidPrebuilt = true; useAndroidPrebuilt = true;
}; };
aarch64-android-prebuilt = rec { aarch64-android-prebuilt = {
config = "aarch64-unknown-linux-android"; config = "aarch64-unknown-linux-android";
sdkVer = "24"; sdkVer = "24";
ndkVer = "18b"; ndkVer = "18b";
@ -65,17 +65,17 @@ rec {
inherit (platform.gcc) fpu; inherit (platform.gcc) fpu;
}; };
pogoplug4 = rec { pogoplug4 = {
config = "armv5tel-unknown-linux-gnueabi"; config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.pogoplug4; platform = platforms.pogoplug4;
}; };
ben-nanonote = rec { ben-nanonote = {
config = "mipsel-unknown-linux-uclibc"; config = "mipsel-unknown-linux-uclibc";
platform = platforms.ben_nanonote; platform = platforms.ben_nanonote;
}; };
fuloongminipc = rec { fuloongminipc = {
config = "mipsel-unknown-linux-gnu"; config = "mipsel-unknown-linux-gnu";
platform = platforms.fuloong2f_n32; platform = platforms.fuloong2f_n32;
}; };

View file

@ -403,7 +403,7 @@ rec {
getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}"); getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}"); getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
parsed = rec { parsed = {
cpu = getCpu args.cpu; cpu = getCpu args.cpu;
vendor = vendor =
/**/ if args ? vendor then getVendor args.vendor /**/ if args ? vendor then getVendor args.vendor

View file

@ -107,7 +107,7 @@ rec {
merge = mergeEqualOption; merge = mergeEqualOption;
}; };
int = mkOptionType rec { int = mkOptionType {
name = "int"; name = "int";
description = "signed integer"; description = "signed integer";
check = isInt; check = isInt;
@ -136,7 +136,7 @@ rec {
sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1) sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
"signedInt${toString bit}" "${toString bit} bit signed integer"; "signedInt${toString bit}" "${toString bit} bit signed integer";
in rec { in {
/* An int with a fixed range. /* An int with a fixed range.
* *
* Example: * Example:
@ -172,7 +172,7 @@ rec {
# Alias of u16 for a port number # Alias of u16 for a port number
port = ints.u16; port = ints.u16;
float = mkOptionType rec { float = mkOptionType {
name = "float"; name = "float";
description = "floating point number"; description = "floating point number";
check = isFloat; check = isFloat;

View file

@ -7,7 +7,7 @@ let
in in
rec { {
/* Get the major version string from a string. /* Get the major version string from a string.

View file

@ -126,7 +126,7 @@ let
} }
''; '';
in rec { in {
inherit optionsNix; inherit optionsNix;
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix); optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);

View file

@ -1,6 +1,6 @@
pkgs: with pkgs.lib; pkgs: with pkgs.lib;
rec { {
# Check whenever fileSystem is needed for boot # Check whenever fileSystem is needed for boot
fsNeededForBoot = fs: fs.neededForBoot fsNeededForBoot = fs: fs.neededForBoot

View file

@ -6,7 +6,7 @@ let
# The set of alternative malloc(3) providers. # The set of alternative malloc(3) providers.
providers = { providers = {
graphene-hardened = rec { graphene-hardened = {
libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so"; libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so";
description = '' description = ''
An allocator designed to mitigate memory corruption attacks, such as An allocator designed to mitigate memory corruption attacks, such as

View file

@ -129,7 +129,7 @@ in
]; ];
nixpkgs.config = { nixpkgs.config = {
packageOverrides = p: rec { packageOverrides = p: {
linux_3_4 = p.linux_3_4.override { linux_3_4 = p.linux_3_4.override {
extraConfig = '' extraConfig = ''
# Enable drivers in kernel for most NICs. # Enable drivers in kernel for most NICs.

View file

@ -18,7 +18,7 @@ with lib;
}; };
config = rec { config = {
# Don't build the GRUB menu builder script, since we don't need it # Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency. # here and it causes a cyclic dependency.
boot.loader.grub.enable = false; boot.loader.grub.enable = false;

View file

@ -5,7 +5,7 @@ with lib;
let let
cfg = config.programs.firejail; cfg = config.programs.firejail;
wrappedBins = pkgs.stdenv.mkDerivation rec { wrappedBins = pkgs.stdenv.mkDerivation {
name = "firejail-wrapped-binaries"; name = "firejail-wrapped-binaries";
nativeBuildInputs = with pkgs; [ makeWrapper ]; nativeBuildInputs = with pkgs; [ makeWrapper ];
buildCommand = '' buildCommand = ''

View file

@ -261,7 +261,7 @@ in {
before = [ "kubernetes.target" ]; before = [ "kubernetes.target" ];
}; };
systemd.services.kube-control-plane-online = rec { systemd.services.kube-control-plane-online = {
description = "Kubernetes control plane is online"; description = "Kubernetes control plane is online";
wantedBy = [ "kube-control-plane-online.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-scheduler.service" "kube-controller-manager.service" ]; after = [ "kube-scheduler.service" "kube-controller-manager.service" ];

View file

@ -43,7 +43,7 @@ in
###### interface ###### interface
options = { options = {
services.hydra = rec { services.hydra = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;

View file

@ -33,7 +33,7 @@ let
addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs); addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "brscan4-etc-files-0.4.3-3"; name = "brscan4-etc-files-0.4.3-3";
src = "${brscan4}/opt/brother/scanner/brscan4"; src = "${brscan4}/opt/brother/scanner/brscan4";

View file

@ -140,7 +140,7 @@ let
RAILS_ENV = "production"; RAILS_ENV = "production";
}; };
gitlab-rake = pkgs.stdenv.mkDerivation rec { gitlab-rake = pkgs.stdenv.mkDerivation {
name = "gitlab-rake"; name = "gitlab-rake";
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
dontBuild = true; dontBuild = true;
@ -155,7 +155,7 @@ let
''; '';
}; };
gitlab-rails = pkgs.stdenv.mkDerivation rec { gitlab-rails = pkgs.stdenv.mkDerivation {
name = "gitlab-rails"; name = "gitlab-rails";
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
dontBuild = true; dontBuild = true;

View file

@ -9,7 +9,7 @@ in {
meta.maintainers = with lib.maintainers; [ peterhoeg ]; meta.maintainers = with lib.maintainers; [ peterhoeg ];
options = { options = {
services.pykms = rec { services.pykms = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;

View file

@ -312,7 +312,7 @@ in {
}; };
systemd.services = { systemd.services = {
zoneminder = with pkgs; rec { zoneminder = with pkgs; {
inherit (zoneminder.meta) description; inherit (zoneminder.meta) description;
documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ]; documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ];
path = [ path = [

View file

@ -3,7 +3,7 @@
let let
inherit (lib) concatStringsSep mkOption types; inherit (lib) concatStringsSep mkOption types;
in rec { in {
mkCellServDB = cellName: db: '' mkCellServDB = cellName: db: ''
>${cellName} >${cellName}

View file

@ -11,7 +11,7 @@ with lib;
let let
cfg = config.services.kippo; cfg = config.services.kippo;
in in
rec { {
options = { options = {
services.kippo = { services.kippo = {
enable = mkOption { enable = mkOption {

View file

@ -19,7 +19,7 @@ let
RAILS_SERVE_STATIC_FILES = "1"; RAILS_SERVE_STATIC_FILES = "1";
} // cfg.extraEnvironment; } // cfg.extraEnvironment;
frab-rake = pkgs.stdenv.mkDerivation rec { frab-rake = pkgs.stdenv.mkDerivation {
name = "frab-rake"; name = "frab-rake";
buildInputs = [ package.env pkgs.makeWrapper ]; buildInputs = [ package.env pkgs.makeWrapper ];
phases = "installPhase fixupPhase"; phases = "installPhase fixupPhase";

View file

@ -133,7 +133,7 @@ let
''; '';
}; };
database = rec { database = {
host = mkOption { host = mkOption {
type = types.str; type = types.str;
default = "localhost"; default = "localhost";

View file

@ -44,7 +44,7 @@ in {
client = { ... }: { client = { ... }: {
services.borgbackup.jobs = { services.borgbackup.jobs = {
local = rec { local = {
paths = dataDir; paths = dataDir;
repo = localRepo; repo = localRepo;
preHook = '' preHook = ''

View file

@ -1,4 +1,4 @@
import ./make-test.nix ({pkgs, ...}: rec { import ./make-test.nix ({pkgs, ...}: {
name = "All-in-one-basic-ceph-cluster"; name = "All-in-one-basic-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lejonet ]; maintainers = [ lejonet ];

View file

@ -23,8 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
maintainers = [ ehmry ]; maintainers = [ ehmry ];
}; };
nodes = rec nodes = { # Alice finds peers over over ETHInterface.
{ # Alice finds peers over over ETHInterface.
alice = alice =
{ ... }: { ... }:
{ imports = [ basicConfig ]; { imports = [ basicConfig ];

View file

@ -100,7 +100,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
meta.maintainers = with pkgs.stdenv.lib.maintainers; meta.maintainers = with pkgs.stdenv.lib.maintainers;
[ thoughtpolice ]; [ thoughtpolice ];
nodes = rec { nodes = {
node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null; node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null;
node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1"; node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1"; node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1";

View file

@ -1,6 +1,6 @@
import ./make-test.nix ({ pkgs, lib, ...} : import ./make-test.nix ({ pkgs, lib, ...} :
let let
client_base = rec { client_base = {
containers.test1 = { containers.test1 = {
autoStart = true; autoStart = true;

View file

@ -1,7 +1,7 @@
# Test for NixOS' container support. # Test for NixOS' container support.
let let
client_base = rec { client_base = {
networking.firewall.enable = false; networking.firewall.enable = false;
containers.webserver = { containers.webserver = {

View file

@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, ...} : rec { import ./make-test.nix ({ pkgs, ...} : {
name = "flannel"; name = "flannel";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {

View file

@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript = testScript =
let let
hardened-malloc-tests = pkgs.stdenv.mkDerivation rec { hardened-malloc-tests = pkgs.stdenv.mkDerivation {
name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}"; name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}";
src = pkgs.graphene-hardened-malloc.src; src = pkgs.graphene-hardened-malloc.src;
buildPhase = '' buildPhase = ''

View file

@ -6,7 +6,7 @@ import ../make-test.nix ({ lib, ... }:
maintainers = [ willibutz ]; maintainers = [ willibutz ];
}; };
nodes = with lib; rec { nodes = with lib; {
server = server =
{ config, ... }: { config, ... }:
{ {

View file

@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib; with lib;
rec { {
name = "jackett"; name = "jackett";
meta.maintainers = with maintainers; [ etu ]; meta.maintainers = with maintainers; [ etu ];

View file

@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib; with lib;
rec { {
name = "lidarr"; name = "lidarr";
meta.maintainers = with maintainers; [ etu ]; meta.maintainers = with maintainers; [ etu ];

View file

@ -16,7 +16,7 @@ let
"-t ${topic}" "-t ${topic}"
]; ];
in rec { in {
name = "mosquitto"; name = "mosquitto";
meta = with pkgs.stdenv.lib; { meta = with pkgs.stdenv.lib; {
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];

View file

@ -4,7 +4,7 @@ let
# Build Quake with coverage instrumentation. # Build Quake with coverage instrumentation.
overrides = pkgs: overrides = pkgs:
rec { {
quake3game = pkgs.quake3game.override (args: { quake3game = pkgs.quake3game.override (args: {
stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv; stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
}); });

View file

@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib; with lib;
rec { {
name = "radarr"; name = "radarr";
meta.maintainers = with maintainers; [ etu ]; meta.maintainers = with maintainers; [ etu ];

View file

@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib; with lib;
rec { {
name = "sonarr"; name = "sonarr";
meta.maintainers = with maintainers; [ etu ]; meta.maintainers = with maintainers; [ etu ];

View file

@ -14,7 +14,7 @@
, perl , perl
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage {
pname = "parity"; pname = "parity";
inherit version; inherit version;
inherit cargoSha256; inherit cargoSha256;

View file

@ -4,7 +4,7 @@
let let
inherit (python2Packages) python dbus-python; inherit (python2Packages) python dbus-python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "a2jmidid"; pname = "a2jmidid";
version = "8"; version = "8";

View file

@ -35,7 +35,7 @@ let
withUdisks = (withTaglib && withDevices); withUdisks = (withTaglib && withDevices);
in mkDerivation rec { in mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -4,7 +4,7 @@ let
version = "1.7.5"; version = "1.7.5";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "caudec"; pname = "caudec";
inherit version; inherit version;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "2018-10-11"; version = "2018-10-11";
pname = "cmusfm-unstable"; pname = "cmusfm-unstable";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -4,7 +4,7 @@
libxslt libxslt
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "csound-manual"; pname = "csound-manual";
version = "unstable-2019-02-22"; version = "unstable-2019-02-22";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: { stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "deadbeef-lyricbar-plugin"; pname = "deadbeef-lyricbar-plugin";
version = "unstable-2019-01-29"; version = "unstable-2019-01-29";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "dirt-2018-01-01"; name = "dirt-2018-01-01";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "Dirt"; repo = "Dirt";

View file

@ -3,7 +3,7 @@
, bc, coreutils, which , bc, coreutils, which
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "faustlive"; pname = "faustlive";
version = "2017-12-05"; version = "2017-12-05";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -19,7 +19,7 @@ in
with versionMap.${version}; with versionMap.${version};
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "fluidsynth-${fluidsynthVersion}"; name = "fluidsynth-${fluidsynthVersion}";
version = fluidsynthVersion; version = fluidsynthVersion;

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "fmsynth-unstable"; pname = "fmsynth-unstable";
version = "2015-02-07"; version = "2015-02-07";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: { stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "git-2015-05-21"; version = "git-2015-05-21";
pname = "foo-yc20"; pname = "foo-yc20";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -3,7 +3,7 @@
# TODO: build from git for easier updates # TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec { # rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "0.4.6"; version = "0.4.6";
pname = "gnome-podcasts"; pname = "gnome-podcasts";

View file

@ -18,7 +18,7 @@
let let
version = "7.2"; version = "7.2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "gradio"; pname = "gradio";
inherit version; inherit version;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, libGLU_combined }: , lv2, pkgconfig, libGLU_combined }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "0.9.0"; version = "0.9.0";
pname = "helm"; pname = "helm";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake { stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "iannix"; pname = "iannix";
version = "2016-01-31"; version = "2016-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: { stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "jackmix-0.5.2"; name = "jackmix-0.5.2";
src = fetchurl { src = fetchurl {
url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "lv2bm"; pname = "lv2bm";
version = "git-2015-11-29"; version = "git-2015-11-29";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lv2 }: { stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "mod-distortion-git"; pname = "mod-distortion-git";
version = "2016-08-19"; version = "2016-08-19";

View file

@ -16,7 +16,7 @@
, gitAndTools , gitAndTools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "muse-sequencer"; pname = "muse-sequencer";
version = "3.1pre1"; version = "3.1pre1";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: { stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "musly"; pname = "musly";
version = "unstable-2017-04-26"; version = "unstable-2017-04-26";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -2,7 +2,7 @@
, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook , libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "non"; pname = "non";
version = "2018-02-15"; version = "2018-02-15";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: {stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "0.2-2"; version = "0.2-2";
pname = "nova-filters"; pname = "nova-filters";

View file

@ -3,7 +3,7 @@
let let
version = "0.4.1"; version = "0.4.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "openmpt123"; pname = "openmpt123";
inherit version; inherit version;

View file

@ -2,7 +2,7 @@
, gtkmm2, libjack2, pkgconfig, python2, wafHook , gtkmm2, libjack2, pkgconfig, python2, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "patchage"; pname = "patchage";
version = "1.0.1"; version = "1.0.1";
src = fetchsvn { src = fetchsvn {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, puredata }: { stdenv, fetchurl, unzip, puredata }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "helmholtz"; name = "helmholtz";
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, puredata }: { stdenv, fetchurl, puredata }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "mrpeach"; pname = "mrpeach";
version = "1.1"; version = "1.1";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "pianobooster"; pname = "pianobooster";
version = "0.6.4b"; version = "0.6.4b";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "plugin-torture"; pname = "plugin-torture";
version = "2016-07-25"; version = "2016-07-25";

View file

@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null;
let let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
in pythonPackages.buildPythonApplication rec { in pythonPackages.buildPythonApplication {
pname = "pulseaudio-dlna"; pname = "pulseaudio-dlna";
version = "2017-11-01"; version = "2017-11-01";

View file

@ -3,7 +3,7 @@
let let
version = "unstable-2018-02-10"; version = "unstable-2018-02-10";
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "rhvoice"; pname = "rhvoice";
inherit version; inherit version;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, flac }: { stdenv, fetchurl, flac }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "3.0.10"; version = "3.0.10";
pname = "shntool"; pname = "shntool";

View file

@ -14,7 +14,7 @@
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL , 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"; pname = "soundscape-renderer-unstable";
version = "2016-11-03"; version = "2016-11-03";

View file

@ -8,7 +8,7 @@ let
sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"; sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4";
}; };
rnnoise-nu = stdenv.mkDerivation rec { rnnoise-nu = stdenv.mkDerivation {
pname = "rnnoise-nu"; pname = "rnnoise-nu";
version = "unstable-07-10-2019"; version = "unstable-07-10-2019";
src = speech-denoiser-src; src = speech-denoiser-src;
@ -18,7 +18,7 @@ let
installTargets = [ "install-rnnoise-nu" ]; installTargets = [ "install-rnnoise-nu" ];
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "speech-denoiser"; pname = "speech-denoiser";
version = "unstable-07-10-2019"; version = "unstable-07-10-2019";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "spotifywm-unstable"; pname = "spotifywm-unstable";
version = "2016-11-28"; version = "2016-11-28";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit }: { stdenv, fetchgit }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "svox"; pname = "svox";
version = "2017-07-18"; version = "2017-07-18";

View file

@ -2,7 +2,7 @@
, 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
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "traverso"; pname = "traverso";
version = "0.49.6"; version = "0.49.6";

View file

@ -2,7 +2,7 @@
let let
version = "2.13"; version = "2.13";
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "uade123"; pname = "uade123";
inherit version; inherit version;
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "zam-plugins"; pname = "zam-plugins";
version = "3.11"; version = "3.11";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: { stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "areca-7.5"; name = "areca-7.5";
src = fetchurl { src = fetchurl {

View file

@ -2,7 +2,7 @@
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
version = "0.2.1"; version = "0.2.1";
pname = "lightdm-enso-os-greeter"; pname = "lightdm-enso-os-greeter";

View file

@ -6,7 +6,7 @@
let let
version = "0.18.1"; version = "0.18.1";
in mkDerivation rec { in mkDerivation {
pname = "sddm"; pname = "sddm";
inherit version; inherit version;

View file

@ -18,7 +18,7 @@ let
build = "192.5807797"; build = "192.5807797";
sha256Hash = "1l47miiyd8z7v0hbvda06953pp9ilyrsma83gxqx35ghnc0n7g81"; sha256Hash = "1l47miiyd8z7v0hbvda06953pp9ilyrsma83gxqx35ghnc0n7g81";
}; };
in rec { in {
# Attributes are named by their corresponding release channels # Attributes are named by their corresponding release channels
stable = mkStudio (stableVersion // { stable = mkStudio (stableVersion // {

View file

@ -7,7 +7,7 @@ let
# skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly'
depSrcs = import ./skia-deps.nix { inherit fetchgit; }; depSrcs = import ./skia-deps.nix { inherit fetchgit; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "skia-aseprite-m71"; name = "skia-aseprite-m71";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "edit-nightly"; pname = "edit-nightly";
version = "20160425"; version = "20160425";

View file

@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, stdenv, ncurses }: { fetchurl, fetchpatch, stdenv, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "elvis-2.2_0"; name = "elvis-2.2_0";
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,6 @@
{ stdenv, cedille, emacs }: { stdenv, cedille, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "cedille-mode"; pname = "cedille-mode";
version = cedille.version; version = cedille.version;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs }: { stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "coffee-mode-0.4.1"; name = "coffee-mode-0.4.1";
src = fetchgit { src = fetchgit {

View file

@ -2,7 +2,7 @@
let let
commit = "412713a0fcedd520d208a7b783fea03d710bcc61"; commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "color-theme-solarized-1.0.0"; name = "color-theme-solarized-1.0.0";
src = fetchzip { src = fetchzip {

View file

@ -1,7 +1,7 @@
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }: { fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
let date = "2013-03-21"; in let date = "2013-03-21"; in
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "emacs-w3m-cvs${date}"; name = "emacs-w3m-cvs${date}";
# Get the source from CVS because the previous release (1.4.4) is old and # Get the source from CVS because the previous release (1.4.4) is old and

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, emacs }: { stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "flymake-cursor-0.1.5"; name = "flymake-cursor-0.1.5";
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs, pcache, logito }: { stdenv, fetchgit, emacs, pcache, logito }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "gh-0.5.3"; name = "gh-0.5.3";
src = fetchgit { src = fetchgit {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs, gh, pcache, logito }: { stdenv, fetchgit, emacs, gh, pcache, logito }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "gist-1.0"; name = "gist-1.0";
src = fetchgit { src = fetchgit {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs }: { stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "logito-0.1"; name = "logito-0.1";
src = fetchgit { src = fetchgit {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, emacs }: { stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "lorem-ipsum-0.1"; name = "lorem-ipsum-0.1";
src = fetchurl { src = fetchurl {

View file

@ -59,7 +59,7 @@
font-lock-plus = callPackage ./font-lock-plus { }; font-lock-plus = callPackage ./font-lock-plus { };
ghc-mod = melpaBuild rec { ghc-mod = melpaBuild {
pname = "ghc"; pname = "ghc";
version = external.ghc-mod.version; version = external.ghc-mod.version;
src = external.ghc-mod.src; src = external.ghc-mod.src;
@ -75,7 +75,7 @@
}; };
}; };
haskell-unicode-input-method = melpaBuild rec { haskell-unicode-input-method = melpaBuild {
pname = "emacs-haskell-unicode-input-method"; pname = "emacs-haskell-unicode-input-method";
version = "20110905.2307"; version = "20110905.2307";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -104,7 +104,7 @@
icicles = callPackage ./icicles { }; icicles = callPackage ./icicles { };
rtags = melpaBuild rec { rtags = melpaBuild {
inherit (external.rtags) version src meta; inherit (external.rtags) version src meta;
pname = "rtags"; pname = "rtags";

View file

@ -458,7 +458,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
}; };
}); });
in pkgs.stdenv.mkDerivation rec { in pkgs.stdenv.mkDerivation {
inherit (super.vterm) name version src; inherit (super.vterm) name version src;
nativeBuildInputs = [ pkgs.cmake ]; nativeBuildInputs = [ pkgs.cmake ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs, xmlRpc }: { stdenv, fetchgit, emacs, xmlRpc }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "metaweblog-0.1"; name = "metaweblog-0.1";
src = fetchgit { src = fetchgit {

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}: {stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "org-mac-link-1.2"; name = "org-mac-link-1.2";
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }: { stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "org2blog-0.8.1"; name = "org2blog-0.8.1";
src = fetchgit { src = fetchgit {

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, emacs }: { stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "pcache-0.2.3"; name = "pcache-0.2.3";
src = fetchgit { src = fetchgit {

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