ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #153434 from AndersonTorres/new-misc

Browse Source 
misc updates

dialog: 1.3-20210621 -> 1.3-20211214
xa: 2.3.11 -> 2.3.12
tcsh: 6.23.00 -> 6.23.02
pyspread: 1.99.6 -> 2.0.2
kirc: 0.2.7 -> 0.2.9
This commit is contained in:
Anderson Torres 2022-01-04 12:46:46 -03:00 committed by GitHub
commit edf6fb3bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/gftp/default.nix → pkgs/applications/networking/ftp/gftp/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gftp";
version = "2.7.0b";
version = "2.8.0b";
src = fetchFromGitHub {
owner = "masneyb";
repo = pname;
rev = version;
hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog=";
hash = "sha256-syeRFpqbd1VhKhhs/fIByDSVpcY+SAlmikDo3J1ZHlo=";
};
nativeBuildInputs = [
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
libtool
pkg-config
];
buildInputs = [
gtk
ncurses
@ -39,12 +40,12 @@ stdenv.mkDerivation rec {
readline
];
hardeningDisable = [ "format" ];
preConfigure = ''
./autogen.sh
'';
hardeningDisable = [ "format" ];
meta = with lib; {
homepage = "https://github.com/masneyb/gftp";
description = "GTK-based multithreaded FTP client for *nix-based machines";

4
pkgs/applications/networking/irc/kirc/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "kirc";
version = "0.2.7";
version = "0.2.9";
src = fetchFromGitHub {
owner = "mcpcpc";
repo = pname;
rev = version;
hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4=";
hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo=";
};
dontConfigure = true;

43
pkgs/applications/office/pyspread/default.nix
View File

@ -1,31 +1,22 @@
{ lib
, python3
, fetchpatch
, copyDesktopItems
, makeDesktopItem
, python3
, qtsvg
, wrapQtAppsHook
}:
python3.pkgs.buildPythonApplication rec {
pname = "pyspread";
version = "1.99.6";
version = "2.0.2";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8=";
hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
};
patches = [
# https://gitlab.com/pyspread/pyspread/-/merge_requests/34
(fetchpatch {
name = "entry-points.patch";
url = "https://gitlab.com/pyspread/pyspread/-/commit/3d8da6a7a7d76f7027d77ca95fac103961d729a2.patch";
excludes = [ "bin/pyspread" "bin/pyspread.bat" ];
sha256 = "1l614k7agv339hrin23jj7s1mq576vkdfkdim6wp224k7y37bnil";
})
];
nativeBuildInputs = [
copyDesktopItems
wrapQtAppsHook
];
@ -47,19 +38,17 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "pyspread" ];
desktopItem = makeDesktopItem rec {
name = pname;
exec = name;
icon = name;
desktopName = "Pyspread";
genericName = "Spreadsheet";
comment = meta.description;
categories = "Office;Development;Spreadsheet;";
};
postInstall = ''
install -m 444 -Dt $out/share/applications ${desktopItem}/share/applications/*
'';
desktopItems = [
(makeDesktopItem rec {
name = pname;
exec = name;
icon = name;
desktopName = "Pyspread";
genericName = "Spreadsheet";
comment = meta.description;
categories = "Office;Development;Spreadsheet;";
})
];
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")

4
pkgs/development/compilers/xa/xa.nix
View File

@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "xa";
version = "2.3.11";
version = "2.3.12";
src = fetchurl {
urls = [
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
];
hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0=";
hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ=";
};
checkInputs = [ perl ];

4
pkgs/shells/tcsh/default.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "tcsh";
version = "6.23.00";
version = "6.23.02";
src = fetchurl {
urls = [
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
];
hash = "sha256-Tr6y8zYz0RXZU19VTGUahSMEDY2R5d4zP7LuBFuOAB4=";
hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus=";
};
buildInputs = [

6
pkgs/tools/misc/dialog/default.nix
View File

@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
version = "1.3-20210621";
version = "1.3-20211214";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g=";
hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks=";
};
buildInputs = [
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
description = "Display dialog boxes from shell";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ AndersonTorres spacefrogg ];
platforms = ncurses.meta.platforms;
inherit (ncurses.meta) platforms;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -5619,7 +5619,7 @@ with pkgs;
gexiv2 = callPackage ../development/libraries/gexiv2 { };
gftp = callPackage ../applications/networking/gftp {
gftp = callPackage ../applications/networking/ftp/gftp {
gtk = gtk2;
};