mod: nur overlays

flake.nix

@@ -42,8 +42,7 @@
 
     myOverlays = { ... }: {
       nixpkgs.overlays = [
-        rust-overlay.overlays.default
+        nur.overlays.default
-        go-overlay.overlays.default
         aagl.overlays.default
         self.common.overlays
       ];

modules/common/overlays.nix

@@ -1,67 +1,67 @@
 final: prev: let
-  rust_latest = prev.rust-bin.stable.latest.default;
+  # rust_latest = prev.rust-bin.stable.latest.default;
-  golang_latest = prev.go-bin.latestStable;
+  # golang_latest = prev.go-bin.latestStable;
-  buildGoModuleLatest = prev.buildGoModule.override {
+  # buildGoModuleLatest = prev.buildGoModule.override {
-    go = golang_latest;
+  #   go = golang_latest;
-  };
+  # };
-  myRustPlatform = prev.makeRustPlatform {
+  # myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_latest;
+  #   cargo = rust_latest;
-    rustc = rust_latest;
+  #   rustc = rust_latest;
-  };
+  # };
 in {
-  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
+  # lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.61.0";
+  #   version = "0.61.0";
-    src = prev.fetchFromGitHub {
+  #   src = prev.fetchFromGitHub {
-      owner = "jesseduffield";
+  #     owner = "jesseduffield";
-      repo = "lazygit";
+  #     repo = "lazygit";
-      rev = "v${version}";
+  #     rev = "v${version}";
-      hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
+  #     hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
-    };
+  #   };
-
+  #
-    vendorHash = null;
+  #   vendorHash = null;
-    subPackages = [ "." ];
+  #   subPackages = [ "." ];
-    ldflags = [
+  #   ldflags = [
-      "-X main.version=${version}"
+  #     "-X main.version=${version}"
-      "-X main.buildSource=nix"
+  #     "-X main.buildSource=nix"
-    ];
+  #   ];
-  });
+  # });
-
+  #
-  atuinLatest = (prev.atuin.override {
+  # atuinLatest = (prev.atuin.override {
-    rustPlatform = myRustPlatform;
+  #   rustPlatform = myRustPlatform;
-  }).overrideAttrs (oldAttrs: rec {
+  # }).overrideAttrs (oldAttrs: rec {
-    version = "18.13.6";
+  #   version = "18.13.6";
-
+  #
-    src = prev.fetchFromGitHub {
+  #   src = prev.fetchFromGitHub {
-      owner = "atuinsh";
+  #     owner = "atuinsh";
-      repo = "atuin";
+  #     repo = "atuin";
-      rev = "v${version}";
+  #     rev = "v${version}";
-      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
+  #     hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
-    };
+  #   };
-
+  #
-    cargoDeps = myRustPlatform.fetchCargoVendor {
+  #   cargoDeps = myRustPlatform.fetchCargoVendor {
-      # name = "atuin-${version}-vendor.tar.gz";
+  #     # name = "atuin-${version}-vendor.tar.gz";
-      inherit src;
+  #     inherit src;
-      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
+  #     hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
-    };
+  #   };
-
+  #
-    cargoBuildFeatures = [
+  #   cargoBuildFeatures = [
-      "ai"
+  #     "ai"
-      "client"
+  #     "client"
-      "clipboard"
+  #     "clipboard"
-      "daemon"
+  #     "daemon"
-      "hex"
+  #     "hex"
-      "sync"
+  #     "sync"
-    ];
+  #   ];
-    cargoCheckFeatures = cargoBuildFeatures;
+  #   cargoCheckFeatures = cargoBuildFeatures;
-
+  #
-    preCheck = (oldAttrs.preCheck or "") + ''
+  #   preCheck = (oldAttrs.preCheck or "") + ''
-      export HOME="$TMPDIR"
+  #     export HOME="$TMPDIR"
-      export XDG_CONFIG_HOME="$TMPDIR/.config"
+  #     export XDG_CONFIG_HOME="$TMPDIR/.config"
-      export XDG_DATA_HOME="$TMPDIR/.local/share"
+  #     export XDG_DATA_HOME="$TMPDIR/.local/share"
-      export XDG_STATE_HOME="$TMPDIR/.local/state"
+  #     export XDG_STATE_HOME="$TMPDIR/.local/state"
-      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+  #     mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
-    '';
+  #   '';
-  });
+  # });
 
   # k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
   #   version = "0.30.16";
@@ -77,52 +77,52 @@ in {
   #   ];
   # });
 
-  ghDashLatest = (prev.gh-dash.override {
+  # ghDashLatest = (prev.gh-dash.override {
-    buildGoModule = buildGoModuleLatest;
+  #   buildGoModule = buildGoModuleLatest;
-  }).overrideAttrs (oldAttrs: rec {
+  # }).overrideAttrs (oldAttrs: rec {
-    version = "4.23.2";
+  #   version = "4.23.2";
-    src = prev.fetchFromGitHub {
+  #   src = prev.fetchFromGitHub {
-      owner = "dlvhdr";
+  #     owner = "dlvhdr";
-      repo = "gh-dash";
+  #     repo = "gh-dash";
-      rev = "v${version}";
+  #     rev = "v${version}";
-      hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
+  #     hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
-    };
+  #   };
-
+  #
-    vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
+  #   vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
-    doCheck = false;
+  #   doCheck = false;
-    checkFlags = [
+  #   checkFlags = [
-      "-skip=TestFullOutput"
+  #     "-skip=TestFullOutput"
-    ];
+  #   ];
-
+  #
-    ldflags = [
+  #   ldflags = [
-      "-s"
+  #     "-s"
-      "-w"
+  #     "-w"
-      "-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
+  #     "-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
-    ];
+  #   ];
-
+  #
-    passthru = (oldAttrs.passthru or {}) // {
+  #   passthru = (oldAttrs.passthru or {}) // {
-      tests = {
+  #     tests = {
-        version = oldAttrs.testers.testVersion { package = final.ghDashLatest; };
+  #       version = oldAttrs.testers.testVersion { package = final.ghDashLatest; };
-      };
+  #     };
-    };
+  #   };
-  });
+  # });
-
+  #
-  diffNavLatest = (prev.diffnav.override {
+  # diffNavLatest = (prev.diffnav.override {
-    buildGoModule = buildGoModuleLatest;
+  #   buildGoModule = buildGoModuleLatest;
-  }).overrideAttrs (_: rec {
+  # }).overrideAttrs (_: rec {
-    version = "0.10.0";
+  #   version = "0.10.0";
-    src = prev.fetchFromGitHub {
+  #   src = prev.fetchFromGitHub {
-      owner = "dlvhdr";
+  #     owner = "dlvhdr";
-      repo = "diffnav";
+  #     repo = "diffnav";
-      rev = "v${version}";
+  #     rev = "v${version}";
-      hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
+  #     hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
-    };
+  #   };
-
+  #
-    vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
+  #   vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
-
+  #
-    ldflags = [
+  #   ldflags = [
-      "-s"
+  #     "-s"
-      "-w"
+  #     "-w"
-    ];
+  #   ];
-  });
+  # });
 }