summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-11-17 06:44:09 +0059
committerGregor Kleen <gkleen@yggdrasil.li>2021-11-17 06:44:09 +0059
commite76a654ce960d190c53339f2290906b6736dee60 (patch)
treec81943b24c82a447bcc7ae4645477146b2e059be
parent85ecd1a65123cce94e634dc41c342a1d02f43c06 (diff)
downloadnixos-e76a654ce960d190c53339f2290906b6736dee60.tar
nixos-e76a654ce960d190c53339f2290906b6736dee60.tar.gz
nixos-e76a654ce960d190c53339f2290906b6736dee60.tar.bz2
nixos-e76a654ce960d190c53339f2290906b6736dee60.tar.xz
nixos-e76a654ce960d190c53339f2290906b6736dee60.zip
bump versions
-rw-r--r--flake.lock18
-rw-r--r--hosts/sif/default.nix4
-rw-r--r--hosts/vidhar/default.nix11
-rw-r--r--overlays/pidgin.nix23
-rw-r--r--overlays/udp2raw/default.nix3
-rw-r--r--overlays/udp2raw/package.nix20
-rw-r--r--overlays/udp2raw/udp2raw-makefile.patch10
-rw-r--r--user-profiles/direnv.nix5
8 files changed, 42 insertions, 52 deletions
diff --git a/flake.lock b/flake.lock
index 32b6b825..48d48e92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
7 ] 7 ]
8 }, 8 },
9 "locked": { 9 "locked": {
10 "lastModified": 1633733120, 10 "lastModified": 1637010045,
11 "narHash": "sha256-IdUgCn7eud2he4LWZpzFPf1D2u+mjZC09mvo3oSNoss=", 11 "narHash": "sha256-EzA+Iu2c8N1i3K8jouZSuyMOOeR1glFZSW9ZgqmPH54=",
12 "owner": "nix-community", 12 "owner": "nix-community",
13 "repo": "home-manager", 13 "repo": "home-manager",
14 "rev": "32285d8fe64138a41f1caed23d94f28529ea4eb4", 14 "rev": "a7c5b00d44f65efd1e8ace2c02243f179e72283a",
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": 1633888814, 26 "lastModified": 1637072800,
27 "narHash": "sha256-5toxku+055gGxzmvUIUOM7jtRC8N41FjWzFyBA1lG9E=", 27 "narHash": "sha256-Q7MDJG+DG/gXnZ1dBPuQBNrGUy1R5GD4xnIbKOu8/Mw=",
28 "owner": "NixOS", 28 "owner": "NixOS",
29 "repo": "nixpkgs", 29 "repo": "nixpkgs",
30 "rev": "f52699bc713545e32b5aaa1290e03c4ebf0d4110", 30 "rev": "57c90b8956cd00b35c56b92fcb857116631d5d5d",
31 "type": "github" 31 "type": "github"
32 }, 32 },
33 "original": { 33 "original": {
@@ -51,11 +51,11 @@
51 ] 51 ]
52 }, 52 },
53 "locked": { 53 "locked": {
54 "lastModified": 1633273832, 54 "lastModified": 1637050424,
55 "narHash": "sha256-oOjpMVYpkIUpiML61PeqTk+sg4juRvF7P6jroI/YvTw=", 55 "narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=",
56 "owner": "Mic92", 56 "owner": "Mic92",
57 "repo": "sops-nix", 57 "repo": "sops-nix",
58 "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c", 58 "rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9",
59 "type": "github" 59 "type": "github"
60 }, 60 },
61 "original": { 61 "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 4d83ee11..bdd6653a 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -271,8 +271,8 @@
271 271
272 nix = { 272 nix = {
273 autoOptimiseStore = true; 273 autoOptimiseStore = true;
274 daemonNiceLevel = 10; 274 daemonCPUSchedPolicy = "idle";
275 daemonIONiceLevel = 3; 275 daemonIOSchedClass = "idle";
276 276
277 buildServers.vidhar = { 277 buildServers.vidhar = {
278 address = "vidhar.yggdrasil"; 278 address = "vidhar.yggdrasil";
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 1d8f4c3c..0bad0f8c 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -254,9 +254,14 @@
254 Defaults lecture = never 254 Defaults lecture = never
255 ''; 255 '';
256 256
257 nix.gc = { 257 nix = {
258 automatic = true; 258 daemonCPUSchedPolicy = "batch";
259 options = "--delete-older-than 30d"; 259 daemonIOSchedClass = "idle";
260
261 gc = {
262 automatic = true;
263 options = "--delete-older-than 30d";
264 };
260 }; 265 };
261 266
262 powerManagement = { 267 powerManagement = {
diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix
index d346c7a1..3c9fb93c 100644
--- a/overlays/pidgin.nix
+++ b/overlays/pidgin.nix
@@ -4,8 +4,29 @@ let
4 url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch"; 4 url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch";
5 sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44"; 5 sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44";
6 }; 6 };
7
8 pidginWrapper = { symlinkJoin, pidgin, makeWrapper, plugins }:
9 let
10 extraArgs = map (x: x.wrapArgs or "") plugins;
11 majorVersion = prev.lib.versions.major pidgin.version;
12 in symlinkJoin {
13 name = "pidgin-with-plugins-${pidgin.version}";
14
15 paths = [ pidgin ] ++ plugins;
16
17 buildInputs = [ makeWrapper ];
18
19 postBuild = ''
20 wrapProgram $out/bin/pidgin \
21 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion} $out/lib/pidgin" \
22 ${toString extraArgs}
23 wrapProgram $out/bin/finch \
24 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion}" \
25 ${toString extraArgs}
26 '';
27 };
7in { 28in {
8 pidgin-with-plugins = import (/. + prev.path + "/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix") { 29 pidgin-with-plugins = pidginWrapper {
9 inherit (prev) makeWrapper symlinkJoin; 30 inherit (prev) makeWrapper symlinkJoin;
10 plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ]; 31 plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ];
11 pidgin = prev.pidgin.overrideAttrs (oldAttrs: { 32 pidgin = prev.pidgin.overrideAttrs (oldAttrs: {
diff --git a/overlays/udp2raw/default.nix b/overlays/udp2raw/default.nix
deleted file mode 100644
index b08bdf4b..00000000
--- a/overlays/udp2raw/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
1final: prev: {
2 udp2raw = final.callPackage ./package.nix {};
3}
diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix
deleted file mode 100644
index 6612ac3e..00000000
--- a/overlays/udp2raw/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
1{ pkgsMusl, fetchFromGitHub }:
2pkgsMusl.stdenv.mkDerivation rec {
3 pname = "udp2raw";
4 version = "20200818.0";
5
6 src = fetchFromGitHub {
7 repo = "udp2raw-tunnel";
8 owner = "wangyu-";
9 rev = version;
10 hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8=";
11 };
12 patches = [ ./udp2raw-makefile.patch ];
13 configurePhase = "";
14 buildPhase = ''
15 make cc_amd64=''${CXX} amd64_hw_aes
16 '';
17 installPhase = ''
18 install -Dm755 udp2raw_amd64_hw_aes $out/bin/udp2raw
19 '';
20}
diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch
deleted file mode 100644
index 264f5cf4..00000000
--- a/overlays/udp2raw/udp2raw-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1diff --git a/makefile b/makefile
2index 22c07ae..ddcfbc4 100755
3--- a/makefile
4+++ b/makefile
5@@ -131,4 +131,4 @@ clean:
6 rm -f git_version.h
7
8 git_version:
9- echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > git_version.h
10+ echo "const char *gitversion = \"cc6ea766c495cf4c69d1c7485728ba022b0f19de\";" > git_version.h
diff --git a/user-profiles/direnv.nix b/user-profiles/direnv.nix
index 53706b6a..7887d765 100644
--- a/user-profiles/direnv.nix
+++ b/user-profiles/direnv.nix
@@ -3,10 +3,7 @@
3 home-manager.users.${userName} = { 3 home-manager.users.${userName} = {
4 programs.direnv = { 4 programs.direnv = {
5 enable = true; 5 enable = true;
6 nix-direnv = { 6 nix-direnv.enable = true;
7 enable = true;
8 enableFlakes = true;
9 };
10 }; 7 };
11 }; 8 };
12} 9}