From 021e557be323eb63f0117cbd4911afee80880cb3 Mon Sep 17 00:00:00 2001 From: j-keck Date: Wed, 7 Jan 2015 13:57:21 +0100 Subject: [PATCH] postgresql: remove 9.4betaX final version 9.4.0 added per commit: 73839ca --- pkgs/servers/sql/postgresql/9.4beta2.nix | 44 ------------------------ pkgs/servers/sql/postgresql/9.4beta3.nix | 44 ------------------------ pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 91 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/9.4beta2.nix delete mode 100644 pkgs/servers/sql/postgresql/9.4beta3.nix diff --git a/pkgs/servers/sql/postgresql/9.4beta2.nix b/pkgs/servers/sql/postgresql/9.4beta2.nix deleted file mode 100644 index 2608dcae5042..000000000000 --- a/pkgs/servers/sql/postgresql/9.4beta2.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: - -with stdenv.lib; - -let version = "9.4beta2"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "131q3b9hv4pw02xhjsfi5is9i7pp5f4srxwfdn8ifs9qb37hcx2n"; - }; - - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; - - patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.4"; - }; - - meta = { - homepage = http://www.postgresql.org/ ; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/servers/sql/postgresql/9.4beta3.nix b/pkgs/servers/sql/postgresql/9.4beta3.nix deleted file mode 100644 index d446a4ab75b7..000000000000 --- a/pkgs/servers/sql/postgresql/9.4beta3.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: - -with stdenv.lib; - -let version = "9.4beta3"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0pdawsmrzwgf2c4g18xlgzv6q34kd8q2p1nxag0xaw4sbdmdilas"; - }; - - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; - - patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.4"; - }; - - meta = { - homepage = http://www.postgresql.org/ ; - description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52fa2315b19f..1b5d5078be45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7864,9 +7864,6 @@ let postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; - postgresql94beta2 = callPackage ../servers/sql/postgresql/9.4beta2.nix { }; - postgresql94beta3 = callPackage ../servers/sql/postgresql/9.4beta3.nix { }; - postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { }; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };