diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/em/default.nix | 29 | ||||
-rw-r--r-- | pkgs/applications/misc/copyq/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 41 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/efl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/enlightenment/terminology/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/wolfssl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/uunf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/filebrowser_safe/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/limnoria/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/parfive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pysimplegui/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/python-gitlab/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/rizin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
14 files changed, 122 insertions, 55 deletions
diff --git a/pkgs/applications/editors/em/default.nix b/pkgs/applications/editors/em/default.nix new file mode 100644 index 00000000000..89cc795f567 --- /dev/null +++ b/pkgs/applications/editors/em/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "em"; + version = "1.0.0"; + + src = fetchurl { + url = "http://pgas.freeshell.org/C/em/${pname}-${version}.tar.gz"; + hash = "sha256-ijMBkl7U1f9MTXgli9kUFB8ttMG6TMQnxfDMP9AblTQ="; + }; + + meta = with lib; { + homepage = "http://pgas.freeshell.org/C/em/"; + description = "Editor for Mortals"; + longDescription = '' + Em is a QMC variant of the standard Unix text editor - ed. It includes all + of ed, so the documentation for ed is fully applicable to em. Em also has + a number of new commands and facilities designed to improve its + interaction and increase its usefulness to users at fast vdu terminals + (such as the ITT's at QMC). + ''; + license = licenses.publicDomain; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 5c96a328224..1050a91e99a 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "4.1.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li"; + sha256 = "sha256-edrRgnjbszqJLbGLE4anCJSGApymvK0O+2ks5jWe8aw="; }; nativeBuildInputs = [ @@ -42,15 +42,6 @@ mkDerivation rec { wayland ]; - patches = [ - # Install the bash completion script correctly - # Remove once 4.1.1 is released - (fetchpatch { - url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch"; - sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl"; - }) - ]; - postPatch = '' substituteInPlace shared/com.github.hluk.copyq.desktop.in \ --replace copyq "$out/bin/copyq" diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index eea3e7afb77..8320491758e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -6,6 +6,12 @@ , guiSupport ? fullBuild, tk , highlightSupport ? fullBuild , ApplicationServices +# test dependencies +, unzip +, which +, sqlite +, git +, gnupg }: let @@ -13,11 +19,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.9.3"; + version = "6.0.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4="; + sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI="; }; format = "other"; @@ -27,11 +33,20 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n"; + sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs="; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; + postPatch = '' + patchShebangs . + + for f in **/*.{py,c,t}; do + # not only used in shebangs + substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}' + done + ''; + propagatedBuildInputs = lib.optional re2Support fb-re2 ++ lib.optional gitSupport pygit2 ++ lib.optional highlightSupport pygments; @@ -47,6 +62,26 @@ let makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; + doCheck = stdenv.isLinux; # tests seem unstable on Darwin + checkInputs = [ + unzip + which + sqlite + git + gnupg + ]; + checkPhase = '' + cat << EOF > tests/blacklists/nix + # tests enforcing "/usr/bin/env" shebangs, which are patched for nix + test-run-tests.t + test-check-shbang.t + EOF + + # extended timeout necessary for tests to pass on the busy CI workers + export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600" + make check + ''; + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 14d4572cf6f..fb67cafd63a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0k10mwpdjn57r2kflbzpybhvwl25yqqa2i2fhx0qazyjbzjbrad4"; + sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 10b97436b91..a2e4f717f48 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g"; + sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq"; }; nativeBuildInputs = [ @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ efl - pcre - mesa - ]; - - mesonFlags = [ - "-D edje-cc=${efl}/bin/edje_cc" ]; postPatch = '' diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 619f41eb33f..d2735f34b7f 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-PkuYXDL04LbUiY+O/4EilZn2+hTbwbRXPDE3B5d/4pQ="; + sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw="; }; # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index b71442a6a8b..073e6865fcd 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [ uchar ]; + prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index d571f76f922..28798dd838e 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -2,18 +2,25 @@ , buildPythonPackage , fetchPypi , django +, pythonOlder }: buildPythonPackage rec { - version = "1.1.0"; - pname = "filebrowser_safe"; + pname = "filebrowser-safe"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4"; + pname = "filebrowser_safe"; + inherit version; + sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94"; }; - buildInputs = [ django ]; + buildInputs = [ + django + ]; # There is no test embedded doCheck = false; @@ -24,15 +31,10 @@ buildPythonPackage rec { filebrowser_safe was created to provide a snapshot of the FileBrowser asset manager for Django, to be referenced as a dependency for the Mezzanine CMS for Django. - - At the time of filebrowser_safe's creation, FileBrowser was - incorrectly packaged on PyPI, and had also dropped compatibility - with Django 1.1 - filebrowser_safe was therefore created to - address these specific issues. ''; homepage = "https://github.com/stephenmcd/filebrowser-safe"; downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/"; - license = licenses.free; + license = licenses.bsd3; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 8e2cb3ca366..7a4e93f9ddd 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.1.1"; + version = "2022.1.1.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tJqUsNRvSipuvOTfxJOFUCojrkRrrrzIgEYNShrTP8c="; + hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 822ae2113b2..5bb1b044393 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f36128e8a93f3494ce3de8af883eeba4bd651ab228682810a46ec4b7897a84b3"; + sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index 9542ffe1b3b..ecc396d1b0f 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -2,26 +2,34 @@ , buildPythonPackage , fetchPypi , tkinter +, pythonOlder }: + buildPythonPackage rec { - pname = "PySimpleGUI"; - version = "4.55.1"; + pname = "pysimplegui"; + version = "4.56.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew="; + pname = "PySimpleGUI"; + inherit version; + sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5"; }; - pythonImportsCheck = [ "PySimpleGUI" ]; - propagatedBuildInputs = [ tkinter ]; + pythonImportsCheck = [ + "PySimpleGUI" + ]; + meta = with lib; { - description = "Python GUIs for Humans."; + description = "Python GUIs for Humans"; homepage = "https://github.com/PySimpleGUI/PySimpleGUI"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ lucasew ]; }; } diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index a5c40533c16..c3e35db28aa 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.1"; - disabled = pythonOlder "3.6"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; + sha256 = "89f82740b76820cf407cee9c43b75ca3ddb72f344f595902ee963837d7664986"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index e632c3c3cc0..c316ef970f8 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-muS3+cR75jZl/Q5ZN1srEPg8NxVquwRMpNYcHw/Ij34="; + sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig="; }; mesonFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fee17edb52..e0bd15a195d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7719,6 +7719,8 @@ with pkgs; guile = guile_1_8; }; + mcstatus = with python3Packages; toPythonApplication mcstatus; + mdbtools = callPackage ../tools/misc/mdbtools { }; mdk = callPackage ../development/tools/mdk { }; @@ -25042,6 +25044,8 @@ with pkgs; elvis = callPackage ../applications/editors/elvis { }; + em = callPackage ../applications/editors/em { }; + emacs = emacs27; emacs-nox = emacs27-nox; |