diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/tools/iaca | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/iaca')
-rw-r--r-- | nixpkgs/pkgs/development/tools/iaca/2.1.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/tools/iaca/3.0.nix | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/tools/iaca/2.1.nix b/nixpkgs/pkgs/development/tools/iaca/2.1.nix index 6170cbb4318b..a1b9729ccb4a 100644 --- a/nixpkgs/pkgs/development/tools/iaca/2.1.nix +++ b/nixpkgs/pkgs/development/tools/iaca/2.1.nix @@ -2,10 +2,11 @@ with lib; # v2.1: last version with NHM/WSM arch support -stdenv.mkDerivation { - name = "iaca-2.1"; +stdenv.mkDerivation rec { + pname = "iaca"; + version = "2.1"; src = requireFile { - name = "iaca-version-2.1-lin64.zip"; + name = "iaca-version-${version}-lin64.zip"; sha256 = "11s1134ijf66wrc77ksky9mnb0lq6ml6fzmr86a6p6r5xclzay2m"; url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; }; diff --git a/nixpkgs/pkgs/development/tools/iaca/3.0.nix b/nixpkgs/pkgs/development/tools/iaca/3.0.nix index 731b64317172..4da6851af5af 100644 --- a/nixpkgs/pkgs/development/tools/iaca/3.0.nix +++ b/nixpkgs/pkgs/development/tools/iaca/3.0.nix @@ -1,10 +1,11 @@ { lib, stdenv, requireFile, unzip }: with lib; -stdenv.mkDerivation { - name = "iaca-3.0"; +stdenv.mkDerivation rec { + pname = "iaca"; + version = "3.0"; src = requireFile { - name = "iaca-version-v3.0-lin64.zip"; + name = "iaca-version-v${version}-lin64.zip"; sha256 = "0qd81bxg269cwwvfmdp266kvhcl3sdvhrkfqdrbmanawk0w7lvp1"; url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; }; |