From 54520ef6bcb259ddcf1a92c3164eb88ecc548eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 19 Jun 2022 13:31:22 +0100 Subject: [PATCH] add cargo2nix --- flake.lock | 124 ++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 2 + 2 files changed, 111 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 0293cd9..f1117dd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "cargo2nix": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1655189312, + "narHash": "sha256-gpJ57OgIebUpO+7F00VltxSEy6dz2x6HeJ5BcRM8rDA=", + "owner": "cargo2nix", + "repo": "cargo2nix", + "rev": "c149357cc3d17f2849c73eb7a09d07a307cdcfe8", + "type": "github" + }, + "original": { + "owner": "cargo2nix", + "repo": "cargo2nix", + "type": "github" + } + }, "clean-s3-cache": { "flake": false, "locked": { @@ -16,6 +37,22 @@ "url": "https://gist.github.com/DarkKirb/533e9e8b9b6dd1badf9b103b4285dc4e" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1653893745, @@ -31,9 +68,24 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -148,16 +200,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", + "lastModified": 1654275867, + "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "release-22.05", "repo": "nixpkgs", "type": "github" } @@ -180,11 +232,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1655415671, - "narHash": "sha256-WD7HxxW1m8D/fkV1QlCYlZvnE5gQdg7ckq3myI4gPtE=", + "lastModified": 1655562720, + "narHash": "sha256-OrN8DkBRZqZMzMuECuQNvSQ5gWoFBCxDvxYXjIQ/pH0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f96729212602f15a6a226d2f27f5de70492ad095", + "rev": "27dffce7eaa9648b4a13a461e786f169a17c0889", "type": "github" }, "original": { @@ -196,11 +248,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1655583581, - "narHash": "sha256-7t8qgaDrXZIYs+S8FzDLz5YgMMGvTaXGf/JO1x8JXbI=", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a64c0ef4b5dab8bbcbbff8a6234f1cd7d12641b", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1655641096, + "narHash": "sha256-VwjhpSJ/m+4TqoDobYcwRC1iJXqEg30GbdTif9pkahE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ce505a39845b93e48f125ededeaaec6f597df43f", "type": "github" }, "original": { @@ -243,8 +311,9 @@ }, "root": { "inputs": { + "cargo2nix": "cargo2nix", "clean-s3-cache": "clean-s3-cache", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "gomod2nix": "gomod2nix", "kreative-open-relay": "kreative-open-relay", "mastodon": "mastodon", @@ -252,7 +321,7 @@ "mautrix-whatsapp": "mautrix-whatsapp", "miifox-net": "miifox-net", "nasin-nanpa": "nasin-nanpa", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-go116": "nixpkgs-go116", "nixpkgs-stable": "nixpkgs-stable", "plover": "plover", @@ -260,6 +329,31 @@ "wortformliste": "wortformliste" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "cargo2nix", + "flake-utils" + ], + "nixpkgs": [ + "cargo2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1653878966, + "narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8526d618af012a923ca116be9603e818b502a8db", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1653893745, diff --git a/flake.nix b/flake.nix index fe4970e..4faeb0a 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ regenpfeifer.flake = false; wortformliste.url = "github:mkrnr/wortformliste"; wortformliste.flake = false; + cargo2nix.url = "github:cargo2nix/cargo2nix"; }; outputs = { @@ -66,6 +67,7 @@ if system == "x86_64-linux" then { inherit packages devShells; + inherit (inputs.cargo2nix.packages.${system}) cargo2nix; } else {}; }