about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-11-03 12:32:29 +0100
committerGitHub <noreply@github.com>2017-11-03 12:32:29 +0100
commit9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d (patch)
tree0ad1e4caceeaf0a08ea764cd2b0d8ed3d868308e /pkgs
parent6fb9706a1cd4804791a691b0525a88ea525f6f06 (diff)
parentc8943272153d1ad5c7dd1329bf0045f2834d52dd (diff)
downloadnixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar.gz
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar.bz2
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar.lz
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar.xz
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.tar.zst
nixlib-9a1534496a0f2d8c6f10ebe7e4c75970d77ef28d.zip
Merge pull request #31149 from LumiGuide/pgmanage-10.0.2
postage: replaced by pgmanage-10.0.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/pgmanage/default.nix (renamed from pkgs/applications/misc/postage/default.nix)16
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index eeb879ee6e48..fd66ce8fc31c 100644
--- a/pkgs/applications/misc/postage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
-  name = "postage-${version}";
-  version = "3.2.18";
+  name = "pgmanage-${version}";
+  version = "10.0.2";
 
   src = fetchFromGitHub {
-    owner  = "workflowproducts";
-    repo   = "postage";
-    rev    = "eV${version}";
-    sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";
+    owner  = "pgManage";
+    repo   = "pgManage";
+    rev    = "v${version}";
+    sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
   };
 
   buildInputs = [ postgresql openssl ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
       the style of NGINX and Node.js. This heart makes Postage as fast as any
       PostgreSQL interface can hope to be.
     '';
-    homepage = http://www.workflowproducts.com/postage.html;
-    license = licenses.asl20;
+    homepage = https://github.com/pgManage/pgManage;
+    license = licenses.postgresql;
     maintainers = [ maintainers.basvandijk ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 20d9ba833549..b6f36aa9de10 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -116,6 +116,7 @@ mapAliases (rec {
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
+  postage = pgmanage; # added 2017-11-03
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
   PPSSPP = ppsspp; # added 2017-10-01
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d226f0aa1ce4..136a47231335 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19319,7 +19319,7 @@ with pkgs;
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
-  postage = callPackage ../applications/misc/postage { };
+  pgmanage = callPackage ../applications/misc/pgmanage { };
 
   pgadmin = callPackage ../applications/misc/pgadmin { };