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

Commits on Oct 18, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    29dcb82 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    28bb32f View commit details

Commits on Nov 26, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8585991 View commit details
Original file line number Diff line number Diff line change
@@ -86,6 +86,8 @@ let

git-crypt = callPackage ./git-crypt { };

git-delete-merged-branches = callPackage ./git-delete-merged-branches { };

git-dit = callPackage ./git-dit {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ lib, python3Packages, fetchFromGitHub, git }:

python3Packages.buildPythonApplication rec {
pname = "git-delete-merged-branches";
version = "6.0.5";

src = fetchFromGitHub {
owner = "hartwork";
repo = pname;
rev = version;
sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp";
};

propagatedBuildInputs = with python3Packages; [
colorama
clintermission
];

checkInputs = [ git ]
++ (with python3Packages; [ parameterized ]);

meta = with lib; {
description = "Command-line tool to delete merged Git branches";
homepage = "https://pypi.org/project/git-delete-merged-branches/";
license = licenses.gpl3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/clintermission/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }:

buildPythonApplication rec {
pname = "clintermission";
version = "0.2.0";

src = fetchFromGitHub {
owner = "sebageek";
repo = pname;
rev = "v${version}";
sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv";
};

propagatedBuildInputs = [ prompt_toolkit ];

disabled = !isPy3k;

# repo contains no tests
doCheck = false;

pythonImportsCheck = [ "clintermission" ];

meta = with lib; {
description = "Non-fullscreen command-line selection menu";
homepage = "https://github.com/sebageek/clintermission";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -1227,6 +1227,8 @@ in {

clint = callPackage ../development/python-modules/clint { };

clintermission = callPackage ../development/python-modules/clintermission { };

clize = callPackage ../development/python-modules/clize { };

clldutils = callPackage ../development/python-modules/clldutils { };