diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-25 16:32:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 16:32:48 -0500 |
| commit | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (patch) | |
| tree | 745ae7c1d7e5f666ccb2fa3fa038bfb0e51bd011 /pkgs/applications/networking | |
| parent | 11d26c797fb4010f5cae07848902e7fad8a9d3a9 (diff) | |
| parent | ee8fa757f36b80a34fa97f8ee686f92abe742cf1 (diff) | |
| download | nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.gz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.bz2 nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.lz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.xz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.zst nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.zip | |
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/gmailieer/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 38b7e485259a..4f45de76d161 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -60,8 +60,8 @@ let # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. if actualPlugins == [] then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else stdenv.mkDerivation { - name = "${terraform.name}-with-plugins"; + else lib.appendToName "with-plugins "(stdenv.mkDerivation { + inherit (terraform) name; buildInputs = [ makeWrapper ]; buildCommand = '' @@ -72,7 +72,7 @@ let ''; inherit passthru; - }; + }); in withPlugins (_: []); plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index c3085519ec4c..9b738fe3863f 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "gmailieer"; + name = "gmailieer-${version}"; version = "0.6"; src = fetchFromGitHub { |