diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 56c510c4e692..e659b0c04f50 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1126,9 +1126,9 @@ class Driver: try: yield return True - except: - rootlog.error(f'Test "{name}" failed with error:') - raise + except Exception as e: + rootlog.error(f'Test "{name}" failed with error: "{e}"') + raise e def test_symbols(self) -> Dict[str, Any]: @contextmanager diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a2b4e949499b..9c25b2784b40 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.8.0"; + version = "0.8.3"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"; + sha256 = "sha256-qDLJ+Mw4z66ro9/zoEIzDJpA+jJLYw0WgsP7mA+56XM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index fc1fb67bd301..36dad897668c 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "457"; + version = "458"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZXBVJc+9dFzi75JYl3U3ic0MKolWMsdR3UkLe5EOzsw="; + sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 1acc5655d83a..c7428387d2c8 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.20.2"; + version = "0.20.9"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-jqRxNd6lx1hnOa4F3m3YOr8ZBnSKQBz0XVC5absf9mM="; + sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/applications/terminal-emulators/ctx/default.nix new file mode 100644 index 000000000000..78c673d035a0 --- /dev/null +++ b/pkgs/applications/terminal-emulators/ctx/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchgit +, SDL2 +, alsa-lib +, babl +, curl +, libdrm # Not documented +, pkg-config +, enableFb ? false +}: + +stdenv.mkDerivation rec { + pname = "ctx"; + version = "0.pre+date=2021-10-09"; + + src = fetchgit { + name = "ctx-source"; # because of a dash starting the directory + url = "https://ctx.graphics/.git/"; + rev = "d11d0d1a719a3c77712528e2feed8c0878e0ea64"; + sha256 = "sha256-Az3POgdvDOVaaRtzLlISDODhAKbefpGx5KgwO3dttqs="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL2 + alsa-lib + babl + curl + libdrm + ]; + + configureScript = "./configure.sh"; + configureFlags = lib.optional enableFb "--enable-fb"; + dontAddPrefix = true; + + hardeningDisable = [ "format" ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://ctx.graphics/"; + description = "Vector graphics terminal"; + longDescription= '' + ctx is an interactive 2D vector graphics, audio, text- canvas and + terminal, with escape sequences that enable a 2D vector drawing API using + a vector graphics protocol. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/applications/version-management/verco/default.nix index 538544c5b224..814ffacefc47 100644 --- a/pkgs/applications/version-management/verco/default.nix +++ b/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.5.5"; + version = "6.6.0"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+GGiu/xGGGC6FQPoASok87bCG0MFVIf6l6nt1lvw8A="; + sha256 = "sha256-ZfiGDEx6gjYziatbQSpqghmpXMXSPPBtTVYjll922t8="; }; - cargoSha256 = "sha256-lNtR4N+bFFCr3Ct99DJCbtDeKxTzT7ZjvAWixbQm3jg="; + cargoSha256 = "sha256-jrA6vGw+lyfix8L3INBamrJ4pab5denPzWwjF0dRXB0="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index eb6635ec3a38..a707d6f25a49 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -2,36 +2,36 @@ let fonts = { - aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; }; - aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; }; - assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; }; - eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; - maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; }; - symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; - unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; + aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "1w4ks341jw12p6zi1fy1hb3kqiqv61yn8i2hr9ybng9n8xdw03li"; description = "Aegean"; }; + aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "16j8rj3mr2cddag7laxvzpm5w3yk467fwzsk60nq8pnh6ab1v05y"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; + akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "1f2v9cjk307c5lw0si9hwjcll5wb9nwwy5im0y16kvpgwh2ccshc"; description = "Sumero-Akkadian Cuneiform"; }; + assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "18nx6ayfk3ba6wg1rp37r9fll5ajrwq2mp5w2l3y1q1kk92frkid"; description = "Neo-Assyrian in Unicode with OpenType"; }; + eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "1kk5rd3wd7y13z9bqcg1k9idbwad4l3hfmi3lbfk4y1w895vgxk2"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; + maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "0fzzrlkd4m2dj2phg97nz782w0afmw0f0ykdvlwyp29j1ak7yyp1"; description = "Maya Hieroglyphs"; }; + symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "04pxh5agvlkyg8mvv2szwshnmzi3n0m7va4xsyq401zbsa147rmi"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; + textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "1xp8qlfpvcf5n96zgm07zij3ndlzvqjlii8gx9sbj5aa56rxkdgb"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "0cvnxblk9wsr8mxm5lrdpdm456vi7lln7qh53b67npg4baf0as63"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; }; mkpkg = name_: {version, file, sha256, description}: fetchzip rec { name = "${name_}-${version}"; - url = "http://users.teilar.gr/~g1951d/${file}"; + url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; postFetch = '' mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.odt \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty ''; inherit sha256; meta = { inherit description; - # see http://users.teilar.gr/~g1951d/License.pdf + # see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf # quite draconian: non-commercial, no modifications, # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = "http://users.teilar.gr/~g1951d/"; + homepage = "https://dn-works.com/ufas/"; }; }; in diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index db669e5b6730..e987e5a892c4 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - HOME=$TMPDIR xvfb-run meson test + HOME=$TMPDIR xvfb-run meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 90486c8c3992..029d9f467763 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.90"; + version = "0.12.99"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s"; + sha256 = "0rv8xf5yx88wh95myysqmv29n5rr15zgwsvh8a4xb1pmw3h9kb6q"; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix new file mode 100644 index 000000000000..272657dfaafd --- /dev/null +++ b/pkgs/development/python-modules/timecop/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "timecop"; + version = "0.5.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbi58sw2yp1qchzfhyi7bsrwxajiypphg65fir98kvj03g011wd"; + }; + + # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 + preCheck = '' + sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py + ''; + + meta = with lib; { + description = "A port of the most excellent TimeCop Ruby Gem for Python"; + homepage = "https://github.com/bluekelp/pytimecop"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 85917a114c0f..2b9d543fb791 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.10"; + version = "0.11"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; + sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 836b959f1023..92863d76de9a 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2"; + sha256 = "11r4gzcsbqlflam2rdixc451qw69c46mkf7g0slq6f127is25fgz"; }; - cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x"; + cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn"; LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 50632e46104e..ce2558a7c016 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oVcp1tICw+Wluzp/nVTv8iWR04ihmwa5lzqKyrPcOPE="; + sha256 = "sha256-1lODB7k0HGfwlrCWh7TKafPezytKo66EnyDHD3eyAl0="; }; - cargoSha256 = "sha256-GkKxm1M0e/yWWuY71BqCLd8KaqJFLpWuh4nrLSWM2nw="; + cargoSha256 = "sha256-qCXGYxvOAbVrlk3X431n+soxcGQBIjZcibMcAP4uAh8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index fed502e8388b..0ec3754bffdc 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.0.4"; + version = "9.0.5"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "9OX1rSNWq2YJQBCt64iE4osZvfVajgEC2F28w7HSs3U="; + sha256 = "1z28v5vrjld99ydai66k8hw01x54647324ax459bvblw989lzp7v"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 8e08be28eda8..06b1221dccb8 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,14 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-14002"; + version = "5.0-15260"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "53222560650e4a99eceafcd537d4e04d1c50b3a6"; - sha256 = "1m71gk9hm011fpv5hmpladf7abkylmawgr60d0czkr276pzg04ky"; + rev = "207c931a04c8e2629a735bc2b3f36b5c89365ca7"; + sha256 = "15r9syk7f62h16klcznw7css6sng8nqkkz4d1qr8d988rdfaiypx"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index d082ec7e1b2e..e584331ea669 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7065"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e"; - sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2"; + rev = "c54a14d0b8d445d9d0074861dca816cc801e4008"; + sha256 = "13j91413x1bvg27vcx9sgc7gv00q84d8f5pllih5g5plzld4r541"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/tools/misc/parallel/wrapper.nix index b85dfc56f3d6..0240f1ac9e9e 100644 --- a/pkgs/tools/misc/parallel/wrapper.nix +++ b/pkgs/tools/misc/parallel/wrapper.nix @@ -1,13 +1,10 @@ -{ parallel, makeWrapper , runCommand -, perlPackages -, extraPerlPackages ? - with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] -}: +{ lib, runCommand, makeWrapper, parallel, perlPackages +, extraPerlPackages ? with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +, willCite ? false }: -runCommand "parallel-full" { - nativeBuildInputs = [ makeWrapper ]; - } '' - mkdir -p $out/bin - makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ - --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" - '' +runCommand "parallel-full" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ + ${lib.optionalString willCite "--add-flags --will-cite"} +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3197712d39a..4ce1bb73baf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -999,6 +999,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + ctx = callPackage ../applications/terminal-emulators/ctx { }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10f2bbca0928..aca66777eea8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9104,6 +9104,8 @@ in { timeago = callPackage ../development/python-modules/timeago { }; + timecop = callPackage ../development/python-modules/timecop { }; + timelib = callPackage ../development/python-modules/timelib { }; time-machine = callPackage ../development/python-modules/time-machine { };