From 59dca5cc57720cb54622f5dc57967b630d9e9372 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 19 Jul 2022 12:48:39 -0400 Subject: [PATCH 1/8] mlc: 3.9 -> 3.9a The previous version is also now unavailable, and the URL appears to have been changed. --- pkgs/tools/system/mlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index 447ab30d4975..5df3579ca9a1 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, patchelf }: stdenv.mkDerivation rec { pname = "mlc"; - version = "3.9"; + version = "3.9a"; src = fetchurl { - url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz"; - sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb"; + url = "https://downloadmirror.intel.com/736634/mlc_v${version}.tgz"; + sha256 = "3vNI/CQwyY4KMFest1wkVYecsxigjXyGIUIKai979W4="; }; sourceRoot = "Linux"; From a6f00d8fdd8467541456d0bc59cdf6cb83a75937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Sat, 23 Jul 2022 02:26:46 +0200 Subject: [PATCH 2/8] fractal-next: init at unstable-2022-07-10 --- .../fractal-next/default.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/fractal-next/default.nix diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix new file mode 100644 index 000000000000..140b72f20f01 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, rustPlatform +, pkg-config +, glib +, gtk4 +, gtksourceview5 +, libadwaita +, gstreamer +, gst-plugins-base +, gst-plugins-bad +, libsecret +, desktop-file-utils +, appstream-glib +, openssl +, pipewire +, libshumate +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "fractal-next"; + version = "unstable-2022-07-10"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "fractal"; + rev = "837b56978474fe512469805844b8ee234587499a"; + hash = "sha256-6op/+eiDra5EFRludpkQOucBXdPl5a/oQWPwwhJEx+M="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-2mE26ES+fYSWdfMr8uTsX2VVGTNMDQ9MXEk5E/L95UI="; + }; + + nativeBuildInputs = [ + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + desktop-file-utils + appstream-glib + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gstreamer + gst-plugins-base + gst-plugins-bad + gtk4 + gtksourceview5 + libadwaita + libsecret + openssl + pipewire + libshumate + ]; + + meta = with lib; { + description = "Matrix group messaging app (development version)"; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa162d3d0eeb..e62843537f8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27045,6 +27045,10 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; + fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + }; + fragments = callPackage ../applications/networking/p2p/fragments { }; freecad = libsForQt5.callPackage ../applications/graphics/freecad { From 3fd75cfdb1b06f7b630b7f1d366b59ddead8a704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 13:58:09 +0000 Subject: [PATCH 3/8] odpic: 4.3.0 -> 4.4.1 --- pkgs/development/libraries/odpic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index b9095f214814..2c5d0e2a3d56 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.3.0"; + version = "4.4.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-oL2yehjP8JJxU19VY4e/ueh2xjo1yp4X7FGslqCXO8A="; + sha256 = "sha256-tc6N19jSLkuOvTe5f/pBAd1FvpnOjsa4V9CgygUvpZo="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; From 027cedc1c1147f31a9a72ff756f467bfb5ad0179 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 13:42:15 +0000 Subject: [PATCH 4/8] hwinfo: 21.80 -> 21.82 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 12840b3f5100..0b8bb97ec68c 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.80"; + version = "21.82"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-T4ny1tq3IMtmeZRgcAOvu2O23XEiLeKRoqOxhuVGBRw="; + sha256 = "sha256-kFoOqMaejvlv8RnAcUPi03qrhV/Jcy8jQ4AQA1/eBsY="; }; nativeBuildInputs = [ From 8bb04c816d91584027ab55273cfa5ca68e93d286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 21:17:41 +0000 Subject: [PATCH 5/8] libsurvive: 1.0 -> 1.01 --- pkgs/development/libraries/libsurvive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index ddcbcb8222c2..02c4ddffd78a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libsurvive"; - version = "1.0"; + version = "1.01"; src = fetchFromGitHub { owner = "cntools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' fetchSubmodules = true; - sha256 = "sha256-I8Wx9avfMyDic+Bk/1IjzZiiHj+l3XqpRwxYbWlsG/Q="; + sha256 = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; }; nativeBuildInputs = [ cmake pkg-config ]; From 82c4da06775fe0c7cbea53c166f64cd9e33cdca5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 23:55:17 +0000 Subject: [PATCH 6/8] micropython: 1.19 -> 1.19.1 --- pkgs/development/interpreters/micropython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 591c52e4c970..52be0a412078 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.19"; + version = "1.19.1"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-M3cKNuRKOcB1lF9M1rDOpp3sPdx/I60ooLtOYmBWe7c="; + sha256 = "sha256-BoX3Z3Zr/AQqkgRrq+UVgdoDqNESDTNsY9AtrElpzfA="; fetchSubmodules = true; }; From 0aca06698628a73c4b6db4c9792045b288787359 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 1 Aug 2022 00:52:57 +0200 Subject: [PATCH 7/8] qgit: update source sha256 for tag moved upstream see https://github.com/tibirna/qgit/pull/123#issuecomment-1010171222 --- .../version-management/git-and-tools/qgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 6355b7114f5f..85cb9127c21e 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "tibirna"; repo = "qgit"; rev = "${pname}-${version}"; - sha256 = "1cwq43ywvii9zh4m31mgkgisfc9qhiixlz0zlv99skk9vb5v6r38"; + sha256 = "sha256-xM0nroWs4WByc2O469zVeAlzKn6LLr+8WDlEdSjtRYI="; }; buildInputs = [ qtbase ]; From a54fb7fc4ce8a2973097851eabfdb068a19d2211 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 16:47:00 +0000 Subject: [PATCH 8/8] kdiff3: 1.9.5 -> 1.9.6 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 07f82c08591a..d0ac783ca4f5 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CDchWW2dQ3O8LxKYOUqN21tVp61NckKTOnzYrmRoPBo="; + sha256 = "sha256-rJIkdvhQYTpzkoTj+vR3yYrDSa0Vpzeity3thFH2srw="; }; buildInputs = [ boost ];