diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/coturn/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/unit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/facette/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/plugins/esxi.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/plugins/labs_consol_de.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/prom2json.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/telegraf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/uchiwa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/7.x.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/sickbeard/sickrage.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/skydns/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/cryptpad/node-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 2 |
15 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index e1d02d2f9d742..2fbd0bbfb3da5 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; - rev = "${version}"; + rev = version; sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; }; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 1dbf7eb2388b1..8d015a92a8f1c 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nginx"; repo = "unit"; - rev = "${version}"; + rev = version; sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a"; }; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index e5f30f4e61466..5d6f0fc3bfe90 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "facette"; repo = "facette"; - rev = "${version}"; + rev = version; sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; }; nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 888cef61fcb6b..dfa13c805e59a 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -2,7 +2,7 @@ let bName = "check_esxi_hardware"; - pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}"; + pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; in python2Packages.buildPythonApplication rec { name = "${pName}-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index c47e627f81691..744e333594c80 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -11,7 +11,7 @@ let generic = { pname, version, sha256, description, buildInputs, ... }: let - name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}"; + name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] pname}-${version}"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index efe146c843fbd..c101e55bc871d 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "prom2json"; version = "0.1.0"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/prometheus/prom2json"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index dfe2bdb71b28c..bf2a5935d1d21 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "influxdata"; repo = "telegraf"; - rev = "${version}"; + rev = version; sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; }; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index fafe8ad3046e1..95f8ca4432b3c 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -7,7 +7,7 @@ let src = fetchFromGitHub { inherit owner repo sha256; - rev = "${version}"; + rev = version; }; backend = buildGoPackage { diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4ec00506b3385..9bec174a58aab 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-system-mitkrb5" - "--with-system-mitkdc" "${krb5Full}" + "--with-system-mitkdc" krb5Full "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 34494c76dedb8..318919203699f 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; - "x86_64-darwin" = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; + x86_64-linux = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; + x86_64-darwin = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; } else { - "x86_64-linux" = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; - "x86_64-darwin" = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; + x86_64-linux = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; + x86_64-darwin = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; }; in stdenv.mkDerivation (rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index f4a37f85c6cb5..cbde11e3dc0cc 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SickRage"; repo = "SickRage"; - rev = "${version}"; + rev = version; sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; }; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 12a52c2641d51..f6f914b7cbd52 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromBitbucket { owner = "skskeyserver"; repo = "sks-keyserver"; - rev = "${version}"; + rev = version; sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 340ef36ac5934..2fc67008b8926 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "skydns"; version = "2.5.3a"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/skynetservices/skydns"; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index cae300a53f405..82739d484f28e 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index f18a50fe7e92c..cd5fac60abe4c 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -137,7 +137,7 @@ in stdenv.mkDerivation { ruby ${./patch_plist.rb} \ ${stdenv.lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; - XQUARTZ_DEFAULT_SHELL = "${shell}"; + XQUARTZ_DEFAULT_SHELL = shell; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; FONTCONFIG_FILE = "@FONTCONFIG_FILE@"; })} \ |