Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ec6a25c830a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16f239a00b70
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 28, 2020

  1. wine-stable: 4.0.3 -> 5.0

    @lovesegfault
    lovesegfault committed Jan 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lovesegfault Bernardo Meurer
    GPG key ID: E421C74191EA186C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8db6255 View commit details

  2. wine-{unstable,staging}: 5.0-rc6 -> 5.0

    @lovesegfault
    lovesegfault committed Jan 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lovesegfault Bernardo Meurer
    GPG key ID: E421C74191EA186C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58bd466 View commit details

  3. Merge pull request #78246 from lovesegfault/wine-bump 

    Wine bump (5.0)
    @worldofpeace
    worldofpeace authored Jan 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    16f239a View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/misc/emulators/wine/sources.nix
12 changes: 6 additions & 6 deletions pkgs/misc/emulators/wine/sources.nix
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
in rec {

stable = fetchurl rec {
version = "4.0.3";
url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
sha256 = "1nhgw1wm613ln9dhjm0d03zs5adcmnqr2b50p21jbmm5k2gns0i5";
version = "5.0";
url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q";

## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
@@ -39,16 +39,16 @@ in rec {

unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "5.0-rc6";
version = "5.0";
url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
sha256 = "1d1kv7ppqq5irx3wv2lw810ylg8wk1nddc1kwb936v5qrkkgifwc";
sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q";
inherit (stable) mono gecko32 gecko64;
};

staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "193z92gpw7f421a4sa46qmp90pnbgglrlgyzfs5zpap32zmwhrqz";
sha256 = "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";