File tree Expand file tree Collapse file tree 3 files changed +20
-8
lines changed Expand file tree Collapse file tree 3 files changed +20
-8
lines changed Original file line number Diff line number Diff line change 2020 options = {
2121 version = lib . mkOption { type = lib . types . str ; } ;
2222 hash = lib . mkOption { type = lib . types . str ; } ;
23+ revision = lib . mkOption {
24+ type = lib . types . nullOr lib . types . str ;
25+ default = null ;
26+ } ;
2327 } ;
2428 } ;
2529 supabaseSubmodule = lib . types . submodule {
5357 orioledb = {
5458 "17" = {
5559 version = "17_11" ;
56- hash = "sha256-RZYU955PmGZExfX2JKw1dIQMMuuswtAXpXjZ9CLbOsw=" ;
60+ hash = "sha256-+YJxHrkd+q2zWbXYeUWdA2OuJRFB7HRb8SDvx9lyuZk=" ;
61+ revision = "00aff1ddc299330310c57ddc087e83b1f819e191" ;
5762 } ;
5863 } ;
5964 } ;
Original file line number Diff line number Diff line change 2020 pkgs . lib . nameValuePair "${ namePrefix } ${ versionSuffix } " (
2121 pkgs . callPackage ./generic.nix {
2222 inherit isOrioleDB ;
23- inherit ( config ) version hash ;
23+ inherit ( config ) version hash revision ;
2424 jitSupport = jitSupport ;
2525 self = pkgs ;
2626 }
Original file line number Diff line number Diff line change 4646 # source specification
4747 version ,
4848 hash ,
49+ revision ? null ,
4950 muslPatches ? { } ,
5051
5152 # for tests
8889 pname = pname + lib . optionalString jitSupport "-jit" ;
8990
9091 src =
91- if ( builtins . match "[0-9][0-9]_.*" version != null ) then
92- fetchurl {
93- url = "https://github.com/orioledb/postgres/archive/refs/tags/patches${ version } .tar.gz" ;
94- inherit hash ;
95- }
92+ if isOrioleDB then
93+ if revision != null then
94+ fetchurl {
95+ url = "https://github.com/orioledb/postgres/archive/${ revision } .tar.gz" ;
96+ inherit hash ;
97+ }
98+ else
99+ fetchurl {
100+ url = "https://github.com/orioledb/postgres/archive/refs/tags/patches${ version } .tar.gz" ;
101+ inherit hash ;
102+ }
96103 else
97104 fetchurl {
98105 url = "mirror://postgresql/source/v${ version } /${ pname } -${ version } .tar.bz2" ;
126133 ++ lib . optionals ( ! stdenv' . isDarwin ) [ libossp_uuid ]
127134 ++
128135 lib . optionals
129- ( ( builtins . match "[0-9][0-9]_.*" version != null ) || ( lib . versionAtLeast version "17" ) )
136+ ( isOrioleDB || ( lib . versionAtLeast version "17" ) )
130137 [
131138 perl
132139 bison
You can’t perform that action at this time.
0 commit comments