Merge master into staging-next (4a0d961f) · Commits · nix / nixpkgs

pkgs/by-name/_1/_1password-gui/sources.json

+10 −10

Original line number	Diff line number	Diff line
		{
		"stable": {
		"linux": {
		"version": "8.11.16",
		"version": "8.11.18",
		"sources": {
		"x86_64": {
		"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",
		"hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="
		"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.18.x64.tar.gz",
		"hash": "sha256-0a3DfTuCfPH49Nanb825azgc3WglQCf44g8w3GPI68Q="
		},
		"aarch64": {
		"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",
		"hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="
		"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.18.arm64.tar.gz",
		"hash": "sha256-1fyQjPBQP6kYYh63bNQkggqGf8Pj+CEcDfLjweDrCrs="
		}
		}
		},
		"darwin": {
		"version": "8.11.16",
		"version": "8.11.18",
		"sources": {
		"x86_64": {
		"url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",
		"hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="
		"url": "https://downloads.1password.com/mac/1Password-8.11.18-x86_64.zip",
		"hash": "sha256-N9t4oIdI/xXE8YHVHAfPykbaSdob01liCZ4n4Ef/FYo="
		},
		"aarch64": {
		"url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",
		"hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="
		"url": "https://downloads.1password.com/mac/1Password-8.11.18-aarch64.zip",
		"hash": "sha256-OoaZw8IfgQFaU8FtLIrVeQxR7iAMt+PWAZBb9TsWlDs="
		}
		}
		}

+10 −5

Original line number	Diff line number	Diff line
		@@ -18,23 +18,23 @@
		}:
		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "atuin-desktop";
		version = "0.1.3";
		version = "0.1.11";

		src = fetchFromGitHub {
		owner = "atuinsh";
		repo = "desktop";
		tag = "v${finalAttrs.version}";
		hash = "sha256-woYWWDJ2JeyghlRh5IKhPfDy4WmcAGlBJgjBPg1hHq8=";
		hash = "sha256-ySws3R4CatOrKjjGrLJQU9feXIb5MdVX1uKK0fFV21s=";
		};

		cargoRoot = "backend";
		buildAndTestSubdir = finalAttrs.cargoRoot;
		cargoHash = "sha256-tyN9gM8U8kOl62Z0N/plcpTOCbOPuT0kkLI/EKLv/mQ=";
		cargoHash = "sha256-gyDg8XBPiMovOtzmb0eHVWuXmavZTBMvPPgbcdNU6xo=";

		pnpmDeps = pnpm.fetchDeps {
		inherit (finalAttrs) pname version src;
		fetcherVersion = 2;
		hash = "sha256-y+WZF30R/+nvAVr50SWmMN5kfVb1kYiylAd1IBftoVA=";
		hash = "sha256-6YDYrFo5iCelRGBnDFoI8V3Nv/8w3XPNwuArc+nSShU=";
		};

		nativeBuildInputs = [
		@@ -71,6 +71,12 @@ rustPlatform.buildRustPackage (finalAttrs: {

		passthru.updateScript = nix-update-script { };

		checkFlags = [
		# Failing for unknown reason.
		"--skip=runtime::blocks::handlers::script_output_test::tests::test_multiple_scripts"
		];
		doCheck = !stdenv.isDarwin;

		meta = {
		description = "Local-first, executable runbook editor";
		homepage = "https://atuin.sh";
		@@ -84,6 +90,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
		];
		mainProgram = "atuin-desktop";
		platforms = with lib.platforms; windows ++ darwin ++ linux;
		broken = stdenv.hostPlatform.isDarwin;
		};
		})

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		desktop-file-utils,
		fetchFromGitLab,
		glib,
		gobject-introspection,
		graphene,
		gtk4,
		gusb,
		@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
		appstream
		desktop-file-utils
		glib
		gobject-introspection
		gtk4
		json-glib
		libpeas2

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		commit a5d3497577c78b03c05c69d17df972fa9fb54f53
		Author: Linus Heckemann <git@sphalerite.org>
		Date: Fri Jan 5 23:57:09 2018 +0100

		Add -Wno-narrowing to GWEN's CMakeLists

		This avoids the compilation issue that occurs on aarch64 with gcc6.
		(nixpkgs-specific patch)

		diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
		index 82fa0ffba..26c4bbd37 100644
		--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
		+++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
		@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE)
		ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1")
		ENDIF()

		-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB )
		+ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing )

		FILE(GLOB gwen_SRCS ".cpp" "Controls/.cpp" "Controls/Dialog/.cpp" "Controls/Dialogs/.cpp" "Controls/Layout/.cpp" "Controls/Property/.cpp" "Input/.cpp" "Platforms/.cpp" "Renderers/.cpp" "Skins/.cpp")
		FILE(GLOB gwen_HDRS ".h" "Controls/.h" "Controls/Dialog/.h" "Controls/Dialogs/.h" "Controls/Layout/.h" "Controls/Property/.h" "Input/.h" "Platforms/.h" "Renderers/.h" "Skins/.h")

deleted100644 → 0

+0 −58

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchFromGitHub,
		cmake,
		libGLU,
		libGL,
		libglut,
		}:

		stdenv.mkDerivation {
		pname = "bullet";
		version = "2019-03-27";

		src = fetchFromGitHub {
		owner = "olegklimov";
		repo = "bullet3";
		# roboschool needs the HEAD of a specific branch of this fork, see
		# https://github.com/openai/roboschool/issues/126#issuecomment-421643980
		# https://github.com/openai/roboschool/pull/62
		# https://github.com/openai/roboschool/issues/124
		rev = "3687507ddc04a15de2c5db1e349ada3f2b34b3d6";
		sha256 = "1wd7vj9136dl7lfb8ll0rc2fdl723y3ls9ipp7657yfl2xrqhvkb";
		};

		nativeBuildInputs = [ cmake ];
		buildInputs = [
		libGLU
		libGL
		libglut
		];

		patches = [ ./gwen-narrowing.patch ];

		cmakeFlags = [
		"-DBUILD_SHARED_LIBS=ON"
		"-DBUILD_CPU_DEMOS=OFF"
		"-DINSTALL_EXTRA_LIBS=ON"
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin [
		"-DBUILD_BULLET2_DEMOS=OFF"
		"-DBUILD_UNIT_TESTS=OFF"
		];

		meta = with lib; {
		description = "Professional free 3D Game Multiphysics Library";
		longDescription = ''
		Bullet 3D Game Multiphysics Library provides state of the art collision
		detection, soft body and rigid body dynamics.
		'';
		homepage = "http://bulletphysics.org";
		license = licenses.zlib;
		platforms = platforms.unix;
		# /tmp/nix-build-bullet-2019-03-27.drv-0/source/src/Bullet3Common/b3Vector3.h:297:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range]
		# y = b3_splat_ps(y, 0x80);
		broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
		};
		}