-
-
Notifications
You must be signed in to change notification settings - Fork 17.6k
krename: switch to podofo 0.10, adopt, refactor #413435
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
0f062e9 to
fb0ab71
Compare
|
|
Looks good from here. I haven't had this issue myself as I'm running the beta with qt6 support which works with the latest podofo. Maybe while at it, can you move it to Here's my local patch. diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
deleted file mode 100644
index 58e81790e683..000000000000
--- a/pkgs/applications/misc/krename/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- mkDerivation,
- fetchurl,
- fetchpatch,
- lib,
- extra-cmake-modules,
- kdoctools,
- wrapGAppsHook3,
- kconfig,
- kinit,
- kjsembed,
- taglib,
- exiv2,
- podofo,
- kcrash,
-}:
-
-let
- pname = "krename";
- version = "5.0.2";
-
-in
-mkDerivation rec {
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "sha256-sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0=";
- };
-
- patches = [
- (fetchpatch {
- name = "fix-build-with-exiv2-0.28.patch";
- url = "https://invent.kde.org/utilities/krename/-/commit/e7dd767a9a1068ee1fe1502c4d619b57d3b12add.patch";
- hash = "sha256-JpLVbegRHJbXi/Z99nZt9kgNTetBi+L9GfKv5s3LAZw=";
- })
- ];
-
- buildInputs = [
- taglib
- exiv2
- podofo
- ];
-
- nativeBuildInputs = [
- extra-cmake-modules
- kdoctools
- wrapGAppsHook3
- ];
-
- propagatedBuildInputs = [
- kconfig
- kcrash
- kinit
- kjsembed
- ];
-
- NIX_LDFLAGS = "-ltag";
-
- meta = with lib; {
- description = "Powerful batch renamer for KDE";
- mainProgram = "krename";
- homepage = "https://kde.org/applications/utilities/krename/";
- license = licenses.gpl2;
- maintainers = with maintainers; [ peterhoeg ];
- inherit (kconfig.meta) platforms;
- };
-}
diff --git a/pkgs/by-name/kr/krename/package.nix b/pkgs/by-name/kr/krename/package.nix
new file mode 100644
index 000000000000..03a25a78328f
--- /dev/null
+++ b/pkgs/by-name/kr/krename/package.nix
@@ -0,0 +1,57 @@
+{
+ stdenv,
+ fetchurl,
+ fetchFromGitLab,
+ lib,
+ extra-cmake-modules,
+ kdePackages,
+ taglib,
+ exiv2,
+ podofo,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "krename";
+ version = "5.0.60";
+
+ # src = fetchurl {
+ # url = "mirror://kde/stable/krename/${version}/src/krename-${finalAttrs.version}.tar.xz";
+ # hash = "sha256-sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0=";
+ # };
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ owner = "utilities";
+ repo = "krename";
+ rev = "1d7b03864d0394a77c37c57c09d1ef57b0378cd1";
+ hash = "sha256-zdTg5xMNMSuDSuVBguPY/T3Pl6p+Ktv3rVckKCC9izY=";
+ };
+
+ buildInputs = with kdePackages; [
+ exiv2
+ podofo
+ kio
+ kxmlgui
+ qtbase
+ qtdeclarative
+ qt5compat
+ taglib
+ ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ kdePackages.kdoctools
+ kdePackages.wrapQtAppsHook
+ ];
+
+ env.NIX_LDFLAGS = "-ltag";
+
+ meta = with lib; {
+ description = "Powerful batch renamer for KDE";
+ mainProgram = "krename";
+ homepage = "https://kde.org/applications/utilities/krename/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (kdePackages.qtbase.meta) platforms;
+ };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01babb4544c1..46d92d083af4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4049,8 +4049,6 @@ with pkgs;
kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
- krename = libsForQt5.callPackage ../applications/misc/krename { };
-
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
krunner-translator = libsForQt5.callPackage ../tools/misc/krunner-translator { };
|
fb0ab71 to
02eb8e6
Compare
|
We typically don't jump to unstable/unrelased versions unless there is a very good reason to do so. Qt5 works fine and that's why I didn't create a PR earlier but just kept the changes locally. I suggest mark this as draft and rejig it when a proper krename release is made. |
The thing is that i probably don't have the necessary perms to make it a draft again |
02eb8e6 to
3ff88a3
Compare
3ff88a3 to
1dde9c9
Compare
|
@peterhoeg I think this is probably what you wanted |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/5716 |
973e447 to
e65aa4b
Compare
changes: - adopt - podofo 0.9 -> 0.10 - switch to explicit qt5 lib - remove `with lib;` - migrate to pkgs/by-name - switch to finalAttrs - switch to stdenv.mkDerivation from mkDerivation - remove pname from src url
e65aa4b to
2c427af
Compare
|
Closing in favour of #440935 |
Changes:
with lib;Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.