dev.fron.io rc / ec0a150
flake::lock: update Tony Olagbaiye 1 year, 9 days ago
3 changed file(s) with 67 addition(s) and 86 deletion(s). Raw diff Collapse all Expand all
168168 ]
169169 },
170170 "locked": {
171 "lastModified": 1605129117,
172 "narHash": "sha256-FYlnVHsFF7W/P0CF/pNhOGiE0BFIArTNeoFWEF1+iUw=",
171 "lastModified": 1605947207,
172 "narHash": "sha256-0foBTiQUh0U19AJKnVobPXVb9GqORJt2+L2C1MOlBEc=",
173173 "owner": "matrix-construct",
174174 "repo": "construct",
175 "rev": "471de2e6b64973a9adf1e175ab71eb1c0c46f275",
175 "rev": "214af71f09dda48d79da29b4ef563376b3bf0127",
176176 "type": "github"
177177 },
178178 "original": {
271271 },
272272 "emacs": {
273273 "locked": {
274 "lastModified": 1605976199,
275 "narHash": "sha256-NGzFCCeNvaeCP32/eRgEf+3Y5s5f6xmxaYadQBExKZs=",
274 "lastModified": 1606220707,
275 "narHash": "sha256-30oqeQNd97lX0r8YLx/WTHMtqnQDlcmln1nQn8ogGEw=",
276276 "owner": "nix-community",
277277 "repo": "emacs-overlay",
278 "rev": "ca7d028d6e6f8c9fa5307f55b65e4b37eb5354b8",
278 "rev": "648249c0557c02f3cb9d810fe61e0f7e7a70c9b7",
279279 "type": "github"
280280 },
281281 "original": {
319319 "emacs-webkit": {
320320 "flake": false,
321321 "locked": {
322 "lastModified": 1606075147,
323 "narHash": "sha256-2zubpjlNZkaTWa+BqQ+HEgBz7y78XZcMtZ52mj9S+6I=",
322 "lastModified": 1606100390,
323 "narHash": "sha256-hv26c/CFcG5dLS6xD4+g8BFJbQY7JujvFzrk44EmtCA=",
324324 "owner": "akirakyle",
325325 "repo": "emacs-webkit",
326 "rev": "5af94ac13acc5f3fac605e0803e18e2e74467091",
326 "rev": "781ec593cee21d1af79da3c7500932879ab30b2a",
327327 "type": "github"
328328 },
329329 "original": {
527527 "gnome-network-displays": {
528528 "flake": false,
529529 "locked": {
530 "lastModified": 1605117773,
531 "narHash": "sha256-Evc4naWvxlD8kA/TMQ+DI1l2y3612obWa6kgCbVLgJk=",
530 "lastModified": 1606035597,
531 "narHash": "sha256-YtIgYAXwN97BnQ+VpdCZiRGCLX3Y0t2ov8hQAyRor0Y=",
532532 "ref": "master",
533 "rev": "427e9622bd4fe13cd921a785cdaf8f3e1299b1fd",
534 "revCount": 199,
533 "rev": "5fa570edecac11eff3b33e7304c9d78cae8d13b3",
534 "revCount": 200,
535535 "type": "git",
536536 "url": "https://gitlab.gnome.org/gnome/gnome-network-displays"
537537 },
577577 },
578578 "haskell": {
579579 "locked": {
580 "lastModified": 1605921254,
581 "narHash": "sha256-uqT5k4OehuWWmmUBePI85CQVyUKJDz5qgKx3BvE778Y=",
580 "lastModified": 1606188525,
581 "narHash": "sha256-RM6hdogBfA8B1IXjyjYPfbtKp+bppsARbGMNUGMUrHw=",
582582 "owner": "input-output-hk",
583583 "repo": "haskell.nix",
584 "rev": "c52845ff2e5c14d0803712446f5779a6cd35ed96",
584 "rev": "e729389f3266e50602f36b7035c5e34177b705ac",
585585 "type": "github"
586586 },
587587 "original": {
646646 ]
647647 },
648648 "locked": {
649 "lastModified": 1605635123,
650 "narHash": "sha256-8bROJh1fshk+TaFcIfU9enDcN6/1+uiOKgBgk6rSJMk=",
649 "lastModified": 1606046962,
650 "narHash": "sha256-244JrrVFht/VMRItDcDlrcwejqpqJInDUWA/x6mucW4=",
651651 "owner": "nix-community",
652652 "repo": "home-manager",
653 "rev": "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c",
653 "rev": "a3a0f1289acac24ce2ffe0481bf8cabd3a6ccc64",
654654 "type": "github"
655655 },
656656 "original": {
709709 },
710710 "large": {
711711 "locked": {
712 "lastModified": 1605447878,
713 "narHash": "sha256-gvO1uqPhXOT9k5Gggfll0ZMipPIJuRu9+NFMkTfOya8=",
714 "owner": "nixos",
715 "repo": "nixpkgs",
716 "rev": "069f183f16c3ea5d4b6e7625433b92eba77534f7",
712 "lastModified": 1605744920,
713 "narHash": "sha256-FGg6wSlUv4A0Mue4snu2VRNZOoJVT2+vLkfJ2HGcFeQ=",
714 "owner": "nixos",
715 "repo": "nixpkgs",
716 "rev": "a322b32e9d74fb476944ff6cfb55833dc69cfaaa",
717717 "type": "github"
718718 },
719719 "original": {
757757 },
758758 "master": {
759759 "locked": {
760 "lastModified": 1605926951,
761 "narHash": "sha256-FHJcwGKCWlky1/j/xMwRVpwZhmHZGJ/DEPlxriT0urM=",
762 "owner": "nixos",
763 "repo": "nixpkgs",
764 "rev": "65c4e2500f25076a2db330b8953410faab817420",
760 "lastModified": 1606187548,
761 "narHash": "sha256-cfAmEeBhEi+c38PupiBF0k8pAQIzvgtdQXrfJPKbJSw=",
762 "owner": "nixos",
763 "repo": "nixpkgs",
764 "rev": "bc51448c00e0e9b22c11b405c6043c153d563bff",
765765 "type": "github"
766766 },
767767 "original": {
901901 "nyxt": {
902902 "flake": false,
903903 "locked": {
904 "lastModified": 1605912842,
905 "narHash": "sha256-tfu4ZDrTrKDsoxrPw1frkkodNPAeuEfj5VVNrNFe+R0=",
904 "lastModified": 1606138130,
905 "narHash": "sha256-VoywFjc9wd+61S23cIzO6SK4Cn7YcxKk/uU9H3eB0Js=",
906906 "owner": "atlas-engineer",
907907 "repo": "nyxt",
908 "rev": "0ce7fb98a93f073025d81e5c7c97b6f27d1e0218",
908 "rev": "d313ba71c426f481386965a6fe8516edfdb643bb",
909909 "type": "github"
910910 },
911911 "original": {
997997 },
998998 "pr93659": {
999999 "locked": {
1000 "lastModified": 1602167818,
1001 "narHash": "sha256-M8LkxkzRI+zcx4errhSW6HcPiE+YBYM2AN8LgiCaf20=",
1000 "lastModified": 1606101824,
1001 "narHash": "sha256-PabkSIlHTKVitpwNsZzs4wIaex3xn3fFwkG/Qd9uHOM=",
10021002 "owner": "ju1m",
10031003 "repo": "nixpkgs",
1004 "rev": "cb2de9ec08178fd3707b01e7e5242c9e461e11d8",
1004 "rev": "99f8f9ed6fd74d2b645527c67ddfa2bd72cdb56d",
10051005 "type": "github"
10061006 },
10071007 "original": {
12271227 },
12281228 "rel2003": {
12291229 "locked": {
1230 "lastModified": 1605650229,
1231 "narHash": "sha256-NQ7x3KcB4sf8r+fOjOa/TJewrMwLxL5miNEKuCfZb/Y=",
1232 "owner": "nixos",
1233 "repo": "nixpkgs",
1234 "rev": "f05c380a51daee53ac2edb0bac2fd5f1774e977a",
1230 "lastModified": 1606047817,
1231 "narHash": "sha256-ZlGheXdtriKXpx2r3zupumJ6+lljUPH75MoYhHGBRyc=",
1232 "owner": "nixos",
1233 "repo": "nixpkgs",
1234 "rev": "5a9e4f07f714e811bded0a45ed8fe55c5c6048fd",
12351235 "type": "github"
12361236 },
12371237 "original": {
12431243 },
12441244 "rel2009": {
12451245 "locked": {
1246 "lastModified": 1605721780,
1247 "narHash": "sha256-MhaNS4HGHcOCwW+HadSxustHTzD1LWznh584eYBvJ5Q=",
1248 "owner": "nixos",
1249 "repo": "nixpkgs",
1250 "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb",
1246 "lastModified": 1606086654,
1247 "narHash": "sha256-VFl+3eGIMqNp7cyOMJ6TjM/+UcsLKtodKoYexrlTJMI=",
1248 "owner": "nixos",
1249 "repo": "nixpkgs",
1250 "rev": "19db3e5ea2777daa874563b5986288151f502e27",
12511251 "type": "github"
12521252 },
12531253 "original": {
14131413 },
14141414 "small": {
14151415 "locked": {
1416 "lastModified": 1605855428,
1417 "narHash": "sha256-cLnuA+8lMQoFwPd1RfNjPtFig1rMqvw2EDUJCW4UdGs=",
1418 "owner": "nixos",
1419 "repo": "nixpkgs",
1420 "rev": "26803925aa41f3ba67d70facc5c020aa20cf70a8",
1416 "lastModified": 1606161374,
1417 "narHash": "sha256-oWFE496Rpc0sC85jRNffefJQV3jcYtlM26U6PmiJMO4=",
1418 "owner": "nixos",
1419 "repo": "nixpkgs",
1420 "rev": "b8a78e5b2aa911caa291888f5f8844564e51f194",
14211421 "type": "github"
14221422 },
14231423 "original": {
15091509 },
15101510 "staged": {
15111511 "locked": {
1512 "lastModified": 1605903952,
1513 "narHash": "sha256-VZXaD8Uz8x+WxH1O9f3O4ozvUAh0KolykWu9p8vIgFQ=",
1514 "owner": "nixos",
1515 "repo": "nixpkgs",
1516 "rev": "8d210e2ea42f5a6ef10320800355ecd4b49fb428",
1512 "lastModified": 1606170097,
1513 "narHash": "sha256-nKmT8vXzbJL2gwITMyw4+G0yOuKiJlYF0Q/qokSqNrY=",
1514 "owner": "nixos",
1515 "repo": "nixpkgs",
1516 "rev": "90bc70bbd2a1164f1dd98946f6732ac971fca102",
15171517 "type": "github"
15181518 },
15191519 "original": {
16431643 ]
16441644 },
16451645 "locked": {
1646 "lastModified": 1605920760,
1647 "narHash": "sha256-3szOi8equmitz7dQE1PQG0j4ORtXeQDkb3fzJ5AEzbY=",
1646 "lastModified": 1605950277,
1647 "narHash": "sha256-VKLZcDOIUbviX9tcmq3ixS7rAJQhCL7POEQX6310q20=",
16481648 "owner": "colemickens",
16491649 "repo": "nixpkgs-wayland",
1650 "rev": "f72d5348dceb7c49274c4732cf00f938d4e2906f",
1650 "rev": "2c9f01598a4665d76f11a969ca60c0493e54ce7c",
16511651 "type": "github"
16521652 },
16531653 "original": {
114114 };
115115
116116 patchNixpkgs = basePkgs: let
117 untransmission = (basePkgs.writeText "tr.patch" ''
118 diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
119 index aeb58a7194f99..717c18d367f01 100644
120 --- a/nixos/modules/services/torrent/transmission.nix
121 +++ b/nixos/modules/services/torrent/transmission.nix
122 @@ -236,7 +236,6 @@ in
123 # an AppArmor profile is provided to get a confinement based upon paths and rights.
124 builtins.storeDir
125 "/etc"
126 - "/run"
127 ] ++
128 optional (cfg.settings.script-torrent-done-enabled &&
129 cfg.settings.script-torrent-done-filename != "")
130 @@ -409,7 +408,6 @@ in
131 #r @{PROC}/@{pid}/environ,
132 r @{PROC}/@{pid}/mounts,
133 rwk /tmp/tr_session_id_*,
134 - r /run/systemd/resolve/stub-resolv.conf,
135 -
136 +
137 r ''${pkgs.openssl.out}/etc/**,
138 r ''${config.systemd.services.transmission.environment.CURL_CA_BUNDLE},
139 '') // { outputHash = "untransmission"; };
140117 pullReqs = map (meta: {
141118 url = meta.url or "https://github.com/nixos/nixpkgs/pull/${toString meta.id}.diff";
142119 name = "nixpkgs-pull-request-${toString meta.id}";
145122 }) [
146123 {
147124 description = "apparmor: fix and improve the service";
148 id = 101071; hash = "DRwN1+ubcWRuy6qb3jszJ88J+o5DM6WjR5akjEYC7Ck=";
125 id = 101071; hash = "rZOtPo5kXnYsn1m5z7FjURbKNnfRGGi2y3UV024VpV0=";
149126 }
150127 #{
151128 # description = "nixos/security.gnupg: provisioning GnuPG-protected secrets through the Nix store";
152129 # id = 93659; hash = "3im5nSrlM32DQUeq0Yp1MHkUcQyLdCGbxfJjgcc9e78=";
153130 #}
154131 ];
155 patches = [ untransmission ] ++ map basePkgs.fetchpatch pullReqs;
132 patches = map basePkgs.fetchpatch pullReqs;
156133 patchedTree = basePkgs.applyPatches {
157134 name = "nixpkgs-patched";
158135 src = basePkgs.path;
275252 inherit (inputs.pr99188.legacyPackages.${system}) giara;
276253 inherit (inputs.large.legacyPackages.${system}) matrix-synapse;
277254 })
255 (final: prev: {
256 xmlsec = prev.xmlsec.overrideAttrs (drv: {
257 doCheck = false; # broken by update
258 });
259 })
278260 ];
279261 };
280262
713695 (builtins.readFile /etc/nix/nix.conf)}
714696 experimental-features = nix-command flakes ca-references
715697 print-build-logs = true
716 access-tokens = "${(import ./secrets/git.github.nix).oauth-token}"
698 access-tokens = "github.com=${(import ./secrets/git.github.nix).oauth-token}"
717699 '';
718700 in linkFarm "nix-conf-dir" ( [
719701 { name = "nix.conf"; path = writeText "flakes-nix.conf" nixConf; }
7373 "/var" = hdd // { options = [ "subvol=var" ]; };
7474 "/home" = hdd // { options = [ "subvol=home" ]; };
7575 "/srv" = hdd // { options = [ "subvol=srv" ]; };
76 "/nix" = ssd // { options = [ "subvol=nix" "noatime" "nodiratime" "discard=async" ]; };
77 #"/gnu" = ssd // { options = [ "subvol=gnu" "noatime" "nodiratime" "discard=async" ]; };
76 "/nix" = ssd // { options = [ "subvol=nix" "noatime" "nodiratime" "discard=async" "compress=lzo" ]; };
7877 "/games" = hdd // { options = [ "subvol=games" ]; };
7978 "/run/hdd" = hdd // { options = [ "subvolid=0" ]; };
8079 "/run/ssd" = ssd // { options = [ "subvolid=0" "noatime" "nodiratime" "discard=async" ]; };