diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/applications/terminal-emulators/iterm2 | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators/iterm2')
| -rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch | 11 |
2 files changed, 4 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix index e8fbb8cb9fa9..c547e3d0d769 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,13 +11,15 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.15"; + version = "3.4.19"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo="; + hash = "sha256-UioKFhlwVdrkHtoS1ixXE2rykVO5aQeNQ8TnC5kNSUc="; }; + dontFixup = true; + installPhase = '' runHook preInstall APP_DIR="$out/Applications/iTerm2.app" diff --git a/nixpkgs/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch b/nixpkgs/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch deleted file mode 100644 index e717c58f30f1..000000000000 --- a/nixpkgs/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:28.000000000 +0200 -+++ iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:42.000000000 +0200 -@@ -189,7 +189,7 @@ - kPreferenceKeyInstantReplayMemoryMegabytes: @4, - kPreferenceKeySavePasteAndCommandHistory: @NO, - kPreferenceKeyAddBonjourHostsToProfiles: @NO, -- kPreferenceKeyCheckForUpdatesAutomatically: @YES, -+ kPreferenceKeyCheckForUpdatesAutomatically: @NO, - kPreferenceKeyCheckForTestReleases: @NO, - kPreferenceKeyLoadPrefsFromCustomFolder: @NO, - kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO, |