diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-27 12:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 12:01:20 +0000 |
| commit | 2692c2e4277b0b1b3b01299462f238efccba91e2 (patch) | |
| tree | 9c186fa1b83585cd1f7f82351b8c8d061bfd6395 /pkgs/applications/misc | |
| parent | 4fc4793298c10b1d648a0f269bc44394d5171c9e (diff) | |
| parent | 2431a34ffe50eeb382ea4d7f8d3984e9029d6e04 (diff) | |
| download | nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.gz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.bz2 nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.lz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.xz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.zst nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/misc/coregarage/default.nix | 33 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d27c9c9af65..07e0a62b901 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -94,7 +95,15 @@ mkDerivation rec { python regex sip - zeroconf + (zeroconf.overrideAttrs (oldAttrs: rec { + version = "0.31.0"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + }; + })) # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/coregarage/default.nix new file mode 100644 index 00000000000..6d665479764 --- /dev/null +++ b/pkgs/applications/misc/coregarage/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: + +mkDerivation rec { + pname = "coregarage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libarchive + libarchive-qt + ]; + + meta = with lib; { + description = "A settings manager for the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} |