diff --git a/flake.lock b/flake.lock index a073a7c..f39df90 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -76,27 +76,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1708807242, @@ -137,7 +116,9 @@ "flake-utils": [ "flake-utils" ], - "gitignore": "gitignore_2", + "gitignore": [ + "gitignore" + ], "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 3c60615..e02f611 100644 --- a/flake.nix +++ b/flake.nix @@ -22,20 +22,21 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; + gitignore = { + url = "github:hercules-ci/gitignore.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + pre-commit-hooks-nix = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; + gitignore.follows = "gitignore"; flake-utils.follows = "flake-utils"; flake-compat.follows = "flake-compat"; }; }; - gitignore = { - url = "github:hercules-ci/gitignore.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; outputs = inputs@{ self, flake-parts, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } { diff --git a/nix/packages/transformer.nix b/nix/packages/transformer.nix index 4285755..cf25d0d 100644 --- a/nix/packages/transformer.nix +++ b/nix/packages/transformer.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage { pname = "bombon-transformer"; - version = "0.1.0"; + version = (builtins.fromTOML (builtins.readFile ../../rust/transformer/Cargo.toml)).package.version; src = gitignoreSource ../../rust/transformer; diff --git a/rust/transformer/Cargo.toml b/rust/transformer/Cargo.toml index fb25d0b..422ca4f 100644 --- a/rust/transformer/Cargo.toml +++ b/rust/transformer/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.79" -clap = { version = "4.4.18", features = ["derive"] } -cyclonedx-bom = "0.4.3" -itertools = "0.12.1" -serde = { version = "1.0.196", features = [ "derive" ] } -serde_json = "1.0.113" +anyhow = "1.0" +clap = { version = "4.4", features = ["derive"] } +cyclonedx-bom = "0.4" +itertools = "0.12" +serde = { version = "1.0", features = [ "derive" ] } +serde_json = "1.0"