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: c9c79d7dba8e
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: 3a70659b4d01
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 9, 2020

  1. enlightenment.efl: add dependence mint-x-icons 

    It provides the Mint-X icon theme, which is a parent of the
Enlightenment-X icon theme.
    @romildo
    romildo committed Jun 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3c1ac42 View commit details

Commits on Jun 11, 2020

  1. abcmidi: 2020.03.25 -> 2020.06.07

    @dotlambda
    dotlambda committed Jun 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8deeeb0 View commit details

  2. Merge pull request #89918 from romildo/upd.efl 

    enlightenment.efl: add dependence mint-x-icons
    @romildo
    romildo authored Jun 11, 2020
    Copy the full SHA
    3a70659 View commit details
Showing with 6 additions and 3 deletions.
  1. +4 −1 pkgs/desktops/enlightenment/efl.nix
  2. +2 −2 pkgs/tools/audio/abcmidi/default.nix
5 changes: 4 additions & 1 deletion pkgs/desktops/enlightenment/efl.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@
, luajit
, lz4
, mesa
, mint-x-icons
, openjpeg
, openssl
, poppler
@@ -92,7 +93,7 @@ stdenv.mkDerivation rec {
xorg.libXcursor
xorg.xorgproto
zlib
# still missing parent icon themes: Mint-X, RAVE-X, Faenza
# still missing parent icon themes: RAVE-X, Faenza
];

propagatedBuildInputs = [
@@ -107,6 +108,7 @@ stdenv.mkDerivation rec {
fribidi
ghostscript
harfbuzz
hicolor-icon-theme # for the icon theme
jbig2dec
libdrm
libinput
@@ -117,6 +119,7 @@ stdenv.mkDerivation rec {
libwebp
libxkbcommon
luajit
mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X
openjpeg
poppler
utillinux
4 changes: 2 additions & 2 deletions pkgs/tools/audio/abcmidi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2020.03.25";
version = "2020.06.07";

src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "0rzif8idsja8ryhx0y4zdk8lhn36h10ahfjqa8bmif0rdbyab0kv";
sha256 = "06jpawwm4zcss9mi2bjdbdkkfr8cw1q9cpzplq5r83z8pljqb12l";
};

# There is also a file called "makefile" which seems to be preferred by the standard build phase