12 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index 472b4a6508f..3d219eed012 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages  }:
 
 python2Packages.buildPythonApplication rec {
-  name     = "amazon-glacier-cmd-interface-${version}";
+  pname = "amazon-glacier-cmd-interface";
   version  = "2016-09-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 8f4cd60e1ee..3097756ddf8 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -9,7 +9,7 @@ let version = "0.29.2"; in
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bup";
   inherit version;
 
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b090da85263..1cf7a19014e 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -5,11 +5,11 @@
 , rsync, makeWrapper }:
 
 python2Packages.buildPythonApplication rec {
-  name = "duplicity-${version}";
+  pname = "duplicity";
   version = "0.7.19";
 
   src = fetchurl {
-    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6";
   };
   patches = [
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
index 412c9696d02..a56d1274f92 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, zfs }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "easysnap";
   version = "unstable-2019-02-17";
 
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
index 739f14ca1a6..8d71671f6fe 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, runtimeShell }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "flockit";
   version = "2012-08-11";
 
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
index 0ed70ade829..814c02267ba 100644
--- a/pkgs/tools/backup/lvmsync/default.nix
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -3,7 +3,7 @@
 let
 
   pname = "lvmsync";
-  version = (import ./gemset.nix)."${pname}".version;
+  version = (import ./gemset.nix).${pname}.version;
 
 in stdenv.mkDerivation rec {
 
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index e07eb33abb5..30ee0041c7c 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "0.8.1";
   pname = "ori";
 
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index e0ac2c3f232..bd5c10ea122 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -3,7 +3,7 @@
 , Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "rdedup-${version}";
+  pname = "rdedup";
   version = "3.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix
index 56f9c4f9daf..0df4ecda89e 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/pkgs/tools/backup/rdup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rdup";
   version = "1.1.15";
 
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index 4c13c831ba9..90a8c665cd4 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, coreutils, gnused, gawk, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rsbep";
   version = "0.1.0";
 
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index 928ba9842b2..d7a160328ed 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "zbackup";
   version = "1.4.4";
   src = fetchurl {
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 973e9217644..b44564efb82 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -23,7 +23,7 @@ let
   version = "0.18.0";
   checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "znapzend";
   inherit version;