From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 15 Aug 2019 12:41:18 +0000 Subject: treewide: name -> pname (easy cases) (#66585) treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname --- pkgs/servers/identd/nullidentdmod/default.nix | 2 +- pkgs/servers/identd/oidentd/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/identd') diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index fdad63d67af4b..8171f61c112da 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "nullidentdmod-${version}"; + pname = "nullidentdmod"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 81eeae804d25c..8e0395529bc8c 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "oidentd-${version}"; + pname = "oidentd"; version = "2.3.2"; nativeBuildInputs = [ bison flex ]; src = fetchurl { - url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "10c5jkhirkvm1s4v3zdj4micfi6rkfjj32q4k7wjwh1fnzrwyb5n"; }; -- cgit 1.4.1