From 003af7110788afb31850a08b023cdb5b3f4fd9b5 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Fri, 31 Jan 2025 22:58:32 +0100 Subject: [PATCH] chore: simplify flake.nix and update flake.lock --- flake.lock | 12 ++++++------ flake.nix | 20 -------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index fac435d..265e37c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737858462, - "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", + "lastModified": 1738290352, + "narHash": "sha256-YKOHUmc0Clm4tMV8grnxYL4IIwtjTayoq/3nqk0QM7k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", + "rev": "b031b584125d33d23a0182f91ddbaf3ab4880236", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e431b32..8c95dbf 100644 --- a/flake.nix +++ b/flake.nix @@ -13,27 +13,7 @@ overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; rustVersion = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml); - rustPlatform = pkgs.makeRustPlatform { - cargo = rustVersion; - rustc = rustVersion; - }; - - libName = "georm"; - - libRustBuildGeorm = rustPlatform.buildRustPackage { - pname = libName; - version = "0.1.0"; - src = ./.; - cargoLock.lockFile = ./Cargo.lock; - buildPhase = '' -SQLX_OFFLINE="1" cargo build --release -''; - }; in { - packages = { - lib = libRustBuildGeorm; - }; - defaultPackage = libRustBuildGeorm; devShell = with pkgs; mkShell { buildInputs = [ bacon