flake.nix: update the package

This primarily adds assert to hint on the magic URL.
silicon-heaven · Jan 28, 2025 · fb2131d · fb2131d
1 parent 5e6e9a5
commit fb2131d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 51 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,14 +18,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-          fetch-depth: 0
+          fetch-depth: 1
       - name: Install Nix
-        uses: cachix/install-nix-action@V28
+        uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - name: Build
-        run: nix --experimental-features 'nix-command flakes' build -L "git+file://$(pwd)?submodules=1&rev=$(git rev-parse HEAD)"
+        run: nix --experimental-features 'nix-command flakes' build -L '.?submodules=1#'
       - name: Flake check
-        run: nix --experimental-features 'nix-command flakes' flake check "git+file://$(pwd)?submodules=1&rev=$(git rev-parse HEAD)"
+        run: nix --experimental-features 'nix-command flakes' flake check '.?submodules=1#'
       - name: Format
         run: nix --experimental-features 'nix-command flakes' fmt && git diff --exit-code
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,7 @@
     nixpkgs,
   }: let
     inherit (flake-utils.lib) eachDefaultSystem;
-    inherit (nixpkgs.lib) hasSuffix composeManyExtensions;
+    inherit (nixpkgs.lib) assertMsg;
     rev = self.shortRev or self.dirtyShortRev or "unknown";
 
     shvspy = {
@@ -19,49 +19,41 @@
       copyDesktopItems,
       makeDesktopItem,
     }:
-      stdenv.mkDerivation {
-        name = "shvspy-${rev}";
-        src = builtins.path {
-          path = ./.;
-          filter = path: _: ! hasSuffix ".nix" path;
+      assert assertMsg self.submodules
+      "Unable to build without submodules. Append '?submodules=1#' to the URL.";
+        stdenv.mkDerivation {
+          name = "shvspy-${rev}";
+          src = ./.;
+          buildInputs = [
+            qt6.wrapQtAppsHook
+            qt6.qtbase
+            qt6.qtserialport
+            qt6.qtwebsockets
+            qt6.qtsvg
+            qt6.qtnetworkauth
+            doctest
+            openldap
+          ];
+          nativeBuildInputs = [
+            cmake
+            qt6.qttools
+            copyDesktopItems
+          ];
+          desktopItems = [
+            (makeDesktopItem {
+              name = "shvspy";
+              exec = "shvspy";
+              desktopName = "SHVSpy";
+              categories = ["Network" "RemoteAccess"];
+            })
+          ];
+          cmakeFlags = ["-DUSE_QT6=ON"];
+          meta.mainProgram = "shvspy";
         };
-        buildInputs = [
-          qt6.wrapQtAppsHook
-          qt6.qtbase
-          qt6.qtserialport
-          qt6.qtwebsockets
-          qt6.qtsvg
-          qt6.qtnetworkauth
-          doctest
-          openldap
-        ];
-        nativeBuildInputs = [
-          cmake
-          qt6.qttools
-          copyDesktopItems
-        ];
-        desktopItems = [
-          (makeDesktopItem {
-            name = "shvspy";
-            exec = "shvspy";
-            desktopName = "SHVSpy";
-            categories = ["Network" "RemoteAccess"];
-          })
-        ];
-        cmakeFlags = [
-          "-DUSE_QT6=ON"
-        ];
-        meta.mainProgram = "shvspy";
-      };
   in
     {
-      overlays = {
-        pkgs = final: _: {
-          shvspy = final.callPackage shvspy {};
-        };
-        default = composeManyExtensions [
-          self.overlays.pkgs
-        ];
+      overlays.default = final: _: {
+        shvspy = final.callPackage shvspy {};
       };
     }
     // eachDefaultSystem (system: let