Skip to content

nix-prefetch: 0.3.0 -> 0.3.1 #85367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterhoeg merged 3 commits into from
Apr 17, 2020
+43 −36
Merged

nix-prefetch: 0.3.0 -> 0.3.1 #85367

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f803e
nix-prefetch: 0.3.0 -> 0.3.1
peterhoeg Apr 16, 2020
081da98
nix-prefetch: date in man page
peterhoeg Apr 16, 2020
5894f39
nix-prefetch: use UTC
peterhoeg Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 36 additions & 35 deletions pkgs/tools/package-management/nix-prefetch/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,68 @@
{ stdenv, fetchFromGitHub, makeWrapper
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, coreutils, gawk, gnugrep, gnused, jq, nix }:
{ stdenv, lib, fetchFromGitHub, makeWrapper, asciidoc, docbook_xml_dtd_45, git
, docbook_xsl, libxml2, libxslt, coreutils, gawk, gnugrep, gnused, jq, nix
, installShellFiles }:

@msteen msteen Apr 16, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally prefer to separate the Nix specific things needed to package the software and the rest. For example:

{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper,
... the rest sorted by alphabet and split to prevent too long lines ...

However, this is styling related and could be considered personal taste, so I do not consider this a blocker of any kind, can be kept as is and that is fine as well, just not my preference.

@peterhoeg peterhoeg Apr 16, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have nixpkgs-fmt in a save-hook so all formatting is due to that.


stdenv.mkDerivation rec {
let binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];

@msteen msteen Apr 16, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just use stdenv.lib? If you really prefer lib, I am fine with that, but then be consistent, i.e. also use meta = with lib; {.


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

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

postPatch = ''
lib=$out/lib/${pname}

substituteInPlace doc/nix-prefetch.1.asciidoc \
--subst-var-by version $version

substituteInPlace src/main.sh \
--subst-var-by lib $lib \
--subst-var-by version $version

substituteInPlace src/tests.sh \
--subst-var-by bin $out/bin
'';

nativeBuildInputs = [
asciidoc
docbook_xml_dtd_45
docbook_xsl
installShellFiles
libxml2
libxslt
makeWrapper
asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];

configurePhase = ''
. configure.sh
'';
dontConfigure = true;

buildPhase = ''
a2x -f manpage doc/nix-prefetch.1.asciidoc
'';

installPhase = ''
lib=$out/lib/${pname}
mkdir -p $lib
substitute src/main.sh $lib/main.sh \
--subst-var-by lib $lib \
--subst-var-by version '${version}'
chmod +x $lib/main.sh
patchShebangs $lib/main.sh
cp lib/*.nix $lib/

mkdir -p $out/bin
install -Dm555 -t $lib src/*.sh
install -Dm444 -t $lib lib/*
makeWrapper $lib/main.sh $out/bin/${pname} \
--prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}'

substitute src/tests.sh $lib/tests.sh \
--subst-var-by bin $out/bin
chmod +x $lib/tests.sh
patchShebangs $lib/tests.sh
--prefix PATH : ${binPath}

mkdir -p $out/share/man/man1
substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \
--subst-var-by version '${version}' \
--replace '01/01/1970' "$date"
installManPage doc/nix-prefetch.?

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
installShellCompletion --name ${pname} contrib/nix-prefetch-completion.{bash,zsh}

mkdir -p $out/share/doc/${pname}/contrib
cp -r contrib/hello_rs $out/share/doc/${pname}/contrib/
cp -r contrib/hello_rs $out/share/doc/${pname}/contrib
'';

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

@msteen msteen Apr 16, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this removed because it is the default? Just so I know for future reference.

@peterhoeg peterhoeg Apr 16, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

inherit (src.meta) homepage;
};
}