From d8fe23231a627f82305b483693d0e7967bbe8621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Mar 2022 06:40:19 +0000 Subject: [PATCH 1/8] mbpfan: 2.2.1 -> 2.3.0 --- pkgs/os-specific/linux/mbpfan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 675d9417a01a..26c3d07364ce 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "mbpfan"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "0gc9ypxi55vxs77nx8ihhh9zk7fr9v0m0zfm76q7x0bi6jz11mbr"; + sha256 = "sha256-jIYg9b0c/7mMRS5WF+mOH6t9SCWEP32lsdbCgpWpg24="; }; installPhase = '' mkdir -p $out/bin $out/etc From 614b54d9b04092d6926afd49d64efe86272f7dd1 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sun, 3 Oct 2021 17:14:03 -0400 Subject: [PATCH 2/8] hardware/nvidia: stricter constraints on PCI bus-id. The current type for the busId options are too relaxed, a stricter constraint should be imposed to guard against typos which result in Xorg unable to start. This commit restricts the type to adhere to the B/D/F notation[1] for addressing devices as expected by the module option. [1] - https://wiki.osdev.org/PCI#Configuration_Space_Access_Mechanism_.231 --- nixos/modules/hardware/video/nvidia.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6de5b99a1ee6..c7c440bea19c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -68,7 +68,7 @@ in }; hardware.nvidia.prime.nvidiaBusId = mkOption { - type = types.str; + type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; default = ""; example = "PCI:1:0:0"; description = '' @@ -78,7 +78,7 @@ in }; hardware.nvidia.prime.intelBusId = mkOption { - type = types.str; + type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; default = ""; example = "PCI:0:2:0"; description = '' @@ -88,7 +88,7 @@ in }; hardware.nvidia.prime.amdgpuBusId = mkOption { - type = types.str; + type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; default = ""; example = "PCI:4:0:0"; description = '' From b4e7303ddfb7a8df37678e152b13148f40ce9acb Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 17 Apr 2022 05:48:33 +0200 Subject: [PATCH 3/8] nixos/specialisation: fix curly brackets --- nixos/modules/system/activation/top-level.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index f016fff824c4..84f560691fc4 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -163,7 +163,7 @@ in specialisation = mkOption { default = {}; - example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }"; + example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }; }"; description = '' Additional configurations to build. If inheritParentConfig is true, the system From b9121c70d830d308be69f107614c51c05ab1a7d5 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 17 Apr 2022 07:05:44 -0300 Subject: [PATCH 4/8] popeye: 0.9.8 -> 0.10.0 --- pkgs/applications/networking/cluster/popeye/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 25fa2c4adc55..08e55ec6693f 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q="; + sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; + vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4="; doCheck = true; From 2e2a25426a8755423f8dd9b8486b1e79343a8de0 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 17 Apr 2022 07:08:22 -0300 Subject: [PATCH 5/8] mongodb-compass: 1.31.1 -> 1.31.2 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 84a0dbde8e9a..5a86018fc2ab 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.31.1"; + version = "1.31.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-sC3ghtOA+Zp7LuAwry460WvyWXXw35aQESlaWznfZYk="; + sha256 = "sha256-ij5lOP3xaty9YjKPionfUhZTcuumlFHt46MUMkjO2yA="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 7a05dabd70a3aed5040c9a95a44c698631c55c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 Apr 2022 11:10:44 +0100 Subject: [PATCH 6/8] nearcore: init at 1.25.0 (#168635) --- .../blockchains/nearcore/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/blockchains/nearcore/default.nix diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix new file mode 100644 index 000000000000..f9f0bd0c69bf --- /dev/null +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -0,0 +1,42 @@ +{ rustPlatform, lib, fetchFromGitHub +, zlib, elfutils, openssl +, cmake, python3, pkg-config, protobuf, perl, llvmPackages +}: +rustPlatform.buildRustPackage rec { + #https://github.com/near/nearcore + pname = "nearcore"; + version = "1.25.0"; + src = fetchFromGitHub { + owner = "near"; + repo = "nearcore"; + # there is also a branch for this version number, so we need to be explicit + rev = "refs/tags/${version}"; + sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM="; + }; + + cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc="; + + # don't build SDK samples that require wasm-enabled rust + cargoBuildFlags = [ "-p" "neard" ]; + doCheck = false; # needs network + + buildInputs = [ zlib elfutils openssl ]; + nativeBuildInputs = [ + cmake + python3 + pkg-config + protobuf + perl + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include"; + + meta = with lib; { + description = "Reference client for NEAR Protocol"; + homepage = "https://github.com/near/nearcore"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f00ee1c353ff..2cb33763c823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8162,6 +8162,8 @@ with pkgs; ndppd = callPackage ../applications/networking/ndppd { }; + nearcore = callPackage ../applications/blockchains/nearcore { }; + nebula = callPackage ../tools/networking/nebula { }; nemiver = callPackage ../development/tools/nemiver { }; From 89158c89c53140ae6dacd043efa74ad598c470b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 03:07:01 +0000 Subject: [PATCH 7/8] gnome.ghex: 42.0 -> 42.1 --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index d78fb3fc2019..3cbc2b2cfddf 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ly11VO8SimxoAJ2YY5TiBMMWeMU+HUpAnyGQmNS/ybs="; + sha256 = "8QMj08MvvRqDFU+/0qJ+yj7pDZwbJSNfGxX+3l+xE6M="; }; nativeBuildInputs = [ From d8b455312ecc706675958bc1c7fdf238e62f26a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Apr 2022 03:40:52 -0700 Subject: [PATCH 8/8] python310Packages.jupyterlab: 3.3.3 -> 3.3.4 (#168906) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 49d345d10743..1a72398f05a4 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.3.3"; + version = "3.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KU1nEmAVujl/axyAVj3uyGLkfgQmI4Ubvip9hw1p62o="; + sha256 = "sha256-4ENVhIs9kaxNlcLjhGoEKbM+nC7ceWaPtPxNIS8eUQc="; }; nativeBuildInputs = [