Unverified Commit 4ad1a0ec authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

postgresqlPackages: refactor finalAttrs support (#398194)

parents be15e0c3 05254729

pkgs/servers/sql/postgresql/ext/age.nix

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ let 
    "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw=";

  };

in

postgresqlBuildExtension rec {

postgresqlBuildExtension (finalAttrs: {

  pname = "age";

  version = "1.5.0-rc0";
@@ -27,7 +27,7 @@ postgresqlBuildExtension rec { 
    owner = "apache";

    repo = "age";

    tag = "PG${lib.versions.major postgresql.version}/v${

      builtins.replaceStrings [ "." ] [ "_" ] version

      builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version

    }";

    hash =

      hashes.${lib.versions.major postgresql.version}
@@ -42,7 +42,7 @@ postgresqlBuildExtension rec { 


  enableUpdateScript = false;

  passthru.tests = stdenv.mkDerivation {

    inherit version src;

    inherit (finalAttrs) version src;



    pname = "age-regression";
@@ -50,7 +50,7 @@ postgresqlBuildExtension rec { 


    buildPhase =

      let

        postgresqlAge = postgresql.withPackages (ps: [ ps.age ]);

        postgresqlAge = postgresql.withPackages (_: [ finalAttrs.finalPackage ]);

      in

      ''

        # The regression tests need to be run in the order specified in the Makefile.
@@ -76,9 +76,9 @@ postgresqlBuildExtension rec { 
    broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes);

    description = "Graph database extension for PostgreSQL";

    homepage = "https://age.apache.org/";

    changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE";

    changelog = "https://github.com/apache/age/raw/v${finalAttrs.src.rev}/RELEASE";

    maintainers = [ ];

    platforms = postgresql.meta.platforms;

    license = lib.licenses.asl20;

  };

}
 
})

pkgs/servers/sql/postgresql/ext/citus.nix

+4 −4
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 
  stdenv,

}:



postgresqlBuildExtension rec {

postgresqlBuildExtension (finalAttrs: {

  pname = "citus";

  version = "13.0.3";



  src = fetchFromGitHub {

    owner = "citusdata";

    repo = "citus";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-tQ2YkMUeziz+dhfXtfuK0x8PWH3vfoJiVbE+YvQ/Gzc=";

  };
@@ -42,9 +42,9 @@ postgresqlBuildExtension rec { 
    broken = lib.versionOlder postgresql.version "15";

    description = "Distributed PostgreSQL as an extension";

    homepage = "https://www.citusdata.com/";

    changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";

    changelog = "https://github.com/citusdata/citus/blob/${finalAttrs.src.rev}/CHANGELOG.md";

    license = lib.licenses.agpl3Only;

    maintainers = [ ];

    inherit (postgresql.meta) platforms;

  };

}
 
})

pkgs/servers/sql/postgresql/ext/hypopg.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 
  stdenv,

}:



postgresqlBuildExtension rec {

postgresqlBuildExtension (finalAttrs: {

  pname = "hypopg";

  version = "1.4.1";



  src = fetchFromGitHub {

    owner = "HypoPG";

    repo = "hypopg";

    tag = version;

    tag = finalAttrs.version;

    hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM=";

  };
@@ -31,4 +31,4 @@ postgresqlBuildExtension rec { 
    platforms = postgresql.meta.platforms;

    maintainers = with lib.maintainers; [ bbigras ];

  };

}
 
})

pkgs/servers/sql/postgresql/ext/periods.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
  stdenv,

}:



postgresqlBuildExtension rec {

postgresqlBuildExtension (finalAttrs: {

  pname = "periods";

  version = "1.2.3";



  src = fetchFromGitHub {

    owner = "xocolatl";

    repo = "periods";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo=";

  };
@@ -24,4 +24,4 @@ postgresqlBuildExtension rec { 
    platforms = postgresql.meta.platforms;

    license = lib.licenses.postgresql;

  };

}
 
})

pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
  stdenv,

}:



postgresqlBuildExtension rec {

postgresqlBuildExtension (finalAttrs: {

  pname = "pg_auto_failover";

  version = "2.2";



  src = fetchFromGitHub {

    owner = "citusdata";

    repo = "pg_auto_failover";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-lsnVry+5n08kLOun8u0B7XFvI5ijTKJtFJ84fixMHe4=";

  };
@@ -23,9 +23,9 @@ postgresqlBuildExtension rec { 
    description = "PostgreSQL extension and service for automated failover and high-availability";

    mainProgram = "pg_autoctl";

    homepage = "https://github.com/citusdata/pg_auto_failover";

    changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md";

    changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${finalAttrs.version}/CHANGELOG.md";

    maintainers = [ ];

    platforms = postgresql.meta.platforms;

    license = lib.licenses.postgresql;

  };

}
 
})