From 30d1d1cf28224c95149b9bb3c2b4078add355192 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 25 Mar 2024 19:44:09 +0100 Subject: newsboat: 2.34 -> 2.35 Changelog: https://github.com/newsboat/newsboat/blob/master/CHANGELOG.md#235---2024-03-24 Diff: https://github.com/newsboat/newsboat/compare/r2.34...r2.35 --- pkgs/applications/networking/feedreaders/newsboat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index c522210bb6e70..bd89a2a0a329c 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.34"; + version = "2.35"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-knF+N/HHL/E6C973t+ww5XTLV2thwy7lMAeqTyXspHY="; + hash = "sha256-WbicKP46N8MVjUeerYUdcHJO5Qf7rQFyYCpxexd2wDY="; }; - cargoHash = "sha256-IsDym+tqF040SxCJF575OPm45IROYMFsCrxJcM1SAJ4="; + cargoHash = "sha256-B6U+DxIRm9Sn4x+dZCfNKENNDsTUVZFT6i0Yz47gjTs="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' -- cgit 1.4.1 From 9d05397e502674799ad3a983fcd19e5763940d39 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 8 Apr 2024 21:22:57 +0200 Subject: soundmodem: add desktop item --- pkgs/applications/radio/soundmodem/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index 01a8006822f69..f69fbfecd608c 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "soundmodem"; @@ -9,13 +9,26 @@ stdenv.mkDerivation rec { sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; buildInputs = [ alsa-lib audiofile gtk2 libxml2 ]; patches = [ ./matFix.patch ]; doCheck = true; + desktopItems = [ + (makeDesktopItem { + name = "SoundmodemConfig"; + exec = "soundmodemconfig"; + desktopName = "SoundModemConfig"; + comment = "Audio based modem for ham radio supporting ax.25"; + categories = [ "Audio" ]; + }) + ]; + meta = with lib; { description = "Audio based modem for ham radio supporting ax.25"; longDescription = '' -- cgit 1.4.1 From 61921f8df967be0b6382fd9ed2e7eea8141084ce Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 7 Apr 2024 23:41:48 +0530 Subject: tiramisu: 2.0.20211107 -> 2.0-unstable-2023-03-29 Use a commit since the last release to get the latest changes since latest changes are not released yet as per https://github.com/NixOS/nixpkgs/issues/217845 --- pkgs/applications/misc/tiramisu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 8624bded6641f..2da7c99bceee1 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tiramisu"; - version = "2.0.20211107"; + version = "2.0-unstable-2023-03-29"; src = fetchFromGitHub { owner = "Sweets"; repo = pname; - rev = version; - sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw"; + rev = "5dddd83abd695bfa15640047a97a08ff0a8d9f9b"; + sha256 = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; }; buildInputs = [ glib ]; -- cgit 1.4.1 From 2b54af67e1888830d81ad08a4cce1b8318f04356 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:31:17 +0530 Subject: tiramisu: cleanup add comments why we have to use the current HEAD commit --- pkgs/applications/misc/tiramisu/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 2da7c99bceee1..4a123be328c90 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "tiramisu"; + # FIXME: once a newer release in upstream is available version = "2.0-unstable-2023-03-29"; src = fetchFromGitHub { owner = "Sweets"; - repo = pname; + repo = "tiramisu"; + # FIXME: use the current HEAD commit as upstream has no releases since 2021 rev = "5dddd83abd695bfa15640047a97a08ff0a8d9f9b"; - sha256 = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; + hash = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; }; buildInputs = [ glib ]; -- cgit 1.4.1 From 55995103d380e4dbe38f3d3809daf7bc854831d4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Apr 2024 13:07:28 +0400 Subject: gitui: 0.25.2 → 0.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version-management/gitui/default.nix | 33 +++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix index 4b31c2e248536..f59249a9796d3 100644 --- a/pkgs/applications/version-management/gitui/default.nix +++ b/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.25.2"; + version = "0.26.1"; src = fetchFromGitHub { owner = "extrawurst"; - repo = pname; + repo = "gitui"; rev = "v${version}"; - hash = "sha256-1sBuyY6lpxb/Vlpy6pi7YP69HZID6D97ZkVLbPEZ4Qw="; + hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ="; }; - cargoHash = "sha256-S8Oy5DII05430nkRJmMgZsb4fUIks2zliDea9RycH3E="; + cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU="; nativeBuildInputs = [ pkg-config ]; @@ -29,27 +29,32 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; + postPatch = '' + # The cargo config overrides linkers for some targets, breaking the build + # on e.g. `aarch64-linux`. These overrides are not required in the Nix + # environment: delete them. + rm .cargo/config - # The cargo config overrides linkers for some targets, breaking the build - # on e.g. `aarch64-linux`. These overrides are not required in the Nix - # environment: delete them. - postPatch = "rm .cargo/config"; + # build script tries to get version information from git + rm build.rs + substituteInPlace Cargo.toml --replace-fail 'build = "build.rs"' "" + ''; + GITUI_BUILD_NAME = version; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; # Getting app_config_path fails with a permission denied checkFlags = [ "--skip=keys::key_config::tests::test_symbolic_links" ]; - - meta = with lib; { + meta = { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; mainProgram = "gitui"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne yanganto mfrw ]; }; } -- cgit 1.4.1 From bd662930103650e0d569776e6e0566d510e43479 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Apr 2024 13:11:27 +0400 Subject: gitui: migrate to by-name --- .../version-management/gitui/default.nix | 60 --------------------- pkgs/by-name/gi/gitui/package.nix | 63 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 63 insertions(+), 64 deletions(-) delete mode 100644 pkgs/applications/version-management/gitui/default.nix create mode 100644 pkgs/by-name/gi/gitui/package.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix deleted file mode 100644 index f59249a9796d3..0000000000000 --- a/pkgs/applications/version-management/gitui/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, libiconv -, openssl -, pkg-config -, xclip -, AppKit -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gitui"; - version = "0.26.1"; - - src = fetchFromGitHub { - owner = "extrawurst"; - repo = "gitui"; - rev = "v${version}"; - hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ="; - }; - - cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux xclip - ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - - postPatch = '' - # The cargo config overrides linkers for some targets, breaking the build - # on e.g. `aarch64-linux`. These overrides are not required in the Nix - # environment: delete them. - rm .cargo/config - - # build script tries to get version information from git - rm build.rs - substituteInPlace Cargo.toml --replace-fail 'build = "build.rs"' "" - ''; - - GITUI_BUILD_NAME = version; - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - - # Getting app_config_path fails with a permission denied - checkFlags = [ - "--skip=keys::key_config::tests::test_symbolic_links" - ]; - - meta = { - description = "Blazing fast terminal-ui for Git written in Rust"; - homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; - mainProgram = "gitui"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Br1ght0ne yanganto mfrw ]; - }; -} diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix new file mode 100644 index 0000000000000..edc03effa5fd9 --- /dev/null +++ b/pkgs/by-name/gi/gitui/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, xclip +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.26.1"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = "gitui"; + rev = "v${version}"; + hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ="; + }; + + cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isLinux xclip + ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit + ]; + + postPatch = '' + # The cargo config overrides linkers for some targets, breaking the build + # on e.g. `aarch64-linux`. These overrides are not required in the Nix + # environment: delete them. + rm .cargo/config + + # build script tries to get version information from git + rm build.rs + substituteInPlace Cargo.toml --replace-fail 'build = "build.rs"' "" + ''; + + GITUI_BUILD_NAME = version; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + # Getting app_config_path fails with a permission denied + checkFlags = [ + "--skip=keys::key_config::tests::test_symbolic_links" + ]; + + meta = { + description = "Blazing fast terminal-ui for Git written in Rust"; + homepage = "https://github.com/extrawurst/gitui"; + changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; + mainProgram = "gitui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne yanganto mfrw ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e81a4a5acb6e..ab71ea43cb3d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2528,10 +2528,6 @@ with pkgs; gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { }; - gitui = callPackage ../applications/version-management/gitui { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - }; - gitweb = callPackage ../applications/version-management/gitweb { }; glab = callPackage ../applications/version-management/glab { }; -- cgit 1.4.1 From 53c8ac36310ca47858bf40b21248a14cc8aaed1b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 12 Apr 2024 21:01:42 +0200 Subject: vimPlugins.trust-vim: init at 2022-04-14 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index de84fcdce8dab..24b32d2cabd73 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11099,6 +11099,18 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; + trust-vim = buildVimPlugin { + pname = "trust.vim"; + version = "2022-04-14"; + src = fetchFromGitHub { + owner = "tesaguri"; + repo = "trust.vim"; + rev = "3e17b29ff13f862eeda269d7ce0260571dab6cb7"; + sha256 = "1zvxjgyzzhnza2gv528dvyp7m1nvsz5gjn0qp65jn0k7y4gh3nnl"; + }; + meta.homepage = "https://github.com/tesaguri/trust.vim/"; + }; + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ca18c766c3df6..0f3ca25471a47 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -932,6 +932,7 @@ https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, +https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, -- cgit 1.4.1 From 79a5df03ab50e329038a01ebc1069cb6e58539fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 16:28:43 +0000 Subject: git-mit: 5.12.194 -> 5.12.196 --- pkgs/applications/version-management/git-mit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index f3dbcc6273d66..ff1f8e98a79d0 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.194"; + version = "5.12.196"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-9ITy2VPLIunSLSNx4EXbvxZ7V/Kr+DwmjzDVj/QVGHs="; + hash = "sha256-vv60+8H6WQes+xVJRsgLppwQ/DkQbfNC6tRx2TB/4HQ="; }; - cargoHash = "sha256-6R+T0BSgT6IivugkXXsX5xJ2c3/J3FnLY3ZvcfYW53E="; + cargoHash = "sha256-jK2GTI+T7Ie5cdQQQHh2aj6Egb/5BxsfJkFrSo+z7Pc="; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From e8abfd98b083c86c1dee005456ae19700be9b1e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 01:26:52 +0000 Subject: nomad: 1.7.6 -> 1.7.7 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index f94cb28ce2f55..89891fd04046a 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,9 +82,9 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.6"; - sha256 = "sha256-rEWXQwkW/muX3D0An3WmHCoboPACFCrSG7Tyzor2wnQ="; - vendorHash = "sha256-95yUtNfN/50LjWHHReaB4/riUqy8J67099bP8Ua7gRw="; + version = "1.7.7"; + sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; + vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' -- cgit 1.4.1