AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade system

Browse Source
This commit is contained in:
Dmitriy Kholkin 2024-11-12 00:58:04 +03:00
parent c60116fcad
commit 71bb3c0ef6
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
7 changed files with 232 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

251
flake.lock generated
View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1728524457,
"narHash": "sha256-R+GJ3H1PvRUHLm45muY1KEezhfgIl8l7HJ36DySZMu0=",
"lastModified": 1730486342,
"narHash": "sha256-/fNj+vW2oE69JMXqyjadxVeuQoWshn+wHp2LHufiVpw=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "5611dd61df02e0bc5d62bb3f5388821d8854faff",
"rev": "512940696be1969a42d3b89e1e77f9dc7e0641b4",
"type": "github"
},
"original": {
@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1728902391,
"narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
"lastModified": 1730968822,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
"type": "github"
},
"original": {
@ -61,11 +61,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1729273362,
"narHash": "sha256-eAZvPgWh7JagGHnx3onFENJRKzQQs2OfcsCtN8M9yE0=",
"lastModified": 1731001447,
"narHash": "sha256-+S5EwsCuMQaQPSj8H7C+dblmaXTRC6bIqp08weRx69Q=",
"owner": "AtaraxiaSjel",
"repo": "nur",
"rev": "bd5be9a7405fbd89b9350b3c2ace1adacf1ba98b",
"rev": "9db97ac325dce1feaf6b25f4465d7dbc12e14844",
"type": "github"
},
"original": {
@ -79,15 +79,16 @@
"crane": "crane",
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1729116596,
"narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=",
"lastModified": 1730906442,
"narHash": "sha256-tBuyb8jWBSHHgcIrOfiyQJZGY1IviMzH2V74t7gWfgI=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782",
"rev": "d0b66cf897e4d55f03d341562c9821dc4e566e54",
"type": "github"
},
"original": {
@ -225,11 +226,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1728407414,
"narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=",
"lastModified": 1731088327,
"narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=",
"owner": "catppuccin",
"repo": "nix",
"rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f",
"rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8",
"type": "github"
},
"original": {
@ -243,11 +244,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1725822842,
"narHash": "sha256-fOR805OwfINbMFzqSmE8piFAFHM9fE+BDdQQUahqDaQ=",
"lastModified": 1731107453,
"narHash": "sha256-U5+2/yP0NMFPHc8/HVz0pKApXvKHB+tNrnQcekGiauc=",
"owner": "catppuccin",
"repo": "vscode",
"rev": "54316f9afc31c3b5070a242cd3ca47d66ab0e9ac",
"rev": "bbb0b5a231a082790398613266e56268ae2e4de0",
"type": "github"
},
"original": {
@ -264,11 +265,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1729348269,
"narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=",
"lastModified": 1731000594,
"narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "528723447ef037a1c081add43f4fd46440c9c3b1",
"rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef",
"type": "github"
},
"original": {
@ -422,11 +423,11 @@
]
},
"locked": {
"lastModified": 1729281548,
"narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
"lastModified": 1731060864,
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
"owner": "nix-community",
"repo": "disko",
"rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
"type": "github"
},
"original": {
@ -661,11 +662,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@ -949,11 +950,11 @@
]
},
"locked": {
"lastModified": 1729027341,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@ -969,11 +970,11 @@
]
},
"locked": {
"lastModified": 1729321331,
"narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
@ -1027,11 +1028,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1729378105,
"narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=",
"lastModified": 1731086737,
"narHash": "sha256-3072G8QfgmLCEDwU4HDpnLsQmijaSyhs308MY27Z9/k=",
"ref": "refs/heads/main",
"rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
"revCount": 5362,
"rev": "3b66351eeb76e802bac37cc892529549efc49905",
"revCount": 5426,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -1108,11 +1109,11 @@
]
},
"locked": {
"lastModified": 1728941256,
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"lastModified": 1730968903,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9",
"type": "github"
},
"original": {
@ -1148,11 +1149,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1729068498,
"narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
"lastModified": 1730403150,
"narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "e337457502571b23e449bf42153d7faa10c0a562",
"rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
"type": "github"
},
"original": {
@ -1163,18 +1164,18 @@
},
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions_2",
"nix-github-actions": "nix-github-actions_3",
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728974938,
"narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
"lastModified": 1730962714,
"narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "23170582b0658e6afd913149a58863af3a57b376",
"rev": "93b525229c99fec0016db72a174f43b9d6237714",
"type": "github"
},
"original": {
@ -1218,15 +1219,15 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"lastModified": 1729298361,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
}
},
"lix-module": {
@ -1239,14 +1240,15 @@
]
},
"locked": {
"lastModified": 1726327948,
"narHash": "sha256-eY/tvAu6AjilxzYcFiz9LaetBG3PHotKqJ8pLIspsqQ=",
"lastModified": 1729360442,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball",
"url": "https://github.com/AtaraxiaSjel/lix-nixos-module/archive/fix-2.91.0.tar.gz"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
},
"original": {
"type": "tarball",
"url": "https://github.com/AtaraxiaSjel/lix-nixos-module/archive/fix-2.91.0.tar.gz"
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
}
},
"lowdown-src": {
@ -1346,11 +1348,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1728378234,
"narHash": "sha256-98wCzdmEWz7GcZ0iLNTGx7B8eEbgYflDN3OADslQrSg=",
"lastModified": 1730016967,
"narHash": "sha256-VI/PtySiAdixRTljL5rbjPepSkI4vUvhQBrO1yzNnfE=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "0d71ed4c4e98918e79bec02be48a66756a393884",
"rev": "7789681eb28fae8de052866f14d009f2375f9362",
"type": "github"
},
"original": {
@ -1368,11 +1370,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1728306776,
"narHash": "sha256-57QXMMEELaEbE+ZVg0ngSC7UGZoyYP2QmDGcQSJ8BnE=",
"lastModified": 1730278911,
"narHash": "sha256-CrbqsC+lEA3w6gLfpqfDMDEKoEta2sl4sbQK6Z/gXak=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "1775c732071d0ee37c1950ce4ecbf2729487ee71",
"rev": "8e7c9d76979381441facb8888f21408312cf177a",
"type": "github"
},
"original": {
@ -1439,6 +1441,27 @@
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-github-actions_3": {
"inputs": {
"nixpkgs": [
"chaotic",
@ -1447,11 +1470,11 @@
]
},
"locked": {
"lastModified": 1690328911,
"narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
"lastModified": 1729697500,
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
"type": "github"
},
"original": {
@ -1491,11 +1514,11 @@
]
},
"locked": {
"lastModified": 1729302344,
"narHash": "sha256-txj6S9QC1IiUlxz41dU8QORG47Mu0vX7ldwNKud2oy4=",
"lastModified": 1731030477,
"narHash": "sha256-RhkVjPXsfkqK0Dn3zmaRIBkb0L7kexTdpOJ7ldByHtM=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "a2a26f1bada2202572599346eb952bd3e130af66",
"rev": "35de68b66b5ac51a18c707fa7069151fc6dca168",
"type": "github"
},
"original": {
@ -1588,11 +1611,11 @@
},
"nixlib": {
"locked": {
"lastModified": 1728781282,
"lastModified": 1729386149,
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
"type": "github"
},
"original": {
@ -1609,11 +1632,11 @@
]
},
"locked": {
"lastModified": 1729127034,
"narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=",
"lastModified": 1729472750,
"narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f",
"rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
"type": "github"
},
"original": {
@ -1668,23 +1691,23 @@
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1729379553,
"narHash": "sha256-uWpTWtXeWzJ8Yezi+xB4Gsj1DTayT68cncFIhVShs1I=",
"lastModified": 1731112359,
"narHash": "sha256-V3Qjx+yvNPPVhY+zwTjmKy898oPAFyzdXYquD9nivSA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "92d82d989a419f92358a19bb92044df88096a8d0",
"rev": "182fa20acfa985f2d8858b898d926950b756f4bd",
"type": "github"
},
"original": {
@ -1792,11 +1815,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@ -1808,11 +1831,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1729181673,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"lastModified": 1730883749,
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
"type": "github"
},
"original": {
@ -1824,11 +1847,11 @@
},
"nixpkgs-stable_5": {
"locked": {
"lastModified": 1728156290,
"narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
"lastModified": 1730602179,
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "17ae88b569bb15590549ff478bab6494dde4a907",
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
"type": "github"
},
"original": {
@ -1888,11 +1911,11 @@
},
"nixpkgs_13": {
"locked": {
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@ -1904,11 +1927,11 @@
},
"nixpkgs_14": {
"locked": {
"lastModified": 1726062873,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github"
},
"original": {
@ -2016,11 +2039,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@ -2154,11 +2177,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1728778939,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
@ -2175,11 +2198,11 @@
"nixpkgs": "nixpkgs_14"
},
"locked": {
"lastModified": 1727493393,
"narHash": "sha256-ah0Wf0FtYB1dRcuNieJX1rOM+hWjdExN08MDAglCuAE=",
"lastModified": 1730301005,
"narHash": "sha256-gqhmUyHif/EfXgNGYLrUk6l4KGVZ9bNgeZzEj7Xd11M=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "fbbed445916710ddaf486986bd812e70b6fd55a3",
"rev": "6eca6eb5c02a7a9416c1b5a1233d97760c158a4f",
"type": "github"
},
"original": {
@ -2230,11 +2253,11 @@
"nixpkgs-stable": "nixpkgs-stable_5"
},
"locked": {
"lastModified": 1728345710,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
"lastModified": 1731047660,
"narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
"rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f",
"type": "github"
},
"original": {
@ -2383,11 +2406,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1729372338,
"narHash": "sha256-pTPlDnI8F53iJwRzNcwA1QM/ZHSL2nnOokOuwjxidnw=",
"lastModified": 1730836236,
"narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
"ref": "refs/heads/main",
"rev": "63b427bd91406177e8dcdc62a690a7813ac96608",
"revCount": 808,
"rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
"revCount": 833,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
@ -2445,11 +2468,11 @@
]
},
"locked": {
"lastModified": 1728166987,
"narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
"lastModified": 1730743262,
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
"type": "github"
},
"original": {

6
flake.nix
View File

@ -16,8 +16,8 @@
};
impermanence.url = "github:nix-community/impermanence";
lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
url = "https://github.com/AtaraxiaSjel/lix-nixos-module/archive/fix-2.91.0.tar.gz";
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
# url = "https://github.com/AtaraxiaSjel/lix-nixos-module/archive/fix-2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
aagl = {
@ -172,6 +172,8 @@
shared-patches = patchesPath [ ];
unstable-patches = shared-patches ++ patchesPath [
"353833.patch" # fix pywebview
"354243.patch" # fix geoclue2
# "netbird-24.11.patch"
"onlyoffice.patch"
# "zen-kernels.patch"

11
machines/AMD-Workstation/default.nix
View File

@ -158,6 +158,7 @@
pkgs.kdePackages.merkuro
pkgs.libsForQt5.ark
pkgs.libsForQt5.dolphin
pkgs.maa-cli
pkgs.mitmproxy
pkgs.modprobed-db
pkgs.packwiz
@ -197,14 +198,16 @@
homeDirectories = [
".arduino15"
".arduinoIDE"
".local/share/winbox"
".local/share/PrismLauncher"
".local/share/distrobox"
".mitmproxy"
".config/exercism"
".config/maa"
".config/modprobed-db"
".config/sops/age"
".config/streamrip"
".local/share/distrobox"
".local/share/maa"
".local/share/PrismLauncher"
".local/share/winbox"
".mitmproxy"
];
};

2
machines/Dell-Laptop/default.nix
View File

@ -7,8 +7,6 @@
customProfiles.bluetooth
];
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
deviceSpecific.devInfo = {
cpu.vendor = "intel";
drive.type = "ssd";

2
machines/NixOS-VPS/default.nix
View File

@ -267,7 +267,7 @@
security.unprivilegedUsernsClone = true;
nixpkgs.overlays = let
unstable = import inputs.nixpkgs {
unstable = import self.unstable-nixpkgs {
config = config.nixpkgs.config;
localSystem = { system = pkgs.hostPlatform.system; };
};

61
patches/353833.patch Normal file
View File

@ -0,0 +1,61 @@
From bdfa0f011297b749d18954e76c8eb36309e3808d Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Tue, 5 Nov 2024 13:22:10 +0000
Subject: [PATCH] python3Packages.pywebview: build fix for tests
Fixes #353686
Basically the *tests/run.sh* used upstream has a few rough edges and this replaces it with a smoother version.
An issue was also opened on the upstream project to maybe get this smoothed out generally.
Story time for those who are curious.
Basically upstream uses this as a script to call for the CI pipeline where [the builds seem to run smoothly in appveyor](https://ci.appveyor.com/project/r0x0r/pywebview/builds/50791017).
However the general structure of the script iterates over the files, which in earlier versions had been done by collecting the list of tests via pytest itself, which replaced the earliest implementation which was a file hard-coding all the tests to run.
The latter had the benefit of being able to disable tests by commenting them out on our end, however the new version, at least for our purpose, is just a more complicated version of running pytest against the entire thing.
We can't just use plain pytest however (which'd presumably be supported by nixpkgs infra already) because we still need to shove the Qt and xvfb-run shims in between.
So with running pytest as a single command we are now (with this commit) able to specifically disable tests that we know to be flakey using regular pytest means.
With the Qt wrapper function passing extra args to *makeWrapper* we can use the extra flags to pass everything we need, and with the env invocation we avoid polluting the build environment so that the *checkPhase* itself doesn't change the output.
Now on to the actual failing tests, apparently those happened to be related to relative paths which use an internal HTTP server to be served (for absolute paths this is optional), and getting rid of the cwd shenanigans which were required by the upstream version of the script (since it globbed on the current directory) means that somehow pytest now runs these tests without changing directory in a subprocess so the asset used for testing is properly accessible (before this change one could "fix" the tests by changing to an absolute path in the tests).
Signed-off-by: benaryorg <binary@benary.org>
---
.../python-modules/pywebview/default.nix | 24 ++++++++-----------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index 96b1213ca5140..6346c96c62fcc 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -50,21 +50,17 @@ buildPythonPackage rec {
];
checkPhase = ''
- # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
- export HOME=$TMPDIR
- # QStandardPaths: XDG_RUNTIME_DIR not set
- export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
+ # a Qt wrapper is required to run the Qt backend
+ # since the upstream script does not have a way to disable tests individually pytest is used directly instead
+ makeQtWrapper "$(command -v pytest)" tests/run.sh \
+ --set PYWEBVIEW_LOG debug \
+ --add-flags "--deselect tests/test_js_api.py::test_concurrent"
- pushd tests
- substituteInPlace run.sh \
- --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
- --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
-
- patchShebangs run.sh
- wrapQtApp run.sh
-
- xvfb-run -s '-screen 0 800x600x24' ./run.sh
- popd
+ # HOME and XDG directories are required for the tests
+ env \
+ HOME=$TMPDIR \
+ XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \
+ xvfb-run -s '-screen 0 800x600x24' tests/run.sh
'';
pythonImportsCheck = [ "webview" ];

22
patches/354243.patch Normal file
View File

@ -0,0 +1,22 @@
From d08e25d8683ebe341d2fed24523d7604793f3414 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 7 Nov 2024 09:36:11 -0500
Subject: [PATCH] geoclue: fix placing updateScript in passthru
---
pkgs/development/libraries/geoclue/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index d30c0b411796d..2b1e203c78089 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs demo/install-file.py
'';
- updateScript = nix-update-script {};
+ passthru.updateScript = nix-update-script {};
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin && withDemoAgent;