diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0dcafe12276..151453a2378e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12193,6 +12193,7 @@ github = "alyssais"; githubId = 2768870; name = "Alyssa Ross"; + matrix = "@qyliss:fairydust.space"; keys = [{ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 4368ec24ea9e..54352a517a24 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -215,10 +215,12 @@ foreach my $u (@{$spec->{users}}) { } else { $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid}; - if (defined $u->{initialPassword}) { - $u->{hashedPassword} = hashPassword($u->{initialPassword}); - } elsif (defined $u->{initialHashedPassword}) { - $u->{hashedPassword} = $u->{initialHashedPassword}; + if (!defined $u->{hashedPassword}) { + if (defined $u->{initialPassword}) { + $u->{hashedPassword} = hashPassword($u->{initialPassword}); + } elsif (defined $u->{initialHashedPassword}) { + $u->{hashedPassword} = $u->{initialHashedPassword}; + } } } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 352d6e39435b..ee4692fc6a6a 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -273,6 +273,9 @@ let {command}`passwd` command. Otherwise, it's equivalent to setting the {option}`hashedPassword` option. + Note that the {option}`hashedPassword` option will override + this option if both are set. + ${hashedPasswordDescription} ''; }; @@ -291,6 +294,9 @@ let is world-readable in the Nix store, so it should only be used for guest accounts or passwords that will be changed promptly. + + Note that the {option}`password` option will override this + option if both are set. ''; }; diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index baa2e5945c05..c9a04088e870 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -5,6 +5,7 @@ let password4 = "asdf123"; hashed_bcrypt = "$2b$05$8xIEflrk2RxQtcVXbGIxs.Vl0x7dF1/JSv3cyX6JJt0npzkTCWvxK"; # fnord hashed_yeshash = "$y$j9T$d8Z4EAf8P1SvM/aDFbxMS0$VnTXMp/Hnc7QdCBEaLTq5ZFOAFo2/PM0/xEAFuOE88."; # fnord + hashed_sha512crypt = "$6$ymzs8WINZ5wGwQcV$VC2S0cQiX8NVukOLymysTPn4v1zJoJp3NGyhnqyv/dAf4NWZsBWYveQcj6gEJr4ZUjRBRjM0Pj1L8TCQ8hUUp0"; # meow in import ./make-test-python.nix ({ pkgs, ... }: { name = "shadow"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; @@ -39,6 +40,12 @@ in import ./make-test-python.nix ({ pkgs, ... }: { hashedPassword = hashed_yeshash; shell = pkgs.bash; }; + users.leo = { + isNormalUser = true; + initialHashedPassword = "!"; + hashedPassword = hashed_sha512crypt; # should take precedence over initialHashedPassword + shell = pkgs.bash; + }; }; }; @@ -145,5 +152,21 @@ in import ./make-test-python.nix ({ pkgs, ... }: { print(shadow.succeed(f"cat /tmp/{u}")) assert u in shadow.succeed(f"cat /tmp/{u}") shadow.send_chars("logout\n") + + with subtest("Ensure hashedPassword does not get overridden by initialHashedPassword"): + shadow.send_key("alt-f6") + shadow.wait_until_succeeds("[ $(fgconsole) = 6 ]") + shadow.wait_for_unit("getty@tty6.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty6'") + shadow.wait_until_tty_matches("6", "login: ") + shadow.send_chars("leo\n") + shadow.wait_until_tty_matches("6", "login: leo") + shadow.wait_until_succeeds("pgrep login") + shadow.sleep(2) + shadow.send_chars("meow\n") + shadow.send_chars("whoami > /tmp/leo\n") + shadow.wait_for_file("/tmp/leo") + assert "leo" in shadow.succeed("cat /tmp/leo") + shadow.send_chars("logout\n") ''; }) diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix index 688cd6dd2c17..dad8167f198f 100644 --- a/nixos/tests/systemd-shutdown.nix +++ b/nixos/tests/systemd-shutdown.nix @@ -11,6 +11,7 @@ in { systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/shutdown-message".source = pkgs.writeShellScript "shutdown-message" '' echo "${msg}" ''; + boot.initrd.systemd.enable = systemdStage1; }; testScript = '' diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index 9dc7e5d04bd5..d371bafd6965 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -16,6 +16,8 @@ let }; nodes.server = { + nixpkgs.config = config; + services.unifi = { enable = true; unifiPackage = unifi; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 258d58cac05d..c21444afa003 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -487,6 +487,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + harpoon = super.harpoon.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + himalaya-vim = super.himalaya-vim.overrideAttrs (old: { postPatch = '' substituteInPlace plugin/himalaya.vim \ diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index b9efcaaf4f6e..f6aa0f9c526a 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14702-cfb788941"; - rpcs3Version = "0.0.26-14702-cfb788941"; - rpcs3Revision = "cfb788941ce73ebf41060baf0867861dd6bd3e13"; - rpcs3Sha256 = "0kwd3x043x3gsqlax3jcb5g1w2v7v7gghmqgbrn3vimcc47x62vn"; + rpcs3GitVersion = "14757-3388c8ed0"; + rpcs3Version = "0.0.26-14757-3388c8ed0"; + rpcs3Revision = "3388c8ed090afb216f40c1d00361c6f6f1e7a9ba"; + rpcs3Sha256 = "0w2qsk91dxp0lxy6bdz4yyf79wqfnzyxswrg1kxwm0s7iwwch2pj"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 195d55d0f1a7..e117313861f5 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - hash = "sha256-PpnMslZ1AKT1OEWXh23uH83FnZGLTrgIc2jZspJa8sk="; + hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 93ebc060c111..ac8170ed551c 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2019-02-16"; + version = "unstable-2022-12-19"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "b14e039639ed28005fbb8bddeb5b5fa0c93475ac"; - sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; + rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; + hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 928c0b6abebc..9ad48e79c933 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -18,14 +18,14 @@ assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; with lib; -let common = { version, sha256, patches ? [ ] }: +let common = { version, sha256, patches ? [ ], tag ? "z3" }: stdenv.mkDerivation rec { pname = "z3"; inherit version sha256 patches; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; - rev = "z3-${version}"; + rev = "${tag}-${version}"; sha256 = sha256; }; @@ -95,4 +95,9 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; + z3_4_8_5 = common { + tag = "Z3"; + version = "4.8.5"; + sha256 = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; + }; } diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 748869ea63c5..a21aa31ef407 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ + z3 makeWrapper installShellFiles removeReferencesTo @@ -24,9 +25,7 @@ stdenv.mkDerivation rec { menhir ]); - buildInputs = [ - z3 - ] ++ (with ocamlPackages; [ + buildInputs = with ocamlPackages; [ batteries zarith stdint @@ -39,12 +38,10 @@ stdenv.mkDerivation rec { ppx_deriving ppx_deriving_yojson process - ]); + ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "libs" ]; - enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 0a06881b5806..0f4e62789a27 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -75,5 +75,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + broken = stdenv.hostPlatform.isMusl; # Broken at 2022-02-25 + # See https://github.com/NixOS/nixpkgs/issues/218274 }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 7366565370c3..5bacc5784355 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.9.2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc="; + sha256 = "sha256-iEW+n1PSnDoCzQCVfl4T1nchc0kL2q/M3jKNYW2f9/8="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix index e410c280a282..8bc51fdd9ec5 100644 --- a/pkgs/development/libraries/sigslot/default.nix +++ b/pkgs/development/libraries/sigslot/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sigslot"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "palacaze"; repo = "sigslot"; rev = "v${version}"; - hash = "sha256-FXoKI0aTpZNHHYZnEoPduf3ctOQ/qKoQrrXZPviAvuY="; + hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 4d8f02020018..790a14ba014e 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.11.1"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ="; + hash = "sha256-uw64JnXx790S4snLjANU0aLI3r7AMPec+IQentTZOdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index e388adfb1f1e..ba082c9285b9 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,40 +2,57 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "paste"; - version = "3.5.0"; + version = "3.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdent"; repo = "paste"; - rev = version; - sha256 = "sha256-yaOxbfQ8rdViepxhdF0UzlelC/ozdsP1lOdU5w4OPEQ="; + rev = "refs/tags/${version}"; + hash = "sha256-lpQMzrRpcG5TqWm/FJn4oo9TV8Skf0ypZVeQC4y8p1U="; }; postPatch = '' patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + setuptools + six + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # broken test "test_file_cache" # requires network connection "test_proxy_to_website" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/cdent/paste/issues/72 + "test_form" ]; - pythonNamespaces = [ "paste" ]; + pythonNamespaces = [ + "paste" + ]; meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; - homepage = "http://pythonpaste.org/"; + homepage = "https://pythonpaste.readthedocs.io/"; + changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 03b765719069..749d3574d701 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -2,24 +2,40 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pastedeploy"; - version = "2.1.1"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Pylons"; repo = pname; - rev = version; - sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU="; + rev = "refs/tags/${version}"; + hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q="; }; - nativeCheckInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov" "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "paste.deploy" + ]; meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; homepage = "https://github.com/Pylons/pastedeploy"; + changelog = "https://github.com/Pylons/pastedeploy/blob/${version}/docs/news.rst"; license = licenses.mit; maintainers = teams.openstack.members; }; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 8c146474d94e..7c0f38b525d6 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "4.1"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JXgU2uoMhfqKlQOksbdYZtnJbs7UZKlTxZNo7OIGEig="; + hash = "sha256-bR/e5pZCrnMCUt9zEszI0aVlqezTzwR3DIdpXv/6qGM="; }; propagatedBuildInputs = [ @@ -43,5 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marsam ]; + mainProgram = "pgpp"; }; } diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 4133cb02394c..6742b989c292 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "portalocker"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lk9oMPtCp0tdMrzpntN9gwjB19RN3xjz3Yn0aA3pezk="; + hash = "sha256-Ay6B1TSojsFzbQP3gLoHPwR6BsR4sG4pN0hvM06VXFE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 16a5622cc78a..7f531b75a15a 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post2"; + version = "0.1.5.post3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fa960b//HacdoG6C1RR72xrIZlgWF9jwbMTu2kjioUk="; + sha256 = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index c1ce980176c7..efb51c9b9e93 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.11.0"; + version = "0.11.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E="; + hash = "sha256-oeARQA7TtcplsvXvWVN4pcjj0BaMmHOJPZxGA55luI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index e1139ecf1b14..b38236170f05 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -123,8 +123,10 @@ buildPythonPackage rec { "tests/unit_tests_old/test_public_api.py" "tests/unit_tests_old/test_runtime.py" "tests/unit_tests_old/test_sender.py" + "tests/unit_tests_old/test_summary.py" "tests/unit_tests_old/test_tb_watcher.py" "tests/unit_tests_old/test_time_resolution.py" + "tests/unit_tests_old/test_wandb.py" "tests/unit_tests_old/test_wandb_agent.py" "tests/unit_tests_old/test_wandb_artifacts.py" "tests/unit_tests_old/test_wandb_integration.py" diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 9ca01d574d7f..c795568149ea 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.4.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc="; + hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 230840807a0a..00752a147054 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.0.10"; + version = "3.1.1"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "sha256-zxEBX7+WYQE2BDZmF4N8imFOBPorrYzg55tLlWUO8Lo="; + sha256 = "sha256-t7k4zpZrbaCwTZTngPlJGEmJOVl8onfIPVb2XGXuH5s="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorSha256 = "sha256-mIKknTrsJfFBKZrcxhnlDbvQq9q9FCOrk6ueJOoxOzk="; + vendorHash = "sha256-9KKnJQ5eM0UpO1tHebbEVnqwVJZnrls4KXi6BzlgZgM="; doCheck = true; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 84d768e5f720..921207863879 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-OPbDxUNqHGyTMokDayyJjS1GAekGP7LLJDUwQFjyVUM="; + sha256 = "sha256-0o7kemIxKCf+oNCl2ryKT02w49LQUuKaFIQUDt5mIw4="; }; - cargoSha256 = "sha256-skgSFVxHa6DBm6qLbk6MUK4jaVdC8GQBGl1HgHRnxX0="; + cargoSha256 = "sha256-DnPf75MEIbX4UQ6XeGLRE4giu+DxgWWmKJY34jrPwpc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 00cd1e7638bb..c3bd9fa1e869 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation rec { - pname = "cdogs"; - version = "1.4.0"; + pname = "cdogs-sdl"; + version = "1.4.1"; src = fetchFromGitHub { - repo = "cdogs-sdl"; + repo = pname; owner = "cxong"; rev = version; - sha256 = "sha256-jEK84iFodd0skRnHG3R0+MvBUXLd3o+YOLnBjZdsDms="; + sha256 = "sha256-CH0P8OrRUXtuqAHxDKv4ziKYdwGTccLPwpzh4xo7lQc="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 6ea2da037ac3..b0769f70ca48 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -24,14 +24,14 @@ assert (!libsOnly) -> kernel != null; stdenv.mkDerivation rec { - version = "18.1.1-53328"; + version = "18.2.0-53488"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-Vw9i7Diki+hKODeosxfCY5bL/UOfwgzeCC6+QmWfIZw="; + hash = "sha256-FpAbQQapIcZ7GsGjH4ZeJ81Ke+NUF7GvgV1wEDLKoUU="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 582667c0c7da..ce7aa5f753f2 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sysstat"; - version = "12.6.1"; + version = "12.6.2"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - hash = "sha256-GP9aThSeJWjkM4Vjf3JDf+a6/MEyKpPRPRmB6UZKA0I="; + hash = "sha256-PncTSu2qb8V9l0XaZ+39iZDhmt7nGsRxliKSYcVj+0g="; }; buildInputs = [ gettext ]; diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index cc4b85518b2b..bdd8c4c43f6f 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.62.0"; + version = "15.7.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-sGZUns6ad4FQ/5VYEi7hhgp35YIdbwyaMYPMbK8hlNA="; + sha256 = "sha256-Aj6XQVIdulwx6mWivwYafR4yrWiNaDeyje3LFQzZPfU="; }; - vendorSha256 = "sha256-UHSXhRfegqgKyFl2W/2am9VNIzVYeIuUsVlha8nAZw0="; + vendorHash = "sha256-mGcIN9gDCFfr1MvBdfR26LAbrAE2RNivhXP7fCNMyBQ="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index 2730686bdc81..286463c1bef7 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "phlare"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "phlare"; - sha256 = "sha256-z1PT5chkpHQJPziY7bGf6W1X5uezL6E2GUV6w/NlyFk="; + sha256 = "sha256-q7y3sZMI1Kk7Ar0ER8RoU1Y7xAhFh89y/mzESjLrxcM="; }; proxyVendor = true; - vendorSha256 = "sha256-KJbh+M9jYxUW9akVBHZoB/mtOHWpMPtlwIgC9fu+NYY="; + vendorHash = "sha256-Oz1qV+3sB0pOWGEMtp7mgMR9Ljd0rd9oa6NJO2azTJg="; ldflags = let prefix = "github.com/grafana/phlare/pkg/util/build"; in [ "-s" "-w" - # https://github.com/grafana/phlare/blob/v0.3.0/Makefile#L32 + # https://github.com/grafana/phlare/blob/v0.5.1/Makefile#L32 "-X ${prefix}.Version=${version}" "-X ${prefix}.Branch=v${version}" "-X ${prefix}.Revision=v${version}" diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index acfb546277fa..b88509555ba6 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -66,7 +66,7 @@ in rec { }; unifi7 = generic { - version = "7.3.76"; - sha256 = "sha256-/g/gCAhCT+8eyYDiIkF8WnTIWgEzneiAYHXj1pYj/dA="; + version = "7.3.83"; + sha256 = "sha256-mDbF9vfoWjvABxcOIRngStji7xBllgZfUhVA9kF6ERU="; }; } diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 3bf0bbb286ce..3e24e84b8c72 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2023-01-12"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "e50b93ca882aa58b0119b2e90818c4157e30c794"; - sha256 = "25mz5UMTCHAVjtUhQsWTMsAGAweAwwTdGNLHMp2LCBM="; + rev = "fc444f57e11131b2cad68f474bcf1201cba062a4"; + sha256 = "pypWlWWEBKGT98GVg5yVdzrWJb28jsw2xzGeYhO2DNk="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 93a6eea3111b..cdb5e7bbd8ad 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-Pp6QhOGG5nDc5wHIykEXIS0tQj7gPifYN5HM9tfKMR4="; + hash = "sha256-yozW+Yb8uHOA5NfAQ+QWVylgJUM8b8DTKPUHxCNi9SU="; }; - vendorHash = "sha256-EPFy9fgdVN0wdMm3zWXuLqxkmIP1Fg0hOTBbeI6w4gI="; + vendorHash = "sha256-8kG3GTb3dpLNeFppuLwvB+cjM0K1mp3QJgXTDieLgW8="; doCheck = false; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index d82c24dba915..f0fa269360e3 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2023-01-25"; + version = "unstable-2023-02-20"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "4bffe0f0d9d0e1496ae5cfb7579e813277c29b0f"; - sha256 = "oDQBJz6KKV72DfhNEXjAZNeolufIUQwhroczCuYnGQA="; + rev = "471599dc7721d454b6658062c901b52038a78be2"; + sha256 = "F158oUVsfIvuWDHwUnJlyyCFsfn0varRA6Borf9VZ60="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5280943e994a..432665e215ff 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-HS+vtF+h5M6lbk7TROAXwrHpj92SeC+j0TjmP6ycH2Q="; + hash = "sha256-t1NQHATLc5KDkmR59KksmeiEO1dcMkOXz0oCpHw3D10="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8="; + cargoHash = "sha256-qCNw9VkJOpt7v18xNT4UIqO9Lf7VVoY5tJNevNvGmu4="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index 8dd91679d093..279b6cd6c9fc 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobuster"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "OJ"; repo = "gobuster"; rev = "v${version}"; - hash = "sha256-GSpCmJx60DMGr6hDaL//i0gteJniU2jJO+sEDp+eUvg="; + hash = "sha256-Ohv/FgMbniItbrcrncAe9QKVjrhxoZ80BGYJmJtJpPk="; }; - vendorHash = "sha256-xY+RoM19bsoSCRJk7caMjU3jkUoWkOYRYKHfQjiVVPo="; + vendorHash = "sha256-ZbY5PyXKcTB9spVGfW2Qhj8SV9alOSH0DyXx1dh/NgQ="; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1a4e71725b6..6c430186a502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14981,7 +14981,9 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { }; + fstar = callPackage ../development/compilers/fstar { + z3 = z3_4_8_5; + }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -37074,7 +37076,8 @@ with pkgs; inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_11 - z3_4_8; + z3_4_8 + z3_4_8_5; z3 = z3_4_8; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {};