From ff05ad7e21e9eb4cc6a7345af8ead3b9d64a20b1 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Sat, 15 Oct 2022 16:25:00 +0200 Subject: [PATCH] Update flake --- flake.lock | 116 ++++++++++++------ overlays/sandbox.nix | 1 + .../tools/games/replaysorcery/default.nix | 4 +- .../virtualisation/evdev-proxy/default.nix | 4 +- 4 files changed, 83 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index e34d6f7..aff11fe 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1662958374, - "narHash": "sha256-MpyHx+UjOA8Zi0r0dRKRL509Wqz7JFWI7XFJJstL10w=", + "lastModified": 1665824418, + "narHash": "sha256-OZX8io9UKzxFAwdRvf4uOThDFpGtlbMyi13RbqIpmoY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "46c1067b0b397df28de5e8f551d2df54f7da7a93", + "rev": "08445dd7824253ee8580f06127460a7d14e942cf", "type": "github" }, "original": { @@ -134,6 +134,21 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -154,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1662759269, - "narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=", + "lastModified": 1665655007, + "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd", + "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", "type": "github" }, "original": { @@ -221,11 +236,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1660330190, - "narHash": "sha256-RgQUtZGmdb9fRkdBcI8x1KYuykbQCBaeY6ejFls7hFM=", + "lastModified": 1665655007, + "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8675cfa549e1240c9d2abb1c878bc427eefcf926", + "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", "type": "github" }, "original": { @@ -340,13 +355,36 @@ "type": "github" } }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "ostylk-home", + "pkg-unstable" + ] + }, + "locked": { + "lastModified": 1661367362, + "narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=", + "owner": "guibou", + "repo": "nixGL", + "rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae", + "type": "github" + }, + "original": { + "owner": "guibou", + "ref": "main", + "repo": "nixGL", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1662714967, - "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=", + "lastModified": 1665734422, + "narHash": "sha256-v8DMfRyFdulDyCCoOXak+oue1IgVBJZdSY1eXqdMRwQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6", + "rev": "c8c54d8f0af9f19ed6e929e60f0e1609b89b1240", "type": "github" }, "original": { @@ -374,9 +412,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=", - "path": "/nix/store/5356r3f8pfz731rwcm1xrwaqqcbrq8gg-source", + "lastModified": 1662911228, + "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=", + "path": "/nix/store/10w6l7qp2i8dcqhl1vafpdwywv1y695y-source", + "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90", "type": "path" }, "original": { @@ -402,11 +441,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654953433, - "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", + "lastModified": 1662996720, + "narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", + "rev": "5f326e2a403e1cebaec378e72ceaf5725983376d", "type": "github" }, "original": { @@ -418,11 +457,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1662911228, - "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=", + "lastModified": 1665643254, + "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90", + "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "type": "github" }, "original": { @@ -524,11 +563,11 @@ }, "nur": { "locked": { - "lastModified": 1662966217, - "narHash": "sha256-jLOh0txlWYlvvSUJmPLdfdaaUuoqRJjGPEEUKF2ya94=", + "lastModified": 1665816557, + "narHash": "sha256-l+PbGkSE8IEQW5PFg95bf1ne8QxNdtxIOzXb/3j3Yw4=", "owner": "nix-community", "repo": "nur", - "rev": "fbba74f5057f1941066ecca23c681adf6738e5c9", + "rev": "2ff0d1346d6c6dadbb6435ac1d5e55c8ec9dec43", "type": "github" }, "original": { @@ -572,17 +611,18 @@ "impermanence": "impermanence_2", "libwacom-surface": "libwacom-surface", "linux-surface": "linux-surface", + "nixgl": "nixgl", "pkg-compile": "pkg-compile", "pkg-stable": "pkg-stable", "pkg-unstable": "pkg-unstable", "rnix-lsp": "rnix-lsp_2" }, "locked": { - "lastModified": 1660515901, - "narHash": "sha256-5sQVUgj9vnDW8hPIrynGviUXFPADrrL9X4qm3SLbqPM=", + "lastModified": 1665757700, + "narHash": "sha256-ewx+XtdjZSwoY148+FMAhnhkReb8wnXdB4jd48e/ew4=", "ref": "refs/heads/master", - "rev": "48fa0996c44bc160802faaad2692ccfbbfb2647b", - "revCount": 98, + "rev": "2f221bae4c04e89b371c64995b36c3fab48f82fe", + "revCount": 109, "type": "git", "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" }, @@ -625,11 +665,11 @@ }, "pkg-unstable": { "locked": { - "lastModified": 1660162369, - "narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=", + "lastModified": 1665643254, + "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2", + "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "type": "github" }, "original": { @@ -735,7 +775,7 @@ }, "tablet-mode_2": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -754,11 +794,11 @@ }, "utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -784,11 +824,11 @@ }, "utils_3": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/overlays/sandbox.nix b/overlays/sandbox.nix index 6ade555..ac5d5ba 100644 --- a/overlays/sandbox.nix +++ b/overlays/sandbox.nix @@ -86,6 +86,7 @@ in { additionalMounts = [ "/mnt/Storage/Games/LeagueOfLegends" "/mnt/Storage/Games/Origin" + "/mnt/Storage/Games/SteamLibrary" "/mnt/tmp" ]; mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ]; diff --git a/packages/tools/games/replaysorcery/default.nix b/packages/tools/games/replaysorcery/default.nix index 74828f8..fd94115 100644 --- a/packages/tools/games/replaysorcery/default.nix +++ b/packages/tools/games/replaysorcery/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, - pkgconfig, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify, + pkg-config, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify, fetchgit }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig cmake + pkg-config cmake ]; buildInputs = [ diff --git a/packages/tools/virtualisation/evdev-proxy/default.nix b/packages/tools/virtualisation/evdev-proxy/default.nix index e793d74..c118b30 100644 --- a/packages/tools/virtualisation/evdev-proxy/default.nix +++ b/packages/tools/virtualisation/evdev-proxy/default.nix @@ -1,7 +1,7 @@ { lib , rustPlatform -, pkgconfig, udev +, pkg-config, udev , fetchFromGitHub }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { patches = [ ./add-evdev-selector.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ];