commit 69d4bdc55788efb3a34a831cf341e5e69484fadc · pyrox.dev/nixpkgs

+21 -11

pkgs/tools/security/notary/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, buildGoPackage, git, libtool }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, buildGoPackage, libtool }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         name = "notary-${version}";

     

       5
       5
       -
         version = "0.6.0";

     

       6
       6
       -
         gitcommit = "34f53ad";

     

       5
       5
       +
         version = "0.6.1";

     

       6
       6
       +
         gitcommit = "d6e1431f";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "theupdateframework";

     

       10
       10
        
           repo = "notary";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a";

     

       12
       12
       +
           sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ libtool ];

     

       16
       16
       -
       

     

       17
       17
       -
         goPackagePath = "github.com/theupdateframework/notary";

     

       15
       15
       +
         patches = [ ./no-git-usage.patch ];

     

       18
       16
        
       

     

       17
       17
       +
         buildInputs = [ libtool ];

     

       19
       18
        
         buildPhase = ''

     

       19
       19
       +
           runHook preBuild

     

       20
       20
        
           cd go/src/github.com/theupdateframework/notary

     

       21
       21
       -
           make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client

     

       21
       21
       +
           make client GITCOMMIT=${gitcommit}

     

       22
       22
       +
           runHook postBuild

     

       22
       23
        
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         goPackagePath = "github.com/theupdateframework/notary";

     

       23
       26
        
       

     

       24
       27
        
         installPhase = ''

     

       28
       28
       +
           runHook preInstall

     

       25
       29
        
           install -D bin/notary $bin/bin/notary

     

       30
       30
       +
           runHook postInstall

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         doCheck = true;

     

       34
       34
       +
         checkPhase = ''

     

       35
       35
       +
           make test PKGS=github.com/theupdateframework/notary/cmd/notary

     

       26
       36
        
         '';

     

       27
       37
        
       

     

       28
       38
        
         meta = with stdenv.lib; {

     

       29
       29
       -
           description = " Notary is a project that allows anyone to have trust over arbitrary collections of data";

     

       39
       39
       +
           description = "Notary is a project that allows anyone to have trust over arbitrary collections of data";

     

       30
       40
        
           longDescription = ''

     

       31
       41
        
             The Notary project comprises a server and a client for running and

     

       32
       42
        
             interacting with trusted collections. See the service architecture

     
···

       49
       59
        
           '';

     

       50
       60
        
           license = licenses.asl20;

     

       51
       61
        
           homepage = https://github.com/theupdateframework/notary;

     

       52
       52
       -
           maintainers = with maintainers; [ vdemeester ];

     

       53
       53
       -
           platforms = with platforms; unix;

     

       62
       62
       +
           maintainers = with maintainers; [ vdemeester ma27 ];

     

       63
       63
       +
           platforms = platforms.unix;

     

       54
       64
        
         };

     

       55
       65
        
       }

+15

pkgs/tools/security/notary/no-git-usage.patch

···

       1
       1
       +
       diff --git a/Makefile b/Makefile

     

       2
       2
       +
       index ab794165..0cbd047f 100644

     

       3
       3
       +
       --- a/Makefile

     

       4
       4
       +
       +++ b/Makefile

     

       5
       5
       +
       @@ -5,8 +5,8 @@ PREFIX?=$(shell pwd)

     

       6
       6
       +
        # Add to compile time flags

     

       7
       7
       +
        NOTARY_PKG := github.com/theupdateframework/notary

     

       8
       8
       +
        NOTARY_VERSION := $(shell cat NOTARY_VERSION)

     

       9
       9
       +
       -GITCOMMIT := $(shell git rev-parse --short HEAD)

     

       10
       10
       +
       -GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no)

     

       11
       11
       +
       +GITCOMMIT ?= $(shell git rev-parse --short HEAD)

     

       12
       12
       +
       +GITUNTRACKEDCHANGES :=

     

       13
       13
       +
        ifneq ($(GITUNTRACKEDCHANGES),)

     

       14
       14
       +
        GITCOMMIT := $(GITCOMMIT)-dirty

     

       15
       15
       +
        endif