~andir/nixpkgs-dev

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
11 2

[PATCH nixpkgs 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210425093732.2562-1-mail@beyermatthias.de>
DKIM signature
missing
Download raw message
Patch: +41 -0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/tools/security/plasma-pass/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
new file mode 100644
index 00000000000..25415941b03
--- /dev/null
+++ b/pkgs/tools/security/plasma-pass/default.nix
@@ -0,0 +1,39 @@
{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
, ki18n
, kitemmodels
, oathToolkit
, qgpgme
, plasma-framework
, qt5 }:

mkDerivation rec {
  pname = "plasma-pass";
  version = "1.2.0";

  src = fetchgit {
    url = "https://invent.kde.org/plasma/plasma-pass";
    rev = "v${version}";
    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
  };

  buildInputs  = [
    ki18n
    kitemmodels
    oathToolkit
    qgpgme
    plasma-framework
    qt5.qtbase
    qt5.qtdeclarative
  ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];

  meta = with lib; {
    description = "a Plasma applet to access password from pass, the standard UNIX password manager";
    homepage = "https://github.com/KDE/plasma-pass";
    license = licenses.gpl3;
    maintainers = with maintainers; [ matthiasbeyer ];
    platforms = platforms.unix;
  };
}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f781f0e10..6fde283f6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28534,6 +28534,8 @@ in

  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

  inherit (callPackages ../applications/misc/redshift {
    inherit (python3Packages) python pygobject3 pyxdg wrapPython;
    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
-- 
2.29.3
Details
Message ID
<20210426102609.gdsgrkwbtguemt6l@quiver>
In-Reply-To
<20210425093732.2562-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
On Sun, Apr 25, 2021 at 11:37:32AM +0200, Matthias Beyer wrote:
>Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
>---
> pkgs/tools/security/plasma-pass/default.nix | 39 +++++++++++++++++++++
> pkgs/top-level/all-packages.nix             |  2 ++
> 2 files changed, 41 insertions(+)
> create mode 100644 pkgs/tools/security/plasma-pass/default.nix
>
>diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
>new file mode 100644
>index 00000000000..25415941b03
>--- /dev/null
>+++ b/pkgs/tools/security/plasma-pass/default.nix
>@@ -0,0 +1,39 @@
>+{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
>+, ki18n
>+, kitemmodels
>+, oathToolkit
>+, qgpgme
>+, plasma-framework
>+, qt5 }:
>+
>+mkDerivation rec {
>+  pname = "plasma-pass";
>+  version = "1.2.0";
>+
>+  src = fetchgit {
>+    url = "https://invent.kde.org/plasma/plasma-pass";
>+    rev = "v${version}";
>+    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
>+  };
>+
>+  buildInputs  = [
>+    ki18n
>+    kitemmodels
>+    oathToolkit
>+    qgpgme
>+    plasma-framework
>+    qt5.qtbase
>+    qt5.qtdeclarative
>+  ];
>+
>+  nativeBuildInputs = [ cmake extra-cmake-modules ];
>+
>+  meta = with lib; {
>+    description = "a Plasma applet to access password from pass, the standard UNIX password manager";
>+    homepage = "https://github.com/KDE/plasma-pass";
>+    license = licenses.gpl3;

nit: people call me out on this whenever I submit a PR these days:
gpl3Plus or gpl3Only ?

>+    maintainers = with maintainers; [ matthiasbeyer ];
>+    platforms = platforms.unix;
>+  };
>+}
>+
>diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
>index f8f781f0e10..6fde283f6e6 100644
>--- a/pkgs/top-level/all-packages.nix
>+++ b/pkgs/top-level/all-packages.nix
>@@ -28534,6 +28534,8 @@ in
>
>   plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
>
>+  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };
>+
>   inherit (callPackages ../applications/misc/redshift {
>     inherit (python3Packages) python pygobject3 pyxdg wrapPython;
>     inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
>-- 
>2.29.3
>
Details
Message ID
<20210426121450.pxvut5fzffwoc34a@hoshi>
In-Reply-To
<20210426102609.gdsgrkwbtguemt6l@quiver> (view parent)
DKIM signature
missing
Download raw message
On 26-04-2021 03:26:09, William Casarin wrote:
> nit: people call me out on this whenever I submit a PR these days:
> gpl3Plus or gpl3Only ?

Good catch, this is actually LGPL2.1-or-later. Will resend.

[PATCH nixpkgs v2 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426121532.17300-1-mail@beyermatthias.de>
In-Reply-To
<20210425093732.2562-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
Patch: +41 -0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/tools/security/plasma-pass/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
new file mode 100644
index 00000000000..25415941b03
--- /dev/null
+++ b/pkgs/tools/security/plasma-pass/default.nix
@@ -0,0 +1,39 @@
{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
, ki18n
, kitemmodels
, oathToolkit
, qgpgme
, plasma-framework
, qt5 }:

mkDerivation rec {
  pname = "plasma-pass";
  version = "1.2.0";

  src = fetchgit {
    url = "https://invent.kde.org/plasma/plasma-pass";
    rev = "v${version}";
    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
  };

  buildInputs  = [
    ki18n
    kitemmodels
    oathToolkit
    qgpgme
    plasma-framework
    qt5.qtbase
    qt5.qtdeclarative
  ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];

  meta = with lib; {
    description = "a Plasma applet to access password from pass, the standard UNIX password manager";
    homepage = "https://github.com/KDE/plasma-pass";
    license = licenses.gpl3;
    maintainers = with maintainers; [ matthiasbeyer ];
    platforms = platforms.unix;
  };
}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f781f0e10..6fde283f6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28534,6 +28534,8 @@ in

  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

  inherit (callPackages ../applications/misc/redshift {
    inherit (python3Packages) python pygobject3 pyxdg wrapPython;
    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
-- 
2.29.3

Re: [PATCH nixpkgs v2 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426121852.4fdlo7phqgvr7a74@hoshi>
In-Reply-To
<20210426121532.17300-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
On 26-04-2021 14:15:32, Matthias Beyer wrote:
> +    license = licenses.gpl3;

WTF just happened. This is broken as well. Hm. Maybe I messed up once again.
Hang on...

[PATCH nixpkgs v3 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426121952.17969-1-mail@beyermatthias.de>
In-Reply-To
<20210426121532.17300-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
Patch: +41 -0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/tools/security/plasma-pass/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
new file mode 100644
index 00000000000..aefd75c7ab6
--- /dev/null
+++ b/pkgs/tools/security/plasma-pass/default.nix
@@ -0,0 +1,39 @@
{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
, ki18n
, kitemmodels
, oathToolkit
, qgpgme
, plasma-framework
, qt5 }:

mkDerivation rec {
  pname = "plasma-pass";
  version = "1.2.0";

  src = fetchgit {
    url = "https://invent.kde.org/plasma/plasma-pass";
    rev = "v${version}";
    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
  };

  buildInputs  = [
    ki18n
    kitemmodels
    oathToolkit
    qgpgme
    plasma-framework
    qt5.qtbase
    qt5.qtdeclarative
  ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];

  meta = with lib; {
    description = "a Plasma applet to access password from pass, the standard UNIX password manager";
    homepage = "https://github.com/KDE/plasma-pass";
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [ matthiasbeyer ];
    platforms = platforms.unix;
  };
}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f781f0e10..6fde283f6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28534,6 +28534,8 @@ in

  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

  inherit (callPackages ../applications/misc/redshift {
    inherit (python3Packages) python pygobject3 pyxdg wrapPython;
    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
-- 
2.29.3

Re: [PATCH nixpkgs v3 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426164135.7oi3jev4it7xfyv6@quiver>
In-Reply-To
<20210426121952.17969-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
Reviewed-by: William Casarin <jb55@jb55.com>

Re: [PATCH nixpkgs v3 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426182923.4vwea6aywp64rjfh@quiver>
In-Reply-To
<20210426164135.7oi3jev4it7xfyv6@quiver> (view parent)
DKIM signature
missing
Download raw message
https://github.com/NixOS/nixpkgs/pull/120770

[PATCH nixpkgs v4 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426194545.10065-1-mail@beyermatthias.de>
In-Reply-To
<20210426182923.4vwea6aywp64rjfh@quiver> (view parent)
DKIM signature
missing
Download raw message
Patch: +41 -0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/tools/security/plasma-pass/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
new file mode 100644
index 00000000000..a6c204bc5ea
--- /dev/null
+++ b/pkgs/tools/security/plasma-pass/default.nix
@@ -0,0 +1,39 @@
{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
, ki18n
, kitemmodels
, oathToolkit
, qgpgme
, plasma-framework
, qt5 }:

mkDerivation rec {
  pname = "plasma-pass";
  version = "1.2.0";

  src = fetchgit {
    url = "https://invent.kde.org/plasma/plasma-pass";
    rev = "v${version}";
    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
  };

  buildInputs  = [
    ki18n
    kitemmodels
    oathToolkit
    qgpgme
    plasma-framework
    qt5.qtbase
    qt5.qtdeclarative
  ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];

  meta = with lib; {
    description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
    homepage = "https://github.com/KDE/plasma-pass";
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [ matthiasbeyer ];
    platforms = platforms.unix;
  };
}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f781f0e10..6fde283f6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28534,6 +28534,8 @@ in

  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

  inherit (callPackages ../applications/misc/redshift {
    inherit (python3Packages) python pygobject3 pyxdg wrapPython;
    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
-- 
2.29.3

Re: [PATCH nixpkgs v4 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210426203159.g3oqgjppoo6zdijo@quiver>
In-Reply-To
<20210426194545.10065-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
thx,

pushed

To github.com:jb55/nixpkgs
  + f62d3e6d8e0...b15197f0ed0 plasma-pass -> plasma-pass (forced update)


range-diff v3->v4:

1:  f62d3e6d8e0 ! 1:  b15197f0ed0 plasma-pass: init at 1.2.0
     @@ Commit message
      
          Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
          Reviewed-by: William Casarin <jb55@jb55.com>
     -    Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210426121952.17969-1-mail@beyermatthias.de%3E
     +    Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210426194545.10065-1-mail@beyermatthias.de%3E
      
       ## pkgs/tools/security/plasma-pass/default.nix (new) ##
      @@
     @@ pkgs/tools/security/plasma-pass/default.nix (new)
      +  nativeBuildInputs = [ cmake extra-cmake-modules ];
      +
      +  meta = with lib; {
     -+    description = "a Plasma applet to access password from pass, the standard UNIX password manager";
     ++    description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
      +    homepage = "https://github.com/KDE/plasma-pass";
      +    license = licenses.lgpl21Plus;
      +    maintainers = with maintainers; [ matthiasbeyer ];

[PATCH nixpkgs v5 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210427123311.517-1-mail@beyermatthias.de>
In-Reply-To
<20210426194545.10065-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
Patch: +43 -0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/tools/security/plasma-pass/default.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
new file mode 100644
index 00000000000..20f64b725f1
--- /dev/null
+++ b/pkgs/tools/security/plasma-pass/default.nix
@@ -0,0 +1,41 @@
{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
, ki18n
, kitemmodels
, oathToolkit
, qgpgme
, plasma-framework
, qt5 }:

mkDerivation rec {
  pname = "plasma-pass";
  version = "1.2.0";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "plasma";
    repo = "plasma-pass";
    rev = "v${version}";
    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
  };

  buildInputs  = [
    ki18n
    kitemmodels
    oathToolkit
    qgpgme
    plasma-framework
    qt5.qtbase
    qt5.qtdeclarative
  ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];

  meta = with lib; {
    description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
    homepage = "https://invent.kde.org/plasma/plasma-pass";
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [ matthiasbeyer ];
    platforms = platforms.unix;
  };
}

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f781f0e10..6fde283f6e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28534,6 +28534,8 @@ in

  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

  inherit (callPackages ../applications/misc/redshift {
    inherit (python3Packages) python pygobject3 pyxdg wrapPython;
    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
-- 
2.29.3

Re: [PATCH nixpkgs v5 1/1] plasma-pass: init at 1.2.0

Details
Message ID
<20210427155840.qqld3wxnd6nmqszx@quiver>
In-Reply-To
<20210427123311.517-1-mail@beyermatthias.de> (view parent)
DKIM signature
missing
Download raw message
Thanks!

Pushed

To github.com:jb55/nixpkgs
  + b15197f0ed0...0db1ac4ec26 HEAD -> plasma-pass (forced update)


$ git range-diff b15197f0ed0...0db1ac4ec26


  1:  b15197f0ed0 ! 95:  0db1ac4ec26 plasma-pass: init at 1.2.0
     @@ Metadata
       ## Commit message ##
          plasma-pass: init at 1.2.0
      
     -    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
          Reviewed-by: William Casarin <jb55@jb55.com>
     -    Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210426194545.10065-1-mail@beyermatthias.de%3E
     +    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
     +    Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210427123311.517-1-mail@beyermatthias.de%3E
      
       ## pkgs/tools/security/plasma-pass/default.nix (new) ##
      @@
     -+{ mkDerivation, lib, fetchgit, cmake, extra-cmake-modules
     ++{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
      +, ki18n
      +, kitemmodels
      +, oathToolkit
     @@ pkgs/tools/security/plasma-pass/default.nix (new)
      +  pname = "plasma-pass";
      +  version = "1.2.0";
      +
     -+  src = fetchgit {
     -+    url = "https://invent.kde.org/plasma/plasma-pass";
     ++  src = fetchFromGitLab {
     ++    domain = "invent.kde.org";
     ++    owner = "plasma";
     ++    repo = "plasma-pass";
      +    rev = "v${version}";
      +    sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
      +  };
     @@ pkgs/tools/security/plasma-pass/default.nix (new)
      +
      +  meta = with lib; {
      +    description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
     -+    homepage = "https://github.com/KDE/plasma-pass";
     ++    homepage = "https://invent.kde.org/plasma/plasma-pass";
      +    license = licenses.lgpl21Plus;
      +    maintainers = with maintainers; [ matthiasbeyer ];
      +    platforms = platforms.unix;
Reply to thread Export thread (mbox)