Merge branch 'main' into mc/dolphin-emu

.github/actions/common-setup/action.yml

@@ -1,5 +1,8 @@
 name: Setup Environment
 inputs:
+  GITHUB_TOKEN:
+    required: true
+    description: "GitHub access token used to prevent GitHub's rate limit for unauthenticated requests"
   CACHIX_SIGNING_KEY: # determines what node version to install
     required: true
     description: 'Cachix Signing Key'
@@ -8,11 +11,13 @@ runs:
   steps:
 
     - name: Installing Nix
-      uses: cachix/install-nix-action@v16
+      uses: cachix/install-nix-action@v18
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
+        extra_nix_config: |
+          access-tokens = github.com=${{ inputs.GITHUB_TOKEN }}
 
-    - uses: cachix/cachix-action@v10
+    - uses: cachix/cachix-action@v12
       with:
         name: nixos-search
         signingKey: '${{ inputs.CACHIX_SIGNING_KEY }}'

.github/workflows/build-flake-info.yml

@@ -20,6 +20,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
 

.github/workflows/check-flake-files.yml

@@ -24,6 +24,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Try importing all custom flakes

.github/workflows/frontend.yml

@@ -21,6 +21,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
 

.github/workflows/import-to-elasticsearch.yml

@@ -20,6 +20,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: NixOS Channels
@@ -41,7 +42,7 @@ jobs:
     env:
       RUST_LOG: debug
       FI_ES_EXISTS_STRATEGY: abort
-      FI_ES_URL: ${{ secrets.ELASTICSEARCH_URL }}
+      FI_ES_URL: ${{ secrets.ELASTICSEARCH_URL2 }}
 
     steps:
     - name: Checking out the repository
@@ -50,6 +51,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Import ${{ matrix.channel }} channel
@@ -62,7 +64,7 @@ jobs:
     - name: Warmup ${{ matrix.channel }} channel
       run: |
         for (( i = 0; i < 3; i++ )) do
-          curl -sS ${{ secrets.ELASTICSEARCH_URL }}/latest-$(< VERSION)-nixos-${{ matrix.channel }}/_search | jq -c '.took // .'
+          curl -sS ${{ secrets.ELASTICSEARCH_URL2 }}/latest-$(< VERSION)-nixos-${{ matrix.channel }}/_search | jq -c '.took // .'
         done
       if: github.repository_owner == 'NixOS'
 
@@ -79,7 +81,7 @@ jobs:
     env:
       RUST_LOG: debug
       FI_ES_EXISTS_STRATEGY: recreate
-      FI_ES_URL: ${{ secrets.ELASTICSEARCH_URL }}
+      FI_ES_URL: ${{ secrets.ELASTICSEARCH_URL2 }}
 
     steps:
 
@@ -89,6 +91,7 @@ jobs:
     - name: Setup
       uses: ./.github/actions/common-setup
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Import ${{ matrix.group }} group
@@ -99,6 +102,6 @@ jobs:
     - name: Warmup ${{ matrix.group }} group
       run: |
         for (( i = 0; i < 3; i++ )) do
-          curl -sS ${{ secrets.ELASTICSEARCH_URL }}/latest-$(< VERSION)-group-${{ matrix.group }}/_search | jq -c '.took // .'
+          curl -sS ${{ secrets.ELASTICSEARCH_URL2 }}/latest-$(< VERSION)-group-${{ matrix.group }}/_search | jq -c '.took // .'
         done
       if: github.repository_owner == 'NixOS'

.github/workflows/update-flake-lock.yml

@@ -11,9 +11,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Nix
-        uses: cachix/install-nix-action@v17
+        uses: cachix/install-nix-action@v18
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v10
+        uses: DeterminateSystems/update-flake-lock@v14

.gitignore

@@ -14,7 +14,6 @@ ignore
 logs
 node_modules
 npm-debug.log*
-package-lock.json
 repl-temp-*
 result
 src-url

VERSION

@@ -1 +1 @@
-31
+32

flake-info/Cargo.toml

@@ -18,13 +18,12 @@ structopt = "0.3"
 command-run = "0.13"
 env_logger = "0.9"
 log = "0.4"
-tempfile = "3"
 lazy_static = "1.4"
 fancy-regex = "0.6"
 tokio = { version = "*", features = ["full"] }
 reqwest = { version = "0.11", features = ["json", "blocking"] }
 sha2 = "0.9"
-pandoc = "0.8"
+pandoc = "0.8.10"
 semver = "1.0"
 
 elasticsearch = {git = "https://github.com/elastic/elasticsearch-rs", features = ["rustls-tls"], optional = true}

flake-info/src/commands/flake_info.nix → flake-info/assets/commands/flake_info.nix

