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

Commits on Mar 2, 2019

  1. catimg: init at 2.5.0

    @ryantm
    ryantm committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    146408d View commit details

Commits on Mar 3, 2019

  1. Merge pull request #56726 from ryantm/catimg 

    catimg: init at 2.5.0
    @ryantm
    ryantm authored Mar 3, 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
    2e5c30c View commit details
Showing with 28 additions and 0 deletions.
  1. +26 −0 pkgs/tools/misc/catimg/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
26 changes: 26 additions & 0 deletions pkgs/tools/misc/catimg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, cmake } :

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "catimg";
version = "2.5.0";

src = fetchFromGitHub {
owner = "posva";
repo = pname;
rev = version;
sha256 = "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm";
};

nativeBuildInputs = [ cmake ];

meta = {
license = licenses.mit;
homepage = "https://github.com/posva/catimg";
description = "Insanely fast image printing in your terminal";
maintainers = with maintainers; [ ryantm ];
platforms = platforms.unix;
};

}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16391,6 +16391,8 @@ in

catfish = callPackage ../applications/search/catfish { };

catimg = callPackage ../tools/misc/catimg { };

cava = callPackage ../applications/audio/cava { };

cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };