diff options
Diffstat (limited to 'pkgs/development')
10 files changed, 94 insertions, 32 deletions
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 2ba6a65c7afcb..f685ab2405f64 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,24 +4,26 @@ , gmp , less , makeWrapper +, libb2 , ncurses6 +, openssl , stdenv , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.19"; + version = "0.5.20"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-//bjpmW45BqBHmBIj2uMahYQYjhNJ8hvGh+O/7oYQOk="; + hash = "sha256-jhI3qy2ov8bf3l1n0wsslWT70LDeQ6sGNSH62VFJ5cE="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-3WyiV6mIuo5GDpDK/KdWMvj22sZ3uph15u3v3TX5YZA="; + hash = "sha256-MOm0RsMFWGik2OL2MPkgmHqKYNO28fkZHVJ/6P3aIww="; }; # The tarball is just the prebuilt binary, in the archive root. @@ -31,14 +33,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; installPhase = '' - mkdir -p $out/bin - mv ucm $out/bin + mkdir -p $out/{bin,lib} + mv runtime $out/lib/runtime mv ui $out/ui - wrapProgram $out/bin/ucm \ + mv unison $out/unison + makeWrapper $out/unison/unison $out/bin/ucm \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libb2 openssl ]} \ --prefix PATH ":" "${lib.makeBinPath [ less ]}" \ + --add-flags "--runtime-path $out/lib/runtime/bin/unison-runtime" \ --set UCM_WEB_UI "$out/ui" ''; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index fafe521fbde19..afa65741892c9 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20.0.2"; + version = "21.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; + hash = "sha256-2iCtAgOhO7ydmaSKFFdiMMImrJHv53EtVeJ6tn3F7/Y="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; + cargoHash = "sha256-vYOSX01jYJ4x6QaGazYXA1QJiR501zlaV3QZfeDDUdw="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 3f7fd5abd6d19..eb6458d6a96cd 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -11,7 +11,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.18.12"; + version = "0.18.13"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -21,7 +21,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-6rAAu3Fd4D93rX8kvkcqhykzBu/lDByQ6zpjWq7J8mg="; + hash = "sha256-9tfB5/XMLnwn+AgaT9TkHtc3HcHiD4pme/+BW1uztIs="; }; # Remove all references to pytest-cov diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 31f4c7d8292c9..34989f1655994 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -33,5 +33,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ boltzmannrain ]; platforms = platforms.darwin; + broken = true; # last successful build 2023-12-04 }; } diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index e74df33a7bfbf..4d10ea2440444 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -115,8 +115,7 @@ in rec { }; rocgdb = callPackage ./rocgdb { - inherit rocmUpdateScript; - elfutils = elfutils.override { enableDebuginfod = true; }; + inherit rocmUpdateScript rocdbgapi; stdenv = llvm.rocmClangStdenv; }; diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index 919b3e70f6e06..2112c6cf02105 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -6,11 +6,16 @@ , texinfo , bison , flex +, glibc , zlib -, elfutils , gmp +, mpfr , ncurses , expat +, rocdbgapi +, python3 +, babeltrace +, sourceHighlight }: stdenv.mkDerivation (finalAttrs: { @@ -33,12 +38,53 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib - elfutils gmp + mpfr ncurses expat + rocdbgapi + python3 + babeltrace + sourceHighlight ]; + configureFlags = [ + # Ensure we build the amdgpu traget + "--enable-targets=${stdenv.targetPlatform.config},amdgcn-amd-amdhsa" + "--with-amd-dbgapi=yes" + + "--with-iconv-path=${glibc.bin}" + "--enable-tui" + "--with-babeltrace" + "--with-python=python3" + "--with-system-zlib" + "--enable-64-bit-bfd" + "--with-gmp=${gmp.dev}" + "--with-mpfr=${mpfr.dev}" + "--with-expat" + "--with-libexpat-prefix=${expat.dev}" + + # So the installed binary is called "rocgdb" instead on plain "gdb" + "--program-prefix=roc" + + # Disable building many components not used or incompatible with the amdgcn target + "--disable-sim" + "--disable-gdbserver" + "--disable-ld" + "--disable-gas" + "--disable-gdbserver" + "--disable-sim" + "--disable-gdbtk" + "--disable-gprofng" + "--disable-shared" + ]; + + # The source directory for ROCgdb (based on upstream GDB) contains multiple project + # of GNU’s toolchain (binutils and onther), we only need to install the GDB part. + installPhase = '' + make install-gdb + ''; + # `-Wno-format-nonliteral` doesn't work env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; @@ -51,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm source-level debugger for Linux, based on GDB"; homepage = "https://github.com/ROCm/ROCgdb"; - license = with licenses; [ gpl2 gpl3 bsd3 ]; + license = licenses.gpl3Plus; maintainers = teams.rocm.members; platforms = platforms.linux; broken = versionAtLeast finalAttrs.version "7.0.0"; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index a86db85067f6a..c9b74bfb0f4e8 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.117.0"; + version = "0.118.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dJq2/XxhSvqlRQwMHX2RHct6KQu9uik3SPeWD2/rwto="; + sha256 = "sha256-b3riwH3/hsn5PL3QYk/TzVrMpVCVaFxn9gbEn0oTILQ="; }; vendorHash = "sha256-d3cHXO4SFeNybiVDc3dUmd1XzUJ1SlMqSw7KPC3ZrXQ="; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 50789530be67d..79514af491938 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.26.1"; + version = "2.27.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-bWyerkXmAto0c/LYybUSRctajmL1R0PldfpKsh8crfA="; + hash = "sha256-CpU29+dVC/OHZdVtbQKSUwoBHsUUb2ZmBNtU1YSa/UA="; }; - vendorHash = "sha256-cYiyKNpsMfjqLL+6Q/s3nHRcj2y0DHuOu+S5GndLHxk="; + vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; postPatch = '' # Disable some tests that need file system & network access. @@ -21,6 +21,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + excludedPackages = [ "integration" "samples" ]; + ldflags = [ "-s" "-w" @@ -30,7 +32,7 @@ buildGoModule rec { tags = [ "osusergo" "netgo" "static_build" ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME="$(mktemp -d)" ''; checkFlags = [ @@ -46,7 +48,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = okteto; - command = "HOME=$(mktemp -d) okteto version"; + command = "HOME=\"$(mktemp -d)\" okteto version"; }; meta = with lib; { diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index 0737f56c2bdee..613dd0f5acbdc 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-05-11"; + version = "0-unstable-2024-05-18"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "30625d5568c085c622deece91ed8ac9e81ba28be"; - hash = "sha256-iBrXpLrnBL5W47Iz0Uy4nd5h/ADqSnxZt2jWQi9eYiM="; + rev = "b5b6733320bd866b6895cc2f44910f180dda4e0b"; + hash = "sha256-Mok77ioHklE3jeSFT2um1XgrnRuQf0ysDcTo3Fjukmk="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 2e4d996af01e3..88de0065e8ec2 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,5 +1,5 @@ { - lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, + lib, stdenv, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, makeBinaryWrapper, zlib, boost179, libunwind, elfutils, sparsehash, zstd, qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: @@ -12,20 +12,29 @@ mkDerivation rec { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; + hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper ]; buildInputs = [ - zlib boost179 libunwind elfutils sparsehash zstd + zlib boost179 libunwind sparsehash zstd qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + elfutils ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper \ + $out/Applications/KDE/heaptrack_gui.app/Contents/MacOS/heaptrack_gui \ + $out/bin/heaptrack_gui + ''; + meta = with lib; { description = "Heap memory profiler for Linux"; homepage = "https://github.com/KDE/heaptrack"; license = licenses.lgpl21Plus; + mainProgram = "heaptrack_gui"; maintainers = with maintainers; [ gebner ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |