mirror of
https://github.com/NixOS/nix
synced 2025-07-13 17:10:47 +02:00
* Maintain integrity of the substitute and successor mappings when
deleting a path in the store. * Allow absolute paths in Nix expressions. * Get nix-prefetch-url to work again. * Various other fixes.
This commit is contained in:
parent
40d9eb14df
commit
ab0bc4999a
15 changed files with 152 additions and 199 deletions
|
@ -1,10 +1,11 @@
|
|||
all-local: fetchurl.sh
|
||||
all-local: builder.sh
|
||||
|
||||
install-exec-local:
|
||||
$(INSTALL) -d $(datadir)/fix/fetchurl
|
||||
$(INSTALL_DATA) fetchurl.fix $(datadir)/fix/fetchurl
|
||||
$(INSTALL_PROGRAM) fetchurl.sh $(datadir)/fix/fetchurl
|
||||
$(INSTALL) -d $(datadir)/nix/corepkgs
|
||||
$(INSTALL) -d $(datadir)/nix/corepkgs/fetchurl
|
||||
$(INSTALL_DATA) default.nix $(datadir)/nix/corepkgs/fetchurl
|
||||
$(INSTALL_PROGRAM) builder.sh $(datadir)/nix/corepkgs/fetchurl
|
||||
|
||||
include ../../substitute.mk
|
||||
|
||||
EXTRA_DIST = fetchurl.fix fetchurl.sh.in
|
||||
EXTRA_DIST = default.nix builder.sh.in
|
||||
|
|
8
corepkgs/fetchurl/default.nix
Normal file
8
corepkgs/fetchurl/default.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{system, url, md5}: derivation {
|
||||
name = baseNameOf (toString url);
|
||||
system = system;
|
||||
builder = ./builder.sh;
|
||||
url = url;
|
||||
md5 = md5;
|
||||
id = md5;
|
||||
}
|
|
@ -1,10 +0,0 @@
|
|||
Function(["url", "md5"],
|
||||
Package(
|
||||
[ ("build", Relative("fetchurl/fetchurl.sh"))
|
||||
, ("url", Var("url"))
|
||||
, ("md5", Var("md5"))
|
||||
, ("name", BaseName(Var("url")))
|
||||
, ("id", Var("md5"))
|
||||
]
|
||||
)
|
||||
)
|
Loading…
Add table
Add a link
Reference in a new issue