From f43bc32ce0ae8f7276ffddc25d06b73bd422185d Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 19 Jun 2022 11:01:30 -0700 Subject: [PATCH] Seems to have had no effect. --- flake.nix | 71 ++++++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/flake.nix b/flake.nix index 0cb78e5..b853df1 100644 --- a/flake.nix +++ b/flake.nix @@ -11,55 +11,30 @@ }; outputs = { self, nixpkgs, utils, clj-nix, ... }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages."${system}"; - cljpkgs = clj-nix.packages."${system}"; - update-deps = pkgs.writeShellScriptBin "update-deps.sh" '' - ${clj-nix.packages."${system}".deps-lock}/bin/deps-lock - ''; - in { - packages."${system}".fudo-pricebot = cljpkgs.mkCljBin { - projectSrc = ./.; - name = "org.fudo/pricebot"; - main-ns = "pricebot.core"; - jdkRunner = pkgs.jdk17_headless; - version = "0.1"; - }; + utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages."${system}"; + cljpkgs = clj-nix.packages."${system}"; + update-deps = pkgs.writeShellScriptBin "update-deps.sh" '' + ${clj-nix.packages."${system}".deps-lock}/bin/deps-lock + ''; + in { + packages = { + fudo-pricebot = cljpkgs.mkCljBin { + projectSrc = ./.; + name = "org.fudo/pricebot"; + main-ns = "pricebot.core"; + jdkRunner = pkgs.jdk17_headless; + version = "0.1"; + }; + }; - defaultPackage = self.packages."${system}".fudo-pricebot; + defaultPackage = self.packages."${system}".fudo-pricebot; - nixosModule = import ./module.nix self.packages."${system}".fudo-pricebot; + nixosModule = + import ./module.nix self.packages."${system}".fudo-pricebot; - devShell = - pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; }; - }; - - # outputs = { self, nixpkgs, utils, clj-nix, ... }: - # utils.lib.eachDefaultSystem (system: - # let - # pkgs = nixpkgs.legacyPackages."${system}"; - # cljpkgs = clj-nix.packages."${system}"; - # update-deps = pkgs.writeShellScriptBin "update-deps.sh" '' - # ${clj-nix.packages."${system}".deps-lock}/bin/deps-lock - # ''; - # in { - # packages = { - # fudo-pricebot = cljpkgs.mkCljBin { - # projectSrc = ./.; - # name = "org.fudo/pricebot"; - # main-ns = "pricebot.core"; - # jdkRunner = pkgs.jdk17_headless; - # version = "0.1"; - # }; - # }; - - # defaultPackage = self.packages."${system}".fudo-pricebot; - - # nixosModule = - # import ./module.nix self.packages."${system}".fudo-pricebot; - - # devShell = - # pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; }; - # }); + devShell = + pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; }; + }); }