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

Commits on Apr 11, 2020

  1. hdapsgl: 0.5.0 -> 0.7.0 

    We now package a fork on github because:
* gentoo does it
* the fork is owned by the same organisation as the one we take hdapsd
from.
    @symphorien
    symphorien committed Apr 11, 2020
    Copy the full SHA
    c8c3181 View commit details

Commits on Apr 12, 2020

  1. Merge pull request #85005 from symphorien/update-hdapsgl 

    hdapsgl: 0.5.0 -> 0.7.0
    @bhipple
    bhipple authored Apr 12, 2020
    Copy the full SHA
    6cfcc41 View commit details
Showing with 9 additions and 11 deletions.
  1. +9 −11 pkgs/tools/misc/hdaps-gl/default.nix
20 changes: 9 additions & 11 deletions pkgs/tools/misc/hdaps-gl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{ stdenv, fetchzip, freeglut, libGL, libGLU }:
{ stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }:

let version = "0.0.5"; in
let version = "0.0.7"; in
stdenv.mkDerivation {
pname = "hdaps-gl";
inherit version;
src = fetchzip {
url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz";
sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4";
src = fetchFromGitHub {
owner = "linux-thinkpad";
repo = "hdaps-gl";
rev = version;
sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh";
};

nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ freeglut libGL libGLU ];

# the Makefile has no install target
installPhase = ''
install -Dt $out/bin ./hdaps-gl
'';

meta = with stdenv.lib; {
description = "GL-based laptop model that rotates in real-time via hdaps";
homepage = "https://sourceforge.net/projects/hdaps/";
homepage = "https://github.com/linux-thinkpad/hdaps-gl";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.symphorien ];