Packages.elm: add missing newline to 'nix-env' tab (#799)

* flake.lock: Update

Flake lock file updates:

• Updated input 'nixos-infra':
    'github:NixOS/infra/5e2b57f9a5bc43b9fd3eb822caaa7ddf0448b2b3?narHash=sha256-BiZudUcdFCpW9d8IXiPHXhKP1vTVqcDrQRtd/dLr7n0%3D' (2024-06-04)
  → 'github:NixOS/infra/ca11a27e5609a152b5e9d9293c4ea99e9234d9e6?narHash=sha256-%2BlOSTU8TjJZvNpcqANrTYarIdrMo4eUTYW1/CLWJ0No%3D' (2024-06-15)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07)
  → 'github:NixOS/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420?narHash=sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY%3D' (2024-06-13)

* ci: bump actions

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>

.forgejo/workflows/frontend.yml

@@ -1,30 +0,0 @@
-name: "Frontend: Build & Deploy to Netlify"
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - "flake.nix"
-      - "flake.lock"
-      - "frontend/**"
-      - "VERSION"
-
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-deploy:
-    runs-on: nixos-unstable
-    steps:
-    - name: Checking out the repository
-      uses: actions/checkout@v4
-
-    - name: Enable flakes
-      run: |
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
-
-    - name: Building search.nixos.org
-      run: |
-        nix -vL build .#frontend
-        mkdir ./dist
-        cp -RL ./result/* ./dist/

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

@@ -0,0 +1,23 @@
+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'
+runs:
+  using: "composite"
+  steps:
+
+    - name: Installing Nix
+      uses: cachix/install-nix-action@v27
+      with:
+        nix_path: nixpkgs=channel:nixpkgs-unstable
+        extra_nix_config: |
+          access-tokens = github.com=${{ inputs.GITHUB_TOKEN }}
+
+    - uses: cachix/cachix-action@v15
+      with:
+        name: nixos-search
+        signingKey: '${{ inputs.CACHIX_SIGNING_KEY }}'

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

@@ -12,14 +12,18 @@ on:
 
 jobs:
   build-flake-info:
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
     steps:
     - name: Checking out the repository
       uses: actions/checkout@v4
 
-    - name: Enable flakes
+    - name: Setup
-      run: |
+      uses: ./.github/actions/common-setup
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
+
+
 
     - name: Building flake-info
       run: |

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

@@ -8,19 +8,24 @@ on:
 
 jobs:
   automatic-custom-flakes-check:
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
+
     strategy:
       fail-fast: true
+
     env:
       RUST_LOG: debug
 
     steps:
+
     - name: Checking out the repository
       uses: actions/checkout@v4
 
-    - name: Enable flakes
+    - name: Setup
-      run: |
+      uses: ./.github/actions/common-setup
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Try importing all custom flakes
       run: |

.github/workflows/frontend.yml

@@ -0,0 +1,51 @@
+name: "Frontend: Build & Deploy to Netlify"
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - "flake.nix"
+      - "flake.lock"
+      - "frontend/**"
+      - "VERSION"
+
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checking out the repository
+      uses: actions/checkout@v4
+
+    - name: Setup
+      uses: ./.github/actions/common-setup
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
+
+
+
+    - name: Building search.nixos.org
+      run: |
+        nix -vL build .#frontend
+        mkdir ./dist
+        cp -RL ./result/* ./dist/
+
+    - name: Deploy to Netlify
+      uses: nwtgck/actions-netlify@v3.0
+      env:
+        NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+      with:
+        production-branch: 'main'
+        production-deploy: ${{ github.event_name == 'push' }}
+        publish-dir: './dist'
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        deploy-message: 'Deploy from GitHub Actions'
+        enable-pull-request-comment: true
+        overwrites-pull-request-comment: true
+        enable-commit-comment: false
+        enable-commit-status: true
+      if: github.repository_owner == 'NixOS'

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

@@ -10,8 +10,10 @@ permissions:
   issues: write
 
 jobs:
+
   nixos-channels:
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
+
     outputs:
       matrix: ${{ steps.nixos-channels.outputs.matrix }}
 
@@ -19,9 +21,11 @@ jobs:
     - name: Checking out the repository
       uses: actions/checkout@v4
 
-    - name: Enable flakes
+    - name: Setup
-      run: |
+      uses: ./.github/actions/common-setup
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: NixOS Channels
       id: nixos-channels
@@ -33,10 +37,12 @@ jobs:
 
   import-nixpkgs:
     needs: nixos-channels
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.nixos-channels.outputs.matrix) }}
+
     env:
       RUST_LOG: debug
       FI_ES_EXISTS_STRATEGY: abort
@@ -46,52 +52,70 @@ jobs:
     - name: Checking out the repository
       uses: actions/checkout@v4
 
-    - name: Enable flakes
+    - name: Setup
-      run: |
+      uses: ./.github/actions/common-setup
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Import ${{ matrix.channel }} channel
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         nix run --accept-flake-config .#flake-info -- --push --elastic-schema-version=$(< VERSION) nixpkgs ${{ matrix.channel }}
-      if: false
+      if: github.repository_owner == 'NixOS'
 
     - name: Warmup ${{ matrix.channel }} channel
       run: |
         for (( i = 0; i < 3; i++ )) do
           curl -sS ${{ secrets.ELASTICSEARCH_URL2 }}/latest-$(< VERSION)-nixos-${{ matrix.channel }}/_search | jq -c '.took // .'
         done
-      if: false
+      if: github.repository_owner == 'NixOS'
+
+    - name: Create issue if failed
+      if: failure()
+      uses: JasonEtco/create-an-issue@v2
+      with:
+        filename: .github/failing-import-issue.md
+        search_existing: open
+        update_existing: false
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CHANNEL: ${{ matrix.channel }}
 
   import-flakes:
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
         group:
-          - manual
+          - "manual"
+
     env:
       RUST_LOG: debug
       FI_ES_EXISTS_STRATEGY: recreate
       FI_ES_URL: ${{ secrets.ELASTICSEARCH_URL2 }}
 
     steps:
+
     - name: Checking out the repository
       uses: actions/checkout@v4
 
-    - name: Enable flakes
+    - name: Setup
-      run: |
+      uses: ./.github/actions/common-setup
-        echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
 
     - name: Import ${{ matrix.group }} group
       run: |
         nix run --accept-flake-config .#flake-info -- --push --elastic-schema-version=$(< ./VERSION) group ./flakes/${{ matrix.group }}.toml ${{ matrix.group }}
-      if: false
+      if: github.repository_owner == 'NixOS'
 
     - name: Warmup ${{ matrix.group }} group
       run: |
         for (( i = 0; i < 3; i++ )) do
           curl -sS ${{ secrets.ELASTICSEARCH_URL2 }}/latest-$(< VERSION)-group-${{ matrix.group }}/_search | jq -c '.took // .'
         done
-      if: false
+      if: github.repository_owner == 'NixOS'

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

@@ -1,5 +1,4 @@
-name: "Update flake.lock"
+name: update-flake-lock
-
 on:
   workflow_dispatch: # allows manual triggering
   schedule:
@@ -7,15 +6,14 @@ on:
 
 jobs:
   lockfile:
-    runs-on: nixos-unstable
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-
+      - name: Install Nix
-      - name: Enable flakes
+        uses: cachix/install-nix-action@v27
-        run: |
+        with:
-          echo 'experimental-features = nix-command flakes' >>/etc/nix/nix.conf
+          extra_nix_config: |
-
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v22
-        if: false

flake.lock

@@ -21,11 +21,11 @@
     "nixos-infra": {
       "flake": false,
       "locked": {
-        "lastModified": 1717510161,
+        "lastModified": 1718459216,
-        "narHash": "sha256-BiZudUcdFCpW9d8IXiPHXhKP1vTVqcDrQRtd/dLr7n0=",
+        "narHash": "sha256-+lOSTU8TjJZvNpcqANrTYarIdrMo4eUTYW1/CLWJ0No=",
         "owner": "NixOS",
         "repo": "infra",
-        "rev": "5e2b57f9a5bc43b9fd3eb822caaa7ddf0448b2b3",
+        "rev": "ca11a27e5609a152b5e9d9293c4ea99e9234d9e6",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717786204,
+        "lastModified": 1718318537,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
         "type": "github"
       },
       "original": {

frontend/src/Page/Packages.elm

@@ -654,7 +654,7 @@ viewResultItem nixosChannels channel showInstallDetails show item =
                                         [ pre [ class "code-block shell-command" ]
                                             [ text "# without flakes:\nnix-env -iA nixpkgs."
                                             , strong [] [ text item.source.attr_name ]
-                                            , text "# with flakes:\nnix profile install nixpkgs#"
+                                            , text "\n# with flakes:\nnix profile install nixpkgs#"
                                             , strong [] [ text item.source.attr_name ]
                                             ]
                                         ]