Merge pull request #39 from wiillou/main

bump hyprland version to v0.40.0
This commit is contained in:
Alessio Molinari 2024-05-05 12:41:11 +02:00 committed by GitHub
commit 6e89e3f64c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 11 deletions

View File

@ -34,22 +34,23 @@
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems", "systems": "systems",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1713283263, "lastModified": 1714837352,
"narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", "rev": "cba1ade848feac44b2eda677503900639581c3f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.39.1", "ref": "v0.40.0",
"repo": "Hyprland", "repo": "Hyprland",
"type": "github" "type": "github"
} }
@ -104,6 +105,31 @@
"type": "github" "type": "github"
} }
}, },
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1714755542,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1712963716,
@ -160,17 +186,17 @@
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713124002, "lastModified": 1713731601,
"narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "wlroots-hyprland", "repo": "wlroots-hyprland",
"rev": "611a4f24cd2384378f6e500253983107c6656c64", "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"repo": "wlroots-hyprland", "repo": "wlroots-hyprland",
"rev": "611a4f24cd2384378f6e500253983107c6656c64", "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github" "type": "github"
} }
}, },

View File

@ -2,7 +2,7 @@
description = "A plugin for the Hyprland compositor, implementing virtual-desktop functionality."; description = "A plugin for the Hyprland compositor, implementing virtual-desktop functionality.";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.hyprland.url = "github:hyprwm/Hyprland/v0.39.1"; inputs.hyprland.url = "github:hyprwm/Hyprland/v0.40.0";
outputs = { self, nixpkgs, hyprland }: outputs = { self, nixpkgs, hyprland }:
let let
@ -10,7 +10,7 @@
withPkgsFor = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system}); withPkgsFor = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
virtualDesktops = withPkgsFor (system: pkgs: pkgs.gcc13Stdenv.mkDerivation rec { virtualDesktops = withPkgsFor (system: pkgs: pkgs.gcc13Stdenv.mkDerivation rec {
pname = "virtual-desktops"; pname = "virtual-desktops";
version = "2.2.1"; version = "2.2.2";
src = ./.; src = ./.;
inherit (hyprland.packages.${system}.hyprland) nativeBuildInputs; inherit (hyprland.packages.${system}.hyprland) nativeBuildInputs;
@ -19,7 +19,7 @@
# Skip meson phases # Skip meson phases
configurePhase = "true"; configurePhase = "true";
mesonConfigurePhase = "true"; mesonConfigurePhase = "true";
mesonBuildPhase = "true"; mesonBuildPhase = "true";
mesonInstallPhase = "true"; mesonInstallPhase = "true";