summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-24 17:22:28 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-24 17:22:28 +0000
commit9b090ccbca3f7dd26d91db06e96e8bf8282c37ca (patch)
tree1654f2f0cb883fa4cb95def306a933475d065431 /doc
parent99537e994f09e8e5499d3d877df0e16da8452ca7 (diff)
downloadnixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.gz
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.bz2
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.lz
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.xz
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.zst
nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.zip
treewide: Get rid of most `parseDrvName` without breaking compat
That is because this commit should be merged to both master and
release-19.09.
Diffstat (limited to 'doc')
-rw-r--r--doc/configuration.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/configuration.xml b/doc/configuration.xml
index b497fa4e272..0d9786c2d6a 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -179,11 +179,10 @@
      allows unfree packages named flash player and visual studio code:
 <programlisting>
 {
-  allowUnfreePredicate = (pkg: builtins.elem
-    (builtins.parseDrvName pkg.name).name [
-      "flashplayer"
-      "vscode"
-    ]);
+  allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "flashplayer"
+    "vscode"
+  ];
 }
 </programlisting>
     </para>
@@ -273,7 +272,7 @@
      very short names:
 <programlisting>
 {
-  allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
+  allowInsecurePredicate = (pkg: (builtins.stringLength (lib.getName pkg) &lt;= 5);
 }
 </programlisting>
     </para>