summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2023-03-16 18:05:45 +0100
committerTheArcaneBrony <myrainbowdash949@gmail.com>2023-03-16 18:05:45 +0100
commit64cb848328eb48ba994d664fa7a31f82139710a9 (patch)
tree2f885d0446e4850b8f67366a086bad8fbf386833
parenttest (diff)
downloadRory-Open-Architecture-64cb848328eb48ba994d664fa7a31f82139710a9.tar.xz
test
-rwxr-xr-xhost/Rory-synapse/configuration.nix6
-rwxr-xr-xmodules/packages/draupnir-as-mjolnir.nix14
2 files changed, 3 insertions, 17 deletions
diff --git a/host/Rory-synapse/configuration.nix b/host/Rory-synapse/configuration.nix
index 72a6294..5ac8d0f 100755
--- a/host/Rory-synapse/configuration.nix
+++ b/host/Rory-synapse/configuration.nix
@@ -164,11 +164,11 @@
   system.stateVersion = "22.11"; # DO NOT EDIT!
 
   nixpkgs.overlays = [
-    (final: prev: {
-        mjolnir = prev.mjolnir.overrideAttrs (prevAttrs: {
+    (self: super: {
+        mjolnir = super.mjolnir.overrideAttrs (old: {
           #pname = "Draupnir";
           #version = "1.81.0";
-          src = final.fetchFromGitHub {
+          src = self.fetchFromGitHub {
             owner = "Gnuxie";
             repo = "Draupnir";
             rev = "v1.81.0";
diff --git a/modules/packages/draupnir-as-mjolnir.nix b/modules/packages/draupnir-as-mjolnir.nix
deleted file mode 100755
index 9427ff4..0000000
--- a/modules/packages/draupnir-as-mjolnir.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    (mjolnir.override {
-      version = "1.81.0";
-      src = fetchFromGithub {
-        owner = "Gnuxie";
-        repo = "Draupnir";
-        rev = "v1.81.0";
-        sha256 = lib.fakeSha256;
-      };
-    }
-  )];
-}