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: 447bc432d99d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f2d0c6a9851
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 14, 2020

  1. cpu-x: 4.0.0 -> 4.0.1

    @r-ryantm
    r-ryantm committed Jun 14, 2020
    Copy the full SHA
    bddef29 View commit details

  2. Merge pull request #90335 from r-ryantm/auto-update/cpu-x 

    cpu-x: 4.0.0 -> 4.0.1
    @ryantm
    ryantm authored Jun 14, 2020
    Copy the full SHA
    5f2d0c6 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/misc/cpu-x/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/cpu-x/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "cpu-x";
version = "4.0.0";
version = "4.0.1";

src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3";
sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3";
};

nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ];