pyrox.dev / nixpkgs
lol
fork atom

pkgsMusl.postgresql: remove icu-collations-hack patch

This was introduced in #228349, but doesn't seem necessary to build for pkgsMusl.

In fact the patch itself seems to be very specific about a stripped down icu
package in Alpine Linux, which does not apply to nixpkgs.

Wolfgang Walther 30fa4dca 1682b4cc

options
unified split
Changed files
+1 -27
pkgs
servers
sql
postgresql
12.nix
13.nix
14.nix
15.nix
16.nix
generic.nix
-6
pkgs/servers/sql/postgresql/12.nix 
···

       
1

       
1

       
 

       
import ./generic.nix {


     

       
2

       
2

       
 

       
  version = "12.18";


     

       
3

       
3

       
 

       
  hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";


     

       
4

       

       
-

       
  muslPatches = {


     

       
5

       

       
-

       
    icu-collations-hack = {


     

       
6

       

       
-

       
      url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";


     

       
7

       

       
-

       
      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";


     

       
8

       

       
-

       
    };


     

       
9

       

       
-

       
  };


     

       
10

       
4

       
 

       
}
-4
pkgs/servers/sql/postgresql/13.nix 
···

       
2

       
2

       
 

       
  version = "13.14";


     

       
3

       
3

       
 

       
  hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";


     

       
4

       
4

       
 

       
  muslPatches = {


     

       
5

       

       
-

       
    icu-collations-hack = {


     

       
6

       

       
-

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";


     

       
7

       

       
-

       
      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";


     

       
8

       

       
-

       
    };


     

       
9

       
5

       
 

       
    disable-test-collate-icu-utf8 = {


     

       
10

       
6

       
 

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";


     

       
11

       
7

       
 

       
      hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";
-4
pkgs/servers/sql/postgresql/14.nix 
···

       
2

       
2

       
 

       
  version = "14.11";


     

       
3

       
3

       
 

       
  hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";


     

       
4

       
4

       
 

       
  muslPatches = {


     

       
5

       

       
-

       
    icu-collations-hack = {


     

       
6

       

       
-

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";


     

       
7

       

       
-

       
      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";


     

       
8

       

       
-

       
    };


     

       
9

       
5

       
 

       
    disable-test-collate-icu-utf8 = {


     

       
10

       
6

       
 

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";


     

       
11

       
7

       
 

       
      hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
-6
pkgs/servers/sql/postgresql/15.nix 
···

       
1

       
1

       
 

       
import ./generic.nix {


     

       
2

       
2

       
 

       
  version = "15.6";


     

       
3

       
3

       
 

       
  hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";


     

       
4

       

       
-

       
  muslPatches = {


     

       
5

       

       
-

       
    icu-collations-hack = {


     

       
6

       

       
-

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";


     

       
7

       

       
-

       
      hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I=";


     

       
8

       

       
-

       
    };


     

       
9

       

       
-

       
  };


     

       
10

       
4

       
 

       
}
-6
pkgs/servers/sql/postgresql/16.nix 
···

       
1

       
1

       
 

       
import ./generic.nix {


     

       
2

       
2

       
 

       
  version = "16.2";


     

       
3

       
3

       
 

       
  hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";


     

       
4

       

       
-

       
  muslPatches = {


     

       
5

       

       
-

       
    icu-collations-hack = {


     

       
6

       

       
-

       
      url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e";


     

       
7

       

       
-

       
      hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0=";


     

       
8

       

       
-

       
    };


     

       
9

       

       
-

       
  };


     

       
10

       
4

       
 

       
}
+1 -1
pkgs/servers/sql/postgresql/generic.nix 
···

       
16

       
16

       
 

       
      , self, newScope, buildEnv


     

       
17

       
17

       
 

       



     

       
18

       
18

       
 

       
      # source specification


     

       
19

       

       
-

       
      , version, hash, muslPatches


     

       

       
19

       
+

       
      , version, hash, muslPatches ? {}


     

       
20

       
20

       
 

       



     

       
21

       
21

       
 

       
      # for tests


     

       
22

       
22

       
 

       
      , testers, nixosTests