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: edf50200429c
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: 93506c3a0b09
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Sep 21, 2018

  1. acl2: 8.1.post.2018.09.20 -> 8.1; turns out there is a release 

    (cherry picked from commit 60b6d5f)
    @7c6f434c @xeji
    7c6f434c authored and xeji committed Sep 21, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    fd69306 View commit details

  2. ephoto: add dependency on mesa_noglu.dev (#47136) 

    (cherry picked from commit e372ab4)
    @romildo @xeji
    romildo authored and xeji committed Sep 21, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    c16b9da View commit details

  3. libretro.mame: 2017-03-02 -> 2018-09-13 

    Fixes build of the MAME libretro core.

Closes #47137.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
    @hrdinka
    hrdinka committed Sep 21, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    fc3cfe3 View commit details

  4. haskellPackages.mandrill: fix build for ghc843 

    (cherry picked from commit 73862bf)
    @basvandijk
    basvandijk committed Sep 21, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    93506c3 View commit details
13 changes: 10 additions & 3 deletions pkgs/desktops/enlightenment/ephoto.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:

stdenv.mkDerivation rec {
name = "ephoto-${version}";
@@ -9,9 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
};

nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
nativeBuildInputs = [
(pkgconfig.override { vanilla = true; })
mesa_noglu.dev # otherwise pkg-config does not find gbm
makeWrapper
];

buildInputs = [ efl pcre ];
buildInputs = [
efl
pcre
];

meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1137,4 +1137,10 @@ self: super: {
safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };

# https://github.com/adinapoli/mandrill/pull/52
mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
});

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/acl2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@

let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
"8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6";
"8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
};
revs = {
"8.0" = "8.0";
"8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770";
"8.1" = "8.1";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
version = "8.0.post.2018.09.20";
version = "8.1";

src = fetchFromGitHub {
owner = "acl2-devel";
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/retroarch/cores.nix
View file
Original file line number Diff line number Diff line change
@@ -234,8 +234,8 @@ in with stdenv.lib.licenses;
core = "mame";
src = fetchRetro {
repo = "mame";
rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
rev = "9f9e6b6c9bde4d50c72e9a5c80496a1fec6b8aa9";
sha256 = "0lfj8bjchkcvyb5x0x29cg10fkfklxndk80947k4qfysclijxpkv";
};
description = "Port of MAME to libretro";
license = gpl2Plus;