diff options
Diffstat (limited to 'nixpkgs/pkgs/development/misc')
6 files changed, 67 insertions, 45 deletions
diff --git a/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix index 0a9d666f8b7f..3364fe796e72 100644 --- a/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; diff --git a/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix new file mode 100644 index 000000000000..7f49430c15c3 --- /dev/null +++ b/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -0,0 +1,21 @@ +{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck +, transformers, transformers-compat +}: +mkDerivation { + pname = "hercules-ci-optparse-applicative"; + version = "0.16.1.0"; + src = fetchgit { + url = "https://github.com/hercules-ci/optparse-applicative.git"; + sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48"; + rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/hercules-ci/optparse-applicative"; + description = "Utilities and combinators for parsing command line options (fork)"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ roberth ]; +} diff --git a/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix deleted file mode 100644 index 38b1df3ca3b5..000000000000 --- a/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub -, avrgcc, avrbinutils -, gcc-arm-embedded, gcc-armhf-embedded -, teensy-loader-cli, dfu-programmer, dfu-util }: - -let version = "0.6.144"; - -in stdenv.mkDerivation { - pname = "qmk_firmware"; - inherit version; - src = fetchFromGitHub { - owner = "qmk"; - repo = "qmk_firmware"; - rev = version; - sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn"; - fetchSubmodules = true; - }; - postPatch = '' - substituteInPlace tmk_core/arm_atsam.mk \ - --replace arm-none-eabi arm-none-eabihf - rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk - ''; - buildFlags = [ "all:default" ]; - doCheck = true; - checkTarget = "test:all"; - installPhase = '' - mkdir $out - ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ - avrgcc - avrbinutils - gcc-arm-embedded - gcc-armhf-embedded - teensy-loader-cli - dfu-programmer - dfu-util - ]; -} diff --git a/nixpkgs/pkgs/development/misc/resholve/deps.nix b/nixpkgs/pkgs/development/misc/resholve/deps.nix index 86bcba570759..6a1d9c77b5a0 100644 --- a/nixpkgs/pkgs/development/misc/resholve/deps.nix +++ b/nixpkgs/pkgs/development/misc/resholve/deps.nix @@ -60,13 +60,13 @@ rec { # resholve's primary dependency is this developer build of the oil shell. oildev = python27Packages.buildPythonPackage rec { pname = "oildev-unstable"; - version = "2020-03-31"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a"; - sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2"; + rev = "11c6bd3ca0e126862c7a1f938c8510779837affa"; + hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY="; /* It's not critical to drop most of these; the primary target is diff --git a/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/nixpkgs/pkgs/development/misc/resholve/resholve.nix index e8b4ed2cfb25..4d039770ce0e 100644 --- a/nixpkgs/pkgs/development/misc/resholve/resholve.nix +++ b/nixpkgs/pkgs/development/misc/resholve/resholve.nix @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.4.2"; + version = "0.5.1"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0="; + hash = "sha256-+9MjvO1H+A3Ol2to5tWqdpNR7osQsYcbkX9avAqyrKw="; }; deps = callPackage ./deps.nix { /* @@ -29,6 +29,9 @@ let "${rSrc}/0002-add_MANIFEST_in.patch" "${rSrc}/0003-fix_codegen_shebang.patch" "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" + "${rSrc}/0005_revert_libc_locale.patch" + "${rSrc}/0006_disable_failing_libc_tests.patch" + "${rSrc}/0007_restore_root_init_py.patch" ]; }; in diff --git a/nixpkgs/pkgs/development/misc/umr/default.nix b/nixpkgs/pkgs/development/misc/umr/default.nix new file mode 100644 index 000000000000..158cef2eed1e --- /dev/null +++ b/nixpkgs/pkgs/development/misc/umr/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config +, libdrm, libpciaccess, llvmPackages, ncurses +}: + +stdenv.mkDerivation rec { + pname = "umr"; + version = "unstable-2021-02-18"; + + src = fetchgit { + url = "https://gitlab.freedesktop.org/tomstdenis/umr"; + rev = "79e17f8f2807ed707fc1be369d0aad536f6dbc97"; + sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + bash-completion + libdrm + libpciaccess + llvmPackages.llvm + ncurses + ]; + + # Remove static libraries (there are no dynamic libraries in there) + postInstall = '' + rm -r $out/lib + ''; + + meta = with lib; { + description = "A userspace debugging and diagnostic tool for AMD GPUs"; + homepage = "https://gitlab.freedesktop.org/tomstdenis/umr"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + platforms = platforms.linux; + }; +} |