Update & Umu & Wine
Some checks failed
Nix Build / build-nixos (push) Failing after 5m54s

This commit is contained in:
soraefir 2024-09-17 10:33:57 +02:00
parent b00983cd21
commit 221250699c
3 changed files with 54 additions and 21 deletions

65
flake.lock generated
View File

@ -137,11 +137,11 @@
},
"hardware": {
"locked": {
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"lastModified": 1726489388,
"narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9",
"type": "github"
},
"original": {
@ -195,11 +195,11 @@
]
},
"locked": {
"lastModified": 1726357542,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"lastModified": 1726440980,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github"
},
"original": {
@ -251,11 +251,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1726353438,
"narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
"lastModified": 1726430622,
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
"ref": "refs/heads/main",
"rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
"revCount": 5221,
"rev": "9e356562446f44c471ae38a80506a9df039305d6",
"revCount": 5224,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -393,11 +393,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726062873,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@ -424,11 +424,11 @@
},
"nur": {
"locked": {
"lastModified": 1726350307,
"narHash": "sha256-wIwzlGmQYMH2DD5cW3Whlpg9NnBDsRGA/E+GsjuJasE=",
"lastModified": 1726559125,
"narHash": "sha256-YbPW9T6rtAvMYNYg6/Xj1N85CONuQJQwsM+hvNJg3do=",
"owner": "nix-community",
"repo": "nur",
"rev": "010b69bd35181eb235494e2075ef41dd0eb999f9",
"rev": "7b12cc8802300c0f46eb1571a06c2c2de76fad1b",
"type": "github"
},
"original": {
@ -447,7 +447,8 @@
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs",
"nur": "nur",
"sops-nix": "sops-nix"
"sops-nix": "sops-nix",
"umu": "umu"
}
},
"sops-nix": {
@ -460,11 +461,11 @@
]
},
"locked": {
"lastModified": 1726218807,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {
@ -488,6 +489,30 @@
"type": "github"
}
},
"umu": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1726520571,
"narHash": "sha256-SKrz6ePLHo0K3L6Ed9PhFfzTqGEFss/4EQxE1zKYXnk=",
"ref": "refs/heads/main",
"rev": "0f79d6cd5394161e1f24084a3ea83cd18a5f80b4",
"revCount": 716,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
},
"original": {
"dir": "packaging/nix",
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",

View File

@ -20,6 +20,10 @@
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
umu= {
url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

View File

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: {
{ inputs, lib, config, pkgs, ... }: {
imports = [ ./openttd.nix ];
@ -15,6 +15,10 @@
prismlauncher
openttd-jgrpp
bottles
inputs.umu.packages.${pkgs.system}.umu
wineWow64Packages.waylandFull
proton-ge-bin
];
};