commit 73774ef8f9cd496162e53d8a4b1f06b382af21c9 · pyrox.dev/nixpkgs

+1 -1

lib/default.nix

···

       24
       24
        
           maintainers = import ./maintainers-list.nix;

     

       25
       25
        
           meta = callLibs ./meta.nix;

     

       26
       26
        
           sources = callLibs ./sources.nix;

     

       27
       27
       -
       

     

       27
       27
       +
           versions = callLibs ./versions.nix;

     

       28
       28
        
       

     

       29
       29
        
           # module system

     

       30
       30
        
           modules = callLibs ./modules.nix;

+47

lib/versions.nix

···

       1
       1
       +
       /* Version string functions. */

     

       2
       2
       +
       { lib }:

     

       3
       3
       +
       

     

       4
       4
       +
       let

     

       5
       5
       +
       

     

       6
       6
       +
         splitVersion = builtins.splitVersion or (lib.splitString ".");

     

       7
       7
       +
       

     

       8
       8
       +
       in

     

       9
       9
       +
       

     

       10
       10
       +
       rec {

     

       11
       11
       +
       

     

       12
       12
       +
         /* Get the major version string from a string.

     

       13
       13
       +
       

     

       14
       14
       +
           Example:

     

       15
       15
       +
             major "1.2.3"

     

       16
       16
       +
             => "1"

     

       17
       17
       +
         */

     

       18
       18
       +
         major = v: builtins.elemAt (splitVersion v) 0;

     

       19
       19
       +
       

     

       20
       20
       +
         /* Get the minor version string from a string.

     

       21
       21
       +
       

     

       22
       22
       +
           Example:

     

       23
       23
       +
             minor "1.2.3"

     

       24
       24
       +
             => "2"

     

       25
       25
       +
         */

     

       26
       26
       +
         minor = v: builtins.elemAt (splitVersion v) 1;

     

       27
       27
       +
       

     

       28
       28
       +
         /* Get the patch version string from a string.

     

       29
       29
       +
       

     

       30
       30
       +
           Example:

     

       31
       31
       +
             patch "1.2.3"

     

       32
       32
       +
             => "3"

     

       33
       33
       +
         */

     

       34
       34
       +
         patch = v: builtins.elemAt (splitVersion v) 2;

     

       35
       35
       +
       

     

       36
       36
       +
         /* Get string of the first two parts (major and minor)

     

       37
       37
       +
            of a version string.

     

       38
       38
       +
       

     

       39
       39
       +
            Example:

     

       40
       40
       +
              majorMinor "1.2.3"

     

       41
       41
       +
              => "1.2"

     

       42
       42
       +
         */

     

       43
       43
       +
         majorMinor = v:

     

       44
       44
       +
           builtins.concatStringsSep "."

     

       45
       45
       +
           (lib.take 2 (splitVersion v));

     

       46
       46
       +
       

     

       47
       47
       +
       }

+2 -4

pkgs/tools/networking/haproxy/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "haproxy";

     

       12
       12
       -
         majorVersion = "1.7";

     

       13
       13
       -
         minorVersion = "9";

     

       14
       14
       -
         version = "${majorVersion}.${minorVersion}";

     

       12
       12
       +
         version = "1.7.9";

     

       15
       13
        
         name = "${pname}-${version}";

     

       16
       14
        
       

     

       17
       15
        
         src = fetchurl {

     

       18
       18
       -
           url = "https://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz";

     

       16
       16
       +
           url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";

     

       19
       17
        
           sha256 = "1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e";

     

       20
       18
        
         };

     

       21
       19