JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #101569 from AndersonTorres/megafix

Browse Source 
Fixing some URLs
This commit is contained in:
Anderson Torres 2020-10-28 10:15:26 -03:00 committed by GitHub
commit c3feda093d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 194 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/misc/sakura/default.nix
View File

@ -1,27 +1,38 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
{ stdenv
, fetchurl
, cmake
, pkgconfig
, gtk3
, perl
, vte
, pcre2
, glib
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "sakura";
version = "3.7.0";
version = "3.7.1";
src = fetchurl {
url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m";
url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos=";
};
nativeBuildInputs = [ cmake perl pkgconfig ];
nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ];
buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
buildInputs = [ gtk3 vte pcre2 glib ];
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
# Set path to gsettings-schemata so sakura knows
# where to find colorchooser, fontchooser etc.
postInstall = ''
wrapProgram $out/bin/sakura \
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
'';
meta = with stdenv.lib; {
homepage = "https://www.pleyades.net/david/projects/sakura";
description = "A terminal emulator based on GTK and VTE";
homepage = "https://www.pleyades.net/david/projects/sakura";
license = licenses.gpl2;
maintainers = with maintainers; [ astsmtl codyopel ];
platforms = platforms.linux;
longDescription = ''
sakura is a terminal emulator based on GTK and VTE. It's a terminal
emulator with few dependencies, so you don't need a full GNOME desktop
@ -32,5 +43,8 @@ stdenv.mkDerivation rec {
terminals in one window and adds a contextual menu with some basic
options. No more no less.
'';
};
license = licenses.gpl2Only;
maintainers = with maintainers; [ astsmtl codyopel AndersonTorres ];
platforms = platforms.linux;
};
}

78
pkgs/applications/video/bombono/default.nix
View File

