overlays cleanup, remove package updates that are in stable by now

pull/92/head
Sandro - 2022-12-04 07:56:27 +01:00
parent 695e095d44
commit 32dd3e9d8a
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 53 additions and 51 deletions

View File

@ -202,7 +202,7 @@
extraHostRegistry.hosts = import ./host-registry.nix;
hostRegistry = lib.recursiveUpdate zwHostRegistry extraHostRegistry;
in {
overlay = import ./overlays {
overlays = import ./overlays {
inherit nixos-unstable;
inherit (inputs) tracer bevy-mandelbrot bevy-julia;
};
@ -211,7 +211,7 @@
pkgs.appendOverlays [
fenix.overlays.default
naersk.overlay
self.overlay
self.overlays
]) nixos.legacyPackages;
packages = import ./packages.nix { inherit hostRegistry inputs lib microvm secrets self; };

42
overlays/allcolors.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, copyDesktopItems
, fetchFromGitHub
, rustPlatform
, libGL
, makeDesktopItem
, mesa
, xorg
}:
rustPlatform.buildRustPackage rec {
pname = "allcolors";
version = "0.1.0";
src = fetchFromGitHub {
owner = "polygon";
repo = "allcolors-rs";
rev = "023bd480245052357a7fd5f42181ff6e67d98b31";
sha256 = "sha256-whaV+k5xh01OQNOehwkEBUDpMWn47mvVihVwchBvWoE=";
};
cargoPatches = [ ./allcolors-cargo-update.patch ];
cargoSha256 = "sha256-RbfACA4hcyemGkw9bqjpIk393SBgBM939I95+grVI0c=";
nativeBuildInputs = [ copyDesktopItems ];
buildInputs = [
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
libGL
mesa
];
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $out/bin/allcolors-rs
'';
desktopItems = [
(makeDesktopItem {
name = "allcolors";
desktopName = "Polygon's allcolors-rs";
categories = [ "Game" ];
exec = "allcolors-rs";
})
];
}

View File

@ -10,38 +10,7 @@ let
pkgs-unstable = nixos-unstable.legacyPackages.${prev.system};
in
with final; {
allcolors = rustPlatform.buildRustPackage rec {
pname = "allcolors";
version = "0.1.0";
src = fetchFromGitHub {
owner = "polygon";
repo = "allcolors-rs";
rev = "023bd480245052357a7fd5f42181ff6e67d98b31";
sha256 = "sha256-whaV+k5xh01OQNOehwkEBUDpMWn47mvVihVwchBvWoE=";
};
cargoPatches = [ ./allcolors-cargo-update.patch ];
cargoSha256 = "sha256-RbfACA4hcyemGkw9bqjpIk393SBgBM939I95+grVI0c=";
nativeBuildInputs = [ copyDesktopItems ];
buildInputs = [
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
libGL
mesa
];
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $out/bin/allcolors-rs
'';
desktopItems = [
(makeDesktopItem {
name = "allcolors";
desktopName = "Polygon's allcolors-rs";
categories = [ "Game" ];
exec = "allcolors-rs";
})
];
};
allcolors = callPackage ./allcolors.nix;
inherit (bevy-julia.packages.${system}) bevy_julia;
inherit (bevy-mandelbrot.packages.${system}) bevy_mandelbrot;
@ -88,7 +57,7 @@ with final; {
];
});
mlat-client = prev.python3Packages.callPackage ./mlat-client.nix { };
mlat-client = python3Packages.callPackage ./mlat-client.nix { };
nixVersions =
prev.nixVersions // {
@ -103,32 +72,23 @@ with final; {
});
};
inherit (nixos-unstable.legacyPackages.${prev.targetPlatform.system}) nomad_1_3;
openssh = prev.openssh.overrideAttrs (oldAttrs: {
# takes 30 minutes
doCheck = false;
});
pile = prev.callPackage ./pile.nix { };
pile = callPackage ./pile.nix { };
pi-sensors = prev.callPackage ./pi-sensors { };
pi-sensors = callPackage ./pi-sensors { };
plume = prev.callPackage ./plume { };
plume = callPackage ./plume { };
readsb = prev.callPackage ./readsb.nix { };
readsb = callPackage ./readsb.nix { };
SimpleYggGen-CPP = prev.callPackage ./simpleygggen.nix { };
simpleygggen-cpp = callPackage ./simpleygggen.nix { };
tracer-game =
let
broken = true;
reason = "haddock runs on affection for 10 hours and more";
in
if broken
then throw "tracer-game: ${reason}"
if true
then throw "tracer-game: haddock runs on affection for 10 hours and more"
else tracer.packages.${system}.tracer-game;
# vector-0.23 + mqtt-sink
vector = pkgs-unstable.callPackage ./vector { };
}