Skip to content

Commit 094da86

Browse files
SuperSandro2000astro
authored andcommitted
Drop waypipe overwrite for 24.05 and earlier
1 parent 075b880 commit 094da86

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

flake.nix

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@
2121
"x86_64-linux"
2222
"aarch64-linux"
2323
];
24-
25-
# https://github.com/NixOS/nixpkgs/pull/296538
26-
# TODO: remove entirely after NixOS 24.05
27-
overrideWaypipe = pkgs:
28-
if builtins.compareVersions pkgs.waypipe.version "0.9" >= 0
29-
then pkgs.waypipe
30-
else pkgs.waypipe.overrideAttrs (attrs: rec {
31-
version = "0.9.0";
32-
src = pkgs.fetchFromGitLab {
33-
domain = "gitlab.freedesktop.org";
34-
owner = "mstoeckl";
35-
repo = "waypipe";
36-
rev = "v${version}";
37-
hash = "sha256-zk5IzZiFff9EeJn24/QmE1ybcBkxpaz6Owp77CfCwV0=";
38-
};
39-
});
4024
in
4125
flake-utils.lib.eachSystem systems (system: {
4226

@@ -84,7 +68,7 @@
8468
waypipe-client = {
8569
type = "app";
8670
program = toString (pkgs.writeShellScript "waypipe-client" ''
87-
exec ${self.packages.${system}.waypipe}/bin/waypipe --vsock -s 6000 client
71+
exec ${pkgs.waypipe}/bin/waypipe --vsock -s 6000 client
8872
'');
8973
};
9074
};
@@ -118,7 +102,6 @@
118102
extraOutputsToInstall = [ "dev" ];
119103
ignoreCollisions = true;
120104
};
121-
waypipe = overrideWaypipe pkgs;
122105
} //
123106
# wrap self.nixosConfigurations in executable packages
124107
builtins.foldl' (result: systemName:
@@ -148,7 +131,6 @@
148131

149132
overlay = final: prev: {
150133
cloud-hypervisor-graphics = prev.callPackage (spectrum + "/pkgs/cloud-hypervisor") {};
151-
waypipe = overrideWaypipe prev;
152134
};
153135
overlays.default = self.overlay;
154136

0 commit comments

Comments
 (0)