diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
commit | ea2acbed493e218f696673a004a95829392c5e33 (patch) | |
tree | c5716552f205bbf4d4addfa4675ea5073786bd06 /nixpkgs/pkgs/development/libraries/volk | |
parent | 06ba6c84f858b011fb1132721e5d5e28fcda4a8a (diff) | |
parent | 8aa8cd68f4745eb92f003666bfd300f3e67cd9c1 (diff) | |
download | nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.gz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.bz2 nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.lz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.xz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.zst nixlib-ea2acbed493e218f696673a004a95829392c5e33.zip |
Merge branch 'staging' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/volk')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/volk/2.5.0.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/volk/default.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix b/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix index 5ac88083aa66..35216cb7e31c 100644 --- a/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix +++ b/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix @@ -8,7 +8,7 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volk"; # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnuradio"; - repo = pname; - rev = "v${version}"; + repo = "volk"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/volk/default.nix b/nixpkgs/pkgs/development/libraries/volk/default.nix index 7271a700e92d..02240ac1febf 100644 --- a/nixpkgs/pkgs/development/libraries/volk/default.nix +++ b/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -8,14 +8,14 @@ , removeReferencesTo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volk"; version = "3.0.0"; src = fetchFromGitHub { owner = "gnuradio"; - repo = pname; - rev = "v${version}"; + repo = "volk"; + rev = "v${finalAttrs.version}"; hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; fetchSubmodules = true; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +}) |