Unverified Commit aae6b0bd authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

Merge pull request #259726 from K900/wine-staging-8.17.1 

wine-staging: 8.17 -> 8.17.1
parents d88d7ed8 456c7870

pkgs/applications/emulators/wine/sources.nix

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ in rec { 


  staging = fetchFromGitHub rec {

    # https://github.com/wine-staging/wine-staging/releases

    inherit (unstable) version;

    hash = "sha256-8uxXyt3zu+LuFJbTQD+bv+Zmnzb18Dhlo3ign1lFT2s=";

    version = "8.17.1";

    hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg=";

    owner = "wine-staging";

    repo = "wine-staging";

    rev = "v${version}";

pkgs/applications/emulators/wine/staging.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ with callPackage ./util.nix {}; 
let patch = (callPackage ./sources.nix {}).staging;

    build-inputs = pkgNames: extra:

      (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;

in assert lib.getVersion wineUnstable == patch.version;

in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;



(lib.overrideDerivation wineUnstable (self: {

  buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;