From 100c9eabe80c813120b69f13bd8395a854ebca95 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Wed, 27 Oct 2021 13:21:53 +0200 Subject: [PATCH] Bump version, update deps, use devshell --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- devshell.toml | 13 +++++++++++++ flake.lock | 43 +++++++++++++------------------------------ flake.nix | 14 +------------- 5 files changed, 37 insertions(+), 53 deletions(-) create mode 100644 devshell.toml diff --git a/Cargo.lock b/Cargo.lock index 18b15a5..df51b24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -935,7 +935,7 @@ dependencies = [ [[package]] name = "mensa" -version = "0.4.2" +version = "0.4.3" dependencies = [ "cacache", "chrono", @@ -1184,9 +1184,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "pretty_assertions" @@ -1248,9 +1248,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] @@ -1688,9 +1688,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -2004,9 +2004,9 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.0.0-alpha.7" +version = "1.0.0-alpha.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" +checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" dependencies = [ "ctor", "version_check", diff --git a/Cargo.toml b/Cargo.toml index 1c37f57..4d9b3e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mensa" -version = "0.4.2" +version = "0.4.3" authors = ["Malte Tammena "] edition = "2021" resolver = "2" diff --git a/devshell.toml b/devshell.toml new file mode 100644 index 0000000..dfb04d4 --- /dev/null +++ b/devshell.toml @@ -0,0 +1,13 @@ +imports = [ "git.hooks" ] + +[devshell] +name = "mensa" + +[[commands]] +help = "update README.md from src/main.rs" +name = "update-readme" +command = "cargo readme --no-indent-headings -o README.md" + +[git.hooks] +enable = true +pre-commit.text = "nix flake check" diff --git a/flake.lock b/flake.lock index cecbb5d..1864937 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1635056590, - "narHash": "sha256-JEdGR/hy5u++X0S9MYrauX7zpUOjEaB+Nu1goYxH9R4=", + "lastModified": 1635315838, + "narHash": "sha256-59un+9LZogbhE4z4eJsZm6C2ZsoJLWjsgrPH+NAOH98=", "owner": "nix-community", "repo": "fenix", - "rev": "e837dcb6738d16da0b17eb4d377d8331aab84dc9", + "rev": "ca0610dbd3a8a575ea0e33c61a6de23ab91a2e01", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "rustOverlay": "rustOverlay" }, "locked": { - "lastModified": 1635055758, - "narHash": "sha256-h2PvCmtSjJKNxDthQQYAbJxvpZMjV+exqnDR2uXnOyY=", + "lastModified": 1635314988, + "narHash": "sha256-qCpnM+H20mJeRCEoz/Ywosr7QEGAqcaZYRRicj2vYac=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "42ab644c856a843faa7a11bb966f355a338de68f", + "rev": "98e845ae7b15689bf2c6883b5ec15bca834c433d", "type": "github" }, "original": { @@ -86,37 +86,20 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1635070701, - "narHash": "sha256-vlwezyDsGFRKcaffprIXx4dfcyeR30bON1yZiSZTMDc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0920efc96dc2474295f17ae9f71da5baf621246e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "fenix": "fenix", - "nixCargoIntegration": "nixCargoIntegration", - "nixpkgs": "nixpkgs_3" + "nixCargoIntegration": "nixCargoIntegration" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1634995832, - "narHash": "sha256-9j9UzrimhoeyU2RJVs+TR53wyL67UjMgUb1e+jMNL5g=", + "lastModified": 1635274542, + "narHash": "sha256-Cew1/WUozM3jalItPuj4cNN8GIFMvCaJ1KXoj6wrHwE=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "9d33d05d85456c855b88a8bdf4ab44d97e32bd4a", + "rev": "dd43f3f2d13a32199828e758ddf13176df1f17f9", "type": "github" }, "original": { @@ -129,11 +112,11 @@ "rustOverlay": { "flake": false, "locked": { - "lastModified": 1635041777, - "narHash": "sha256-36LeviqJlWikocBObavRcaFnAQDdbr1Yaze2y7t0Ie0=", + "lastModified": 1635300835, + "narHash": "sha256-bYcSZCcV5wvqCCcEquYUnOA8Mn2wUwcAQEZ4kPlNVSw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "21ec729445fbf58ac59061c2694063799e9ee1aa", + "rev": "dbedcf48f0a145a9e4b110461d7cd07f97b68285", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0d154ba..c99be9f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,8 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixCargoIntegration.url = "github:yusdacra/nix-cargo-integration"; fenix.url = "github:nix-community/fenix"; }; - outputs = inputs: - let pkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; - in inputs.nixCargoIntegration.lib.makeOutputs { - root = ./.; - overrides.shell = common: prev: { - packages = prev.packages ++ [ - (pkgs.writeScriptBin "update-readme" '' - cargo readme --no-indent-headings -o README.md - '') - ]; - }; - }; + outputs = inputs: inputs.nixCargoIntegration.lib.makeOutputs { root = ./.; }; }