@ -1,54 +1,80 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3,
enca, pkgconfig, fetchpatch }:
{ stdenv
, fetchFromGitHub
, pkgconfig
, fetchpatch
, scons
, boost
, dvdauthor
, dvdplusrwtools
, enca
, ffmpeg_3
, gettext
, gtk2
, gtkmm2
, libdvdread
, libxmlxx
, mjpegtools
, wrapGAppsHook
}:
let fetchPatchFromAur = {name, sha256}:
fetchpatch {
inherit name sha256;
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
}; in
let
fetchPatchFromAur = {name, sha256}:
fetchpatch {
inherit name sha256;
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
};
in
stdenv.mkDerivation rec {
pname = "bombono";
version = "1.2.4";
src = fetchFromGitHub {
owner = "muravjov";
owner = "bombono-dvd";
repo = "bombono-dvd";
rev = version;
sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM=";
};
patches = [
(fetchpatch {
name = "bombono-dvd-1.2.4-scons3.patch";
url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457";
sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4";
sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA=";
})
] ++ (map fetchPatchFromAur [
{name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
{name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
{name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
{name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
{name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
{name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
{name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
{name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
{name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";}
{name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";}
{name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";}
{name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";}
{name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";}
{name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";}
{name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";}
{name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";}
]);
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg_3 enca
];
boost
dvdauthor
dvdplusrwtools
enca
ffmpeg_3
gtk2
gtkmm2
libdvdread
libxmlxx
mjpegtools
];
prefixKey = "PREFIX=";
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
description = "a DVD authoring program for personal computers";
homepage = "http://www.bombono.org/";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ symphorien ];
homepage = "https://www.bombono.org/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ symphorien ];
};
}

6
pkgs/development/libraries/babl/default.nix
View File

@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Image pixel format conversion library";
homepage = "http://gegl.org/babl/";
license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ jtojnar ];
homepage = "https://gegl.org/babl/";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}

8
pkgs/development/libraries/gegl/4.0.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg";
sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
};
patches = [
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
# https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
})
];
@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Graph-based image processing framework";
homepage = "http://www.gegl.org";
license = licenses.gpl3;
homepage = "https://www.gegl.org";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};

31
pkgs/development/libraries/gegl/default.nix
View File

@ -1,12 +1,24 @@
{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
, librsvg, pango, gtk2, bzip2, intltool, libintl
{ stdenv
, fetchurl
, pkgconfig
, babl
, libpng
, cairo
, libjpeg
, librsvg
, pango
, gtk2
, bzip2
, intltool
, libintl
, OpenGL ? null }:
stdenv.mkDerivation rec {
name = "gegl-0.2.0";
pname = "gegl";
version = "0.2.0";
src = fetchurl {
url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2";
sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
};
@ -17,7 +29,7 @@ stdenv.mkDerivation rec {
name = "CVE-2012-4433.patch";
})];
# needs fonts otherwise don't know how to pass them
# needs fonts otherwise don't know how to pass them
configureFlags = [ "--disable-docs" ];
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
@ -27,10 +39,11 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 3 out of 19 tests
meta = {
meta = with stdenv.lib; {
description = "Graph-based image processing framework";
homepage = "http://www.gegl.org";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
homepage = "https://www.gegl.org";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}

7
pkgs/development/pharo/launcher/default.nix
View File

@ -55,10 +55,10 @@ stdenv.mkDerivation rec {
test "$?" == 124 && echo "ok")
'';
meta = {
meta = with stdenv.lib; {
description = "Launcher for Pharo distributions";
homepage = "https://pharo.org";
longDescription = ''
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small
core system, excellent dev tools, and maintained releases, Pharo
@ -75,8 +75,7 @@ stdenv.mkDerivation rec {
access it very rapidly from your OS application launcher. As a
result, launching any image is never more than 3 clicks away.
'';
homepage = "http://pharo.org";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = [ ];
platforms = pharo.meta.platforms;
};

40
pkgs/development/pharo/vm/build-vm-legacy.nix
View File

@ -1,4 +1,20 @@
{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }:
{ stdenv
, fetchurl
, cmake
, bash
, unzip
, glibc
, openssl
, gcc
, libGLU
, libGL
, freetype
, xorg
, alsaLib
, cairo
, libuuid
, makeWrapper
, ... }:
{ name, src, ... }:
@ -10,7 +26,15 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" "pic" ];
# Building
nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
buildInputs = [ bash glibc openssl libGLU libGL freetype
xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
[ cairo libGLU libGL freetype openssl libuuid alsaLib
xorg.libICE xorg.libSM ];
preConfigure = ''
cd build/
'';
@ -46,12 +70,9 @@ stdenv.mkDerivation rec {
ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
'';
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ];
nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
meta = {
meta = with stdenv.lib; {
description = "Clean and innovative Smalltalk-inspired environment";
homepage = "https://pharo.org";
longDescription = ''
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small core
@ -65,9 +86,8 @@ stdenv.mkDerivation rec {
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
packaging (ppa:pharo/stable)' project.
'';
homepage = "http://pharo.org";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.lukego ];
license = licenses.mit;
maintainers = [ maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X)
platforms = stdenv.lib.filter
(system: with stdenv.lib.systems.elaborate { inherit system; };

56
pkgs/development/pharo/vm/build-vm.nix
View File

@ -46,6 +46,33 @@ stdenv.mkDerivation rec {
# while the VM depends on <= gcc48:
"stackprotector" ];
# gcc 4.8 used for the build:
#
# gcc5 crashes during compilation; gcc >= 4.9 produces a
# binary that crashes when forking a child process. See:
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
#
# (stack protection is disabled above for gcc 4.8 compatibility.)
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
bash
unzip
glibc
openssl
gcc48
libGLU libGL
freetype
xorg.libX11
xorg.libICE
xorg.libSM
alsaLib
cairo
pharo-share
libuuid
];
enableParallelBuilding = true;
# Regenerate the configure script.
# Unnecessary? But the build breaks without this.
autoreconfPhase = ''
@ -123,35 +150,9 @@ stdenv.mkDerivation rec {
ln -s ${libgit2}/lib/libgit2.so* "$out/"
'';
enableParallelBuilding = true;
# gcc 4.8 used for the build:
#
# gcc5 crashes during compilation; gcc >= 4.9 produces a
# binary that crashes when forking a child process. See:
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
#
# (stack protection is disabled above for gcc 4.8 compatibility.)
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
bash
unzip
glibc
openssl
gcc48
libGLU libGL
freetype
xorg.libX11
xorg.libICE
xorg.libSM
alsaLib
cairo
pharo-share
libuuid
];
meta = with stdenv.lib; {
description = "Clean and innovative Smalltalk-inspired environment";
homepage = "https://pharo.org";
longDescription = ''
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small core
@ -165,7 +166,6 @@ stdenv.mkDerivation rec {
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
packaging (ppa:pharo/stable)' project.
'';
homepage = "http://pharo.org";
license = licenses.mit;
maintainers = [ maintainers.lukego ];
platforms = [ "i686-linux" "x86_64-linux" ];

2
pkgs/development/pharo/vm/share.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Shared files for Pharo";
homepage = "http://pharo.org";
homepage = "https://pharo.org";
license = stdenv.lib.licenses.mit;
maintainers = [ ];
};

14
pkgs/tools/misc/buildtorrent/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
let version = "0.8"; in
stdenv.mkDerivation rec {
pname = "buildtorrent";
inherit version;
version = "0.8";
src = fetchurl {
url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
};
meta = {
meta = with stdenv.lib; {
description = "A simple commandline torrent creator";
homepage = "http://mathr.co.uk/blog/torrent.html";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
homepage = "https://mathr.co.uk/blog/torrent.html";
license = licenses.gpl3Plus;
platforms = platforms.all;
};
}

44
pkgs/tools/video/atomicparsley/default.nix
View File

@ -1,39 +1,31 @@
{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "atomicparsley";
version = "0.9.6";
version = "20200701.154658.b0d6223";
src = fetchhg {
url = "https://bitbucket.org/wez/atomicparsley";
sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8=";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
installPhase = ''
runHook preInstall
install -D AtomicParsley $out/bin/AtomicParsley
runHook postInstall
'';
meta = with stdenv.lib; {
description = ''
A lightweight command line program for reading, parsing and
setting metadata into MPEG-4 files
'';
longDescription = ''
This is a maintained fork of the original AtomicParsley.
'';
homepage = "https://bitbucket.org/wez/atomicparsley";
license = licenses.gpl2;
description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files";
homepage = "https://github.com/wez/atomicparsley";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ pjones ];
};