From c1f671987750aa35387d3cdbcb144b08ecd3a28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Kugland?= <kugland@gmail.com>
Date: Fri, 3 Jan 2025 05:50:52 -0300
Subject: [PATCH] neocities-deploy: v0.1.13

---
 .github/workflows/build.yml       |  1 +
 default.nix                       |  7 ++++--
 flake.lock                        | 39 +++++++++++++++++++++++++++++++
 flake.nix                         | 10 +++++++-
 pkgs/neocities-deploy/default.nix | 19 +++++++++++----
 5 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4010054..38279c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,6 +42,7 @@ jobs:
       run: |
         nix-env -f . -qa \* --meta --xml \
           --allowed-uris https://static.rust-lang.org \
+          --allowed-uris https://github.com \
           --option restrict-eval true \
           --option allow-import-from-derivation true \
           --drv-path --show-trace \
diff --git a/default.nix b/default.nix
index 47c1c2a..f159aba 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,7 @@
-{ pkgs ? import <nixpkgs> { } }: rec {
+{
+  pkgs ? import <nixpkgs> { },
+  fenix ? import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { },
+}: rec {
   # The `lib`, `modules`, and `overlays` names are special
   lib = import ./lib { inherit pkgs; }; # functions
   modules = import ./modules; # NixOS modules
@@ -8,7 +11,7 @@
   bip39 = pkgs.callPackage ./pkgs/bip39 { };
   ffsubsync = pkgs.callPackage ./pkgs/ffsubsync { inherit auditok pysubs2; };
   my-bookmarks-pl = pkgs.callPackage ./pkgs/my-bookmarks-pl { };
-  neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy { };
+  neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy { inherit fenix; };
   pysubs2 = pkgs.callPackage ./pkgs/pysubs2 { };
   subtitlecomposer = pkgs.callPackage ./pkgs/subtitlecomposer { };
 }
diff --git a/flake.lock b/flake.lock
index ba858e2..db5be4b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1735886062,
+        "narHash": "sha256-TTI7Lt1/hvu3xuUdc2UA9jACoarf/DAKtwHYhsQ/iD8=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "a65f3516dfcce5cf2157cc19d517b1bb87ed71b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1735685343,
@@ -18,8 +39,26 @@
     },
     "root": {
       "inputs": {
+        "fenix": "fenix",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735816508,
+        "narHash": "sha256-oag3BrD8UskICXnQSSjJ888rjUj/IhH9KlqJuqsqwrA=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "d3dd40f6360f970179ed671d042e8e0902c770ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 9716897..9072920 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,15 @@
 {
   description = "My personal NUR repository";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
   outputs =
     { self
+    , fenix
     , nixpkgs
     ,
     }:
@@ -24,6 +31,7 @@
       legacyPackages = forAllSystems (system:
         import ./default.nix {
           pkgs = import nixpkgs { inherit system; };
+          fenix = fenix.outputs.packages.${system};
         });
       packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
     };
diff --git a/pkgs/neocities-deploy/default.nix b/pkgs/neocities-deploy/default.nix
index b643bb0..25900c8 100644
--- a/pkgs/neocities-deploy/default.nix
+++ b/pkgs/neocities-deploy/default.nix
@@ -1,20 +1,29 @@
 { pkgs
 , lib
 , fetchFromGitHub
-, rustPlatform
-, buildRustPackage ? rustPlatform.buildRustPackage
+, fenix
 ,
 }:
-buildRustPackage rec {
+
+let
+  toolchain = fenix.minimal.toolchain;
+  buildRustPackage = (pkgs.makeRustPlatform {
+    cargo = toolchain;
+    rustc = toolchain;
+  }).buildRustPackage;
+
+in
+  buildRustPackage rec {
   pname = "neocities-deploy";
   version = "0.1.13";
   src = fetchFromGitHub {
     owner = "kugland";
     repo = "neocities-deploy";
     rev = "v${version}";
-    hash = "sha256-Xy+YfXSb2ffIu4Ost5tKDXXAOzR+kkfR5kwqdlVLo0o=";
+    hash = "sha256-Ax1xmNyt+Gymk28p9lXh+CV17rWjMBKIZtc+nthic+8=";
   };
-  cargoHash = "sha256-G119UJ7b9nK4XiPtKSKcRPncpWBKRw9GRnJ1PjTAA2Q=";
+  cargoHash = "sha256-wdO46fRqzrWZNSoNAA5FHBckUxLtsxmc72UVtmGhJYU=";
+  doCheck = false;
   meta = with lib; {
     description = "A command-line tool for deploying your Neocities site";
     homepage = "https://github.com/kugland/neocities-deploy";