Unverified Commit 11e3df53 authored by Jacek Galowicz's avatar Jacek Galowicz Committed by GitHub
Browse files

nix-prefetch-fossil: fixups (#488059)

parents 97bdff78 1a03b108

pkgs/build-support/fetchfossil/nix-prefetch-fossil

+11 −5
Original line number Diff line number Diff line
@@ -89,10 +89,15 @@ fossil open "$tmpPath/fossil-clone.fossil" "$rev" >&2 


# Get the actual commit hash and date

checkoutLine=$(fossil info | grep ^checkout:)

# Remove 'checkout:' prefix and squeeze multiple spaces, then extract fields

actualRev=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f1)

# Extract date (format: checkout:     HASH YYYY-MM-DD HH:MM:SS UTC)

actualDate=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f2)

# Remove 'checkout:' prefix & remove whitespace

checkoutData=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ')

# Extract fields: HASH YYYY-MM-DD HH:MM:SS UTC

actualRev=$(echo "$checkoutData" | cut -d' ' -f1)

# Get datetime parts

rawDate=$(echo "$checkoutData" | cut -d' ' -f2)

rawTime=$(echo "$checkoutData" | cut -d' ' -f3)

# Combine into ISO 8601 RFC 3339 format

actualDatetime="${rawDate}T${rawTime}Z"

cd - >/dev/null



# Remove the fossil checkout file
@@ -118,7 +123,8 @@ cat <<EOF 
{

  "url": "$url",

  "rev": "$actualRev",

  "date": "$actualDate",

  "date": "$actualDatetime",

  "path": "$finalPath",

  "$hashType": "$hash",

  "hash": "$(nix-hash --to-sri --type $hashType $hash)"

}

pkgs/tools/package-management/nix-prefetch-scripts/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ rec { 
    mkPrefetchScript "fossil" ../../../build-support/fetchfossil/nix-prefetch-fossil

      [

        fossil

        gnugrep

        gnused

      ];

  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [

    findutils

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -12607,6 +12607,7 @@ with pkgs; 
    nix-prefetch-bzr

    nix-prefetch-cvs

    nix-prefetch-darcs

    nix-prefetch-fossil

    nix-prefetch-git

    nix-prefetch-hg

    nix-prefetch-pijul