diff --git a/flake.lock b/flake.lock index ea4a2361..5ef919f7 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1772176312, - "narHash": "sha256-Yjo/QCJvY9GUhAzwac/m6Rx3oxvRyEaiT5DQ5o+T6g4=", + "lastModified": 1780397302, + "narHash": "sha256-SQmrkj17xBdvc8lVMbsY7pIJCjKftgNh42R1keP3dLQ=", "owner": "nix-community", "repo": "fenix", - "rev": "92d91250c1acd59beabc51208192adc92f31aeb5", + "rev": "f6670530f53e69cc284f7aef818eb0f08fe81905", "type": "github" }, "original": { @@ -117,14 +117,14 @@ "ibm-plex-mono-src": { "flake": false, "locked": { - "lastModified": 1731402384, + "lastModified": 1731402378, "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" }, "original": { "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip" + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" } }, "indigo": { @@ -217,11 +217,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1772094427, - "narHash": "sha256-TiVs6OUBJEvajHdJZ5nIq0KognNJooUWuLGPFfQacSw=", + "lastModified": 1780337665, + "narHash": "sha256-RS3F+/6dtBIwd5+47GVen3jAk62/KumFZ4q3RVYafDk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "56b59a832858329c2f947f9b7bdf1a49da39c981", + "rev": "55af1774e9e840d3b28d12fcfaa72d2e2caa8ac9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c227919e..1fe39f08 100644 --- a/flake.nix +++ b/flake.nix @@ -88,6 +88,9 @@ (self.callPackage "${gomod2nix}/builder" { gomod2nix = gomod2nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}.gomod2nix; }).buildGoApplication; + rustPlatform = pkgs.makeRustPlatform { + inherit (fenix.packages.${pkgs.system}.stable) rustc cargo; + }; modules = ./nix/gomod2nix.toml; sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix { inherit sqlite-lib-src; @@ -109,10 +112,11 @@ dolly = self.callPackage ./nix/pkgs/dolly.nix {}; tap = self.callPackage ./nix/pkgs/tap.nix {}; knotmirror = self.callPackage ./nix/pkgs/knotmirror.nix {}; + bobbin = self.callPackage ./nix/pkgs/bobbin.nix {}; }); in { overlays.default = final: prev: { - inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs dolly tap knotmirror; + inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs dolly tap knotmirror bobbin; }; packages = forAllSystems (system: let @@ -136,6 +140,7 @@ dolly tap knotmirror + bobbin ; pkgsStatic-appview = staticPackages.appview; diff --git a/nix/pkgs/bobbin.nix b/nix/pkgs/bobbin.nix new file mode 100644 index 00000000..bbafedfd --- /dev/null +++ b/nix/pkgs/bobbin.nix @@ -0,0 +1,19 @@ +{ + rustPlatform, + src, + ... +}: +let + flags = ["--bin" "bobbin" "-p" "bobbin"]; +in +rustPlatform.buildRustPackage { + pname = "bobbin"; + version = "0.0.1"; + + inherit src; + + cargoLock.lockFile = "${src}/Cargo.lock"; + + cargoBuildFlags = flags; + cargoTestFlags = flags; +}