byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-01-18 22:55:52 +05:30
Code Issues Packages Projects Releases Wiki Activity

Updated system + added nixpkgs emacs patch

Browse source
This commit is contained in:
Emmet 2023-09-08 21:46:32 -05:00
parent 20e30a60f6
commit 87ab124681
3 changed files with 70 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
flake.lock
View file

@ -21,11 +21,11 @@
"blocklist-hosts": {
"flake": false,
"locked": {
"lastModified": 1693313884,
"narHash": "sha256-5dpMXdScvexhmzr6i0kA5APIApQOOxaalQEbIrovhWg=",
"lastModified": 1694193429,
"narHash": "sha256-rdZsBGGiJMJwqTJs0jJOB/zkICFa7LYbj/zT7g32m+U=",
"owner": "StevenBlack",
"repo": "hosts",
"rev": "85cc9dff95af18be0b715ef5e8db3104a19bb2c3",
"rev": "f2eaf7a7040a89d049501a8ca70b029758ee964b",
"type": "github"
},
"original": {
@ -246,7 +246,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
@ -264,7 +264,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
@ -320,11 +320,11 @@
]
},
"locked": {
"lastModified": 1693646047,
"narHash": "sha256-VsuXtCGOhrzp1qb1CSoV/cO+5f+GPtA4J/SFYqqLyfo=",
"lastModified": 1694134858,
"narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fae8af43e201a8929ce45a5ea46192bbd1ffff18",
"rev": "19c6a4081b14443420358262f8416149bd79561a",
"type": "github"
},
"original": {
@ -355,38 +355,14 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1693754593,
"narHash": "sha256-Bn8MWftUY88BpZkXfdlyQtyDlO+N2MVgBc+cffhpib4=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "8fefb180b1f4bd62cd866f4c3d1d93ed3f019536",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-plugins": {
"inputs": {
"hyprland": "hyprland"
},
"flake": false,
"locked": {
"lastModified": 1692259833,
"narHash": "sha256-2S1dniwmoM8/AUrB5NY9UyBRCDB/tt+OK4yNyhysvZ4=",
"lastModified": 1693752039,
"narHash": "sha256-US7WfYWqMax+uEaRPpCOn8ib2pLYDLa5Fy8dIjWH0aM=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "74a845f1c17a37c41f04b982412fce700dce4d1d",
"rev": "b5d0cfdff726676b8c6df564fdb1732558d6c25b",
"type": "github"
},
"original": {
@ -395,33 +371,6 @@
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland-plugins",
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland-plugins",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"nix-doom-emacs": {
"inputs": {
"doom-emacs": "doom-emacs",
@ -437,7 +386,7 @@
"flake-utils": "flake-utils",
"format-all": "format-all",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -483,22 +432,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1693158576,
"narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1682566018,
"narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
@ -513,13 +446,13 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"nixpkgs_2": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
"lastModified": 1693985761,
"narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
"rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
"type": "github"
},
"original": {
@ -528,7 +461,7 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
@ -544,7 +477,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1690441914,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
@ -712,7 +645,7 @@
"home-manager": "home-manager",
"hyprland-plugins": "hyprland-plugins",
"nix-doom-emacs": "nix-doom-emacs",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"org-nursery": "org-nursery",
"phscroll": "phscroll",
"rust-overlay": "rust-overlay",
@ -738,14 +671,14 @@
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1693620498,
"narHash": "sha256-GPhAI2YayaSs3WYeVVbGN3K4mvRTbui/ii7YGoABZBs=",
"lastModified": 1694139063,
"narHash": "sha256-M2dhhe6IzHmS0zQkmnzbcG98jEQGZ4UcS3VcT+rG/Do=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cdf3b15af70f2db17d5f47822f12016f1a89bd73",
"rev": "46dbbcaf435b0d22b149684589b9b059f73f4ffc",
"type": "github"
},
"original": {
@ -775,7 +708,7 @@
"base16": "base16",
"flake-compat": "flake-compat_2",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1691942466,
@ -792,21 +725,6 @@
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -821,7 +739,7 @@
"type": "github"
}
},
"systems_3": {
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -852,25 +770,6 @@
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1692976565,
"narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab"
}
},
"ws-butler": {
"flake": false,
"locked": {
@ -886,38 +785,6 @@
"repo": "ws-butler",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland-plugins",
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland-plugins",
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland-plugins",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

8
flake.nix
View file

@ -31,8 +31,14 @@
spawnEditor = if (editor == "emacsclient") then "emacsclient -c -a 'emacs'"
else (if (editor == ("vim" || "nvim" || "nano")) then "$TERM -e $EDITOR" else editor);
nixpkgs-patched = (import nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-patched";
src = nixpkgs;
patches = [ ./patches/emacs-no-version-check.patch ];
};
# configure pkgs
pkgs = import nixpkgs {
pkgs = import nixpkgs-patched {
inherit system;
config = { allowUnfree = true; };
overlays = [ rust-overlay.overlays.default ];

37
patches/emacs-no-version-check.patch Normal file
View file

@ -0,0 +1,37 @@
diff -crB nixpkgs/pkgs/build-support/emacs/generic.nix nixpkgs-patched/pkgs/build-support/emacs/generic.nix
*** nixpkgs/pkgs/build-support/emacs/generic.nix 2023-09-08 20:42:24.476059868 -0500
--- nixpkgs-patched/pkgs/build-support/emacs/generic.nix 2023-09-08 21:12:46.637645595 -0500
***************
*** 3,9 ****
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
{ pname
! , version
, buildInputs ? []
, packageRequires ? []
, meta ? {}
--- 3,9 ----
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
{ pname
! , version ? null
, buildInputs ? []
, packageRequires ? []
, meta ? {}
***************
*** 20,26 ****
in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}-${finalAttrs.version}";
unpackCmd = ''
case "$curSrc" in
--- 20,26 ----
in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}";
unpackCmd = ''
case "$curSrc" in