From b160015aa95af37fac67e78e3887d1c9a4e0f19d Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 29 Oct 2023 12:05:36 -0400 Subject: mujmap source --- flake.lock | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 5 +- modules/desktop.nix | 2 +- 3 files changed, 158 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 926e70c..760ed05 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,28 @@ "type": "github" } }, + "cargo2nix": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1682891040, + "narHash": "sha256-hjajsi7lq24uYitUh4o04UJi1g0Qe6ruPL0s5DgPQMY=", + "owner": "cargo2nix", + "repo": "cargo2nix", + "rev": "0167b39f198d72acdf009265634504fd6f5ace15", + "type": "github" + }, + "original": { + "owner": "cargo2nix", + "ref": "release-0.11.0", + "repo": "cargo2nix", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -64,6 +86,22 @@ "type": "github" } }, + "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": { "inputs": { "systems": "systems" @@ -82,6 +120,39 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -122,6 +193,28 @@ "type": "github" } }, + "mujmap": { + "inputs": { + "cargo2nix": "cargo2nix", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684113803, + "narHash": "sha256-mSJ6uyZSaWWdhqiYNcIm7lC6PZZrZ8PSdxfu+s9MZD0=", + "owner": "elizagamedev", + "repo": "mujmap", + "rev": "5f700af890769185ad99d4aae9f53496bb2aa6f2", + "type": "github" + }, + "original": { + "owner": "elizagamedev", + "repo": "mujmap", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -225,6 +318,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1682600000, + "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1697655685, "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", @@ -245,11 +354,39 @@ "agenix": "agenix", "emacs-overlay": "emacs-overlay", "jovian": "jovian", + "mujmap": "mujmap", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "mujmap", + "cargo2nix", + "flake-utils" + ], + "nixpkgs": [ + "mujmap", + "cargo2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673490397, + "narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -264,6 +401,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b9165d1..51203e0 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,11 @@ inputs.agenix.url = "github:ryantm/agenix"; inputs.agenix.inputs.nixpkgs.follows = "nixpkgs"; inputs.jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.mujmap.url = "github:elizagamedev/mujmap"; + inputs.mujmap.inputs.nixpkgs.follows = "nixpkgs"; outputs = - { self, nixpkgs, nixpkgs-unstable, nixos-hardware, emacs-overlay, agenix, jovian }: + { self, nixpkgs, nixpkgs-unstable, nixos-hardware, emacs-overlay, agenix, jovian, mujmap }: let pkgs-module = { config, ... }: let @@ -16,6 +18,7 @@ extra-packages = final: prev: { agenix = agenix.packages.${final.system}.default; + mujmap = mujmap.packages.${final.system}.default; }; unstable-overlay = final: prev: rec { diff --git a/modules/desktop.nix b/modules/desktop.nix index 9c060c9..a6f54b7 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -151,7 +151,7 @@ in { transmission-qt qt5.qtwayland libsForQt5.bismuth - mujmap # email sync + mujmap # email sync -- get this from cargo instead notmuch # email ]; -- cgit v1.2.3