summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-05-25 16:32:48 -0500
committerGitHub <noreply@github.com>2018-05-25 16:32:48 -0500
commit98f2f08b4b9b204912c1c097a08cd26151fae0bb (patch)
tree745ae7c1d7e5f666ccb2fa3fa038bfb0e51bd011 /pkgs/data
parent11d26c797fb4010f5cae07848902e7fad8a9d3a9 (diff)
parentee8fa757f36b80a34fa97f8ee686f92abe742cf1 (diff)
downloadnixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.gz
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.bz2
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.lz
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.xz
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.zst
nixpkgs-98f2f08b4b9b204912c1c097a08cd26151fae0bb.zip
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/liberationsansnarrow/default.nix2
-rw-r--r--pkgs/data/fonts/meslo-lg/default.nix2
-rw-r--r--pkgs/data/fonts/mph-2b-damase/default.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberationsansnarrow/default.nix
index 6a5e81cd3c7..0027d44d9db 100644
--- a/pkgs/data/fonts/liberationsansnarrow/default.nix
+++ b/pkgs/data/fonts/liberationsansnarrow/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "liberationsansnarrow";
   version = "1.07.3";
-  name = "${pname}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index d95aea26c8d..f990575def0 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "1.2.1";
 
-  name = "meslo-lg";
+  name = "meslo-lg-${version}";
 
   meslo-lg = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index 5729561c580..692ad63574f 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchzip}:
 
 fetchzip {
-  name = "MPH-2B-Damase";
+  name = "MPH-2B-Damase-2";
 
   url = http://www.wazu.jp/downloads/damase_v.2.zip;