Merge pull request #305845 from abathur/resholve_0.10.5
resholve: 0.10.2 -> 0.10.5
This commit is contained in:
commit
c83afadf29
@ -102,19 +102,19 @@ trivial, so I'll also link to some real-world examples:
|
|||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
resholvedScript = resholve.writeScript "name" {
|
resholvedScript = resholve.writeScript "name" {
|
||||||
inputs = [ file ];
|
inputs = [ file ];
|
||||||
interpreter = "${bash}/bin/bash";
|
interpreter = "${bash}/bin/bash";
|
||||||
} ''
|
} ''
|
||||||
echo "Hello"
|
echo "Hello"
|
||||||
file .
|
file .
|
||||||
'';
|
'';
|
||||||
resholvedScriptBin = resholve.writeScriptBin "name" {
|
resholvedScriptBin = resholve.writeScriptBin "name" {
|
||||||
inputs = [ file ];
|
inputs = [ file ];
|
||||||
interpreter = "${bash}/bin/bash";
|
interpreter = "${bash}/bin/bash";
|
||||||
} ''
|
} ''
|
||||||
echo "Hello"
|
echo "Hello"
|
||||||
file .
|
file .
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -230,7 +230,7 @@ from the manpage, and the Nix equivalents:
|
|||||||
# all single-word directives use `true` as value
|
# all single-word directives use `true` as value
|
||||||
aliases = true;
|
aliases = true;
|
||||||
"$GIT" = [ "gix" ];
|
"$GIT" = [ "gix" ];
|
||||||
interpreter = "/bin/bash";
|
"/bin/bash" = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# --keep 'source:$HOME /etc/bashrc ~/.bashrc'
|
# --keep 'source:$HOME /etc/bashrc ~/.bashrc'
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "0.10.2";
|
version = "0.10.5";
|
||||||
rSrc = fetchFromGitHub {
|
rSrc = fetchFromGitHub {
|
||||||
owner = "abathur";
|
owner = "abathur";
|
||||||
repo = "resholve";
|
repo = "resholve";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-QXIX3Ai9HUFosvhfYTUJILZ588cvxTzULUUp1LYkQ0A=";
|
hash = "sha256-SzJbA0wLeSwvXnAE4bTNqh0tnpFPkn6N1hp7sZGAkB4=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
, gettext
|
, gettext
|
||||||
, rSrc
|
, rSrc
|
||||||
, runDemo ? false
|
, runDemo ? false
|
||||||
, fetchpatch
|
|
||||||
, binlore
|
, binlore
|
||||||
, sqlite
|
, sqlite
|
||||||
, unixtools
|
, unixtools
|
||||||
@ -26,6 +25,39 @@
|
|||||||
, rlwrap
|
, rlwrap
|
||||||
, gnutar
|
, gnutar
|
||||||
, bc
|
, bc
|
||||||
|
# override testing
|
||||||
|
, esh
|
||||||
|
, getconf
|
||||||
|
, libarchive
|
||||||
|
, locale
|
||||||
|
, mount
|
||||||
|
, ncurses
|
||||||
|
, nixos-install-tools
|
||||||
|
, nixos-rebuild
|
||||||
|
, procps
|
||||||
|
, ps
|
||||||
|
# known consumers
|
||||||
|
, aaxtomp3
|
||||||
|
, arch-install-scripts
|
||||||
|
, bashup-events32
|
||||||
|
, dgoss
|
||||||
|
, git-ftp
|
||||||
|
, ix
|
||||||
|
, lesspipe
|
||||||
|
, locate-dominating-file
|
||||||
|
, mons
|
||||||
|
, msmtp
|
||||||
|
, nix-direnv
|
||||||
|
, pdf2odt
|
||||||
|
, pdfmm
|
||||||
|
, rancid
|
||||||
|
, s0ix-selftest-tool
|
||||||
|
, unix-privesc-check
|
||||||
|
, wgnord
|
||||||
|
, wsl-vpnkit
|
||||||
|
, xdg-utils
|
||||||
|
, yadm
|
||||||
|
, zxfer
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -123,21 +155,6 @@ rec {
|
|||||||
name = "resholve-test";
|
name = "resholve-test";
|
||||||
src = rSrc;
|
src = rSrc;
|
||||||
|
|
||||||
# TODO: should be removable on next resholve update--just
|
|
||||||
# temporarily work around test breaks caused by changes in
|
|
||||||
# bats 1.10.0. Since this is just about fixing tests, I'm
|
|
||||||
# patching test source to avoid going through staging.
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/abathur/resholve/commit/e1d6ccbc9cd5ec26122997610954dcb7d826f652.patch";
|
|
||||||
hash = "sha256-XA9KUc/OAD2S8Vpt+C7KcjTP44rnZ4FLdgnnRqVWdWY=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/abathur/resholve/commit/50db1a6a97baa7d7543a8abe33dddda62b487c65.patch";
|
|
||||||
hash = "sha256-m1dKaLI02Wag7uacG4BkcdCXw30Kn6J4ydTqPd7bsak=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@ -206,4 +223,71 @@ rec {
|
|||||||
echo "Hello"
|
echo "Hello"
|
||||||
file .
|
file .
|
||||||
'';
|
'';
|
||||||
|
# spot-check lore overrides
|
||||||
|
loreOverrides = resholve.writeScriptBin "verify-overrides" {
|
||||||
|
inputs = [
|
||||||
|
coreutils
|
||||||
|
esh
|
||||||
|
getconf
|
||||||
|
libarchive
|
||||||
|
locale
|
||||||
|
mount
|
||||||
|
ncurses
|
||||||
|
procps
|
||||||
|
ps
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
nixos-install-tools
|
||||||
|
nixos-rebuild
|
||||||
|
];
|
||||||
|
interpreter = "none";
|
||||||
|
execer = [
|
||||||
|
"cannot:${esh}/bin/esh"
|
||||||
|
];
|
||||||
|
fix = {
|
||||||
|
mount = true;
|
||||||
|
};
|
||||||
|
} (''
|
||||||
|
env b2sum fake args
|
||||||
|
b2sum fake args
|
||||||
|
esh fake args
|
||||||
|
getconf fake args
|
||||||
|
bsdtar fake args
|
||||||
|
locale fake args
|
||||||
|
mount fake args
|
||||||
|
reset fake args
|
||||||
|
tput fake args
|
||||||
|
tset fake args
|
||||||
|
ps fake args
|
||||||
|
top fake args
|
||||||
|
'' + lib.optionalString stdenv.isLinux ''
|
||||||
|
nixos-generate-config fake args
|
||||||
|
nixos-rebuild fake args
|
||||||
|
'');
|
||||||
|
|
||||||
|
# ensure known consumers in nixpkgs keep working
|
||||||
|
inherit aaxtomp3;
|
||||||
|
inherit bashup-events32;
|
||||||
|
inherit bats;
|
||||||
|
inherit git-ftp;
|
||||||
|
inherit ix;
|
||||||
|
inherit lesspipe;
|
||||||
|
inherit locate-dominating-file;
|
||||||
|
inherit mons;
|
||||||
|
inherit msmtp;
|
||||||
|
inherit nix-direnv;
|
||||||
|
inherit pdf2odt;
|
||||||
|
inherit pdfmm;
|
||||||
|
inherit shunit2;
|
||||||
|
inherit xdg-utils;
|
||||||
|
inherit yadm;
|
||||||
|
} // lib.optionalAttrs stdenv.isLinux {
|
||||||
|
inherit arch-install-scripts;
|
||||||
|
inherit dgoss;
|
||||||
|
inherit rancid;
|
||||||
|
inherit unix-privesc-check;
|
||||||
|
inherit wgnord;
|
||||||
|
inherit wsl-vpnkit;
|
||||||
|
inherit zxfer;
|
||||||
|
} // lib.optionalAttrs (stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64)) {
|
||||||
|
inherit s0ix-selftest-tool;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user