about summary refs log tree commit diff
path: root/nixpkgs/pkgs/os-specific/linux/kbd
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-09-08 00:46:04 +0000
committerAlyssa Ross <hi@alyssa.is>2019-09-16 22:13:21 +0000
commitafcf2d55332c5c01c2d989e9d010577d257cb6cc (patch)
treee1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/os-specific/linux/kbd
parent175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff)
parent4e60699fa727e4a0f9a3e78948012f86da32cfef (diff)
downloadnixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst
nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/kbd')
-rw-r--r--nixpkgs/pkgs/os-specific/linux/kbd/default.nix4
-rw-r--r--nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
index a37e65f8cb50..3386a7f92062 100644
--- a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-${version}";
+  pname = "kbd";
   version = "2.0.4";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
+    url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
     sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
   };
 
diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix
index 32c9f6906806..e6e898118944 100644
--- a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -2,7 +2,7 @@
 
 {
   dvp = stdenv.mkDerivation rec {
-    name = "dvp-${version}";
+    pname = "dvp";
     version = "1.2.1";
 
     src = fetchurl {
@@ -19,7 +19,7 @@
   };
 
   neo = stdenv.mkDerivation rec {
-    name = "neo-${version}";
+    pname = "neo";
     version = "2476";
 
     src = fetchurl {