pkgs/alioth: 0.4.0 -> 0.5.0

Author: astro

flake.lock

@@ -8,18 +8,14 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     flake-utils.url = "github:numtide/flake-utils";
     spectrum = {
       url = "git+https://spectrum-os.org/git/spectrum";
       flake = false;
     };
   };
 
-  outputs = { self, nixpkgs, fenix, flake-utils, spectrum }:
+  outputs = { self, nixpkgs, flake-utils, spectrum }:
     let
       systems = [
         "x86_64-linux"
@@ -98,7 +94,6 @@
             pkgs = import nixpkgs {
               overlays = [ self.overlay ];
             };
-            rustNightly = fenix.packages.${system}.minimal.toolchain;
           in {
             build-microvm = pkgs.callPackage ./pkgs/build-microvm.nix { inherit self; };
             doc = pkgs.callPackage ./pkgs/doc.nix { inherit nixpkgs; };
@@ -123,12 +118,7 @@
               ignoreCollisions = true;
             };
             waypipe = overrideWaypipe pkgs;
-            alioth = pkgs.callPackage ./pkgs/alioth.nix {
-              rustPlatform = pkgs.makeRustPlatform {
-                cargo = rustNightly;
-                rustc = rustNightly;
-              };
-            };
+            alioth = pkgs.callPackage ./pkgs/alioth.nix {};
           } //
           # wrap self.nixosConfigurations in executable packages
           builtins.foldl' (result: systemName:
@@ -159,16 +149,7 @@
         overlay = final: prev: {
           cloud-hypervisor-graphics = prev.callPackage (spectrum + "/pkgs/cloud-hypervisor") {};
           waypipe = overrideWaypipe prev;
-          alioth =
-            let
-              rustNightly = fenix.packages.${final.system}.minimal.toolchain;
-            in
-              prev.callPackage ./pkgs/alioth.nix {
-                rustPlatform = final.makeRustPlatform {
-                  cargo = rustNightly;
-                  rustc = rustNightly;
-                };
-              };
+          alioth = prev.callPackage ./pkgs/alioth.nix {};
         };
         overlays.default = self.overlay;
 

flake.nix

@@ -1,22 +1,24 @@
-# TODO: upstream to nixpkgs once it no longer requires rust nightly
 { lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "alioth";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "google";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Dyev6cZSCzia9PN2+QiiqARCt/OT9NcGnrgF7womvUg=";
+    repo = "alioth";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0=";
   };
 
-  cargoHash = "sha256-4oN0v77VQHpyS/fXefYQPuslBAkDuTpjNPE1UiQ/Rz0=";
+  cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA=";
+
   separateDebugInfo = true;
 
-  # TODO: Broken
-  doCheck = false;
+  checkFlags = [
+    # "test did not panic as expected"
+    "--skip" "test_align_up_panic"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/google/alioth";