diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:17:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:49 +0200 |
| commit | eb269336f1e2c691a9d9265d21ad64446c8a9c20 (patch) | |
| tree | 418e1f97493cdf0dc988640693d0711b286c55ff /pkgs/servers | |
| parent | 3da0f6408844904bf490adb1b81dee1481374507 (diff) | |
| download | nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar.gz nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar.bz2 nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar.lz nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar.xz nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.tar.zst nixlib-eb269336f1e2c691a9d9265d21ad64446c8a9c20.zip | |
Revert "postgresql: Add schema version"
This reverts commit 243dc10b0b54fbc840ebae39bcb224d9e0717add.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/postgresql/8.4.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.0.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.1.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/generic.nix | 6 |
4 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 0254bbe951d6..66933f2ad420 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "8.4"; - version = "${psqlSchema}.22"; + version = "8.4.22"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index dba42e4fb110..6c24e6aa4c45 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "9.0"; - version = "${psqlSchema}.20"; + version = "9.0.20"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 138bc4a30232..b481f292ec54 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "9.1"; - version = "${psqlSchema}.16"; + version = "9.1.16"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 721a3b6323f3..06e6d1e79d69 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, version, src, psqlSchema +, version, src , ... }: @@ -90,7 +90,5 @@ stdenv.mkDerivation rec { hydraPlatforms = platforms.linux; }; - passthru = { - inherit readline psqlSchema; - }; + passthru = { inherit readline; }; } |