Commit d8df53cc authored by Domen Kožar's avatar Domen Kožar
Browse files

nixos: include nixpkgs-unstable release-critical jobs in nixos-unstable 

Previously, the `unstable` attribute was explicitly removed since 2013
(commit 5c1f8cbc) to avoid potential redundancy. However, including it
ensures that  packages that block nixpkgs-unstable also block nixos-unstable.
parent 0cd9cba7

nixos/release-combined.nix

+4 −2
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ rec { 
    }

  );



  nixpkgs = removeAttrs (removeMaintainers (

  nixpkgs = removeMaintainers (

    import ../pkgs/top-level/release.nix {

      inherit supportedSystems;

      nixpkgs = nixpkgsSrc;

    }

  )) [ "unstable" ];

  );



  tested =

    let
@@ -190,6 +190,8 @@ rec { 
        (onFullSupported "nixpkgs.jdk")

        (onSystems [ "x86_64-linux" ] "nixpkgs.mesa_i686") # i686 sanity check + useful

        [

          # Include all release-critical jobs from nixpkgs-unstable channel

          "nixpkgs.unstable"

          "nixpkgs.tarball"

          "nixpkgs.release-checks"

        ]