diff options
author | Atemu <atemu.main@gmail.com> | 2024-01-31 16:49:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-31 16:49:10 +0100 |
commit | cdd4f2ac1b76a3944c7345cf2d2473ef1c2bd3b1 (patch) | |
tree | ac039e5ebfaf3fd822fd7b6d2b26bc84f14d8772 | |
parent | 7d5c09b02eef6d4b7d92229444fafe8a7c73774f (diff) | |
parent | f5d30774ec9d24f74a979573333cb281a108db34 (diff) |
Merge pull request #281348 from Atemu/update/umr
umr: unstable-2022-08-23 -> 1.0.8
-rw-r--r-- | pkgs/development/misc/umr/default.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 35 insertions, 13 deletions
diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/development/misc/umr/default.nix index b83cb91a91b53..37177f926b681 100644 --- a/pkgs/development/misc/umr/default.nix +++ b/pkgs/development/misc/umr/default.nix @@ -1,28 +1,50 @@ -{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config -, json_c, libdrm, libpciaccess, llvmPackages, nanomsg, ncurses, SDL2 +{ lib +, stdenv + +, fetchFromGitLab + +, cmake +, pkg-config + +, libdrm +, mesa # libgbm +, libpciaccess +, llvmPackages +, nanomsg +, ncurses +, SDL2 +, bash-completion + +, nix-update-script }: stdenv.mkDerivation rec { pname = "umr"; - version = "unstable-2022-08-23"; + version = "1.0.8"; - src = fetchgit { - url = "https://gitlab.freedesktop.org/tomstdenis/umr"; - rev = "87f814b1ffdbac8bfddd8529d344a7901cd7e112"; - hash = "sha256-U1VP1AicSGWzBwzz99i7+3awATZocw5jaqtAxuRNaBE="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "tomstdenis"; + repo = "umr"; + rev = version; + hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; }; - nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ - bash-completion - json_c libdrm + mesa libpciaccess llvmPackages.llvm nanomsg ncurses SDL2 + + bash-completion # Tries to create bash-completions in /var/empty otherwise? ]; # Remove static libraries (there are no dynamic libraries in there) @@ -30,6 +52,8 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A userspace debugging and diagnostic tool for AMD GPUs"; homepage = "https://gitlab.freedesktop.org/tomstdenis/umr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32830c460df9b..2f5eeeac5a9cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18151,9 +18151,7 @@ with pkgs; publii = callPackage ../development/web/publii {}; - umr = callPackage ../development/misc/umr { - llvmPackages = llvmPackages_14; - }; + umr = callPackage ../development/misc/umr { }; refurb = callPackage ../development/tools/refurb { }; |