Author: eelco
Date: Mon Mar 19 18:13:47 2012
New Revision: 33271
URL: https://nixos.org/websvn/nix/?rev=33271&sc=1
Log:
* Remove an unnecessary function.
Modified:
nixpkgs/trunk/pkgs/build-support/trivial-builders.nix
nixpkgs/trunk/pkgs/lib/strings.nix
Modified: nixpkgs/trunk/pkgs/build-support/trivial-builders.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/trivial-builders.nix Mon Mar 19
18:07:28 2012 (r33270)
+++ nixpkgs/trunk/pkgs/build-support/trivial-builders.nix Mon Mar 19
18:13:47 2012 (r33271)
@@ -112,7 +112,7 @@
# the default binary.
useSetUID = drv: path:
let
- name = stdenv.lib.basename path;
+ name = baseNameOf path;
bin = "${drv}${path}";
in assert name != "";
writeScript "setUID-${name}" ''
Modified: nixpkgs/trunk/pkgs/lib/strings.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/strings.nix Mon Mar 19 18:07:28 2012 (r33270)
+++ nixpkgs/trunk/pkgs/lib/strings.nix Mon Mar 19 18:13:47 2012 (r33271)
@@ -153,10 +153,6 @@
s;
- # Why do we need this if we have baseNameOf?
- basename = s: lib.last (splitString "/" s);
-
-
# Return true iff string v1 denotes a version older than v2.
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
