commit f94208fc4206ae255e54bdbf02e56f9c0347eb28 · pyrox.dev/nixpkgs

+27

pkgs/by-name/im/img4tool/configure-version.patch

···

       1
       1
       +
       diff --git a/configure.ac b/configure.ac

     

       2
       2
       +
       index 66da2bd..86278ec 100644

     

       3
       3
       +
       --- a/configure.ac

     

       4
       4
       +
       +++ b/configure.ac

     

       5
       5
       +
       @@ -1,5 +1,5 @@

     

       6
       6
       +
        AC_PREREQ([2.69])

     

       7
       7
       +
       -AC_INIT([img4tool], m4_esyscmd([git rev-list --count HEAD | tr -d '\n']), [tihmstar@gmail.com])

     

       8
       8
       +
       +AC_INIT([img4tool], [tihmstar@gmail.com])

     

       9
       9
       +
        

     

       10
       10
       +
        AC_CANONICAL_SYSTEM

     

       11
       11
       +
        AC_CANONICAL_HOST

     

       12
       12
       +
       @@ -9,11 +9,10 @@ AM_INIT_AUTOMAKE([subdir-objects])

     

       13
       13
       +
        AC_CONFIG_HEADERS([config.h])

     

       14
       14
       +
        AC_CONFIG_MACRO_DIRS([m4])

     

       15
       15
       +
        

     

       16
       16
       +
       -

     

       17
       17
       +
       -AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])

     

       18
       18
       +
       -AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])

     

       19
       19
       +
       -AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])

     

       20
       20
       +
       -AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])

     

       21
       21
       +
       +AC_ARG_WITH([version-commit-count], [],

     

       22
       22
       +
       +  [VERSION_COMMIT_COUNT="$withval"])

     

       23
       23
       +
       +AC_DEFINE([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"], [Git commit count])

     

       24
       24
       +
       +AC_SUBST([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"])

     

       25
       25
       +
        

     

       26
       26
       +
        # Checks for programs.

     

       27
       27
       +
        AC_PROG_CXX

+54

pkgs/by-name/im/img4tool/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         clangStdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         autoreconfHook,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         libgeneral,

     

       8
       8
       +
         libplist,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         lzfse,

     

       11
       11
       +
         git,

     

       12
       12
       +
       }:

     

       13
       13
       +
       clangStdenv.mkDerivation (finalAttrs: {

     

       14
       14
       +
         pname = "img4tool";

     

       15
       15
       +
         version = "217";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "tihmstar";

     

       19
       19
       +
           repo = "img4tool";

     

       20
       20
       +
           tag = finalAttrs.version;

     

       21
       21
       +
           hash = "sha256-67Xfq4jEK9juyaSIgVdWygAePZuyb4Yp8mY+6V66+Aw=";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         # Do not depend on git to calculate version, instead

     

       25
       25
       +
         # pass version via configureFlag

     

       26
       26
       +
         patches = [ ./configure-version.patch ];

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           autoreconfHook

     

       30
       30
       +
           pkg-config

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [

     

       34
       34
       +
           libgeneral

     

       35
       35
       +
           libplist

     

       36
       36
       +
           lzfse

     

       37
       37
       +
           openssl

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         configureFlags = [

     

       41
       41
       +
           "--with-version-commit-count=${finalAttrs.version}"

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         strictDeps = true;

     

       45
       45
       +
       

     

       46
       46
       +
         meta = {

     

       47
       47
       +
           description = "Socket daemon to multiplex connections from and to iOS devices";

     

       48
       48
       +
           homepage = "https://github.com/tihmstar/img4tool";

     

       49
       49
       +
           license = lib.licenses.lgpl3;

     

       50
       50
       +
           platforms = lib.platforms.linux;

     

       51
       51
       +
           maintainers = with lib.maintainers; [ onny ];

     

       52
       52
       +
           mainProgram = "img4tool";

     

       53
       53
       +
         };

     

       54
       54
       +
       })

+26

pkgs/by-name/li/libgeneral/configure-version.patch

···

       1
       1
       +
       diff --git a/configure.ac b/configure.ac

     

       2
       2
       +
       index c214ccd..ab0cdd7 100644

     

       3
       3
       +
       --- a/configure.ac

     

       4
       4
       +
       +++ b/configure.ac

     

       5
       5
       +
       @@ -1,5 +1,5 @@

     

       6
       6
       +
        AC_PREREQ([2.69])

     

       7
       7
       +
       -AC_INIT([libgeneral], m4_esyscmd([git rev-list --count HEAD | tr -d '\n']), [tihmstar@gmail.com])

     

       8
       8
       +
       +AC_INIT([libgeneral], [tihmstar@gmail.com])

     

       9
       9
       +
        

     

       10
       10
       +
        AC_CANONICAL_SYSTEM

     

       11
       11
       +
        AC_CANONICAL_HOST

     

       12
       12
       +
       @@ -9,10 +9,10 @@ AM_INIT_AUTOMAKE([subdir-objects])

     

       13
       13
       +
        AC_CONFIG_HEADERS([config.h])

     

       14
       14
       +
        AC_CONFIG_MACRO_DIRS([m4])

     

       15
       15
       +
        

     

       16
       16
       +
       -AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])

     

       17
       17
       +
       -AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])

     

       18
       18
       +
       -AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])

     

       19
       19
       +
       -AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])

     

       20
       20
       +
       +AC_ARG_WITH([version-commit-count], [],

     

       21
       21
       +
       +  [VERSION_COMMIT_COUNT="$withval"])

     

       22
       22
       +
       +AC_DEFINE([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"], [Git commit count])

     

       23
       23
       +
       +AC_SUBST([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"])

     

       24
       24
       +
        

     

       25
       25
       +
        # Checks for programs.

     

       26
       26
       +
        AC_PROG_CXX([clang++])

+44

pkgs/by-name/li/libgeneral/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         clangStdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         autoreconfHook,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         libimobiledevice,

     

       8
       8
       +
         libusb1,

     

       9
       9
       +
         avahi,

     

       10
       10
       +
       }:

     

       11
       11
       +
       clangStdenv.mkDerivation (finalAttrs: {

     

       12
       12
       +
         pname = "libgeneral";

     

       13
       13
       +
         version = "84";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "tihmstar";

     

       17
       17
       +
           repo = "libgeneral";

     

       18
       18
       +
           tag = finalAttrs.version;

     

       19
       19
       +
           hash = "sha256-D6S7Ha7SQvWDGwiJuKh2Y9YOsw2ytxn70ia3llKC034=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         # Do not depend on git to calculate version, instead

     

       23
       23
       +
         # pass version via configureFlag

     

       24
       24
       +
         patches = [ ./configure-version.patch ];

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           autoreconfHook

     

       28
       28
       +
           pkg-config

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         configureFlags = [

     

       32
       32
       +
           "--with-version-commit-count=${finalAttrs.version}"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         strictDeps = true;

     

       36
       36
       +
       

     

       37
       37
       +
         meta = {

     

       38
       38
       +
           description = "Helper library used by usbmuxd2";

     

       39
       39
       +
           homepage = "https://github.com/tihmstar/libgeneral";

     

       40
       40
       +
           license = lib.licenses.lgpl21;

     

       41
       41
       +
           platforms = lib.platforms.all;

     

       42
       42
       +
           maintainers = with lib.maintainers; [ onny ];

     

       43
       43
       +
         };

     

       44
       44
       +
       })

+5 -31

pkgs/by-name/us/usbmuxd2/package.nix

···

       9
       9
        
         avahi,

     

       10
       10
        
         clang,

     

       11
       11
        
         git,

     

       12
       12
       +
         libgeneral,

     

       12
       13
        
       }:

     

       13
       13
       -
       let

     

       14
       14
       -
       

     

       15
       15
       -
         libgeneral = clangStdenv.mkDerivation rec {

     

       16
       16
       -
           pname = "libgeneral";

     

       17
       17
       -
           version = "74";

     

       18
       18
       -
           src = fetchFromGitHub {

     

       19
       19
       -
             owner = "tihmstar";

     

       20
       20
       -
             repo = "libgeneral";

     

       21
       21
       -
             rev = "refs/tags/${version}";

     

       22
       22
       -
             hash = "sha256-6aowcIYssc1xqH6kTi/cpH2F7rgc8+lGC8HgZWYH2w0=";

     

       23
       23
       -
             # Leave DotGit so that autoconfigure can read version from git tags

     

       24
       24
       -
             leaveDotGit = true;

     

       25
       25
       -
           };

     

       26
       26
       -
           nativeBuildInputs = [

     

       27
       27
       -
             autoreconfHook

     

       28
       28
       -
             git

     

       29
       29
       -
             pkg-config

     

       30
       30
       -
           ];

     

       31
       31
       -
           meta = with lib; {

     

       32
       32
       -
             description = "Helper library used by usbmuxd2";

     

       33
       33
       -
             homepage = "https://github.com/tihmstar/libgeneral";

     

       34
       34
       -
             license = licenses.lgpl21;

     

       35
       35
       -
             platforms = platforms.all;

     

       36
       36
       -
           };

     

       37
       37
       -
         };

     

       38
       38
       -
       

     

       39
       39
       -
       in

     

       40
       14
        
       clangStdenv.mkDerivation {

     

       41
       15
        
         pname = "usbmuxd2";

     

       42
       16
        
         version = "unstable-2023-12-12";

     
···

       83
       57
        
           "sbindir=${placeholder "out"}/bin"

     

       84
       58
        
         ];

     

       85
       59
        
       

     

       86
       86
       -
         meta = with lib; {

     

       60
       60
       +
         meta = {

     

       87
       61
        
           homepage = "https://github.com/tihmstar/usbmuxd2";

     

       88
       62
        
           description = "Socket daemon to multiplex connections from and to iOS devices";

     

       89
       89
       -
           license = licenses.lgpl3;

     

       90
       90
       -
           platforms = platforms.linux;

     

       91
       91
       -
           maintainers = with maintainers; [ onny ];

     

       63
       63
       +
           license = lib.licenses.lgpl3;

     

       64
       64
       +
           platforms = lib.platforms.linux;

     

       65
       65
       +
           maintainers = with lib.maintainers; [ onny ];

     

       92
       66
        
           mainProgram = "usbmuxd";

     

       93
       67
        
         };

     

       94
       68
        
       }