summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-04-11 17:47:47 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2021-04-11 17:47:47 +0200
commit9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9 (patch)
tree42473400a7dd9dcd8f93d15c5ca4fa94938a9612
parent57ac967d7b0b764d5fc0c1a4454cea4ed5978859 (diff)
downloadnixos-9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9.tar
nixos-9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9.tar.gz
nixos-9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9.tar.bz2
nixos-9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9.tar.xz
nixos-9f76dbfdd2fae47cbf0e40fd2c2b01d7e94d01a9.zip
bump
-rw-r--r--accounts/gkleen@sif/xmobar/shell.nix4
-rw-r--r--accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix4
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix4
-rw-r--r--flake.lock12
-rw-r--r--hosts/sif/default.nix2
-rw-r--r--modules/uucp.nix2
6 files changed, 14 insertions, 14 deletions
diff --git a/accounts/gkleen@sif/xmobar/shell.nix b/accounts/gkleen@sif/xmobar/shell.nix
index 18188e78..16beb322 100644
--- a/accounts/gkleen@sif/xmobar/shell.nix
+++ b/accounts/gkleen@sif/xmobar/shell.nix
@@ -24,5 +24,5 @@ let
24 name = "interactive-xmobar-environment"; 24 name = "interactive-xmobar-environment";
25 shellHook = ""; 25 shellHook = "";
26 }; 26 };
27in pkgs.stdenv.lib.overrideDerivation dummy override 27in pkgs.lib.overrideDerivation dummy override
28 #pkgs.stdenv.lib.overrideDerivation drv.env override 28 #pkgs.lib.overrideDerivation drv.env override
diff --git a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix b/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
index 1dfc619b..852fb8e5 100644
--- a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
+++ b/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix
@@ -1,4 +1,4 @@
1{ mkDerivation, base, hpack, stdenv, xmobar }: 1{ mkDerivation, base, hpack, lib, xmobar }:
2mkDerivation { 2mkDerivation {
3 pname = "xmobar-yggdrasil"; 3 pname = "xmobar-yggdrasil";
4 version = "0.0.0"; 4 version = "0.0.0";
@@ -9,5 +9,5 @@ mkDerivation {
9 executableHaskellDepends = [ base xmobar ]; 9 executableHaskellDepends = [ base xmobar ];
10 preConfigure = "hpack"; 10 preConfigure = "hpack";
11 license = "unknown"; 11 license = "unknown";
12 hydraPlatforms = stdenv.lib.platforms.none; 12 hydraPlatforms = lib.platforms.none;
13} 13}
diff --git a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
index e8786d35..d3d72310 100644
--- a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
+++ b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
@@ -1,5 +1,5 @@
1{ mkDerivation, aeson, base, bytestring, containers, directory 1{ mkDerivation, aeson, base, bytestring, containers, directory
2, filepath, hostname, hpack, mtl, network, parsec, process, stdenv 2, filepath, hostname, hpack, mtl, network, parsec, process, lib
3, temporary, transformers, unix, utf8-string, X11, xmonad 3, temporary, transformers, unix, utf8-string, X11, xmonad
4, xmonad-contrib, libnotify 4, xmonad-contrib, libnotify
5}: 5}:
@@ -17,5 +17,5 @@ mkDerivation {
17 ]; 17 ];
18 preConfigure = "hpack"; 18 preConfigure = "hpack";
19 license = "unknown"; 19 license = "unknown";
20 hydraPlatforms = stdenv.lib.platforms.none; 20 hydraPlatforms = lib.platforms.none;
21} 21}
diff --git a/flake.lock b/flake.lock
index 4ce01041..d5e943cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
7 ] 7 ]
8 }, 8 },
9 "locked": { 9 "locked": {
10 "lastModified": 1617894699, 10 "lastModified": 1618041827,
11 "narHash": "sha256-zlG3xNXgqo5pbMmfq8YaqGoVjElHnTDnEz13A+pUbZY=", 11 "narHash": "sha256-17Fzc8rmT6HOarCp+8k9RhmgMorNtzTk/rzew+FqHrA=",
12 "owner": "nix-community", 12 "owner": "nix-community",
13 "repo": "home-manager", 13 "repo": "home-manager",
14 "rev": "56f5f41ed42f7d476a7c79fa8ec71f5605487abf", 14 "rev": "f567ea8228e0ce718871d7346e444dd15ad702e5",
15 "type": "github" 15 "type": "github"
16 }, 16 },
17 "original": { 17 "original": {
@@ -23,11 +23,11 @@
23 }, 23 },
24 "nixpkgs": { 24 "nixpkgs": {
25 "locked": { 25 "locked": {
26 "lastModified": 1617987980, 26 "lastModified": 1618153411,
27 "narHash": "sha256-0D5vcBHvccMIpdZN9h4TqPGdiiRuGMpaO4jaj4iJu50=", 27 "narHash": "sha256-xevpO/rTac+Fcf/8KmGGAxdoMN9WoosZTo9tAM8rHKY=",
28 "owner": "NixOS", 28 "owner": "NixOS",
29 "repo": "nixpkgs", 29 "repo": "nixpkgs",
30 "rev": "ae09772927566314ad11e366ddb46a9c7ffb666a", 30 "rev": "20443c348225791ca7ecb2787f403f4be56ab223",
31 "type": "github" 31 "type": "github"
32 }, 32 },
33 "original": { 33 "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 50b7ebbc..68fb82c3 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -208,7 +208,7 @@
208 208
209 bluetooth = { 209 bluetooth = {
210 enable = true; 210 enable = true;
211 config = { 211 settings = {
212 General = { 212 General = {
213 Enable = "Source,Sink,Media,Socket"; 213 Enable = "Source,Sink,Media,Socket";
214 }; 214 };
diff --git a/modules/uucp.nix b/modules/uucp.nix
index 8d8ac1a2..0334a3db 100644
--- a/modules/uucp.nix
+++ b/modules/uucp.nix
@@ -307,7 +307,7 @@ in {
307 in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]); 307 in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]);
308 308
309 nixpkgs.overlays = [(self: super: { 309 nixpkgs.overlays = [(self: super: {
310 uucp = super.stdenv.lib.overrideDerivation super.uucp (oldAttrs: { 310 uucp = super.lib.overrideDerivation super.uucp (oldAttrs: {
311 configureFlags = "--with-newconfigdir=/etc/uucp"; 311 configureFlags = "--with-newconfigdir=/etc/uucp";
312 patches = [ 312 patches = [
313 (super.writeText "mailprogram" '' 313 (super.writeText "mailprogram" ''