diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-20 13:41:12 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-20 13:41:12 +0000 |
commit | f16353b6f236ae9046bfc3d9031efd519fc73b82 (patch) | |
tree | eb4b931c357f70a0cd6804e8be853a49ca2f77c9 /maintainers | |
parent | f7d0fcdaac7dc2d60a0d57e90632f20ba36242f5 (diff) | |
parent | 7dea1a0f4f0b893780e0e4d8a64b77642fa22205 (diff) |
Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/scripts/eval-release.nix | 8 | ||||
-rwxr-xr-x | maintainers/scripts/gnu/gnupdate | 14 | ||||
-rwxr-xr-x | maintainers/scripts/test-eval-release.sh | 3 |
3 files changed, 11 insertions, 14 deletions
diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 64dbbd15cf38..3d4458699c74 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -6,9 +6,13 @@ let lib = (import ../.. {}).lib; - rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"]; + rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; - maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null; + seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs; + + strictAttrs = as: seqList (lib.attrValues as) as; + + maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null; call = attrs: lib.flip lib.mapAttrs attrs (n: v: builtins.trace n ( diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index dbb3f0d528ef..b9f34a2750e3 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -623,19 +623,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ (let ((strverscmp (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) (error "could not find `strverscmp' (from GNU libc)")))) - (make-foreign-function int sym (list '* '*)))) - (string->null-terminated-utf8 - (lambda (s) - (let* ((utf8 (string->utf8 s)) - (len (bytevector-length utf8)) - (nts (make-bytevector (+ len 1)))) - (bytevector-copy! utf8 0 nts 0 len) - (bytevector-u8-set! nts len 0) - nts)))) + (make-foreign-function int sym (list '* '*))))) (lambda (a b) - (let ((a (bytevector->foreign (string->null-terminated-utf8 a))) - (b (bytevector->foreign (string->null-terminated-utf8 b)))) - (> (strverscmp a b) 0))))) + (> (strverscmp (string->pointer a) (string->pointer b)) 0)))) (define (latest-release project) ;; Return "FOO-X.Y" or #f. diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/test-eval-release.sh new file mode 100755 index 000000000000..16921a24ce22 --- /dev/null +++ b/maintainers/scripts/test-eval-release.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null |