From 3957ab13791c2df3cd324310dc86a5605ea011ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 01:17:09 +0000 Subject: [PATCH 1/5] munge: 0.5.14 -> 0.5.15 --- pkgs/tools/security/munge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 99d72fc7c95c..fcf9026f215c 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "munge"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = "${pname}-${version}"; - sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j"; + sha256 = "sha256-Ot/oH/RdfPAzoi3P7EYkxS0Fr24KRWfBJxBEWRF0ctI="; }; strictDeps = true; From e17ff3ff4503881afcdb8e202bfb66613987384c Mon Sep 17 00:00:00 2001 From: Hayden Curfman Date: Tue, 20 Dec 2022 23:50:34 -0500 Subject: [PATCH 2/5] warpd: 1.3.4 -> 1.3.5 fix formatting fixes --- pkgs/applications/misc/warpd/default.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix index 683b725ac5e1..e2d5715447f7 100644 --- a/pkgs/applications/misc/warpd/default.nix +++ b/pkgs/applications/misc/warpd/default.nix @@ -2,35 +2,29 @@ , stdenv , fetchFromGitHub , git -, libXi -, libXinerama -, libXft -, libXfixes -, libXtst -, libX11 -, libXext -, waylandSupport ? false, cairo, libxkbcommon, wayland +, withWayland ? true, cairo, libxkbcommon, wayland +, withX ? true, libXi, libXinerama, libXft, libXfixes, libXtst, libX11, libXext }: stdenv.mkDerivation rec { pname = "warpd"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "rvaiya"; repo = "warpd"; rev = "v${version}"; - sha256 = "sha256-aNv2/+tREvKlpTAsbvmFxkXzONNt73/061i4E3fPFBM="; + hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU="; leaveDotGit = true; }; nativeBuildInputs = [ git ]; - buildInputs = if waylandSupport then [ + buildInputs = lib.optionals withWayland [ cairo libxkbcommon wayland - ] else [ + ] ++ lib.optionals withX [ libXi libXinerama libXft @@ -40,10 +34,12 @@ stdenv.mkDerivation rec { libXext ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals waylandSupport [ "PLATFORM=wayland" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y" + ++ lib.optional (!withX) "DISABLE_X=y"; postPatch = '' - substituteInPlace Makefile \ + substituteInPlace mk/linux.mk \ --replace '-m644' '-Dm644' \ --replace '-m755' '-Dm755' \ --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \ From 8f1881caffd1b13148a7319939c6242d20488465 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 22 Dec 2022 17:11:46 -0500 Subject: [PATCH 3/5] tokodon: Init at 22.11.2 This commit is artificially built over the end-results of the Nixpkgs PR https://github.com/NixOS/nixpkgs/pull/170466 with the package now being built in the way Plasma Mobile Gear packages are built. Main differences: - `mkDerivation` from the Plasma Mobile Gear package set, and related changes (dropping redundant wrapQtAppsHook). - inputs re-ordered and split by usage like sibling packages. The actual work though was by @matthiasbeyer, I only mechanically rehashed the changes. Co-authored-by: Matthias Beyer --- pkgs/applications/plasma-mobile/default.nix | 1 + pkgs/applications/plasma-mobile/tokodon.nix | 78 +++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/plasma-mobile/tokodon.nix diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 48a3f1281fcb..86a4f1d10071 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -79,6 +79,7 @@ let plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; + tokodon = callPackage ./tokodon.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix new file mode 100644 index 000000000000..a412835c8ccd --- /dev/null +++ b/pkgs/applications/plasma-mobile/tokodon.nix @@ -0,0 +1,78 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules +, pkg-config + +, kconfig +, kdbusaddons +, ki18n +, kirigami2 +, kirigami-addons +, knotifications +, libwebsockets +, qqc2-desktop-style +, qtbase +, qtkeychain +, qtmultimedia +, qtquickcontrols2 +, qttools +, qtwebsockets +, kitemmodels +, pimcommon + +# Workarounds for the point release being missing. +, libsForQt5 +, fetchFromGitLab +}: + +# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package +# set for the point release, as the point release was not uploaded to +# the Plasma Mobile gear repo, and the injected `mkDerivation` only can +# use the src (and version) from the `srcs` set. +libsForQt5.mkDerivation rec { + pname = "tokodon"; + + version = "22.11.2"; + # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo. + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uE9iHZDfpn1NTCeJPgsp2WBe0curdguTUbMTrkrmJ6M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + kconfig + kdbusaddons + ki18n + kirigami2 + kirigami-addons + knotifications + qqc2-desktop-style + qtbase + qtkeychain + qtmultimedia + qtquickcontrols2 + qttools + qtwebsockets + kitemmodels + pimcommon + ]; + + meta = with lib; { + description = "A Mastodon client for Plasma and Plasma Mobile"; + homepage = "https://invent.kde.org/network/tokodon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} From 1750c8a3be3ef34e59887e13d70279bd67a67a94 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 22 Dec 2022 17:28:11 -0500 Subject: [PATCH 4/5] aliases: Add tokodon alias at the top level --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dfef1baf367f..ad2822a69be2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1513,6 +1513,7 @@ mapAliases ({ timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 tkcvs = tkrev; # Added 2022-03-07 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 + tokodon = plasma5Packages.tokodon; tomboy = throw "tomboy is not actively developed anymore and was removed"; # Added 2022-01-27 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 From f05c0b78da07e82920eba77a44f78cc572379eff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 04:35:06 +0000 Subject: [PATCH 5/5] imgproxy: 3.9.0 -> 3.13.0 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index b12afc005fe4..68064cbc3d5b 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.9.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-+eI/I+olBPoHez+rjj7Cgqc71M0ZcD9oa35BLQwHPsU="; + sha256 = "sha256-dPGqiNGUI5WwqT65DvY6JXv9/1lc1NZlJbMWUYGgfYY="; rev = "v${version}"; }; - vendorSha256 = "sha256-A6oToGLAFeG0Rd3koDOx+bBsiCye+OcihBwENZNFBSY="; + vendorHash = "sha256-TUu/dWtjs/ua3uwi029gtev0rcAZBCN9AHD9RPZsaDI="; nativeBuildInputs = [ pkg-config ];