lol

Merge pull request #200557 from teutat3s/fix/redis-desktop-manager

authored by

Sandro and committed by
GitHub
82b202d3 72c668b3

+105 -86
-85
pkgs/applications/misc/redis-desktop-manager/default.nix
··· 1 - { stdenv, mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 2 - , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2 3 - , qtsvg, qttools, qtquick1, qtcharts 4 - , qmake 5 - }: 6 - 7 - let 8 - breakpad_lss = fetchFromGitiles { 9 - url = "https://chromium.googlesource.com/linux-syscall-support"; 10 - rev = "08056836f2b4a5747daff75435d10d649bed22f6"; 11 - sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz"; 12 - }; 13 - 14 - in 15 - 16 - mkDerivation rec { 17 - pname = "redis-desktop-manager"; 18 - version = "0.9.1"; 19 - 20 - src = fetchFromGitHub { 21 - owner = "uglide"; 22 - repo = "RedisDesktopManager"; 23 - fetchSubmodules = true; 24 - rev = version; 25 - sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; 26 - }; 27 - 28 - nativeBuildInputs = [ pkg-config qmake ]; 29 - buildInputs = [ 30 - libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats 31 - qtquick1 qtquickcontrols2 qtsvg qttools qtcharts 32 - ]; 33 - 34 - dontUseQmakeConfigure = true; 35 - dontWrapQtApps = true; 36 - 37 - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; 38 - 39 - # Disable annoying update reminder 40 - postPatch = '' 41 - sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp 42 - ''; 43 - 44 - buildPhase = '' 45 - srcdir=$PWD 46 - 47 - cat <<EOF > src/version.h 48 - #ifndef RDM_VERSION 49 - #define RDM_VERSION "${version}-120" 50 - #endif // !RDM_VERSION 51 - EOF 52 - 53 - cd $srcdir/3rdparty/gbreakpad 54 - cp -r ${breakpad_lss} src/third_party/lss 55 - chmod +w -R src/third_party/lss 56 - touch README 57 - 58 - cd $srcdir/3rdparty/crashreporter 59 - qmake CONFIG+=release DESTDIR="$srcdir/rdm/bin/linux/release" QMAKE_LFLAGS_RPATH="" 60 - make 61 - 62 - cd $srcdir/3rdparty/gbreakpad 63 - ./configure 64 - make 65 - 66 - cd $srcdir/src 67 - qmake 68 - make 69 - ''; 70 - 71 - installPhase = '' 72 - mkdir -p $out/bin 73 - instdir="$srcdir/bin/linux/release" 74 - cp $instdir/rdm $out/bin 75 - ''; 76 - 77 - meta = with lib; { 78 - broken = (stdenv.isLinux && stdenv.isAarch64); 79 - description = "Cross-platform open source Redis DB management tool"; 80 - homepage = "https://redisdesktop.com/"; 81 - license = licenses.gpl3Only; 82 - platforms = platforms.linux; 83 - maintainers = with maintainers; [ cstrahan ]; 84 - }; 85 - }
+103
pkgs/applications/misc/resp-app/default.nix
··· 1 + { stdenv 2 + , mkDerivation 3 + , lib 4 + , fetchFromGitHub 5 + , fetchpatch 6 + , brotli 7 + , lz4 8 + , pyotherside 9 + , python3 10 + , python3Packages 11 + , qtbase 12 + , qtcharts 13 + , qmake 14 + , qttools 15 + , rdbtools 16 + , snappy 17 + , wrapQtAppsHook 18 + , zstd 19 + }: 20 + 21 + let 22 + rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: { 23 + # Add required additional flag for resp-app 24 + patches = [ 25 + (fetchpatch { 26 + name = "Add-flag-to-parse-only-key-names.patch"; 27 + url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch"; 28 + hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs="; 29 + }) 30 + ]; 31 + }); 32 + in 33 + mkDerivation rec { 34 + pname = "RESP.app"; 35 + version = "2022.5"; 36 + 37 + src = fetchFromGitHub { 38 + owner = "RedisInsight"; 39 + repo = "RedisDesktopManager"; 40 + fetchSubmodules = true; 41 + rev = version; 42 + sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; 43 + }; 44 + 45 + nativeBuildInputs = [ 46 + python3Packages.wrapPython 47 + qmake 48 + wrapQtAppsHook 49 + ]; 50 + 51 + buildInputs = [ 52 + brotli 53 + lz4 54 + pyotherside 55 + python3 56 + qtbase 57 + qtcharts 58 + qttools 59 + snappy 60 + zstd 61 + ] ++ pythonPath; 62 + 63 + 64 + pythonPath = with python3Packages; [ 65 + bitstring 66 + cbor 67 + msgpack 68 + phpserialize 69 + rdbtools-patched 70 + python-lzf 71 + ]; 72 + 73 + postPatch = '' 74 + substituteInPlace src/resp.pro \ 75 + --replace 'which ccache' "false" \ 76 + --replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \ 77 + --replace '/opt/resp_app' "${placeholder "out"}" \ 78 + --replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \ 79 + --replace '/usr/' "$out/" 80 + ''; 81 + 82 + qmakeFlags = [ 83 + "SYSTEM_LZ4=1" 84 + "SYSTEM_ZSTD=1" 85 + "SYSTEM_SNAPPY=1" 86 + "SYSTEM_BROTLI=1" 87 + "VERSION=${version}" 88 + "src/resp.pro" 89 + ]; 90 + 91 + preFixup = '' 92 + buildPythonPath "$pythonPath" 93 + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") 94 + ''; 95 + 96 + meta = with lib; { 97 + description = "Cross-platform Developer GUI for Redis"; 98 + homepage = "https://resp.app/"; 99 + license = licenses.gpl3Only; 100 + platforms = platforms.linux; 101 + maintainers = with maintainers; [ cstrahan ]; 102 + }; 103 + }
+1
pkgs/top-level/aliases.nix
··· 1272 1272 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 1273 1273 readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 1274 1274 redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 1275 + redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10 1275 1276 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 1276 1277 reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 1277 1278
+1 -1
pkgs/top-level/all-packages.nix
··· 37028 37028 37029 37029 r128gain = callPackage ../applications/audio/r128gain { }; 37030 37030 37031 - redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; 37031 + resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; 37032 37032 37033 37033 robin-map = callPackage ../development/libraries/robin-map { }; 37034 37034