diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-18 13:56:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 13:56:40 +0100 |
| commit | eac1eb7328e13e3d9014c82ec3138f51088c9cf4 (patch) | |
| tree | fb2cd9ea2a73076d9537911f225130c6cadfaa33 /pkgs/by-name | |
| parent | d389a1988307793ebd0d4ad13b66c8df416fada6 (diff) | |
| parent | 0fa9ae6b544ccb9fbc4613c05f7ba27471397080 (diff) | |
Merge pull request #273854 from surfaceflinger/feather-2.6.0
feather: 2.5.2 -> 2.6.1; bc-ur: init at 0.3.0
Diffstat (limited to 'pkgs/by-name')
| -rw-r--r-- | pkgs/by-name/bc/bc-ur/package.nix | 38 | ||||
| -rw-r--r-- | pkgs/by-name/fe/feather/package.nix | 8 |
2 files changed, 43 insertions, 3 deletions
diff --git a/pkgs/by-name/bc/bc-ur/package.nix b/pkgs/by-name/bc/bc-ur/package.nix new file mode 100644 index 0000000000000..2e7cda7764b58 --- /dev/null +++ b/pkgs/by-name/bc/bc-ur/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bc-ur"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "BlockchainCommons"; + repo = "bc-ur"; + rev = finalAttrs.version; + hash = "sha256-j7nmAZH1OL7R5H3jqQomg7kwPOvIHMqrfSk7mq/f7Cg="; + }; + + patches = [ + # Fix missing includes, building on gcc13, add CMakeList.txt + (fetchpatch { + url = "https://raw.githubusercontent.com/feather-wallet/feather/632963a9e22bf4c8bbe6b5b4d895e31bda17bafd/contrib/depends/patches/bc-ur/build-fix.patch"; + hash = "sha256-F53/z0maUGfdzJ7qjcLjTzn6+80oxu4sqfQPsDo4HZ0="; + }) + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/BlockchainCommons/bc-ur"; + description = "UR reference library in C++"; + license = licenses.bsd2Patent; + maintainers = with maintainers; [ surfaceflinger ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 5224d5157a969..f2ebe7582ddb7 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -1,4 +1,5 @@ -{ boost +{ bc-ur +, boost , cmake , fetchFromGitHub , hidapi @@ -20,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.5.2"; + version = "2.6.1"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-OSBG2W35GYlViwz5eXokpScrMTtPSaWAgEUNw2urm6w="; + hash = "sha256-szMNSqkocf/aVs1aF+TLV1qu0MDHTNDiO4V1j4ySBvQ="; fetchSubmodules = true; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bc-ur boost hidapi libsodium |