commit 3380742d55bdb2d9c0c3584b88d73702e5bbb95d · pyrox.dev/nixpkgs

+14 -13

pkgs/development/python-modules/pysvn/default.nix

···

       19
        
       

     

       20
        
       buildPythonPackage rec {

     

       21
        
         pname = "pysvn";

     

       22
       -
         version = "1.9.12";

     

       23
        
         format = "other";

     

       24
        
       

     

       25
        
         src = fetchurl {

     

       26
        
           url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";

     

       27
       -
           sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";

     

       28
        
         };

     

       29
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
         buildInputs = [ bash subversion apr aprutil expat neon openssl ]

     

       31
        
           ++ lib.optionals stdenv.isLinux [ e2fsprogs ]

     

       32
        
           ++ lib.optionals stdenv.isDarwin [ gcc ];

     

       33
       -
       

     

       34
       -
         postPatch = ''

     

       35
       -
           sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py

     

       36
       -
         '';

     

       37
        
       

     

       38
        
         preConfigure = ''

     

       39
        
           cd Source

     
···

       47
        
             --apr-lib-dir=${apr.out}/lib \

     

       48
        
             --svn-lib-dir=${subversion.out}/lib \

     

       49
        
             --svn-bin-dir=${subversion.out}/bin

     

       50
       -
         '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) ''

     

       51
       -
           sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile

     

       52
       -
         '');

     

       53
        
       

     

       54
       -
         checkInputs = [ glibcLocales  ];

     

       55
        
         checkPhase = ''

     

       56
        
           runHook preCheck

     

       57
        
       

     
···

       59
        
           # so it is easier to simply search and replace

     

       60
        
           sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh

     

       61
        
           make -C ../Tests

     

       62
       -
       

     

       63
       -
           ${python.interpreter} -c "import pysvn"

     

       64
        
       

     

       65
        
           runHook postCheck

     

       66
        
         '';

     

       67
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       68
        
         installPhase = ''

     

       69
        
           dest=$(toPythonPath $out)/pysvn

     

       70
        
           mkdir -p $dest

     
···

       77
        
       

     

       78
        
         meta = with lib; {

     

       79
        
           description = "Python bindings for Subversion";

     

       80
       -
           homepage = "http://pysvn.tigris.org/";

     

       81
        
           license = licenses.asl20;

     

       0
        
       
     

       82
        
           # g++: command not found

     

       83
        
           broken = stdenv.isDarwin;

     

       84
        
         };

···

       19
        
       

     

       20
        
       buildPythonPackage rec {

     

       21
        
         pname = "pysvn";

     

       22
       +
         version = "1.9.18";

     

       23
        
         format = "other";

     

       24
        
       

     

       25
        
         src = fetchurl {

     

       26
        
           url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";

     

       27
       +
           hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78=";

     

       28
        
         };

     

       29
        
       

     

       30
       +
         patches = [

     

       31
       +
           ./replace-python-first.patch

     

       32
       +
         ];

     

       33
       +
       

     

       34
        
         buildInputs = [ bash subversion apr aprutil expat neon openssl ]

     

       35
        
           ++ lib.optionals stdenv.isLinux [ e2fsprogs ]

     

       36
        
           ++ lib.optionals stdenv.isDarwin [ gcc ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
       

     

       38
        
         preConfigure = ''

     

       39
        
           cd Source

     
···

       47
        
             --apr-lib-dir=${apr.out}/lib \

     

       48
        
             --svn-lib-dir=${subversion.out}/lib \

     

       49
        
             --svn-bin-dir=${subversion.out}/bin

     

       50
       +
         '';

     

       51
       +
       

     

       52
       +
         checkInputs = [ glibcLocales ];

     

       53
        
       

     

       0
        
       
     

       54
        
         checkPhase = ''

     

       55
        
           runHook preCheck

     

       56
        
       

     
···

       58
        
           # so it is easier to simply search and replace

     

       59
        
           sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh

     

       60
        
           make -C ../Tests

     

       0
        
       
     

       0
        
       
     

       61
        
       

     

       62
        
           runHook postCheck

     

       63
        
         '';

     

       64
        
       

     

       65
       +
         # FIXME https://github.com/NixOS/nixpkgs/issues/175227

     

       66
       +
         # pythonImportsCheck = [ "pysvn" ];

     

       67
       +
       

     

       68
        
         installPhase = ''

     

       69
        
           dest=$(toPythonPath $out)/pysvn

     

       70
        
           mkdir -p $dest

     
···

       77
        
       

     

       78
        
         meta = with lib; {

     

       79
        
           description = "Python bindings for Subversion";

     

       80
       +
           homepage = "https://pysvn.sourceforge.io/";

     

       81
        
           license = licenses.asl20;

     

       82
       +
           maintainers = with maintainers; [ dotlambda ];

     

       83
        
           # g++: command not found

     

       84
        
           broken = stdenv.isDarwin;

     

       85
        
         };

+13

pkgs/development/python-modules/pysvn/replace-python-first.patch

···

       1
       +
       Index: Extension/Tests/benchmark_diff.py

     

       2
       +
       ===================================================================

     

       3
       +
       --- Extension/Tests/benchmark_diff.py	(revision 2093)

     

       4
       +
       +++ Extension/Tests/benchmark_diff.py	(working copy)

     

       5
       +
       @@ -115,7 +115,7 @@

     

       6
       +
        

     

       7
       +
                if self.python:

     

       8
       +
                    python_re = LiteralCaseBlindSearch( self.python )

     

       9
       +
       -            self.replacement_list.append(

     

       10
       +
       +            self.replacement_list.insert(0,

     

       11
       +
                         (python_re,            '<PYTHON>') )

     

       12
       +
        

     

       13
       +
                if self.svn_bin: