diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix index 6a057f1a03ce..ccac79763114 100644 --- a/pkgs/applications/audio/osdlyrics/default.nix +++ b/pkgs/applications/audio/osdlyrics/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "osdlyrics"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-VxLNaNe4hFwgSW4JEF1T4BWC2NwiOgfwVGiAIOszfGE="; + sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4a506aed9e17..01e872dd8821 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -21,7 +20,7 @@ }: let - version = "4.3.0"; + version = "4.3.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -38,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg="; + sha256 = "wYblwD+ej65TVkYS7u5MiB37Ka8jENI3aoHi64xAFtU="; postFetch = '' mv $out ./all @@ -54,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw="; + sha256 = "pAhsHKIMCB3OutJTrgGNT9PKfTcXcgxUj/x16uBK2Is="; }; postUnpack = '' @@ -116,10 +115,6 @@ python3.pkgs.buildPythonApplication { pytestFlagsArray = [ "electrum/tests" ]; - disabledTests = [ - "test_loop" # test tries to bind 127.0.0.1 causing permission error - ]; - postCheck = '' $out/bin/electrum help >/dev/null ''; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 9727625f710b..1343f2e8d392 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -12,20 +12,20 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.7.0"; + version = "1.7.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-AxH0PyAWYEEIqQAx9gG2eYyXMijLZGZqXkRhld32ieE="; + sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI="; }; nativeBuildInputs = [ wrapGAppsHook + gobject-introspection ]; buildInputs = [ gtk3 - gobject-introspection poppler_gi ] ++ lib.optional withGstreamer libcanberra-gtk3; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 89a967678aa5..8acd9f75dd96 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.12.1"; + version = "7.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU="; + hash = "sha256-JuoZ/xE3Z6uB7iJQj72l+VX0cHHi/ZV+6q3QZ/CYjAk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index d06761e66c5e..8092a212d7d0 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.24"; + version = "3.22.25"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-G3JSqrHc2ca32RZOO6gFY8iVlEFX+kukZDcTb8O5UHk="; + sha256 = "sha256-ur29fKSYRGzQBv14L5efN+UuAdTE8e8ooop6DGvO+Rg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f0a07a855f8a..bb999fd5b548 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -167,10 +167,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q="; + sha256 = "sha256-QVeuMeuBrxnoHDaIJhBJGw+49Q4A+ooXsJXIiQi5xFw="; inherit (darwin) configd; inherit passthruFun; }; @@ -180,10 +180,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c="; + sha256 = "sha256-XXfieCcbqAPpkJpBpPO6ygBhgck62mgqXl/o3EokxfM="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 5dcc24cc8bc2..2f990a3cbe64 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gsasl"; - version = "1.10.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; - sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; + sha256 = "sha256-Mix1QgCIQbzYukrgkzsiAhHRkKe1anDdYfZVbezAG3o="; }; buildInputs = [ libidn libkrb5 ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8217d42f0d9a..f987e7c6497f 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk, ant , withAACS ? false, libaacs , withBDplus ? false, libbdplus @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { patches = [ ./BDJ-JARFILE-path.patch + (fetchpatch { + name = "Initial-support-for-Java-18.patch"; + url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch"; + hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo="; + }) + (fetchpatch { + name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch"; + url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch"; + hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ] diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 3f33df66339e..c2b585965b05 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -6,12 +6,14 @@ stdenv.mkDerivation rec { pname = "vmime"; - version = "0.9.2"; + # XXX: using unstable rev for now to comply with the removal of + # deprecated symbols in the latest release of gsasl + version = "unstable-2022-03-26"; src = fetchFromGitHub { owner = "kisli"; repo = "vmime"; - rev = "v${version}"; - sha256 = "1304n50ny2av8bagjpgz55ag0nd7m313akm9bb73abjn6h5nzacv"; + rev = "fc69321d5304c73be685c890f3b30528aadcfeaf"; + sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow="; }; buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 4156d799ad74..d32a37c6a7d3 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-/20FR7yc2aMA9cL3l7XAL/kak3cBBTniAICLC/TOI+U="; + sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 62aeb1fd9996..818d39ab3897 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.2"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0="; + hash = "sha256-r5bBomAoRwlII8pT/2o+0va/oBr3s8b8v2jq9n6WDwI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index ca14185738cd..2478b07d9040 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "2.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KVKUSPGGLXOusflL4OjzXdJDGi66q+895qvtaBrSFG8="; + sha256 = "sha256-34dfYd1DSMAHSB0w6T8YPSQA3GUCgcNEFOD5sM+SapQ="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 9c51b1f9127d..79998f88b5f8 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.0.9"; + version = "0.0.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pQhjLGRfLj/7tJhMtUQDXIlG1v7Iz+CuxeVWNAdzzpw="; + sha256 = "sha256-hMLS59/BlzK7aPoTWN5YgE77xEBBYpvYurUD98XqkDI="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index ed80bc9f81f7..4d0ac3ebd8f7 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hqzixD8XtaZKOIh+3nLHuM4qsLz6ge4o/2Q06TUBCr4="; + sha256 = "sha256-15bXqaa6c6RMoHKqUAcOhPrhMBbqYHrDdnZAaFaHElc="; }; patches = [ diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 1f3495de3f0b..289e90aec31d 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -3,17 +3,18 @@ , fetchFromGitHub , makeWrapper , babashka +, jdk }: stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.36"; + version = "0.1.45"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-byBQLYwFSUQJioV2FccsFqXGMlESSA1kg8aBeSaWbwA="; + sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D neil $out/bin/neil wrapProgram $out/bin/neil \ - --prefix PATH : "${lib.makeBinPath [ babashka ]}" + --prefix PATH : "${lib.makeBinPath [ babashka jdk ]}" ''; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index f5638d2043cb..bba6c791216c 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.17.0"; + version = "0.18.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NwWoF7VkCy+9/8xwaIhR7763JGtC3UheuJdj/FtGzMg="; + sha256 = "sha256-h5eLJyrk5n2lSSeAT6YHDALay7CsN/xApl3j0s3pIjc="; }; - cargoSha256 = "sha256-HFTGtDS4dWzt0q2iC0qgby4fDvnoaNd+Y1eKzhwb3Hs="; + cargoSha256 = "sha256-1zt3q04LPER+Kvp6EQHziWzYeckFYO9MmPRlHto2Juo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 27d9022f31dd..31b4b8d73e89 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, python3, enableNpm ? true }: +{ callPackage, fetchpatch, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,9 +7,17 @@ let in buildNodejs { inherit enableNpm; - version = "18.8.0"; - sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk="; + version = "18.9.0"; + sha256 = "sha256-x1zImv6tl2eRkArM3gKnsefnYnAvD2+mjqrLAZhNllQ="; patches = [ + (fetchpatch { + # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 + name = "revert-arm64-pointer-auth.patch"; + url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch"; + sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY="; + revert = true; + }) + ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 9e91dbdd371a..07b3632d24a0 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-08-14"; + version = "2022-09-07"; pname = "oh-my-zsh"; - rev = "3668ec2a82250020ca0c285ef8b277f1385a8085"; + rev = "875a4553204679cc1e3023a7d0e0bf2cf7d60800"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "nWnvjqjXVUr45wIJSsfvJ/tQGYtWR0nEnNUguycDe5s="; + sha256 = "iPW6u4LxXFNL1n9NzhoA9uGAZvykx+sDI0syYwUf4+k="; }; strictDeps = true; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index b3dfc9626322..40e1154b4be7 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-yIggx2rSi2/AVw5W9fvKQORD4TaK05TeQtErVEmcHUw="; + sha256 = "sha256-O3ZFc2Hc2HpJEctPlwLpWkYI4cJuUVGUXbBIk+1FD7k="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 1747417e1162..8877419a4b74 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -5,6 +5,7 @@ , pkg-config , clang , llvmPackages +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -18,6 +19,15 @@ rustPlatform.buildRustPackage rec { sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm"; }; + cargoPatches = [ + #https://github.com/shimunn/fido2luks/pull/50 + (fetchpatch { + name = "libcryptsetup-rs.patch"; + url = "https://github.com/shimunn/fido2luks/commit/c87a9bbb4cbbe90be7385d4bc2946716c593b91d.diff"; + sha256 = "2IWz9gcEbXhHlz7VWoJNBZfwnJm/J3RRuXg91xH9Pl4="; + }) + ]; + buildInputs = [ cryptsetup ]; nativeBuildInputs = [ pkg-config clang ]; @@ -25,7 +35,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "1sp52zsj0s3736zih71plnk01si24jsawnx0580qfgg322d5f601"; + cargoSha256 = "U/2dAmFmW6rQvojaKSDdO+/WzajBJmhOZWvzwdiYBm0="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; @@ -33,6 +43,5 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ prusnak mmahut ]; platforms = platforms.linux; - broken = true; # 2022-08-28 }; }