From 65f534331d670a3e5677f68fbc34f689ee4eb9d6 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Sun, 25 Feb 2024 21:19:37 +0100 Subject: [PATCH] WIP: Add rocm clang & update flake deps --- flake.lock | 147 +++++++++++++++++++--------------- home-mods/desktop/default.nix | 1 + os-mods/amdgpu/default.nix | 1 + 3 files changed, 84 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 9c01005..cf88777 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1708266612, - "narHash": "sha256-DElg9wukAUuGR/5kpoBZud/D88YdflUIf7rnDsd3Ix0=", + "lastModified": 1708792423, + "narHash": "sha256-9sAXaM/OsXaPx9Wp+b2gny+kTZIZ192dTYmqMOaNsk4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b217bc2f0e351e4c78f79d2d84af58bef02f47cc", + "rev": "4730981fd98f9f7c7c14f641973196fb838a28ab", "type": "github" }, "original": { @@ -113,17 +113,16 @@ ] }, "locked": { - "lastModified": 1708220210, - "narHash": "sha256-qsiApRdQEk9Sd3u/iiFt7idUEdsccHc3TcxmsHy3CJ4=", - "owner": "famedly", - "repo": "conduit", - "rev": "be1e2e93073d88ef1972a3c99014a7d14d731b85", + "lastModified": 1707957373, + "narHash": "sha256-UmySXmi6tZsXSCROUKgV3UM7W05uGhH9lslw8h6EUd0=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "cf9d77d04ec8f7e118cbc8d4400e273778ee47a2", "type": "gitlab" }, "original": { - "owner": "famedly", - "ref": "next", - "repo": "conduit", + "owner": "girlbossceo", + "repo": "conduwuit", "type": "gitlab" } }, @@ -154,11 +153,11 @@ ] }, "locked": { - "lastModified": 1708221730, - "narHash": "sha256-vyx6tsnDGX4bNegiF1kREHMRDH7hy+q1m56V8JYHWLI=", + "lastModified": 1708564520, + "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", "owner": "nix-community", "repo": "disko", - "rev": "d8a4377cd8eec23668ea3fae07efee9d5782cb91", + "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", "type": "github" }, "original": { @@ -283,11 +282,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -445,12 +444,15 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -468,11 +470,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -527,11 +529,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -549,11 +551,11 @@ ] }, "locked": { - "lastModified": 1708148641, - "narHash": "sha256-UliMMpx84PPA+0mcyBj2yuKNawOX7L4u/wO8j9QGHVk=", + "lastModified": 1708585220, + "narHash": "sha256-eQ5nGEEW4I8Btwso6Q940xilYG7QNyTuocfB0awjpA8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f318a856ff3177fdea6044d6c77dd49992330a31", + "rev": "2654de9ed084890d1814a841c4f863e9d7a44d54", "type": "github" }, "original": { @@ -575,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708217097, - "narHash": "sha256-0RaUUKLpd93qNlE1+9HoOj6u6lnH4KAHsoeSovR/lrc=", + "lastModified": 1708757710, + "narHash": "sha256-oL3Zao6Ynku0l5JOMbbpch1Je8ht8WwEIK/uO4LVXHk=", "owner": "martinvonz", "repo": "jj", - "rev": "3c7aa75b9b807509624364209dad2330ffa7e8f6", + "rev": "a67aa089959068db22aa6dea46864e5bd662e62b", "type": "github" }, "original": { @@ -612,11 +614,11 @@ ] }, "locked": { - "lastModified": 1708237234, - "narHash": "sha256-trF/DuUcDM5x0cJdFFC5vrKtrgkAH25Pg67LvZE2WX4=", + "lastModified": 1708754936, + "narHash": "sha256-WMizFbb4GAIMx3YFpqfAlB9ticbdUErmQmXS+ZvTvTY=", "owner": "YaLTeR", "repo": "niri", - "rev": "2b5eeb61620363a325a5c76c4a5d25e45f2a6054", + "rev": "ec156a858795b7f31cac51845d9cf3197a063f92", "type": "github" }, "original": { @@ -729,11 +731,11 @@ ] }, "locked": { - "lastModified": 1708225687, - "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=", + "lastModified": 1708830466, + "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127", + "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b", "type": "github" }, "original": { @@ -771,11 +773,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1682599883, - "narHash": "sha256-3RLfNhq8decb2VOTJLboloPX1M7Rwy3iGZL4DV7aLd0=", + "lastModified": 1708554876, + "narHash": "sha256-gaL/q2OtucwPrh/nVm1kvtLSvGdcem0E87WZ+rozBYc=", "owner": "lunik1", "repo": "nix-wallpaper", - "rev": "e1dfc3e671f9af843721c32ed7c08ea9966426c6", + "rev": "5058a76a9db42a7fdc05ce9cae0cc7c3c71acd22", "type": "github" }, "original": { @@ -804,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", - "revCount": 585059, + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", + "revCount": 587158, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.585059%2Brev-5863c27340ba4de8f83e7e3c023b9599c3cb3c80/018db705-d612-7033-b0e2-b5135c399af8/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.587158%2Brev-cbc4211f0afffe6dfd2478a62615dd5175a13f9a/018dd7db-96ac-7fc3-9238-a3a1b9aeb917/source.tar.gz" }, "original": { "type": "tarball", @@ -852,27 +854,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708247094, - "narHash": "sha256-H2VS7VwesetGDtIaaz4AMsRkPoSLEVzL/Ika8gnbUnE=", + "lastModified": 1708815994, + "narHash": "sha256-hL7N/ut2Xu0NaDxDMsw2HagAjgDskToGiyZOWriiLYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "045b51a3ae66f673ed44b5bbd1f4a341d96703bf", + "rev": "9a9dae8f6319600fa9aebde37f340975cab4b8c0", "type": "github" }, "original": { @@ -932,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -1001,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1708280911, - "narHash": "sha256-8GKvKnYLvS58oYrm3gcfYv04pkqOw04lJQnyeGT1sq0=", + "lastModified": 1708864816, + "narHash": "sha256-SM1zlHhoZf20lhp0v7ss52MYEWux/j+jfqfxUp8yqW8=", "owner": "nix-community", "repo": "NUR", - "rev": "546e675eb1d9a332dc04e8fb3ecc0a35b8101572", + "rev": "1fe352ab8a7560c8bbd793852c52979894a7705e", "type": "github" }, "original": { @@ -1040,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1707590627, - "narHash": "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=", + "lastModified": 1708693644, + "narHash": "sha256-QZxSFZXJ0omNHCN7CT8MeaJwkEPEztvknA6+7wDldcY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4e56cfeb95081a43cb49487d0996dc936d6201e5", + "rev": "02a9761ac6b692eba60a73c1196d205d24300de7", "type": "github" }, "original": { @@ -1068,11 +1070,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1675337566, - "narHash": "sha256-jmLBTQcs1jFOn8h1Q5b5XwPfYgFOtcZ3+mU9KvfC6Js=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5668d079583a5b594cb4e0cc0e6d84f1b93da7ae", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -1204,6 +1206,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 52c7d1b..bf19a6a 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -26,6 +26,7 @@ in # blender brave cavalier + ffmpeg freetube filelight element-desktop diff --git a/os-mods/amdgpu/default.nix b/os-mods/amdgpu/default.nix index 084dd5f..d6e7f32 100644 --- a/os-mods/amdgpu/default.nix +++ b/os-mods/amdgpu/default.nix @@ -26,6 +26,7 @@ extraPackages = with pkgs; [ amdvlk rocmPackages.rocm-runtime + rocmPackages.llvm.clang rocm-opencl-icd rocm-opencl-runtime vaapiVdpau