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

Commits on Nov 25, 2017

  1. pius: move source from Sourceforge to Github 

    Development of pius has moved to Github.

(cherry picked from commit b354f88)
    @kierdavis @Mic92
    kierdavis authored and Mic92 committed Nov 25, 2017
    Copy the full SHA
    e198d74 View commit details

  2. pius: 2.0.11 -> 2.2.4 

    (cherry picked from commit 1f62cfa)
    @kierdavis @Mic92
    kierdavis authored and Mic92 committed Nov 25, 2017

    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
    fc2b9e1 View commit details

  3. pius: add myself as a maintainer 

    (cherry picked from commit 4017f0f)
    @kierdavis @Mic92
    kierdavis authored and Mic92 committed Nov 25, 2017
    Copy the full SHA
    bd80745 View commit details
Showing with 12 additions and 20 deletions.
  1. +12 −20 pkgs/tools/security/pius/default.nix
32 changes: 12 additions & 20 deletions pkgs/tools/security/pius/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
{ fetchurl, stdenv, python, gnupg }:
{ fetchFromGitHub, stdenv, pythonPackages, gnupg }:

let version = "2.0.11"; in
stdenv.mkDerivation {
let version = "2.2.4"; in
pythonPackages.buildPythonApplication {
name = "pius-${version}";
namePrefix = "";

src = fetchurl {
url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2";
sha256 = "0pdbyqz6k0bm182cz81ss7yckmpms5qhrrw0wcr4a1srzcjyzf5f";
src = fetchFromGitHub {
owner = "jaymzh";
repo = "pius";
rev = "v${version}";
sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx";
};

buildInputs = [ python ];

patchPhase = ''
sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg|g'
'';

dontBuild = true;

installPhase = ''
mkdir -p "$out/bin"
cp -v pius "$out/bin"
mkdir -p "$out/doc/pius-${version}"
cp -v README "$out/doc/pius-${version}"
for file in libpius/constants.py pius-keyring-mgr; do
sed -i "$file" -E -e's|/usr/bin/gpg2?|${gnupg}/bin/gpg|g'
done
'';

meta = {
@@ -41,6 +33,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2;

platforms = stdenv.lib.platforms.gnu;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ];
};
}