From 71f6dcfcc234ef35f9b16b9a3acc747a679755a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 17:37:03 -0300 Subject: [PATCH 1/5] vnote: 3.8.1 -> 3.10.1 --- pkgs/applications/office/vnote/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 2c6b5dfe3b3b..2ba594a64aad 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,18 +8,24 @@ mkDerivation rec { pname = "vnote"; - version = "3.8.1"; + version = "3.10.1"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-GgSVBVcT0rfgglyjCmkEMbKCEltesC3eSsN38psrkS4="; + sha256 = "sha256-juLyKAq21qNCWTpyMJSMw86U/DMbw/QJCr8QwyqVclA="; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebengine ]; + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + qtwebengine + ]; meta = with lib; { homepage = "https://vnotex.github.io/vnote"; From 7f08416298a8a601b2f949cc1a0b63b68568f264 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 17:42:34 -0300 Subject: [PATCH 2/5] tcsh: 6.22.04 -> 6.23.00 --- pkgs/shells/tcsh/default.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 4fd4e5730a4e..9a5bf59f18ea 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,24 +1,31 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib +, stdenv +, fetchurl +, fetchpatch , ncurses }: stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.22.04"; + version = "6.23.00"; src = fetchurl { urls = [ - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "https://astron.com/pub/tcsh/${pname}-${version}.tar.gz" "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" ]; - hash = "sha256-6xY1YkMhjDLzngcljXK/iyHmLOlLsOipXjGLFROX4jE="; + hash = "sha256-Tr6y8zYz0RXZU19VTGUahSMEDY2R5d4zP7LuBFuOAB4="; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + ]; patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { @@ -47,7 +54,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; - passthru = { - shellPath = "/bin/tcsh"; - }; + passthru.shellPath = "/bin/tcsh"; } From 0d38cca78a576417f3fbcdb5921d28443399b2e8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 17:43:12 -0300 Subject: [PATCH 3/5] stella: 6.5.3 -> 6.6 --- pkgs/misc/emulators/stella/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 73e5990e112e..212c06690468 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -7,19 +7,22 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.5.3"; + version = "6.6"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - hash = "sha256-Y9rEh9PZalQNj+d7OXN/8z5P8Hti4R3c2RL1BY+J1y4="; + hash = "sha256-+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 ]; + nativeBuildInputs = [ + pkg-config + ]; - enableParallelBuilding = true; + buildInputs = [ + SDL2 + ]; meta = with lib;{ homepage = "https://stella-emu.github.io/"; From 2b310dd32bf4dd984a5a0b9e6e026ac6a6c282c5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 17:43:32 -0300 Subject: [PATCH 4/5] wxSVG: 1.5.22 -> 1.5.23 --- pkgs/development/libraries/wxSVG/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f83f7e408977..05a4655b800f 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { pname = "wxSVG"; - version = "1.5.22"; + version = "1.5.23"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2"; - hash = "sha256-DeFozZ8MzTCbhkDBtuifKpBpg7wS7+dbDFzTDx6v9Sk="; + hash = "sha256-Pwc2H6zH0YzBmpQN1zx4FC7V7sOMFNmTqFvwwGHcq7k="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo ffmpeg @@ -39,5 +40,6 @@ stdenv.mkDerivation rec { license = with licenses; gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = wxGTK.meta.platforms; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f71bc5e163..6b63e5211c13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20112,7 +20112,7 @@ with pkgs; }; wxSVG = callPackage ../development/libraries/wxSVG { - wxGTK = wxGTK30; + wxGTK = wxGTK30-gtk3; }; wtk = callPackage ../development/libraries/wtk { }; From bdb113393585e0e8d675d1ebba1416c432584c17 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 17:43:53 -0300 Subject: [PATCH 5/5] sakura: 3.8.3 -> 3.8.4 Changed to github because launchpad server is down. --- .../terminal-emulators/sakura/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 44c34d76f469..8434c233ad4b 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , cmake , glib , gtk3 @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.3"; + version = "3.8.4"; - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UEDc3TjoqjLNZtWGlIZB3VTVQC+31AP0ASQH0fu+U+Q="; + src = fetchFromGitHub { + owner = "dabisu"; + repo = pname; + rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc="; }; nativeBuildInputs = [ @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { # Set path to gsettings-schemata so sakura knows where to find colorchooser, # fontchooser etc. - postInstall = '' + postFixup = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ '';