Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b55f257b58d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27f514ac0d25
Choose a head ref
  • 5 commits
  • 3 files changed
  • 5 contributors

Commits on Jul 17, 2020

  1. steam-runtime: 0.20200417.0 -> 0.20200604.0

    @euank
    euank committed Jul 17, 2020
    Copy the full SHA
    8c5c7d3 View commit details

  2. gfan: fix clang build on non-Darwin 

    -fno-guess-branch-probability isn't a Darwin-specific thing, it's a
clang-specific thing.
    @alyssais
    alyssais committed Jul 17, 2020
    Copy the full SHA
    8f5eaa6 View commit details

Commits on Jul 19, 2020

  1. Merge pull request #93351 from alyssais/gfan 

    gfan: fix clang build on non-Darwin
    @danieldk
    danieldk authored Jul 19, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5bb161a View commit details

  2. Merge pull request #93448 from euank/update-steamruntime 

    steam-runtime: 0.20200417.0 -> 0.20200604.0
    @srhb
    srhb authored Jul 19, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0bf47d4 View commit details

  3. etcd_3_4: 3.4.9 -> 3.4.10 

    https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.4.md#v3410-2020-07-16
    @zowoq
    zowoq committed Jul 19, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    27f514a View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 pkgs/applications/science/math/gfan/default.nix
  2. +2 −2 pkgs/games/steam/runtime.nix
  3. +3 −3 pkgs/servers/etcd/3.4.nix
2 changes: 1 addition & 1 deletion pkgs/applications/science/math/gfan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
};

patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
patchPhase = stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
'';

4 changes: 2 additions & 2 deletions pkgs/games/steam/runtime.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {

name = "steam-runtime";
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
version = "0.20200417.0";
version = "0.20200604.0";

src = fetchurl {
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy";
sha256 = "04ficg3lnf6ijwkj08094vgcsskfncnlhk61v2csls3wfwvkrmhv";
name = "scout-runtime-${version}.tar.gz";
};

6 changes: 3 additions & 3 deletions pkgs/servers/etcd/3.4.nix
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@

buildGoModule rec {
pname = "etcd";
version = "3.4.9";
version = "3.4.10";

#vendorSha256 = null; revert to `null` for > 3.4.9
#vendorSha256 = null; revert to `null` for > 3.4.10

vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z";
deleteVendor = true;
@@ -13,7 +13,7 @@ buildGoModule rec {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
sha256 = "16l4wmnm7mkhpb2vzf6xnhhyx6lj8xx3z6x1bfs05idajnrw824p";
sha256 = "07kzgh2rm7kzprlpnay6fq8lziiyhiqyikf1qjx8gjjsdsjy180f";
};

buildPhase = ''