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

Commits on Nov 7, 2018

  1. hovercraft: 2.0 -> 2.6 

    move to top-level, use buildPythonApplication
    @makefu
    makefu committed Nov 7, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    elevenfive Matthew Zavislak
    GPG key ID: D8806E3DD5033C7D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    75f5fbe View commit details

Commits on Nov 10, 2018

  1. hovercraft: nitpicks

    @Mic92
    Mic92 committed Nov 10, 2018

    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
    5ac78fe View commit details

  2. Merge pull request #49841 from makefu/pkgs/hovercraft/update 

    hovercraft: 2.0 -> 2.6
    @Mic92
    Mic92 authored Nov 10, 2018
    Copy the full SHA
    0c9b49d View commit details
35 changes: 35 additions & 0 deletions pkgs/applications/misc/hovercraft/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib
, buildPythonApplication
, isPy3k
, fetchFromGitHub
, manuel
, setuptools
, docutils
, lxml
, svg-path
, pygments
, watchdog
}:

buildPythonApplication rec {
pname = "hovercraft";
version = "2.6";
disabled = ! isPy3k;

src = fetchFromGitHub {
owner = "regebro";
repo = "hovercraft";
rev = version;
sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp";
};

checkInputs = [ manuel ];
propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ];

meta = with lib; {
description = "Makes impress.js presentations from reStructuredText";
homepage = https://github.com/regebro/hovercraft;
license = licenses.mit;
maintainers = with maintainers; [ goibhniu makefu ];
};
}
36 changes: 0 additions & 36 deletions pkgs/development/python-modules/hovercraft/default.nix
View file

This file was deleted.

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17268,6 +17268,8 @@ with pkgs;
gtk = gtk3;
};

hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };

howl = callPackage ../applications/editors/howl { };

ht = callPackage ../applications/editors/ht { };
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1696,8 +1696,6 @@ in {

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

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

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

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