Author: raskin Date: Fri Mar 23 05:58:22 2012 New Revision: 33368 URL: https://nixos.org/websvn/nix/?rev=33368&sc=1
Log: Cherry-picking versionOlder from trunk: seems to be non-rebuild-causing, and needed to build NixOS trunk Modified: nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/microcode/intel.nix Modified: nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix ============================================================================== --- nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix Fri Mar 23 05:55:13 2012 (r33367) +++ nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix Fri Mar 23 05:58:22 2012 (r33368) @@ -82,15 +82,18 @@ map f (stringToCharacters s) ); + # same as vim escape function. # Each character contained in list is prefixed by "\" escape = list : string : stringAsChars (c: if lib.elem c list then "\\${c}" else c) string; + # still ugly slow. But more correct now # [] for zsh escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]"); + # replace characters by their substitutes. This function is equivalent to # the `tr' command except that one character can be replace by multiple # ones. e.g., @@ -105,10 +108,12 @@ in stringAsChars subst s; + # Compares strings not requiring context equality # Obviously, a workaround but works on all Nix versions eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b); + # Cut a string with a separator and produces a list of strings which were # separated by this separator. e.g., # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"]. @@ -133,6 +138,7 @@ in recurse 0 0; + # return the suffix of the second argument if the first argument match its # prefix. e.g., # `removePrefix "foo." "foo.bar.baz"' returns "bar.baz". @@ -146,6 +152,13 @@ else 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; + + } Modified: nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/microcode/intel.nix ============================================================================== --- nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/microcode/intel.nix Fri Mar 23 05:55:13 2012 (r33367) +++ nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/microcode/intel.nix Fri Mar 23 05:58:22 2012 (r33368) @@ -22,7 +22,7 @@ ''; meta = { - homepage = http://www.intel.com; + homepage = http://www.intel.com/; description = "Microcode for Intel processors"; }; } \ No newline at end of file _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits