diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 17ced60c684..9865f933a3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3049,6 +3049,12 @@ githubId = 9959940; name = "Andreas Fehn"; }; + felixsinger = { + email = "felixsinger@posteo.net"; + github = "felixsinger"; + githubId = 628359; + name = "Felix Singer"; + }; felschr = { email = "dev@felschr.com"; github = "felschr"; @@ -7579,6 +7585,12 @@ githubId = 115877; name = "Kenny Shen"; }; + queezle = { + email = "git@queezle.net"; + github = "qzle"; + githubId = 1024891; + name = "Jens Nolte"; + }; quentini = { email = "quentini@airmail.cc"; github = "QuentinI"; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b00355cc9cd..bfa8317c9f9 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio +, libiconv, CoreAudio, AudioUnit , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index cf14679cd9b..391e698dcf7 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.5"; + version = "1.16.7"; name = "${pname}-${version}"; suffix = { @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; - x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; - aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; + x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j"; + x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr"; + aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a2bb9da6805..0f28225ad01 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; + sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q="; }; vendorSha256 = null; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 8db532b4211..ac1a52e1bba 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sIF+jvhRoKNfvPs/WjMZmysAeEjOKaiqi7bY0Bbcxw="; + sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 5166efea21f..0a9a4684e12 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2"; + version = "1.2.18"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk"; + sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix new file mode 100644 index 00000000000..a243e56c2fe --- /dev/null +++ b/pkgs/development/libraries/libaudec/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub +, libsndfile, libsamplerate +, meson, ninja, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libaudec"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "zrythm"; + repo = "libaudec"; + rev = "v${version}"; + sha256 = "1570m2dfia17dbkhd2qhx8jjihrpm7g8nnyg6n4wif4vv229s7dz"; + }; + + buildInputs = [ libsndfile libsamplerate ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + + meta = with lib; { + homepage = "https://www.zrythm.org"; + description = "A library for reading and resampling audio files"; + license = licenses.agpl3Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix new file mode 100644 index 00000000000..6531414601d --- /dev/null +++ b/pkgs/development/libraries/reproc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + pname = "reproc"; + version = "14.1.0"; + + src = fetchFromGitHub { + owner = "DaanDeMeyer"; + repo = "reproc"; + rev = "v${version}"; + sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=ON" + "-DREPROC++=ON" + "-DREPROC_TEST=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/DaanDeMeyer/reproc"; + description = "A cross-platform (C99/C++11) process library"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 8269f09a246..cc8ee946250 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b22d500f674c084cefd73acd233fe12b816c8446f1da3cff58d7876477b862a3"; + sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 66c66535a12..b5028e4bebc 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.0.11"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; + sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw="; }; # Upstream hasn't release the tests yet diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix new file mode 100644 index 00000000000..1812ddff952 --- /dev/null +++ b/pkgs/development/python-modules/claripy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, cachetools +, decorator +, fetchFromGitHub +, future +, nose +, pysmt +, pythonOlder +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "claripy"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki"; + }; + + # Use upstream z3 implementation + postPatch = '' + substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" "" + ''; + + propagatedBuildInputs = [ + cachetools + decorator + future + pysmt + z3 + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "claripy" ]; + + meta = with lib; { + description = "Python abstraction layer for constraint solvers"; + homepage = "https://github.com/angr/claripy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index d3846ad4f42..3bc5f185e49 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; + sha256 = "b19f0556c252b805a52c976e3317c53d91e36f56dc8d28192eea190627faf343"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 51ee529e234..481f302d66a 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; + sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix index 4343899e040..5dc77a2661b 100644 --- a/pkgs/development/python-modules/pkce/default.nix +++ b/pkgs/development/python-modules/pkce/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pkce"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "RomeoDespres"; repo = pname; rev = version; - sha256 = "15fzpp3b5qmj27hpgnwkzjwllgwwdfccizz8ydmliakm2hdr1xpn"; + sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix new file mode 100644 index 00000000000..dc35aea6cd1 --- /dev/null +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, prometheus_client +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-flask-exporter"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "rycus86"; + repo = "prometheus_flask_exporter"; + rev = version; + sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; + }; + + propagatedBuildInputs = [ flask prometheus_client ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Prometheus exporter for Flask applications"; + homepage = "https://github.com/rycus86/prometheus_flask_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix new file mode 100644 index 00000000000..ce5b6b8673a --- /dev/null +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "pysmt"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pysmt" ]; + + meta = with lib; { + description = "Python library for SMT formulae manipulation and solving"; + homepage = "https://github.com/pysmt/pysmt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 18d41d6f740..68c1e945191 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-mHr+FuDMxLA5Y7BNbDN75mdHVP6Ah1/S5vXg6cC/dcE="; + sha256 = "0hyjyk3yw2yjb47j9kd6as5bsa2wkjricnx0803sg2p4qc8rb72f"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ed1171458b1..5ba6718a6bd 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,16 +2,16 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; + sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY="; }; - vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index e96d8f38af4..38439e62473 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,25 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY="; + sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw="; }; - cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w="; + cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installManPage man/just.1 - installShellCompletion --bash --name just.bash completions/just.bash - installShellCompletion --fish --name just.fish completions/just.fish - installShellCompletion --zsh --name _just completions/just.zsh + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh ''; checkInputs = [ coreutils bash ]; diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix new file mode 100644 index 00000000000..ec65ca62fa3 --- /dev/null +++ b/pkgs/development/tools/misc/edb/default.nix @@ -0,0 +1,42 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, boost, capstone +, double-conversion, graphviz, qtxmlpatterns }: + +mkDerivation rec { + pname = "edb"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "eteran"; + repo = "edb-debugger"; + rev = "1.3.0"; + fetchSubmodules = true; + sha256 = "fFUau8XnsRFjC83HEsqyhrwCCBOfDmV6oACf3txm7O8="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ boost.dev capstone double-conversion graphviz qtxmlpatterns ]; + + postPatch = '' + # Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice. + substituteInPlace ./src/CMakeLists.txt --replace \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \ + '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"' + + # The build script checks for the presence of .git to determine whether + # submodules were fetched and will throw an error if it's not there. + # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic. + mkdir -p src/qhexview/.git + + # Change default optional terminal program path to one that is more likely to work on NixOS. + substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + ''; + + meta = with lib; { + description = "Cross platform AArch32/x86/x86-64 debugger"; + homepage = "https://github.com/eteran/edb-debugger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lihop maxxk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index c68a1c1547c..c41ab92fb97 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,37 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, rustc -, rustPlatform -, pkg-config -, glib -, openssl -, darwin -}: +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.14"; + version = "0.2.15"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; - rev = version; - sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; + rev = "v${version}"; + sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; + + cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; cargoBuildFlags = [ "--features=all" ]; - nativeBuildInputs = [ - pkg-config cargo rustc - ]; - buildInputs = [ - openssl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 - checkPhase = null; + doCheck = false; meta = with lib; { description = "Ccache with Cloud Storage"; diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix new file mode 100644 index 00000000000..015419ee07a --- /dev/null +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }: + +stdenv.mkDerivation { + pname = "aseq2json"; + version = "unstable-2018-04-28"; + src = fetchFromGitHub { + owner = "google"; + repo = "midi-dump-tools"; + rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; + sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; + }; + sourceRoot = "source/aseq2json"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib glib json-glib ]; + + installPhase = '' + install -D --target-directory "$out/bin" aseq2json + ''; + + meta = with lib; { + description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout"; + homepage = "https://github.com/google/midi-dump-tools"; + license = licenses.asl20; + maintainers = [ maintainers.queezle ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index e092961a762..1e2efc7f9cd 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-+HxezUWQHyL9r4QZkJyWzWnjquq/ux5W5j2B5prH8Fg="; + sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/tools/misc/iotools/default.nix new file mode 100644 index 00000000000..f123d54a023 --- /dev/null +++ b/pkgs/tools/misc/iotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "iotools"; + version = "unstable-2017-12-11"; + + src = fetchFromGitHub { + owner = "adurbin"; + repo = pname; + rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; + sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; + }; + + makeFlags = [ "DEBUG=0" "STATIC=0" ]; + + installPhase = '' + install -Dm755 iotools -t $out/bin + ''; + + meta = with lib; { + description = "Set of simple command line tools which allow access to + hardware device registers"; + longDescription = '' + Provides a set of simple command line tools which allow access to + hardware device registers. Supported register interfaces include PCI, + IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some + utilities which allow for simple arithmetic, logical, and other + operations. + ''; + homepage = "https://github.com/adurbin/iotools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index e0499681848..524c31126eb 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.4.0"; - - goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; + sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; }; + vendorSha256 = null; + + buildFlagsArray = [ "-ldflags=-s -w -X pkg.Version=v${version}" ]; + meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index f8c5b4a9f12..24115ba923f 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; + sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang}/lib" ''; - cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; + cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5968d6a1154..0885ecf1922 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2460,6 +2460,8 @@ in interlock = callPackage ../servers/interlock {}; + iotools = callPackage ../tools/misc/iotools { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; @@ -12120,6 +12122,8 @@ in editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; effitask = callPackage ../applications/misc/effitask { }; @@ -14532,6 +14536,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; + libaudec = callPackage ../development/libraries/libaudec { }; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; @@ -18648,6 +18654,8 @@ in libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches; + aseq2json = callPackage ../os-specific/linux/aseq2json {}; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -21433,7 +21441,7 @@ in cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; }; @@ -23906,6 +23914,8 @@ in rep-gtk = callPackage ../development/libraries/rep-gtk { }; + reproc = callPackage ../development/libraries/reproc { }; + sawfish = callPackage ../applications/window-managers/sawfish { }; sc68 = callPackage ../applications/audio/sc68 { }; @@ -29674,7 +29684,9 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - sccache = callPackage ../development/tools/misc/sccache { }; + sccache = callPackage ../development/tools/misc/sccache { + inherit (darwin.apple_sdk.frameworks) Security; + }; sequeler = callPackage ../applications/misc/sequeler { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd83e3f5ac9..86982acd861 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1283,6 +1283,8 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; + claripy = callPackage ../development/python-modules/claripy { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -5088,6 +5090,8 @@ in { prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let @@ -5958,6 +5962,8 @@ in { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmt = callPackage ../development/python-modules/pysmt { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnooper = callPackage ../development/python-modules/pysnooper { };