diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index d23b42811b89..fdada2e7769a 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,20 +1,36 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, qttools, qtwebengine, hunspell }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, pkg-config +, qttools +, qtwebengine +, hunspell +, cmark +, multimarkdown +, pandoc +}: mkDerivation rec { pname = "ghostwriter"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-bNVhYwX60F3lrP9UmZSntfz83vbmHe9tu/4nUgzUWR4="; + sha256 = "sha256-kNt0IIAcblDJ81ENIkoJuJvrI+F+fdVgWUJ6g1YpjqU="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtwebengine hunspell ]; + qtWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ]) + ]; + meta = with lib; { description = "A cross-platform, aesthetic, distraction-free Markdown editor"; homepage = src.meta.homepage; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index ce5987d6c186..4eb0981d81f1 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: +{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby, sd }: buildGoModule rec { pname = "slides"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "0vwpisyvsgmvrzp26hapghgqmm3fhrzrvdnmws00xc2q3fsij9qx"; + sha256 = "00sml6b9q3df9dgl7fpsn6a3qkq6xklnbfvvblf91xdf4ssn7wrx"; }; checkInputs = [ @@ -16,6 +16,7 @@ buildGoModule rec { go python3 ruby + sd ]; vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 74fcf1af8f9f..4f992c3ebe95 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -1,23 +1,27 @@ -{ lib, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: +{ lib +, python3Packages +, fetchFromGitHub +, ledger +, hledger +, useLedger ? true +, useHledger ? true +}: python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "unstable-2021-04-01"; + version = "1.0.3"; + format = "pyproject"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; - rev = "0b674c57c833f75b1a36d8caf78e1567c8e2180c"; - sha256 = "0q404gr85caib5hg83cnmgx4684l72w9slxyxrwsiwhlf7gm443q"; + rev = "v${version}"; + sha256 = "0n3y4qxsv1cyvyap95h3rj4bj1sinyfgsajygm7s8di3j5aabqr2"; }; - patches = [ - # ledger-autosync specifies an URL for its ofxparse - # dependency. This patch removes the URL to only use the - # `ofxparse` name. This works because nixpkgs' version of ofxparse - # is more recent than the latest release. - ./fix-ofxparse-dependency.patch + nativeBuildInputs = with python3Packages; [ + poetry-core ]; propagatedBuildInputs = with python3Packages; [ @@ -45,10 +49,14 @@ python3Packages.buildPythonApplication rec { # Checks require ledger as a python package, # ledger does not support python3 while ledger-autosync requires it. - checkInputs = with python3Packages; [ ledger hledger nose mock ]; - checkPhase = '' - nosetests -a generic -a ledger -a hledger - ''; + checkInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; + + # Disable some non-passing tests: + # https://github.com/egh/ledger-autosync/issues/127 + disabledTests = [ + "test_payee_match" + "test_args_only" + ]; meta = with lib; { homepage = "https://github.com/egh/ledger-autosync"; diff --git a/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch deleted file mode 100644 index cb12ba9f3351..000000000000 --- a/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index eda6db5..ed6b90b 100644 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ setup( - install_requires=[ - 'setuptools>=26', - 'ofxclient', -- "ofxparse @ https://github.com/jseutter/ofxparse/tarball/3236cfd96434feb6bc79a8b66f3400f18e2ad3c4" -+ 'ofxparse' - ], - - extras_require={ \ No newline at end of file diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c56e5445f0be..924ff3fd9fd2 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,36 +3,33 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz"; - sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw"; + url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-1.4.0.tar.gz"; + sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; }; buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph zarith menhir menhirLib - # Compressed Sessions # Emacs compilation of why3.el emacs # Documentation rubber hevea # GUI - lablgtk + lablgtk3-sourceview3 # WebIDE js_of_ocaml js_of_ocaml-ppx + # S-expression output for why3pp + ppx_deriving ppx_sexp_conv # Coq Support coqPackages.coq coqPackages.flocq ocamlPackages.camlp5 ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip num ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; enableParallelBuilding = true; - postPatch = '' - substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx - ''; - configureFlags = [ "--enable-verbose-make" ]; installTargets = [ "install" "install-lib" ]; diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 2ec1ff26a793..a9545757d792 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.3.0"; + version = "2.3.1"; in stdenv.mkDerivation { @@ -20,18 +20,9 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy"; + sha256 = "sha256-o6YsUATcWHSuAEfU7WnwxKNxRNuBt069qCv0FKDWStg="; }; - patches = [ - # To fix the build with wlroots 0.14.0: - (fetchpatch { - url = "https://cgit.freebsd.org/ports/plain/x11-wm/hikari/files/patch-wlroots-0.14?id=f2820b6cc2170feef17989c422f2cf46644a5b57"; - sha256 = "1kpbcmgdm4clmf2ryrs5pv3ghycnq4glvs3d3ll6zr244ks5yf43"; - extraPrefix = ""; - }) - ]; - nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 186e2e9e4437..2763684c0d4a 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -12,12 +12,11 @@ , Security , pytestCheckHook , toml -, python }: buildPythonPackage rec { pname = "adblock"; - version = "0.4.4"; + version = "0.5.0"; disabled = isPy27; # Pypi only has binary releases @@ -25,13 +24,13 @@ buildPythonPackage rec { owner = "ArniDagur"; repo = "python-adblock"; rev = version; - sha256 = "sha256-zNQ8zEpTLzyU5AnFBNpOGDJ02Ogu2+xl85LA+ia7Si4="; + sha256 = "sha256-JjmMfL24778T6LCuElXsD7cJxQ+RkqbNEnEqwoN24WE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ajVZ0xPxC31hM1gQr3DC1HWdpIYBCSmqm0z2cflcClg="; + hash = "sha256-w+/W4T3ukRHNpCPjhlHZLPn6sgCpz4QHVD8VW+Rw5BI="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index 33d027f1beed..a364c7393ba8 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , six , beautifulsoup4 , lxml @@ -8,15 +8,11 @@ buildPythonPackage rec { pname = "ofxparse"; - version = "unstable-2020-02-05"; + version = "0.21"; - # The newer changes haven't been released yet and ledger-autosync - # depends on them: - src = fetchFromGitHub { - owner = "jseutter"; - repo = "ofxparse"; - rev = "3236cfd96434feb6bc79a8b66f3400f18e2ad3c4"; - sha256 = "1rkp174102q7hwjrg3na0qnfd612xb3r360b9blkbprjhzxy7gr7"; + src = fetchPypi { + inherit pname version; + sha256 = "19y4sp5l9jqiqzzlbqdfiab42qx7d84n4xm4s7jfq397666vcyh5"; }; propagatedBuildInputs = [ six beautifulsoup4 lxml ]; diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 45bc2a55e599..0bba9f988551 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - sha256 = "sha256-da2ZkehyXrxW5LdMR3K5AEQhiCpx8ygn6eswTC8fsRo="; + sha256 = "sha256-Rg2bbFTXLc1hXdShUmFxPcJtlcyWhspcjZtJYDSQ6vQ="; }; nativeBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index 5033ef3e2cff..4bd1f988d455 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-izone"; - version = "1.1.5"; + version = "1.1.6"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Swamp-Ig"; repo = "pizone"; rev = "v${version}"; - sha256 = "0ilvawlhyg5p08ri26zbcvgysrfsmza23scy4ijrx3jbc3669r2c"; + sha256 = "sha256-zgE1ccEPSa9nX0SEMN02VEGfnHexk/+jCJe7ugUL5UA="; }; propagatedBuildInputs = [ @@ -33,13 +33,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # attempt network connection - "test_fail_on_connect" - "test_connection_lost" - "test_ip_addr_change" - ]; - pythonImportsCheck = [ "pizone" ]; meta = with lib; { diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 1079974ae623..ab82aed8e5e6 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -17,6 +17,12 @@ let ocamlgraph stdlib-shims why3 + re + seq + sexplib + sexplib0 + parsexp + base yojson zarith ]; @@ -25,12 +31,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "22.0"; - slang = "Titanium"; + version = "23.0-rc1"; + slang = "Vanadium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "1mq1fijka95ydrla486yr4w6wdl9l7vmp512s1q00b0p6lmfwmkh"; + sha256 = "1z9f9a217bav3vfc99kq57d5rza6j7hr91ndviwkgcaib6wc5hcv"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index e1ae8a5a0e7c..8a8d4201451f 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-fDbnOfT2BTCLF2knUf3ccDnuA0mhM+gkbja7xgmWoaY="; + sha256 = "sha256-FWJ7fSJysT5LVFio49nbN0T0b+zWwiV7NvEJlojbNKs="; }; - cargoSha256 = "sha256-mBrFw5d0LXTKj7Nm8XmT5hsq/d/x84U/Gp02+lay2OY="; + cargoSha256 = "sha256-/VmCuHPURQTyeIumMaWVrFu18ZgVR0klpc/bO1f1w4o="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/casey/just"; - changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "A handy way to save and run project-specific commands"; license = licenses.cc0; maintainers = with maintainers; [ xrelkd jk ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 39048730485c..65ed6d5000c2 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1wj054rzv88ys4ask4zp7crrw0dxrck8svlj3i16qqd8x5dnyhqs"; + sha256 = "sha256-Asjm3IoAfzphITLQuNh6r/i/pjEM/A+wpCsAB83bu2U="; }; - cargoSha256 = "09ph3njll9assk85yh5pyvpsab3nk0mvxrdpqhy5rwps1478w0cq"; + cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];