diff --git a/flake.lock b/flake.lock index a3194665..9caf41e7 100644 --- a/flake.lock +++ b/flake.lock @@ -201,16 +201,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721924089, - "narHash": "sha256-XfIZ6V8cks3a20ONHMeQjF+A/d/rH0I8IXmvA30EAig=", - "owner": "donovanglover", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8aa612d4127ed9d4ce9e5b4ed8163121af43912", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { - "owner": "donovanglover", - "ref": "unstable-phosh-0.40.0", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bb2d842e..9d3c5226 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:donovanglover/nixpkgs/unstable-phosh-0.40.0"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/overlays/xdg-desktop-portal-hyprland.nix b/overlays/xdg-desktop-portal-hyprland.nix deleted file mode 100644 index da81df70..00000000 --- a/overlays/xdg-desktop-portal-hyprland.nix +++ /dev/null @@ -1,14 +0,0 @@ -final: prev: { - xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (oldAttrs: rec { - version = "1.3.3"; - - src = prev.fetchFromGitHub { - owner = "hyprwm"; - repo = "xdg-desktop-portal-hyprland"; - rev = "v${version}"; - hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI="; - }; - - patches = [ ]; - }); -} diff --git a/packages/rmpc.nix b/packages/rmpc.nix deleted file mode 100644 index 80a64f77..00000000 --- a/packages/rmpc.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, cmake -}: - -rustPlatform.buildRustPackage { - pname = "rmpc"; - version = "0.2.1-unstable-2024-07-27"; - - src = fetchFromGitHub { - owner = "mierak"; - repo = "rmpc"; - rev = "f12be6f606f5319523f41576e7c463b6008b9069"; - hash = "sha256-mKTl2sZdrkecd9fMBllHC0YiVHK8rUdoRmN2YF4T9O0="; - }; - - cargoHash = "sha256-/00WGuuxtwtpNuEEeapJhVedbg3RMUtTEQbYYu518po="; - - cargoPatches = [ - ../assets/rmpc-support-older-rustc.patch - ]; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - meta = { - description = "Configurable, terminal-based media player client with album art support via kitty image protocol"; - homepage = "https://github.com/mierak/rmpc"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ donovanglover ]; - mainProgram = "rmpc"; - }; -}