Unverified Commit 69deaa75 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #243018 from tjni/nix-prefetch-github

parents cda88090 ac690207

doc/contributing/coding-conventions.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these 
    owner = "NixOS";

    repo = "nix";

    rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";

    hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";

    hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";

  }

  ```

maintainers/scripts/haskell/update-hackage.sh

+1 −1
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=.

#! nix-shell -i bash -p nix curl jq git gnused -I nixpkgs=.



# See regenerate-hackage-packages.sh for details on the purpose of this script.

maintainers/scripts/haskell/update-stackage.sh

+1 −1
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.

#! nix-shell -i bash -p nix curl jq git gnused gnugrep -I nixpkgs=.

# shellcheck shell=bash



set -eu -o pipefail

pkgs/applications/audio/psst/update.sh

+2 −5
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p nix wget nix-prefetch-github jq coreutils

#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils



# shellcheck shell=bash
@@ -27,15 +27,12 @@ fi 
version="unstable-$(date +%F)"



# Sources

src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .sha256)

src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash)



# Cargo.lock

src="https://raw.githubusercontent.com/jpochyla/psst/$rev"

wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock



# Use friendlier hashes

src_hash=$(nix hash to-sri --type sha256 "$src_hash")



sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix

sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix

sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix

pkgs/applications/audio/squeezelite/update.sh

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then 
  exit 0

fi



srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .sha256)

srcHash=$(nix hash to-sri --type sha256 "$srcHash")

srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .hash)





update-source-version squeezelite "$latestVersion" "$srcHash" --rev="${latestRev}"