diff --git a/Cargo.lock b/Cargo.lock index f353286..3e6c9c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,7 +522,7 @@ dependencies = [ [[package]] name = "ucg" -version = "0.7.2" +version = "0.7.3" dependencies = [ "abortable_parser", "atty", diff --git a/Cargo.toml b/Cargo.toml index efd3ee5..cae3c10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "ucg" -version = "0.7.2" +version = "0.7.3" authors = ["Jeremy Wall "] description = "A configuration generation grammar." repository = "https://github.com/zaphar/ucg" diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..315b844 --- /dev/null +++ b/default.nix @@ -0,0 +1,11 @@ +let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); +in +(import ( + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } +) { + src = ./.; +}).defaultNix \ No newline at end of file diff --git a/flake.lock b/flake.lock index ff5c22b..412ba87 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1652410199, - "narHash": "sha256-R9pEim8k6GIYadmyTRh2jpvUDkFJ857DhUwdnJUCf/o=", + "lastModified": 1673836088, + "narHash": "sha256-cAlfrHbX9sLcRdydMP8vhyxZChlVHqkEkumgc2LK4FY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fe0bc0004e5db3f8034021b4968b26b29fd9edef", + "rev": "8f201a1adfddf715b708befd18164c8cbe65a268", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3604dd..87953ab 100644 --- a/flake.nix +++ b/flake.nix @@ -18,18 +18,29 @@ outputs = {self, nixpkgs, flake-utils, rust-overlay, naersk, flake-compat}: flake-utils.lib.eachDefaultSystem (system: let - overlays = [ rust-overlay.overlay ]; + overlays = [ rust-overlay.overlays.default ]; pkgs = import nixpkgs { inherit system overlays; }; - naersk-lib = naersk.lib."${system}"; + rust-bin = pkgs.rust-bin.stable."1.64.0".default.override { + extensions = [ "rust-src" ]; + # Add wasm32 as an extra target besides the native target. + targets = [ "wasm32-unknown-unknown" ]; + }; + naersk-lib = pkgs.callPackage naersk { + rustc = rust-bin; + cargo = rust-bin; + }; ucg = with pkgs; naersk-lib.buildPackage rec { pname = "ucg"; - version = "0.7.2"; + version = "0.7.3"; src = ./.; cargoBuildOptions = opts: opts ++ ["-p" "${pname}" ]; }; in { + packages = { + inherit ucg; + }; defaultPackage = ucg; defaultApp = { type = "app"; diff --git a/result b/result deleted file mode 120000 index 7d18aac..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/v90fwz0dfbnlghwkhahfq5fjd8yk39m7-ucg-0.7.2 \ No newline at end of file