hsjobeki/noogle
1
1
Fork 0
mirror of https://github.com/hsjobeki/noogle.git synced 2024-11-24 06:35:05 +03:00
Code Issues Projects Releases Wiki Activity

moved: trivial builders relinked to nixpkgs

Browse Source
This commit is contained in:
hsjobeki 2023-06-25 17:06:27 +02:00 committed by Johannes Kirschbauer
parent 82f57c407f
commit 29dd85487b
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -291,11 +291,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1681821560,
"narHash": "sha256-vboxdQHrpIrfWKzu/88rCarqx/oDNwGtiZkupPZntY8=",
"lastModified": 1687704376,
"narHash": "sha256-0ffHOVMHxdw1/5UMCFfUFYMRE6gBXTmQI+nt8STJT84=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1943858c74385bc87a1d1bf23b05f1a279752cf",
"rev": "a06cc8c85e46ba5863e669b94fb3047c1c657b43",
"type": "github"
},
"original": {

10
flake.nix
View File

@ -19,7 +19,7 @@
prepareData = prefix: ''
cp -f ${nixpkgs-data.lib} ${prefix}/lib.json
cp -f ${nixpkgs-data.build_support} ${prefix}/trivial-builders.json
cp -f ${nixpkgs-data.trivial_builders} ${prefix}/trivial-builders.json
cp -f ${builtins-data}/lib/data.json ${prefix}/builtins.json
'';
@ -74,20 +74,20 @@
currently this list is manually maintained below.
'';
src = nixpkgs-master;
outputs = [ "out" "lib" "build_support" ];
outputs = [ "out" "lib" "trivial_builders" ];
nativeBuildInputs = [ indexer ];
buildPhase = ''
echo "running nix metadata collect in nixpkgs/lib"
${indexer}/bin/indexer --dir ./lib
${indexer}/bin/indexer --dir ./pkgs/build-support
${indexer}/bin/indexer --dir ./pkgs/build-support/trivial-builders
'';
installPhase = ''
cat lib.json > $lib
cat build-support.json > $build_support
cat trivial-builders.json > $trivial_builders
mkdir $out
ln -s $lib $out/lib
ln -s $build_support $out/build_support
ln -s $trivial_builders $out/trivial_builders
'';
};

9
indexer/src/main.rs
View File

@ -268,7 +268,14 @@ fn main() {
.filter(|node| node.kind == ASTKind::SetEntry)
.filter_map(|node| collect_entry_information(&nix.arena, node))
.map(|d| ManualEntry {
id: format!("{}.{}.{}", parent, filename, d.name),
id: {
if filename == "default" {
//If filename is default.nix only use the parent directory as id
format!("{}.{}", parent, d.name)
} else {
format!("{}.{}.{}", parent, filename, d.name)
}
},
line: Some(get_line(d.span, &src)).unwrap_or(None),
category: file.display().to_string(),
name: d.name,