Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8d5ec33939e5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9660e1211c66
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 16, 2020

  1. nix-prefetch: 0.1.0 -> 0.3.0

    @peterhoeg
    peterhoeg committed Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bec2162 View commit details

  2. Merge pull request #77810 from peterhoeg/fix_nix_prefetch_contrib 

    nix-prefetch: 0.1.0 -> 0.3.0
    @mmahut
    mmahut authored Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9660e12 View commit details
Showing with 8 additions and 10 deletions.
  1. +8 −10 pkgs/tools/package-management/nix-prefetch/default.nix
18 changes: 8 additions & 10 deletions pkgs/tools/package-management/nix-prefetch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,15 @@
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, coreutils, gawk, gnugrep, gnused, jq, nix }:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "nix-prefetch";
version = "0.1.0";
version = "0.3.0";

src = fetchFromGitHub {
owner = "msteen";
repo = "nix-prefetch";
rev = "f9507a655651b51f3a3ebacde85bb40758853615";
sha256 = "0ykrbvbwwpz348424yy2452idgw8dffi3klh7n85n96dfflyyd4s";
rev = version;
sha256 = "0b9gdi7xzmfq0j258x724xsll8gi31m0m4pzfjkqinlm6zwr3sgm";
};

nativeBuildInputs = [
@@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
makeWrapper $lib/main.sh $out/bin/${pname} \
--prefix PATH : '${makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}'
--prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}'
substitute src/tests.sh $lib/tests.sh \
--subst-var-by bin $out/bin
@@ -55,13 +53,13 @@ stdenv.mkDerivation rec {
install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch
install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch
mkdir $out/contrib
cp -r contrib/hello_rs $out/contrib/
mkdir -p $out/share/doc/${pname}/contrib
cp -r contrib/hello_rs $out/share/doc/${pname}/contrib/
'';

meta = {
meta = with stdenv.lib; {
description = "Prefetch any fetcher function call, e.g. package sources";
homepage = https://github.com/msteen/nix-prefetch;
homepage = "https://github.com/msteen/nix-prefetch";
license = licenses.mit;
maintainers = with maintainers; [ msteen ];
platforms = platforms.all;