@@ -19,6 +19,7 @@ let
   readPackages = system: drvs: lib.mapAttrsToList (
     attribute_name: drv: (
       {
+        entry_type = "package";
         attribute_name = attribute_name;
         system = system;
         name = drv.name;
@@ -35,6 +36,7 @@ let
   readApps = system: apps: lib.mapAttrsToList (
     attribute_name: app: (
       {
+        entry_type = "app";
         attribute_name = attribute_name;
         system = system;
       }
@@ -86,6 +88,7 @@ let
              x;
       in
         opt
+        // { entry_type = "option"; }
         // applyOnAttr "default" substFunction
         // applyOnAttr "example" substFunction # (_: { __type = "function"; })
         // applyOnAttr "type" substFunction

flake-info/default.nix

@@ -20,19 +20,20 @@ pkgs.rustPlatform.buildRustPackage rec {
       libiconv
       darwin.apple_sdk.frameworks.Security
     ];
-  
+
   checkInputs = with pkgs; [ pandoc ];
-
+
+  ROOTDIR = builtins.placeholder "out";
   NIXPKGS_PANDOC_FILTERS_PATH = "${pkgs.path + "/doc/build-aux/pandoc-filters"}";
 
   checkFlags = [
     "--skip elastic::tests"
-    "--skip nix_gc::tests"
   ];
 
   postInstall = ''
+    cp -rt "$out" assets
+
     wrapProgram $out/bin/flake-info \
-      --set NIXPKGS_PANDOC_FILTERS_PATH "${NIXPKGS_PANDOC_FILTERS_PATH}" \
       --set NIXOS_CHANNELS '${builtins.toJSON nixosChannels}' \
       --prefix PATH : ${pkgs.pandoc}/bin
   '';

flake-info/src/commands/mod.rs

@@ -6,3 +6,10 @@ pub use nix_check_version::{check_nix_version, NixCheckError};
 pub use nix_flake_attrs::get_derivation_info;
 pub use nix_flake_info::get_flake_info;
 pub use nixpkgs_info::{get_nixpkgs_info, get_nixpkgs_options};
+
+use lazy_static::lazy_static;
+use std::path::PathBuf;
+
+lazy_static! {
+    static ref EXTRACT_SCRIPT: PathBuf = crate::DATADIR.join("commands/flake_info.nix");
+}

flake-info/src/commands/nix_flake_attrs.rs

@@ -3,11 +3,8 @@ use anyhow::{Context, Result};
 use command_run::{Command, LogTo};
 use serde_json::Deserializer;
 use std::fmt::Display;
-use std::fs::File;
-use std::io::Write;
 use std::path::PathBuf;
 
-const SCRIPT: &str = include_str!("flake_info.nix");
 const ARGS: [&str; 4] = [
     "eval",
     "--json",
@@ -23,12 +20,8 @@ pub fn get_derivation_info<T: AsRef<str> + Display>(
     temp_store: bool,
     extra: &[String],
 ) -> Result<Vec<FlakeEntry>> {
-    let script_dir = tempfile::tempdir()?;
-    let script_path = script_dir.path().join("extract.nix");
-    writeln!(File::create(&script_path)?, "{}", SCRIPT)?;
-
     let mut command = Command::with_args("nix", ARGS.iter());
-    command.add_arg_pair("-f", script_path.as_os_str());
+    command.add_arg_pair("-f", super::EXTRACT_SCRIPT.clone());
     command.add_arg_pair("-I", "nixpkgs=channel:nixpkgs-unstable");
     command.add_args(["--override-flake", "input-flake", flake_ref.as_ref()].iter());
     command.add_args(["--argstr", "flake", flake_ref.as_ref()].iter());

flake-info/src/commands/nixpkgs_info.rs

@@ -1,15 +1,12 @@
 use anyhow::{Context, Result};
 use serde_json::Deserializer;
-use std::io::Write;
-use std::{collections::HashMap, fmt::Display, fs::File};
+use std::{collections::HashMap, fmt::Display};
 
 use command_run::{Command, LogTo};
 use log::error;
 
 use crate::data::import::{NixOption, NixpkgsEntry, Package};
 
-const FLAKE_INFO_SCRIPT: &str = include_str!("flake_info.nix");
-
 pub fn get_nixpkgs_info<T: AsRef<str> + Display>(nixpkgs_channel: T) -> Result<Vec<NixpkgsEntry>> {
     let mut command = Command::new("nix-env");
     command.add_args(&[
@@ -54,20 +51,10 @@ pub fn get_nixpkgs_info<T: AsRef<str> + Display>(nixpkgs_channel: T) -> Result<V
 pub fn get_nixpkgs_options<T: AsRef<str> + Display>(
     nixpkgs_channel: T,
 ) -> Result<Vec<NixpkgsEntry>> {
-    let script_dir = tempfile::tempdir()?;
-    let script_path = script_dir.path().join("flake_info.nix");
-    writeln!(File::create(&script_path)?, "{}", FLAKE_INFO_SCRIPT)?;
-
-    let mut command = Command::new("nix");
-    command.add_args(&[
-        "eval",
-        "--json",
-        "-f",
-        script_path.to_str().unwrap(),
-        "-I",
-        format!("nixpkgs={}", nixpkgs_channel.as_ref()).as_str(),
-        "nixos-options",
-    ]);
+    let mut command = Command::with_args("nix", &["eval", "--json"]);
+    command.add_arg_pair("-f", super::EXTRACT_SCRIPT.clone());
+    command.add_arg_pair("-I", format!("nixpkgs={}", nixpkgs_channel.as_ref()));
+    command.add_arg("nixos-options");
 
     command.enable_capture();
     command.log_to = LogTo::Log;