diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 64ad86825e00..8734d7d1f654 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.1"; + version = "0.7.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-n5Z6LnZ0x+V46Exa9vSMrndZHperJlcXl1unfeTuo9M="; + sha256 = "sha256-4o36h/x4+h2H4xpgPfOgIza6zNANyhmSM3Cm1XwWb7w="; }; - cargoHash = "sha256-eIM0/SWLZVyVsHyQ4GzKSjVTvK7oActAiBEv56+JqK4="; + cargoHash = "sha256-WHxrMD6W7UyJg8HhjxWlm9KQ5SKsM6fLdvhDzBb16pI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 18909852ac8f..1fc4170ffed0 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.45.0"; + version = "2.45.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-jw4ocBtyxhPhI2GnhL9tbduY4iIQK53vUHB64qSGXKI="; + hash = "sha256-KUp7ZQZ+THjioOSe3A40Zj+5OteWxEv+dnSbTUM8qME="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 6e28c58798e7..6cb1e67f30bf 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.26.1"; + version = "0.27.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; + sha256 = "sha256-AcnXhilnr5ay45S30eNSDuN+Ed1TDv/Rh523LsUf3iM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 250d4087e703..1afb5117a4bf 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-CVCXNPmc/0T8vkxfU+i1nSbfusZGFVkLEveSoCePK0M="; + sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-/p2cVxOvWKkcVOYIR0N8tQSCniw+QhXhC+pus4NsQ8k="; + cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 140487868230..61a89f959040 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.151"; + version = "1.2.153"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-YgyR3BVkfQcluTamXlsCHHfqxbM1wqdmGsHPYDyMk8I="; + sha256 = "sha256-BdGeafZvMgH6qRyYrFPQp0r2470me755J6gUK9XkIJQ="; }; vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ="; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 454f23ce88ee..ee4a8f299444 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "1.0.3"; + version = "1.1.3"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-37AEaTOFmJ2yYXLwjNa7UXBoH/NxOK8+vlXhUhj6CM4="; + sha256 = "sha256-fGwSRYpvGYyYvRvP1ljs3mhXRpONzO5/QVegjqMsOdk="; }; buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 3ceda283d3d8..b507c0d31947 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.17.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk="; + sha256 = "1n5r1h2khjwdsckiviv8f2pflxibk8rs68fs08jak0kbm0kkyj18"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 5690355a0ce2..8716b6858cd3 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -16,15 +16,16 @@ , gtk4 , libadwaita , librsvg +, pango }: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M="; + sha256 = "ZikL9yhky8bufM6Mn0DegSTo5gl712hi8teqsMS9sCw="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita librsvg + pango ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index aa3d9981998c..4ec5518da21e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI="; + sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0="; }; nativeBuildInputs = [ @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { vte ]; - # See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80 - mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 9efdcd0c4f07..d6a82d3c66d7 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU="; + sha256 = "sha256-vrh/dCuleE3fikryXX86XC/fdVV+j8HvIe4s/SRpNJw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 1b1eb036ef9a..59559051e65e 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-gXREvxgGpIBo5oVxxal+Xdwk0WFZufuJKGzABzhB7zM="; + sha256 = "sha256-kyazfsm0lGgz26PWJUyFRmFxQFxmotDPXrwx3N/EVl0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 0de5fdf1b7af..efb4c22326d5 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.4.4"; + version = "7.4.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-34pAAqUhHQiH0YuRl6a0zdn8p6hSAIJnZXIErm3SYFE="; + sha256 = "sha256-m1ZHyHYFDGTYpP4uAg4T75sLKoLwhEDJstWg7EXHNc8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/python-modules/configclass/default.nix b/pkgs/development/python-modules/configclass/default.nix new file mode 100644 index 000000000000..9856be48ac3d --- /dev/null +++ b/pkgs/development/python-modules/configclass/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchPypi +, buildPythonPackage +, mergedict +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "configclass"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aoDKBuDxJCeXbVwCXhse6FCbDDM30/Xa8p9qRvDkWBk="; + }; + + propagatedBuildInputs = [ mergedict ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "configclass" ]; + + meta = with lib; { + description = "A Python to class to hold configuration values"; + homepage = "https://github.com/schettino72/configclass/"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix new file mode 100644 index 000000000000..33d128c3d765 --- /dev/null +++ b/pkgs/development/python-modules/doit-py/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, doit +, configclass +, mergedict +, pytestCheckHook +, hunspell +, hunspellDicts +}: + +buildPythonPackage rec { + pname = "doit-py"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "pydoit"; + repo = pname; + rev = version; + sha256 = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4="; + }; + + propagatedBuildInputs = [ + configclass + doit + mergedict + ]; + + checkInputs = [ + hunspell + hunspellDicts.en_US + pytestCheckHook + ]; + + disabledTestPaths = [ + # Disable linting checks + "tests/test_pyflakes.py" + ]; + + pythonImportsCheck = [ "doitpy" ]; + + meta = with lib; { + description = "doit tasks for python stuff"; + homepage = "http://pythonhosted.org/doit-py"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 2ade1982ec27..cfb36b7daf4a 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -10,9 +10,13 @@ , pyinotify , macfsevents , toml +, doit-py +, pyflakes +, configclass +, mergedict }: -buildPythonPackage rec { +let doit = buildPythonPackage rec { pname = "doit"; version = "0.36.0"; @@ -30,16 +34,25 @@ buildPythonPackage rec { ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; - # hangs on darwin - doCheck = !stdenv.isDarwin; - - checkInputs = [ mock pytestCheckHook ]; - - disabledTests = [ - # depends on doit-py, which has a circular dependency on doit - "test___main__.py" + checkInputs = [ + configclass + doit-py + mergedict + mock + pyflakes + pytestCheckHook ]; + # escape infinite recursion with doit-py + doCheck = false; + + passthru.tests = { + # hangs on darwin + check = doit.overridePythonAttrs (_: { doCheck = !stdenv.isDarwin; }); + }; + + pythonImportsCheck = [ "doit" ]; + meta = with lib; { homepage = "https://pydoit.org/"; description = "A task management & automation tool"; @@ -53,4 +66,5 @@ buildPythonPackage rec { ''; maintainers = with maintainers; [ pSub ]; }; -} + +}; in doit diff --git a/pkgs/development/python-modules/mergedict/default.nix b/pkgs/development/python-modules/mergedict/default.nix new file mode 100644 index 000000000000..b1ed82f5348f --- /dev/null +++ b/pkgs/development/python-modules/mergedict/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mergedict"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mergedict" ]; + + meta = with lib; { + description = "A Python dict with a merge() method"; + homepage = "https://github.com/schettino72/mergedict"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index a85de41c2493..2c2f0f6053eb 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.18.1"; + version = "2.19.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-6psHHmU9TN0iugmPErdeLHevm+T2/3IJIp7kMdUSFd8="; + sha256 = "sha256-WjyCU9z+szSeGbnsTTZGq8UFUpmrMPW+pTZPMk1ZC+s="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index b3cbf9329b86..59ea3f5b15e6 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw="; + sha256 = "sha256-uVTnWXbCS3JQkHWxopixhNue/ihzvukJ0CNDL5gm24g="; }; dontUnpack = true; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 7c96448dd920..230dd7b47b3d 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.16.2"; + version = "0.16.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dikjYEY6jrK9dUXM+z378SIWgI4jYd9vLsf1nQ5rUwg="; + sha256 = "sha256-TiXP7ftzQ3yWWfTDqfO33Fuk0XlgVwgt1+tZqSr6mJQ="; }; - vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4="; + vendorSha256 = "sha256-YsnqasRywNtJLq0noUpil9k2AILXJz//+aYoy/tlRIo="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index 3fc916f9082d..37dc222707b0 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "cpm"; - version = "0.35.4"; + version = "0.35.5"; src = fetchurl { url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-Ve+NhDAiAzH4x3ZUZjQkuZ69n65ljGc2h6cR62xnf+0="; + sha256 = "sha256-JWfIptbRExSQQvcxx2bS1k5cudPpQPdyj90aZdbcROk="; }; dontUnpack = true; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 48ed8b337760..8f076fe40c04 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-bxGJvvm9gGkjUA+JCpX2V0Bj35a5WJ1M/JPxa1/2gbk="; + sha256 = "sha256-ouL3qxBzhsQYXTHTeNM3Ezxo72XY9KwTXNYPlLUr4nU="; }; - vendorSha256 = "sha256-DVVAbtfwndwc37iqxCB9Tsscinr8A8Kl//s9X+EFPcw="; + vendorSha256 = "sha256-1db3Ar3UtHS/MkhiaLt7wHuCCg8qGGL7jOHZXh1TywI="; meta = with lib; { description = diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b915cdb65ced..2108ba284040 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -15,8 +15,8 @@ let sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; }; "cppo" = fetchurl { - url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz"; - sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; + url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz"; + sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by"; }; "cudf" = fetchurl { url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz"; @@ -27,8 +27,8 @@ let sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c"; }; "dune-local" = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz"; - sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; + url = "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"; + sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; }; "extlib" = fetchurl { url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; @@ -47,12 +47,12 @@ let sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr"; }; "opam-file-format" = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz"; - sha256 = "1bqyrlsvmjf4gqzmzbiyja9m1ph30ic9i18x23p5ziymyylw2sfg"; + url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz"; + sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02"; }; "re" = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz"; - sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz"; + sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4"; }; "result" = fetchurl { url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz"; @@ -67,13 +67,13 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.2.zip"; - sha256 = "0yq3dgx869016xrf65xv0glmqill1nk2ad12x3l36l70pn90rmyd"; + url = "https://github.com/ocaml/opam/archive/2.1.3.zip"; + sha256 = "08n72n5wc476p28ypxjs8fmlvcb42129fcva753gqm0xicqh24xf"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.2"; + version = "2.1.3"; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -83,7 +83,7 @@ in stdenv.mkDerivation { postUnpack = '' ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tbz + ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz @@ -133,4 +133,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.2 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.3 -p opam-shebangs.patch diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 27e702881282..d74d4ad422e8 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-nNR2r8jiS0XKru6IdSeTDeCp1izO0xORiupJRa+fhHY="; + sha256 = "sha256-7Kh8kCwdSZX7E2s7UWptQHabYCVZG4luMiB1RJ72hQc="; fetchSubmodules = true; }; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 8f2398255a41..c8c67e94b4a4 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20211102.0"; + version = "0.20220601.1"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI="; + sha256 = "sha256-uYauNtbUlvrnATGks7hWy1zt4Y7AEeADrCr1eVylPbY="; name = "scout-runtime-${version}.tar.gz"; }; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index fff449f37251..0ed96d249b49 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.1.0"; + version = "12.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-di1uzTZxeRLevcSS5d/yba5Y6tdy21H2NgU7ZrZTObI="; + sha256 = "sha256-DVum2fUa1BiSyL0d8hzRo3AzEVSRX2EBrJ4DBBIxftE="; }; preConfigure = '' diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 5626217fefef..b33ff33a1814 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.40.15"; + version = "0.40.21"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-KIV9ZEVmx7gsFHjtb8d0QfDwN7eQTsS2jYBKrKj988Y="; + sha256 = "sha256-oqFOAFJheVJOsFmMo5o0RDaPCPrGrGYnNcUgv4Ead8E="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-5FGcM9TFl0BGsN3hryIm1hQDCiRww2AEf2kUw3Uga78="; + vendorSha256 = "sha256-3W5ZNpZ9TNsqQ/atwMUPHbViyQ5YolwwTNznaRXNoso="; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 5d69e312f5bf..b1d666f0b7a0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EodqpYF3wJJdgzHZHqmY0tsrF2YnGirnQWCWaDZ9v8E="; + sha256 = "sha256-/xlnwnUMW7JuUcSnZUV4nqCFcrfGDvXToz7IJykHCGI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 5ce66fd81331..5e1fdd6e8fc3 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2022-04-15"; + version = "unstable-2022-08-11"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "7e0eee64df6c7c81a57792674646b5feaf89f263"; - sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; + rev = "1efe7e3960caeba27e24dd7b546ee5c3545f68bc"; + sha256 = "sha256-GI1+uEpxiMGYiXxfWr1+XtJroFRyX0LhpD7q3zft1E4="; }; strictDeps = true; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index f8d8b4d5af4c..d71fca87ab24 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.16"; + version = "5.0.17"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-gdYtQyCczJOGkCjl7fVCjcKkhEW3wDO5HDYNfMhnb1g="; + sha256 = "sha256-sAPbbMoZ4NGiE7lbtcdzQQsPib6i52JwWsLe+bmTshU="; }; cmakeFlags = [ diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 73e430e54e34..508e39da9d82 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-catgal3bpWJUcTo0x0V0X3VV87AHO2Dp58IpQ/ILsZ8="; + sha256 = "sha256-Lc23VvIZguE6nRHeGDW3pL4exKtJtF8XmFkN2SxUL0g="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index aa77f6b4a305..8cf91fe4808c 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-qDMGeuNY/Y7A6ZGd6giztQrx4psUAjOamUbC0Z4H80k="; + sha256 = "sha256-7SaT2jwrM0pD0BqX18d3nutU52RMCnQb2FuDtoJZMQM="; }; vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw="; diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix index c8dcfd313031..01c6b43069e2 100644 --- a/pkgs/tools/misc/nomino/default.nix +++ b/pkgs/tools/misc/nomino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - sha256 = "sha256-+bnEuSro3/t9aXu2WpwsaqHqB+poSXsVbna01a7pnKo="; + sha256 = "sha256-Zczj2HQkm6/hXH24pOXYT5r7RS/SI/39s5XtNnc7f9o="; }; - cargoSha256 = "sha256-IKsA8btCmKnZfRIwS4QdxJMi1As6SNbTI7ibOL7M+5U="; + cargoSha256 = "sha256-mjekXjHhi8gxjD47DmTs3TGtnXp3FbxiIq7Uo+rOvKc="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index f0a59e1d0aae..086c1eea58a8 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql, zstd }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql, zstd, fetchpatch }: stdenv.mkDerivation rec { pname = "odyssey"; @@ -11,9 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0="; }; + patches = [ + # Fix compression build. Remove with the next release. https://github.com/yandex/odyssey/pull/441 + (fetchpatch { + url = "https://github.com/yandex/odyssey/commit/01ca5b345c4483add7425785c9c33dfa2c135d63.patch"; + sha256 = "sha256-8UPkZkiI08ZZL6GShhug/5/kOVrmdqYlsD1bcqfxg/w="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl postgresql zstd ]; - cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" ]; + cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" "-DBUILD_COMPRESSION=ON" ]; installPhase = '' install -Dm755 -t $out/bin sources/odyssey diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index b8f2b4605289..ee2a25bdf79d 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -19,6 +19,14 @@ buildGoModule { nativeBuildInputs = [ m4 ]; + buildPhase = '' + runHook preBuild + make PREFIX="$out" + runHook postBuild + ''; + + doCheck = false; # no tests + installPhase = '' runHook preInstall make PREFIX="$out" install diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e104a8d57686..641cde900b0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,6 +1940,8 @@ in { configargparse = callPackage ../development/python-modules/configargparse { }; + configclass = callPackage ../development/python-modules/configclass { }; + configobj = callPackage ../development/python-modules/configobj { }; configparser = callPackage ../development/python-modules/configparser { }; @@ -2645,6 +2647,8 @@ in { doit = callPackage ../development/python-modules/doit { }; + doit-py = callPackage ../development/python-modules/doit-py { }; + dominate = callPackage ../development/python-modules/dominate { }; doorbirdpy = callPackage ../development/python-modules/doorbirdpy { }; @@ -5473,6 +5477,8 @@ in { mergedeep = callPackage ../development/python-modules/mergedeep { }; + mergedict = callPackage ../development/python-modules/mergedict { }; + merkletools = callPackage ../development/python-modules/merkletools { }; meross-iot = callPackage ../development/python-modules/meross-iot { };