diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 797cb1f16939..99af050d7baf 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1025,8 +1025,8 @@ pkgs.pgadmin now refers to - pkgs.pgadmin4. If you still need pgadmin3, - use pkgs.pgadmin3. + pkgs.pgadmin4. pgadmin3 + has been removed. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 351ef6448289..3e883625664e 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -377,8 +377,7 @@ In addition to numerous new and upgraded packages, this release has the followin you should change the package you refer to. If you don't need them update your commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. -- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. - If you still need pgadmin3, use `pkgs.pgadmin3`. +- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed. - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release diff --git a/pkgs/tools/admin/pgadmin/3.nix b/pkgs/tools/admin/pgadmin/3.nix deleted file mode 100644 index 4e9d674d0cf6..000000000000 --- a/pkgs/tools/admin/pgadmin/3.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: - -stdenv.mkDerivation rec { - pname = "pgadmin3"; - version = "1.22.2"; - - src = fetchurl { - url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; - }; - - enableParallelBuilding = true; - - buildInputs = [ postgresql wxGTK openssl zlib ]; - - patches = [ - (fetchpatch { - sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk"; - name = "843344.patch"; - url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344"; - }) - ]; - - preConfigure = '' - substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" - ''; - - configureFlags = [ - "--with-pgsql=${postgresql}" - "--with-libxml2=${libxml2.dev}" - "--with-libxslt=${libxslt.dev}" - ]; - - # starting with C++11 narrowing became an error - # and not just a warning. With the current c++ compiler - # pgadmin3 will fail with several "narrowing" errors. - # see https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html#index-Wno-narrowing - makeFlags = "CXXFLAGS=-Wno-narrowing" ; - - meta = with lib; { - description = "PostgreSQL administration GUI tool"; - homepage = "https://www.pgadmin.org"; - license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar wmertens ]; - platforms = platforms.unix; - }; - - postFixup = let - desktopItem = makeDesktopItem { - name = "pgAdmin"; - desktopName = "pgAdmin III"; - genericName = "SQL Administration"; - exec = "pgadmin3"; - icon = "pgAdmin3"; - categories = [ "Development" ]; - mimeTypes = [ "text/html" ]; - }; - in '' - mkdir -p $out/share/pixmaps; - cp pgadmin/include/images/pgAdmin3.png $out/share/pixmaps/; - cp -rv ${desktopItem}/share/applications $out/share/ - ''; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1b3810baaf3e..4159b1dd0bbf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -847,6 +847,7 @@ mapAliases ({ perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 pgadmin = pgadmin4; + pgadmin3 = throw "pgadmin3 was removed for being unmaintained, use pgadmin4 instead."; # Added 2022-03-30 pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08479d754a1c..b1424aa6cce1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34023,10 +34023,6 @@ with pkgs; pgadmin4 = callPackage ../tools/admin/pgadmin { }; - pgadmin3 = callPackage ../tools/admin/pgadmin/3.nix { - openssl = openssl_1_0_2; - }; - pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; pgf = pgf2;