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: 32b6f52d99c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 529465d1718b
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 3, 2020

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    1f5a97b View commit details

Commits on Apr 11, 2020

  1. catcli: init at 0.5.13

    petersjt014 committed Apr 11, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    aa84e47 View commit details
  2. Merge pull request #84078 from petersjt014/master

    catcli: init at 0.5.13
    Ma27 authored Apr 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    529465d View commit details
Showing with 38 additions and 0 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +30 −0 pkgs/tools/filesystems/catcli/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -5771,6 +5771,12 @@
githubId = 5515707;
name = "Peter Romfeld";
};
petersjt014 = {
email = "petersjt014@gmail.com";
github = "petersjt014";
githubId = 29493551;
name = "Josh Peters";
};
peti = {
email = "simons@cryp.to";
github = "peti";
30 changes: 30 additions & 0 deletions pkgs/tools/filesystems/catcli/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenv
, fetchFromGitHub
, buildPythonApplication
, docopt, anytree
}:

buildPythonApplication rec {

pname = "catcli";
version = "0.5.13";

src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "v${version}";
sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i";
};

propagatedBuildInputs = [ docopt anytree ];

postPatch = '' patchShebangs . '';

meta = with stdenv.lib; {
description = "The command line catalog tool for your offline data";
homepage = "https://github.com/deadc0de6/catcli";
license = licenses.gpl3;
maintainers = with maintainers; [ petersjt014 ];
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -828,6 +828,8 @@ in

certigo = callPackage ../tools/admin/certigo { };

catcli = python3Packages.callPackage ../tools/filesystems/catcli { };

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

chipsec = callPackage ../tools/security/chipsec {