nix: update flake inputs

diff --git a/flake.lock b/flake.lock
index faf0fb5ce6d4adeb8b12fae7980aeffbc38c56cd..6f492a7932b11af54d52aa39ff62798f8d307086 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,27 @@
     "doom-emacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1623114989,
-        "narHash": "sha256-btRwMu76Gnn9lW7YbzDAgWjlJx61tCT+e3kByNx97aw=",
+        "lastModified": 1634812062,
+        "narHash": "sha256-LL6aP+Y/L4TPfYzO2v1WCeRY6v9MW9vX7kC6sxgWah0=",
         "owner": "hlissner",
         "repo": "doom-emacs",
-        "rev": "2731685095d1e6101b3215aa689426e1834ce00f",
+        "rev": "0869d28483b5d81b818b110af351fd5c4dc04dd9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hlissner",
+        "repo": "doom-emacs",
+        "type": "github"
+      }
+    },
+    "doom-emacs_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1626604817,
+        "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=",
+        "owner": "hlissner",
+        "repo": "doom-emacs",
+        "rev": "46732c0adaef147144418f9f284ca6b1183ab96f",
         "type": "github"
       },
       "original": {
@@ -20,11 +36,11 @@
     "doom-snippets": {
       "flake": false,
       "locked": {
-        "lastModified": 1622216706,
-        "narHash": "sha256-Dsl5T1OFPy++md0Lo0pKUqcpCW6T5WDF2sjeB/IVi1g=",
+        "lastModified": 1625547004,
+        "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=",
         "owner": "hlissner",
         "repo": "doom-snippets",
-        "rev": "bc613f448eed1bd363e61c41691a61e9fd139534",
+        "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6",
         "type": "github"
       },
       "original": {
@@ -35,11 +51,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1627178902,
-        "narHash": "sha256-yxyk4uSt0BTXsHldSsmAvp6W0s/oB4yzz3+mDk6D0Uo=",
+        "lastModified": 1635096486,
+        "narHash": "sha256-rcf0AG6xVRuHE9cupBd15u5s4MYVBSzmf3VtxAJzhCk=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "22ae5aea4e421aa6191c38f3790d4b007c6f3b87",
+        "rev": "e859854c57c0793f8da053e811112cb774a20778",
         "type": "github"
       },
       "original": {
@@ -68,11 +84,11 @@
     "evil-markdown": {
       "flake": false,
       "locked": {
-        "lastModified": 1591038520,
-        "narHash": "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY=",
+        "lastModified": 1626852210,
+        "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
         "owner": "Somelauw",
         "repo": "evil-markdown",
-        "rev": "064fe9b4767470472356d20bdd08e2f30ebbc9ac",
+        "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
         "type": "github"
       },
       "original": {
@@ -168,6 +184,7 @@
     },
     "julm-nix": {
       "inputs": {
+        "doom-emacs": "doom-emacs",
         "emacs-overlay": "emacs-overlay",
         "flake-utils": [
           "flake-utils"
@@ -179,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1634868304,
-        "narHash": "sha256-3EGKKQb+o2k/5SAaQaBpA7b/IoaUSGZOtIQe+Lgj8G8=",
+        "lastModified": 1635125809,
+        "narHash": "sha256-I0rJAKcM9Yi0y5iKOuG3N4X0YUa+1tFTL6M3CH8I3dY=",
         "ref": "main",
-        "rev": "4ac801d7ebb047489a4620053ae007b9a6cf4772",
-        "revCount": 226,
+        "rev": "0617a234db2740d24c3ed752186cf765d24b8605",
+        "revCount": 234,
         "type": "git",
         "url": "file:///home/julm/work/sourcephile/nix/julm-nix"
       },
@@ -195,7 +212,7 @@
     },
     "nix-doom-emacs": {
       "inputs": {
-        "doom-emacs": "doom-emacs",
+        "doom-emacs": "doom-emacs_2",
         "doom-snippets": "doom-snippets",
         "emacs-overlay": [
           "julm-nix",
@@ -217,18 +234,19 @@
         ],
         "nose": "nose",
         "ob-racket": "ob-racket",
-        "org-mode": "org-mode",
+        "org": "org",
+        "org-contrib": "org-contrib",
         "org-yt": "org-yt",
         "php-extras": "php-extras",
         "revealjs": "revealjs",
         "rotate-text": "rotate-text"
       },
       "locked": {
-        "lastModified": 1625001464,
-        "narHash": "sha256-3RGoNYZ4hAo+iRTfy6qJfQ3YzLMDDFzBIUQNEmCv6Ms=",
+        "lastModified": 1627398156,
+        "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=",
         "owner": "vlaci",
         "repo": "nix-doom-emacs",
-        "rev": "3893c50877a9d2d5d4aeee524ba1539f22115f1f",
+        "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff",
         "type": "github"
       },
       "original": {
@@ -256,17 +274,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1634933215,
-        "narHash": "sha256-TwLp3GXJCD1n5mvQHnB8Eaqx4ogYlGdQ2cM9enH9ps0=",
+        "lastModified": 1635110579,
+        "narHash": "sha256-QJzT/ts3reR1wtezw6/05lOur2BhF8ec1IsD7PQ1yEs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c47fcb70c6885d6df869934280ebeb715ca7e6fd",
+        "rev": "6b23e8fc7820366e489377b5b00890f088f36a01",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c47fcb70c6885d6df869934280ebeb715ca7e6fd",
+        "rev": "6b23e8fc7820366e489377b5b00890f088f36a01",
         "type": "github"
       }
     },
@@ -302,14 +320,14 @@
         "type": "github"
       }
     },
-    "org-mode": {
+    "org": {
       "flake": false,
       "locked": {
-        "lastModified": 1624525995,
-        "narHash": "sha256-1eximAnDXKC+midwicoKko1cHF3ElCEOzzkUUWC8G4M=",
+        "lastModified": 1627155762,
+        "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=",
         "owner": "emacs-straight",
         "repo": "org-mode",
-        "rev": "5c07b279e0737b19e91c1d1b21016d9b4c8ffa62",
+        "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237",
         "type": "github"
       },
       "original": {
@@ -318,6 +336,22 @@
         "type": "github"
       }
     },
+    "org-contrib": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1623339452,
+        "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=",
+        "ref": "master",
+        "rev": "fc81309cf6756607a836f93049a9393c2967c4e0",
+        "revCount": 2599,
+        "type": "git",
+        "url": "https://git.sr.ht/~bzg/org-contrib"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sr.ht/~bzg/org-contrib"
+      }
+    },
     "org-yt": {
       "flake": false,
       "locked": {
@@ -365,11 +399,11 @@
     "revealjs": {
       "flake": false,
       "locked": {
-        "lastModified": 1623242337,
-        "narHash": "sha256-u3gZ13x40cjK1k9HTNnqRrp3io0tDTu6JPGd05mGJGw=",
+        "lastModified": 1625811744,
+        "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=",
         "owner": "hakimel",
         "repo": "reveal.js",
-        "rev": "ade234576e8ddd683cf16d0d8bb0236f37cf1a99",
+        "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad",
         "type": "github"
       },
       "original": {
@@ -380,6 +414,10 @@
     },
     "root": {
       "inputs": {
+        "doom-emacs": [
+          "julm-nix",
+          "doom-emacs"
+        ],
         "emacs-overlay": [
           "julm-nix",
           "emacs-overlay"

diff --git a/flake.nix b/flake.nix
index bba570e78ecebd278e18df1ae8213bd89a2dae1d..652cae729256482ff0af98a88a117df7332f7d02 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
 # Pin down nixpkgs from github, instead of using global, system or user registries.
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/c47fcb70c6885d6df869934280ebeb715ca7e6fd";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/6b23e8fc7820366e489377b5b00890f088f36a01";
 #inputs.nixpkgs.url = "flake:nixpkgs";
 inputs.flake-utils.url = "github:numtide/flake-utils";
 inputs.home-manager.follows = "julm-nix/home-manager";
@@ -8,7 +8,9 @@ inputs.home-manager.follows = "julm-nix/home-manager";
 inputs.julm-nix.url = "git+file:///home/julm/work/sourcephile/nix/julm-nix?ref=main";
 inputs.julm-nix.inputs.flake-utils.follows = "flake-utils";
 inputs.julm-nix.inputs.nixpkgs.follows = "nixpkgs";
+inputs.doom-emacs.follows = "julm-nix/doom-emacs";
 inputs.nix-doom-emacs.follows = "julm-nix/nix-doom-emacs";
+inputs.nix-doom-emacs.inputs.doom-emacs.follows = "julm-nix/doom-emacs";
 inputs.emacs-overlay.follows = "julm-nix/emacs-overlay";
 #inputs.shell = { type = "path"; path = "./shell"; flake = false; };
 #inputs.secrets = { type = "path"; path = "./sec"; flake = false; };
@@ -58,7 +60,7 @@ outputs = inputs: let
           home-manager.verbose = true;
           home-manager.backupFileExtension = null;
           home-manager.extraSpecialArgs = {
-            inherit hostName;
+            inherit hostName inputs;
           };
         }
         ({ pkgs, ... }: {

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index f22956e14a32f6da6a18b81ae83adc7deec38531..d77414986ace18d65e9293fec4439cf5c40cd186 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -26,9 +26,4 @@
   url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
   sha256 = "sha256-1iJ46NXslDxsP/uO0cSaCzO3A5VF338M6d027G7sK3o=";
 }
-{
-  meta.description = "nixos/display-managers: fix cross-compiling";
-  url = "https://github.com/NixOS/nixpkgs/pull/142273.diff";
-  sha256 = "sha256-ZCDQ7SpGhH8JvAwWzdcyrc68RFEWHxxAj0M2+AvEzIg=";
-}
 ]