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: f563832d28da
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: e380ef398761
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 24, 2019

  1. xcpc: move libsdk and lesstiff as optional

    Bignaux Ronan committed May 24, 2019
    Copy the full SHA
    6e175d1 View commit details

Commits on May 26, 2019

  1. autorandr: use official package description 

    Use the description from the manpage / upstream repository.
    @thumphries
    thumphries committed May 26, 2019
    Copy the full SHA
    b7032b5 View commit details

  2. Merge pull request #61982 from bignaux/xcpc 

    xcpc: move libdsk and lesstiff as optional
    @aanderse
    aanderse authored May 26, 2019

    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
    5dc4d65 View commit details

  3. Merge pull request #62072 from thumphries/autorandr-docfix 

    autorandr: use official package description
    @matthewbauer
    matthewbauer authored May 26, 2019

    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
    e380ef3 View commit details
Showing with 14 additions and 7 deletions.
  1. +13 −6 pkgs/misc/emulators/xcpc/default.nix
  2. +1 −1 pkgs/tools/misc/autorandr/default.nix
19 changes: 13 additions & 6 deletions pkgs/misc/emulators/xcpc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }:
{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext
, libDSKSupport ? true, libdsk
, motifSupport ? false, lesstif
}:

with stdenv.lib;
stdenv.mkDerivation rec {
version = "20070122";
name = "xcpc-${version}";
pname = "xcpc";

src = fetchurl {
url = "mirror://sourceforge/xcpc/${name}.tar.gz";
url = "mirror://sourceforge/xcpc/${pname}-${version}.tar.gz";
sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ];

meta = with stdenv.lib; {
buildInputs = [ glib libdsk libXaw libX11 libXext ]
++ optional libDSKSupport libdsk
++ optional motifSupport lesstif;

meta = {
description = "A portable Amstrad CPC 464/664/6128 emulator written in C";
homepage = https://www.xcpc-emulator.net;
homepage = "https://www.xcpc-emulator.net";
license = licenses.gpl2Plus;
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
2 changes: 1 addition & 1 deletion pkgs/tools/misc/autorandr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ in

meta = {
homepage = https://github.com/phillipberndt/autorandr/;
description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
description = "Automatically select a display configuration based on connected devices";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.coroa ];
platforms = stdenv.lib.platforms.unix;