diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-20 21:11:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 21:11:19 -0400 |
| commit | ee5bcfff932fe679342099e58f9e3dad71d5e0ac (patch) | |
| tree | 8967a6e3829e941ab3a0c58ac5187bb5a5fb006d /pkgs/applications/version-management | |
| parent | e15bc90accfd9faae38dad47298c0441a288426b (diff) | |
| parent | 496248820d11e4779d7155a28be091e31236f1be (diff) | |
| download | nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar.gz nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar.bz2 nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar.lz nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar.xz nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.tar.zst nixlib-ee5bcfff932fe679342099e58f9e3dad71d5e0ac.zip | |
Merge pull request #65110 from worldofpeace/smerge-update
sublime-merge: 1107 -> 1116, sublime-merge-dev: 1111 -> 1115
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/sublime-merge/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/sublime-merge/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f69fdbefe184..c095aa49eafb 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -2,7 +2,7 @@ { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" -, writeScript, common-updater-scripts, curl, gnugrep +, writeScript, common-updater-scripts, curl, gnugrep, coreutils }: let @@ -18,7 +18,7 @@ let arch = "x64"; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index da973b0a7ee1..2734028866e7 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "1107"; - sha256 = "70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71"; + buildVersion = "1116"; + sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; } {}; sublime-merge-dev = common { - buildVersion = "1111"; - sha256 = "d287b77b36febe52623db4546bef978dceb0654257b9a70c798d9cd394305c0d"; + buildVersion = "1115"; + sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; dev = true; } {}; } |