From d09c7c2f7ec134d4a59056b9ab9d18aa14eb8967 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 10 Dec 2024 21:22:52 +0100 Subject: [PATCH] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 16 ++++---- nix/os/devices/steveej-x13s/flake.nix | 52 -------------------------- 2 files changed, 8 insertions(+), 60 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index be351ac..9fb86c5 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -165,16 +165,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1733214488, - "narHash": "sha256-nhS3FgdJm1KBjAuTePgcQ4oXzigyDufQfz2TUUahHtM=", + "lastModified": 1733829848, + "narHash": "sha256-eSMC7QBA4N6oKNemce/7tuyjGHHnXDjoLJLyxHaJrJI=", "owner": "jhovold", "repo": "linux", - "rev": "ccd13b9fd1a31c869789e2320e777bfdc150face", + "rev": "bc85c6f253096667ccbf2a60d37070f347e67ae4", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.13-rc1", + "ref": "wip/sc8280xp-6.13-rc2", "repo": "linux", "type": "github" } @@ -248,11 +248,11 @@ "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1733393262, - "narHash": "sha256-cbpUix+ggnZtTT7Rtr1+A+iX+fI+KpduaGOOTXhaQWU=", + "lastModified": 1733855385, + "narHash": "sha256-+13My4h6WUJ+M10gKS0aVUlyIdp4zKqB6FKxyCAyxQ0=", "ref": "bump", - "rev": "b116d698f4b531a7577ccb875ca6a8106b9d63ee", - "revCount": 127, + "rev": "c95058f8aa1b361df3874429c5dc0f694f9cba78", + "revCount": 128, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix index 70f78ea..b94efdb 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -80,59 +80,7 @@ inherit mkNixosConfiguration; }; - overlays.libcamera = - _final: previous: - let - webkitgtkPreConfigure = '' - export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 2 ? 2 : NIX_BUILD_CORES))" - export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES" - ''; - in - { - wireplumber = previous.wireplumber.overrideAttrs (_: { - version = "git"; - src = previous.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "wireplumber"; - rev = "71f868233792f10848644319dbdc97a4f147d554"; - hash = "sha256-VX3OFsBK9AbISm/XTx8p05ak+z/VcKXfUXhB9aI9ev8="; - }; - }); - - libcamera = previous.libcamera.overrideAttrs (_: { - postFixup = '' - ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so - ''; - }); - - libcamera-qcam = previous.libcamera-qcam.overrideAttrs (_: { - postFixup = '' - ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so - ''; - }); - - webkitgtk = previous.webkitgtk.overrideAttrs (attrs: { - preConfigure = attrs.preConfigure + webkitgtkPreConfigure; - }); - - webkitgtk_4_1 = previous.webkitgtk_4_1.overrideAttrs (attrs: { - preConfigure = attrs.preConfigure + webkitgtkPreConfigure; - }); - - webkitgtk_6_0 = previous.webkitgtk_6_0.overrideAttrs (attrs: { - preConfigure = attrs.preConfigure + webkitgtkPreConfigure; - }); - }; - overlays.default = _final: _previous: { - # inherit pkgsUnstable; - # inherit (pkgsUnstable) - # libcamera - # webkitgtk - # webkitgtk_4_1 - # webkitgtk_6_0 - # ; }; nixosConfigurations = {