diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-08 18:01:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-08 18:01:00 +0000 |
commit | b40a01817b24d53878585bd1e0fa2716719ff7e1 (patch) | |
tree | 2a6bba182f960f62afbd6e4dede226b3b0139de3 /pkgs/tools/package-management | |
parent | b26451314a196a4e4d3afbc886c7df57001a5c31 (diff) | |
parent | 048fd95f106ef4dca58ff01159207a027ab612d9 (diff) | |
download | nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar.gz nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar.bz2 nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar.lz nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar.xz nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.tar.zst nixpkgs-b40a01817b24d53878585bd1e0fa2716719ff7e1.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/comma/default.nix | 55 | ||||
-rw-r--r-- | pkgs/tools/package-management/nfpm/default.nix | 4 |
2 files changed, 57 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix new file mode 100644 index 00000000000..1cd8ac8ccd4 --- /dev/null +++ b/pkgs/tools/package-management/comma/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, linkFarm +, nix-index +, fzy +}: + +let + + # nix-index takes a little while to run and the contents don't change + # meaningfully very often. + indexCache = fetchurl { + url = "https://github.com/Mic92/nix-index-database/releases/download/2021-12-12/index-x86_64-linux"; + sha256 = "sha256-+SoG5Qz2KWA/nIWXE6SLpdi8MDqTs8LY90fGZxGKOiA="; + }; + + # nix-locate needs the --db argument to be a directory containing a file + # named "files". + nixIndexDB = linkFarm "nix-index-cache" [ + { name = "files"; path = indexCache; } + ]; + +in stdenv.mkDerivation rec { + pname = "comma"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + sha256 = "sha256-WBIQmwlkb/GMoOq+Dnyrk8YmgiM/wJnc5HYZP8Uw72E="; + }; + + postPatch = '' + substituteInPlace , \ + --replace '$PREBUILT_NIX_INDEX_DB' "${nixIndexDB}" \ + --replace nix-locate "${nix-index}/bin/nix-locate" \ + --replace fzy "${fzy}/bin/fzy" + ''; + + installPhase = '' + install -Dm755 , -t $out/bin + ln -s $out/bin/, $out/bin/comma + ''; + + meta = with lib; { + homepage = "https://github.com/nix-community/comma"; + description = "Run software without installing it"; + license = licenses.mit; + maintainers = with maintainers; [ Enzime ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 85d8c259d67..392a7f2e9b9 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.11.2"; + version = "2.11.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ycb5331o/ILz+eUGGipBrjI7/pYnmHUSDRc4UNpJO5s="; + sha256 = "sha256-xwziGGdFBmPpLRlBBficioULISt8WjGBocbrQUXa8CY="; }; vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk="; |