try: move default by package

SergioRibera · Jan 19, 2024 · 31db13d · 31db13d
1 parent 0503404
commit 31db13d
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 61 deletions.
diff --git a/crates/sss_cli/default.nix b/crates/sss_cli/default.nix
@@ -0,0 +1,38 @@
+{}:
+let
+  pkgs = import <nixpkgs> { };
+  platform = {
+    "x86_64-linux" = "x86_64-unknown-linux-musl";
+    "x86_64-darwin" = "x86_64-apple-darwin";
+    "aarch64-darwin" = "aarch64-apple-darwin";
+  }."${pkgs.stdenv.hostPlatform.system}";
+  hash_sss = {
+    "x86_64-linux" = "0sbrny0a47hyg8z6266xw77h27slamlqg3kdcrimkn2xrn9341wh";
+    "x86_64-darwin" = "00a66gi5l71z0c6xgcswcnlh3m9d5n1hrgkmcgibnr3mxipxgrpm";
+    "aarch64-darwin" = "1dw15gjihr898l1apgwjcqx1dk2b227rhcrcq4qclxyd9wyg2861";
+  }."${pkgs.stdenv.hostPlatform.system}";
+in
+pkgs.stdenv.mkDerivation {
+  name = "sss";
+  version = "0.1.2";
+  src = fetchTarball {
+    url = "https://github.com/SergioRibera/sss/releases/download/sss_cli/v0.1.2/sss_cli-${platform}.tar.xz";
+    sha256 = hash_sss;
+  };
+  buildInputs = with pkgs; [
+    fontconfig
+    dbus
+    wayland
+    wayland-protocols
+    libxkbcommon
+    xorg.libXcursor
+    xorg.libxcb
+    xorg.libX11
+    xorg.libXi
+    xorg.libXrandr
+  ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp sss $out/bin/
+  '';
+}
diff --git a/default.nix → crates/sss_code/default.nix b/default.nix → crates/sss_code/default.nix
@@ -6,44 +6,13 @@ let
     "x86_64-darwin" = "x86_64-apple-darwin";
     "aarch64-darwin" = "aarch64-apple-darwin";
   }."${pkgs.stdenv.hostPlatform.system}";
-  hash_sss = {
-    "x86_64-linux" = "0sbrny0a47hyg8z6266xw77h27slamlqg3kdcrimkn2xrn9341wh";
-    "x86_64-darwin" = "00a66gi5l71z0c6xgcswcnlh3m9d5n1hrgkmcgibnr3mxipxgrpm";
-    "aarch64-darwin" = "1dw15gjihr898l1apgwjcqx1dk2b227rhcrcq4qclxyd9wyg2861";
-  }."${pkgs.stdenv.hostPlatform.system}";
   hash_sss_code = {
     "x86_64-linux" = "0zgn8hrhjrdlxij5mgm8wcnfzigas53asmfwnrnxfxpgd5bi775m";
     "x86_64-darwin" = "1nxykijmp6rpm0s0yxzqx75q3yvsd52p6dssz5wddfjsxpvh2gva";
     "aarch64-darwin" = "14il7r1i0zx62wf8r7y7ayxhml33ycrp1gn0jxzfj5662mmbpgig";
   }."${pkgs.stdenv.hostPlatform.system}";
 in
-{
-  sss = pkgs.stdenv.mkDerivation {
-    name = "sss";
-    version = "0.1.2";
-    src = fetchTarball {
-      url = "https://github.com/SergioRibera/sss/releases/download/sss_cli/v0.1.2/sss_cli-${platform}.tar.xz";
-      sha256 = hash_sss;
-    };
-    buildInputs = with pkgs; [
-      fontconfig
-      dbus
-      wayland
-      wayland-protocols
-      libxkbcommon
-      xorg.libXcursor
-      xorg.libxcb
-      xorg.libX11
-      xorg.libXi
-      xorg.libXrandr
-    ];
-    installPhase = ''
-      mkdir -p $out/bin
-      cp sss $out/bin/
-    '';
-  };
-
-  sss_code = pkgs.stdenv.mkDerivation {
+pkgs.stdenv.mkDerivation {
     name = "sss_code";
     version = "0.1.6";
     src = fetchTarball {
@@ -55,5 +24,4 @@ in
       mkdir -p $out/bin
       cp sss_code $out/bin/
     '';
-  };
 }
diff --git a/flake.nix b/flake.nix
@@ -15,31 +15,11 @@
     , crane
     , self
     , ...
-    }:
-    {
-      homeManagerModules = {
-        sss = (import ./crates/sss_cli/module.nix) {
-          isNixOSModule = false;
-        };
-        sss_code = (import ./crates/sss_code/module.nix) {
-          isNixOSModule = false;
-        };
-        default = self.homeManagerModules.sss;
+    }: {
+      overlays.default = _: prev: {
+        sss = prev.callPackage ./crates/sss_cli { };
+        sss_code = prev.callPackage ./crates/sss_code { };
       };
-
-      nixosModules = {
-        sss = (import ./crates/sss_cli/module.nix) {
-          isNixOSModule = true;
-        };
-        sss_code = (import ./crates/sss_code/module.nix) {
-          isNixOSModule = true;
-        };
-        default = self.nixosModules.sss;
-      };
-
-      # aliases
-      homeManagerModule = self.homeManagerModules.default;
-      nixosModule = self.nixosModules.default;
     } //
     inputs.flake-parts.lib.mkFlake
       {
@@ -84,15 +64,15 @@
             };
             # Compile all artifacts for x86_64-unknown-linux-gnu
             linuxArtifacts = craneLib.buildDepsOnly (commonArgs
-            // {
+              // {
               CARGO_BUILD_TARGET = "x86_64-unknown-linux-gnu";
               doCheck = false;
             });
 
             # Compile app for x86_64-unknown-linux-gnu
             linuxApp = craneLib.buildPackage (
               commonArgs
-              // {
+                // {
                 doCheck = false;
                 cargoArtifacts = linuxArtifacts;
               }

diff --git a/hook.sh b/hook.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-sed -i "s#version = \"${PREV_VERSION}\"#version = \"${NEW_VERSION}\"#g" ../../default.nix
-sed -i "s#${CRATE_NAME}/v${PREV_VERSION}#${CRATE_NAME}/v${NEW_VERSION}#g" ../../default.nix
+sed -i "s#version = \"${PREV_VERSION}\"#version = \"${NEW_VERSION}\"#g" ./default.nix
+sed -i "s#${CRATE_NAME}/v${PREV_VERSION}#${CRATE_NAME}/v${NEW_VERSION}#g" ./default.nix