Merge remote-tracking branch 'origin/master' into haskell-updates.
This commit is contained in:
Peter Simons
commit
7df5c90f06
|
|
@ -10,7 +10,7 @@ jobs:
|
|||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: technote-space/get-diff-action@v2.0.3
|
||||
- uses: technote-space/get-diff-action@v3.0.0
|
||||
- name: Fetch editorconfig-checker
|
||||
if: env.GIT_DIFF
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -331,6 +331,7 @@
|
|||
./services/development/bloop.nix
|
||||
./services/development/hoogle.nix
|
||||
./services/development/jupyter/default.nix
|
||||
./services/development/jupyterhub/default.nix
|
||||
./services/development/lorri.nix
|
||||
./services/editors/emacs.nix
|
||||
./services/editors/infinoted.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,190 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.jupyterhub;
|
||||
|
||||
kernels = (pkgs.jupyter-kernel.create {
|
||||
definitions = if cfg.kernels != null
|
||||
then cfg.kernels
|
||||
else pkgs.jupyter-kernel.default;
|
||||
});
|
||||
|
||||
jupyterhubConfig = pkgs.writeText "jupyterhub_config.py" ''
|
||||
c.JupyterHub.bind_url = "http://${cfg.host}:${toString cfg.port}"
|
||||
|
||||
c.JupyterHub.authentication_class = "${cfg.authentication}"
|
||||
c.JupyterHub.spawner_class = "${cfg.spawner}"
|
||||
|
||||
c.SystemdSpawner.default_url = '/lab'
|
||||
c.SystemdSpawner.cmd = "${cfg.jupyterlabEnv}/bin/jupyterhub-singleuser"
|
||||
c.SystemdSpawner.environment = {
|
||||
'JUPYTER_PATH': '${kernels}'
|
||||
}
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
in {
|
||||
meta.maintainers = with maintainers; [ costrouc ];
|
||||
|
||||
options.services.jupyterhub = {
|
||||
enable = mkEnableOption "Jupyterhub development server";
|
||||
|
||||
authentication = mkOption {
|
||||
type = types.str;
|
||||
default = "jupyterhub.auth.PAMAuthenticator";
|
||||
description = ''
|
||||
Jupyterhub authentication to use
|
||||
|
||||
There are many authenticators available including: oauth, pam,
|
||||
ldap, kerberos, etc.
|
||||
'';
|
||||
};
|
||||
|
||||
spawner = mkOption {
|
||||
type = types.str;
|
||||
default = "systemdspawner.SystemdSpawner";
|
||||
description = ''
|
||||
Jupyterhub spawner to use
|
||||
|
||||
There are many spawners available including: local process,
|
||||
systemd, docker, kubernetes, yarn, batch, etc.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra contents appended to the jupyterhub configuration
|
||||
|
||||
Jupyterhub configuration is a normal python file using
|
||||
Traitlets. https://jupyterhub.readthedocs.io/en/stable/getting-started/config-basics.html. The
|
||||
base configuration of this module was designed to have sane
|
||||
defaults for configuration but you can override anything since
|
||||
this is a python file.
|
||||
'';
|
||||
example = literalExample ''
|
||||
c.SystemdSpawner.mem_limit = '8G'
|
||||
c.SystemdSpawner.cpu_limit = 2.0
|
||||
'';
|
||||
};
|
||||
|
||||
jupyterhubEnv = mkOption {
|
||||
type = types.package;
|
||||
default = (pkgs.python3.withPackages (p: with p; [
|
||||
jupyterhub
|
||||
jupyterhub-systemdspawner
|
||||
]));
|
||||
description = ''
|
||||
Python environment to run jupyterhub
|
||||
|
||||
Customizing will affect the packages available in the hub and
|
||||
proxy. This will allow packages to be available for the
|
||||
extraConfig that you may need. This will not normally need to
|
||||
be changed.
|
||||
'';
|
||||
};
|
||||
|
||||
jupyterlabEnv = mkOption {
|
||||
type = types.package;
|
||||
default = (pkgs.python3.withPackages (p: with p; [
|
||||
jupyterhub
|
||||
jupyterlab
|
||||
]));
|
||||
description = ''
|
||||
Python environment to run jupyterlab
|
||||
|
||||
Customizing will affect the packages available in the
|
||||
jupyterlab server and the default kernel provided. This is the
|
||||
way to customize the jupyterlab extensions and jupyter
|
||||
notebook extensions. This will not normally need to
|
||||
be changed.
|
||||
'';
|
||||
};
|
||||
|
||||
kernels = mkOption {
|
||||
type = types.nullOr (types.attrsOf(types.submodule (import ../jupyter/kernel-options.nix {
|
||||
inherit lib;
|
||||
})));
|
||||
|
||||
default = null;
|
||||
example = literalExample ''
|
||||
{
|
||||
python3 = let
|
||||
env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
|
||||
ipykernel
|
||||
pandas
|
||||
scikitlearn
|
||||
]));
|
||||
in {
|
||||
displayName = "Python 3 for machine learning";
|
||||
argv = [
|
||||
"''${env.interpreter}"
|
||||
"-m"
|
||||
"ipykernel_launcher"
|
||||
"-f"
|
||||
"{connection_file}"
|
||||
];
|
||||
language = "python";
|
||||
logo32 = "''${env}/''${env.sitePackages}/ipykernel/resources/logo-32x32.png";
|
||||
logo64 = "''${env}/''${env.sitePackages}/ipykernel/resources/logo-64x64.png";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Declarative kernel config
|
||||
|
||||
Kernels can be declared in any language that supports and has
|
||||
the required dependencies to communicate with a jupyter server.
|
||||
In python's case, it means that ipykernel package must always be
|
||||
included in the list of packages of the targeted environment.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8000;
|
||||
description = ''
|
||||
Port number Jupyterhub will be listening on
|
||||
'';
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = ''
|
||||
Bind IP JupyterHub will be listening on
|
||||
'';
|
||||
};
|
||||
|
||||
stateDirectory = mkOption {
|
||||
type = types.str;
|
||||
default = "jupyterhub";
|
||||
description = ''
|
||||
Directory for jupyterhub state (token + database)
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
(mkIf cfg.enable {
|
||||
systemd.services.jupyterhub = {
|
||||
description = "Jupyterhub development server";
|
||||
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
ExecStart = "${cfg.jupyterhubEnv}/bin/jupyterhub --config ${jupyterhubConfig}";
|
||||
User = "root";
|
||||
StateDirectory = cfg.stateDirectory;
|
||||
WorkingDirectory = "/var/lib/${cfg.stateDirectory}";
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "13.5.7";
|
||||
version = "13.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
|
||||
sha256 = "1b2sb44zsa6g5nnsa7drn4fn61jfz3a3g3bisai85fyjff746ipc";
|
||||
sha256 = "17nahdv06d41vyqkcqflf652wjp410i3hn4rhlv5cnd3jcr5vgih";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cheat";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cheat";
|
||||
repo = "cheat";
|
||||
rev = version;
|
||||
sha256 = "06dqwjyk7pmfxvkscn06sc307pxvyjqc6myighfsh3f5x83pg1nc";
|
||||
sha256 = "1bzlbd8lvagpipyv553icv17bafhaydscrrlly8jz7kfi4d9xvkk";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/cheat" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, perlPackages
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcstar";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Kerenoc";
|
||||
repo = "GCstar";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vqfff33sssvlvsva1dflggmwl00j5p64sn1669f9wrbvjkxgpv4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
perl
|
||||
ArchiveZip
|
||||
DateCalc
|
||||
DateTimeFormatStrptime
|
||||
Glib
|
||||
Gtk2
|
||||
GD
|
||||
GDGraph
|
||||
GDText
|
||||
HTMLParser
|
||||
JSON
|
||||
ImageExifTool
|
||||
librelative
|
||||
LWPUserAgent
|
||||
LWPProtocolHttps
|
||||
MP3Info
|
||||
MP3Tag
|
||||
NetFreeDB
|
||||
OggVorbisHeaderPurePerl
|
||||
Pango
|
||||
XMLSimple
|
||||
XMLParser
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd gcstar
|
||||
perl install --text --prefix=$out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gcstar --prefix PERL5LIB : $PERL5LIB
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://gitlab.com/Kerenoc/GCstar";
|
||||
description = "Manage your collections of movies, games, books, music and more";
|
||||
longDescription = ''
|
||||
GCstar is an application for managing your collections.
|
||||
It supports many types of collections, including movies, books, games, comics, stamps, coins, and many more.
|
||||
You can even create your own collection type for whatever unique thing it is that you collect!
|
||||
Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to.
|
||||
You may also search and filter your collections by many criteria.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dasj19 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,19 @@
|
|||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fluxctl";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = "flux";
|
||||
rev = version;
|
||||
sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1";
|
||||
sha256 = "1l514rf7rg05prq9548ygj6z284sy85ddzrwiiqr74vz4kilg3vb";
|
||||
};
|
||||
|
||||
vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9";
|
||||
vendorSha256 = "00qm45vfz4afj8f9hikrlk96w0rdzxqq2azhzrnzfymyiwc6jk5c";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -19,6 +21,13 @@ buildGoModule rec {
|
|||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/fluxctl completion $shell > fluxctl.$shell
|
||||
installShellCompletion fluxctl.$shell
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CLI client for Flux, the GitOps Kubernetes operator";
|
||||
homepage = "https://github.com/fluxcd/flux";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, qmake, pkgconfig, olm, wrapQtAppsHook
|
||||
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
|
||||
, python3Packages, pyotherside
|
||||
}:
|
||||
|
||||
let
|
||||
pypkgs = with python3Packages; [
|
||||
aiofiles filetype matrix-nio appdirs cairosvg
|
||||
pymediainfo setuptools html-sanitizer mistune blist
|
||||
pyotherside
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "mirage";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirukana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook python3Packages.wrapPython ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia
|
||||
qtquickcontrols2
|
||||
qtkeychain qtgraphicaleffects
|
||||
olm pyotherside
|
||||
];
|
||||
|
||||
propagatedBuildInputs = pypkgs;
|
||||
|
||||
pythonPath = pypkgs;
|
||||
|
||||
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postInstall = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
wrapProgram $out/bin/mirage \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
"''${qtWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication.";
|
||||
homepage = "https://github.com/mirukana/mirage";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.36.4";
|
||||
version = "3.36.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zfq02h3r1qbxak04i49564q4s2ykvkgcyc3krjgndan9lq3kvvn";
|
||||
sha256 = "0h1wz4hxsasihdvvsaxnmzka4afjw7603gn0qcw8rxpw114ib1bl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
homepage = "https://wiki.gnome.org/Apps/GTG";
|
||||
downloadPage = "https://github.com/getting-things-gnome/gtg/releases";
|
||||
license = licenses.gpl3Only;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ oyren ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "file-roller";
|
||||
version = "3.36.2";
|
||||
version = "3.36.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1lkb0m8ys13sy3b6c1kj3cqrqf5d1dqvhbp8spz8v9yjv3d7z3r6";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1dw1vfnfc44k57b6mip8fv565d2xv5wrigi4js044x3sbl5f2n89";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8"; # postinstall.py
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "3.36.5";
|
||||
version = "3.36.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1khvyhgd3p41fvvknga1hdl0p1ks4kj4cwsiaw28v1sy6nzclm2c";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0c3cw90xqqcpacc2z06ljs0gg8saxizfgjzg9alhpwgz3gl4c5pg";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-mines";
|
||||
version = "3.36.0";
|
||||
version = "3.36.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0m53ymxbgr3rb3yv13fzjwqh6shsfr51abkm47rchsy2jryqkzja";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i";
|
||||
};
|
||||
|
||||
# gobject-introspection for finding vapi files
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
let
|
||||
pname = "gnome-panel";
|
||||
version = "3.36.1";
|
||||
version = "3.36.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1lxba8syy9gb50zxdk13gr1f62dfphwbb7njg6p26x9rvlkbf88y";
|
||||
sha256 = "0z0f64rgcwkv48kfd1ifzjvnmg3c386hwi9cj11mr5198rah0p4p";
|
||||
};
|
||||
|
||||
# make .desktop Exec absolute
|
||||
|
|
|
|||
|
|
@ -1,22 +1,36 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts
|
||||
, gnome3, libsoup, json-glib, gobject-introspection }:
|
||||
, gnome3, libsoup, json-glib, gobject-introspection
|
||||
, gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfbgraph";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
|
||||
sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gobject-introspection ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig gobject-introspection gtk-doc
|
||||
docbook-xsl-nons autoconf automake libtool
|
||||
];
|
||||
buildInputs = [ glib gnome-online-accounts ];
|
||||
propagatedBuildInputs = [ libsoup json-glib librest ];
|
||||
|
||||
configureFlags = [ "--enable-introspection" ];
|
||||
configureFlags = [ "--enable-introspection" "--enable-gtk-doc" ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs autogen.sh
|
||||
substituteInPlace autogen.sh \
|
||||
--replace "which" "${pkgs.which}/bin/which"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtksourceview";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11csdnb5xj1gkn1shynp3jdsfhhi7ks3apgmavfan0p6n85f64sc";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0x7q9lwgrc4kkciy7vgwd80v2ji7plyqiqbvkvx2yqarmfkqgx33";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Gilcher <florian.gilcher@asquera.de>
|
||||
Date: Sun, 23 Mar 2014 23:05:44 +0100
|
||||
Subject: [PATCH] Remove GCC specific flags
|
||||
|
||||
---
|
||||
Makefile.am | 10 ++--------
|
||||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f1e872b..c011f02 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -69,11 +69,7 @@ AM_CFLAGS = \
|
||||
AM_CPPFLAGS = \
|
||||
-include $(top_builddir)/config.h \
|
||||
-I $(srcdir)/src
|
||||
-AM_LDFLAGS = \
|
||||
- -Wl,--as-needed \
|
||||
- -Wl,--gc-sections \
|
||||
- -Wl,-z,relro \
|
||||
- -Wl,-z,now
|
||||
+AM_LDFLAGS =
|
||||
|
||||
if BUILD_ENABLE_DEBUG
|
||||
AM_CFLAGS += -g
|
||||
@@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
libtsm_la_LIBADD = libshl.la
|
||||
EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym
|
||||
libtsm_la_LDFLAGS = \
|
||||
- $(AM_LDFLAGS) \
|
||||
- -version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \
|
||||
- -Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"
|
||||
+ $(AM_LDFLAGS)
|
||||
|
||||
if BUILD_HAVE_XKBCOMMON
|
||||
libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
|
||||
|
|
@ -1,23 +1,21 @@
|
|||
{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }:
|
||||
{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtsm-3";
|
||||
pname = "libtsm";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz";
|
||||
sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aetf";
|
||||
repo = "libtsm";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libxkbcommon ] ++ lib.optionals stdenv.isDarwin [
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [ libxkbcommon ];
|
||||
|
||||
configureFlags = [ "--disable-debug" ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Terminal-emulator State Machine";
|
||||
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "medfile";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz";
|
||||
sha256 = "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54";
|
||||
sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rlottie";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Samsung";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8KQ0ZnVg5rTb44IYnn02WBSe2SA5UGUOSLEdmmscUDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/Samsung/rlottie";
|
||||
description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime.";
|
||||
license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ CRTified ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, buildDunePackage, fetchurl, stdlib-shims }:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.02.3";
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
pname = "ounit2";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz";
|
||||
sha256 = "1h4xdcyzwyhxg263w9b16x9n6cb11fzazmwnsnpich4djpl9lhsk";
|
||||
sha256 = "1naahh24lbyxmrnzpfz8karniqbf1nknivf96mrvsr6zlx5ad072";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ stdlib-shims ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, isPy27
|
||||
, python
|
||||
, pexpect
|
||||
, bash
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -26,6 +27,12 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bash_kernel/kernel.py \
|
||||
--replace "'bash'" "'${bash}/bin/bash'" \
|
||||
--replace "\"bash\"" "'${bash}/bin/bash'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ ipykernel pexpect ];
|
||||
|
||||
# no tests
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "csvs-to-sqlite";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
|
||||
sha256 = "1xi9d8l1sf9vixzvqpz8lvhl6yqmz9x5659nvpsxinl317qzmc8m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1xkds49z4hjyvz170913dz6886lhq4hb2n6dqqpv6q5p1znsx2gj";
|
||||
sha256 = "0dk30ga59lhqba1facram6ls52z45sld6b81gy5cl63q67smy08f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future requests python-dateutil ];
|
||||
|
|
@ -35,4 +35,4 @@ buildPythonPackage rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ liff ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ipykernel
|
||||
, gcc
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-c-kernel";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyter_c_kernel";
|
||||
inherit version;
|
||||
sha256 = "e4b34235b42761cfc3ff08386675b2362e5a97fb926c135eee782661db08a140";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace jupyter_c_kernel/kernel.py \
|
||||
--replace "'gcc'" "'${gcc}/bin/gcc'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ ipykernel ];
|
||||
|
||||
# no tests in repository
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimalistic C kernel for Jupyter";
|
||||
homepage = "https://github.com/brendanrius/jupyter-c-kernel/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyterhub
|
||||
, tornado
|
||||
, bash
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterhub-systemdspawner";
|
||||
version = "0.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jupyterhub
|
||||
tornado
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace systemdspawner/systemd.py \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
|
||||
substituteInPlace systemdspawner/systemdspawner.py \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "JupyterHub Spawner using systemd for resource isolation";
|
||||
homepage = "https://github.com/jupyterhub/systemdspawner";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs";
|
||||
homepage = "https://github.com/getting-things-gnome/liblarch";
|
||||
downloadPage = "https://github.com/getting-things-gnome/liblarch/releases";
|
||||
license = licenses.lgpl3Only;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ oyren ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, cython
|
||||
, numpy
|
||||
, msgpack
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, gcc8
|
||||
}:
|
||||
|
|
@ -31,12 +31,20 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest $out/${python.sitePackages}/numcodecs -k "not test_backwards_compatibility"
|
||||
'';
|
||||
pytestFlagsArray = [
|
||||
"$out/${python.sitePackages}/numcodecs"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_backwards_compatibility"
|
||||
|
||||
"test_encode_decode"
|
||||
"test_legacy_codec_broken"
|
||||
"test_bytes"
|
||||
];
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/alimanfoo/numcodecs";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.130.0";
|
||||
version = "0.131.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1wgf6dib6f1iwkndr2glq8zi2ssg7xvppkm9awic114i4pr88bfa";
|
||||
sha256 = "13a7gfsnfyssyi3b48s0d9k34rim493rarxd2rdyxyr4ir7jnb1p";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
let version = "1.2.1";
|
||||
let version = "1.2.2";
|
||||
in buildGoModule rec {
|
||||
inherit version;
|
||||
pname = "drone-cli";
|
||||
revision = "v${version}";
|
||||
goPackagePath = "github.com/drone/drone-cli";
|
||||
|
||||
vendorSha256 = "1zzx5yy0pp0c8pias4sfxfvdzhhrff9f8j51qf6dkif99xwdq3hb";
|
||||
vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ in buildGoModule rec {
|
|||
owner = "drone";
|
||||
repo = "drone-cli";
|
||||
rev = revision;
|
||||
sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j";
|
||||
sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "08lw345kzkic5b2dqj3d0d9x1mas9rpi4rdmbhww9r60swj169i7";
|
||||
sha256 = "16si1qm835yyvk2f0kwn9wnk8vpy5q4whgws1s2p6jr7dswg43h8";
|
||||
};
|
||||
|
||||
vendorSha256 = "0a78cjfj909ic8wci8id2h5f6r34h90myk6z7m918n08vxv60jvw";
|
||||
vendorSha256 = "0nv9q3j9cja8c6d7ac8fzb8zf82zz1z77f8cxvn3vxjki7fhlavm";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-quick-stats";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
src = fetchFromGitHub {
|
||||
repo = "git-quick-stats";
|
||||
owner = "arzzen";
|
||||
rev = version;
|
||||
sha256 = "0j7yd5fcqdbsad6xzi2k0j4p06w9187hhpal1gqcrh3kj13sjyi3";
|
||||
sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y";
|
||||
};
|
||||
PREFIX = builtins.placeholder "out";
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "20200706T152722";
|
||||
version = "20200806T150857";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
|
||||
sha256 = "1gjlsmahmmjklribdwbqybh1zj5qcv4aaxw7ffqg7rayf967w4pj";
|
||||
sha256 = "132w60p10ffr3vcykgw8rzxs54i6ynmw13p9nd59pqbn5adblrsp";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, sfml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simplenes";
|
||||
version = "unstable-2019-03-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amhndu";
|
||||
repo = "SimpleNES";
|
||||
rev = "4edb7117970c21a33b3bfe11a6606764fffc5173";
|
||||
sha256 = "1nmwj431iwqzzcykxd4xinqmg0rm14mx7zsjyhcc5skz7pihz86g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ sfml ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ./SimpleNES $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/amhndu/SimpleNES";
|
||||
description = "An NES emulator written in C++";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
From 45fa3f18adf57ef9d743038743d9c90573aeeb91 Mon Sep 17 00:00:00 2001
|
||||
From: Dimitri John Ledkov <xnox@ubuntu.com>
|
||||
Date: Tue, 19 May 2020 18:20:39 +0100
|
||||
Subject: [PATCH] wget: implement TLS verification with
|
||||
ENABLE_FEATURE_WGET_OPENSSL
|
||||
|
||||
When ENABLE_FEATURE_WGET_OPENSSL is enabled, correctly implement TLS
|
||||
verification by default. And only ignore verification errors, if
|
||||
--no-check-certificate was passed.
|
||||
|
||||
Also note, that previously OPENSSL implementation did not implement
|
||||
TLS verification, nor printed any warning messages that verification
|
||||
was not performed.
|
||||
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1879533
|
||||
|
||||
CVE-2018-1000500
|
||||
|
||||
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
|
||||
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||
---
|
||||
networking/wget.c | 20 +++++++++++++++++---
|
||||
1 file changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/networking/wget.c b/networking/wget.c
|
||||
index f2fc9e215..6a8c08324 100644
|
||||
--- a/networking/wget.c
|
||||
+++ b/networking/wget.c
|
||||
@@ -91,6 +91,9 @@
|
||||
//config: patches, but do want to waste bandwidth expaining how wrong
|
||||
//config: it is, you will be ignored.
|
||||
//config:
|
||||
+//config: FEATURE_WGET_OPENSSL does implement TLS verification
|
||||
+//config: using the certificates available to OpenSSL.
|
||||
+//config:
|
||||
//config:config FEATURE_WGET_OPENSSL
|
||||
//config: bool "Try to connect to HTTPS using openssl"
|
||||
//config: default y
|
||||
@@ -115,6 +118,9 @@
|
||||
//config: If openssl can't be executed, internal TLS code will be used
|
||||
//config: (if you enabled it); if openssl can be executed but fails later,
|
||||
//config: wget can't detect this, and download will fail.
|
||||
+//config:
|
||||
+//config: By default TLS verification is performed, unless
|
||||
+//config: --no-check-certificate option is passed.
|
||||
|
||||
//applet:IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
|
||||
|
||||
@@ -124,8 +130,11 @@
|
||||
//usage: IF_FEATURE_WGET_LONG_OPTIONS(
|
||||
//usage: "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n"
|
||||
//usage: " [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n"
|
||||
+//usage: IF_FEATURE_WGET_OPENSSL(
|
||||
+//usage: " [--no-check-certificate]\n"
|
||||
+//usage: )
|
||||
/* Since we ignore these opts, we don't show them in --help */
|
||||
-/* //usage: " [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */
|
||||
+/* //usage: " [--no-cache] [--passive-ftp] [-t TRIES]" */
|
||||
/* //usage: " [-nv] [-nc] [-nH] [-np]" */
|
||||
//usage: " [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
|
||||
//usage: )
|
||||
@@ -137,7 +146,9 @@
|
||||
//usage: "Retrieve files via HTTP or FTP\n"
|
||||
//usage: IF_FEATURE_WGET_LONG_OPTIONS(
|
||||
//usage: "\n --spider Only check URL existence: $? is 0 if exists"
|
||||
-///////: "\n --no-check-certificate Don't validate the server's certificate"
|
||||
+//usage: IF_FEATURE_WGET_OPENSSL(
|
||||
+//usage: "\n --no-check-certificate Don't validate the server's certificate"
|
||||
+//usage: )
|
||||
//usage: )
|
||||
//usage: "\n -c Continue retrieval of aborted transfer"
|
||||
//usage: "\n -q Quiet"
|
||||
@@ -662,7 +673,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
|
||||
pid = xvfork();
|
||||
if (pid == 0) {
|
||||
/* Child */
|
||||
- char *argv[8];
|
||||
+ char *argv[9];
|
||||
|
||||
close(sp[0]);
|
||||
xmove_fd(sp[1], 0);
|
||||
@@ -689,6 +700,9 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
|
||||
argv[5] = (char*)"-servername";
|
||||
argv[6] = (char*)servername;
|
||||
}
|
||||
+ if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
|
||||
+ argv[7] = (char*)"-verify_return_error";
|
||||
+ }
|
||||
|
||||
BB_EXECVP(argv[0], argv);
|
||||
xmove_fd(3, 2);
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
|
@ -42,6 +42,9 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# TODO: When bumping this version, please validate whether the wget patch is present upstream
|
||||
# and remove the patch if it is. The patch should be present upstream for all versions 1.32.0+.
|
||||
# See NixOs/nixpkgs#94722 for context.
|
||||
name = "busybox-1.31.1";
|
||||
|
||||
# Note to whoever is updating busybox: please verify that:
|
||||
|
|
@ -58,6 +61,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
./busybox-in-store.patch
|
||||
./0001-Fix-build-with-glibc-2.31.patch
|
||||
./0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch
|
||||
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, fusePackages, utillinux, gettext
|
||||
, meson, ninja, pkgconfig
|
||||
, meson, ninja, pkg-config
|
||||
, autoreconfHook
|
||||
, python3Packages, which
|
||||
}:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);
|
||||
|
||||
nativeBuildInputs = if isFuse3
|
||||
then [ meson ninja pkgconfig ]
|
||||
then [ meson ninja pkg-config ]
|
||||
else [ autoreconfHook gettext ];
|
||||
|
||||
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
|
||||
|
|
@ -60,6 +60,10 @@ in stdenv.mkDerivation rec {
|
|||
# ./fuse3-install_man.patch)
|
||||
install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
|
||||
install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
|
||||
|
||||
# TODO: Temporary version fix:
|
||||
substituteInPlace meson.build \
|
||||
--replace "version: '3.9.3'" "version: '${version}'"
|
||||
'' else ''
|
||||
sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
|
||||
./makeconf.sh
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ in {
|
|||
};
|
||||
|
||||
fuse_3 = mkFuse {
|
||||
version = "3.9.2";
|
||||
sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843";
|
||||
version = "3.9.4";
|
||||
sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, libtsm
|
||||
, systemd
|
||||
, libxkbcommon
|
||||
|
|
@ -13,32 +14,32 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kmscon-8";
|
||||
pname = "kmscon";
|
||||
version = "unstable-2018-09-07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz";
|
||||
sha256 = "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aetf";
|
||||
repo = "kmscon";
|
||||
rev = "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc";
|
||||
sha256 = "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libtsm
|
||||
systemd
|
||||
libxkbcommon
|
||||
libdrm
|
||||
libGLU libGL
|
||||
libdrm
|
||||
libtsm
|
||||
libxkbcommon
|
||||
libxslt
|
||||
pango
|
||||
pixman
|
||||
pkgconfig
|
||||
docbook_xsl
|
||||
libxslt
|
||||
systemd
|
||||
];
|
||||
|
||||
patches = [ ./kmscon-8-glibc-2.26.patch ];
|
||||
|
||||
# FIXME: Remove as soon as kmscon > 8 comes along.
|
||||
postPatch = ''
|
||||
sed -i -e 's/libsystemd-daemon libsystemd-login/libsystemd/g' configure
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
docbook_xsl
|
||||
pkgconfig
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-multi-seat"
|
||||
|
|
@ -49,10 +50,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "KMS/DRM based System Console";
|
||||
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/src/pty.c b/src/pty.c
|
||||
index 3494104..1443f4a 100644
|
||||
--- a/src/pty.c
|
||||
+++ b/src/pty.c
|
||||
@@ -299,7 +299,7 @@ static void setup_child(int master, struct winsize *ws)
|
||||
if (ret)
|
||||
log_warn("cannot reset blocked signals: %m");
|
||||
|
||||
- for (i = 1; i < SIGUNUSED; ++i)
|
||||
+ for (i = 1; i < SIGSYS; ++i)
|
||||
signal(i, SIG_DFL);
|
||||
|
||||
ret = grantpt(master);
|
||||
diff --git a/src/uterm_vt.c b/src/uterm_vt.c
|
||||
index af377f5..fbe9e76 100644
|
||||
--- a/src/uterm_vt.c
|
||||
+++ b/src/uterm_vt.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/signalfd.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <termios.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
|
@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "tomaspinho";
|
||||
repo = "rtl8821ce";
|
||||
rev = "69765eb288a8dfad3b055b906760b53e02ab1dea";
|
||||
sha256 = "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s";
|
||||
rev = "8d7edbe6a78fd79cfab85d599dad9dc34138abd1";
|
||||
sha256 = "1hsf8lqjnkrkvk0gps8yb3lx72mvws6xbgkbdmgdkz7qdxmha8bp";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "jicofo";
|
||||
version = "1.0-589";
|
||||
version = "1.0-612";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "0bsagnmw2rxf9s9kjl4y7gfqx408iv0qlwgy3mz0339g5503p5r9";
|
||||
sha256 = "0xv3p2h8g1jwcmxljdpz08d6dsz543mznp0nwgb6vr93faz8kc81";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.1-202-g5f9377b9";
|
||||
version = "2.1-273-g072dd44b";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "16xj4m6kz4di6y3vxrjkwajd7sfm92zzhrc6q9ljmrwiqnly5z0a";
|
||||
sha256 = "12l84wjn5iqnsg0816icgbx8jfcgyfnqclgyx303w4ncbvymlkv9";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "do-agent";
|
||||
version = "3.5.6";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalocean";
|
||||
repo = "do-agent";
|
||||
rev = "${version}";
|
||||
sha256 = "1gl034cslqa30fqy2p9rymgx398s1rcgbmfvzk5zjlrw47327k8i";
|
||||
sha256 = "024fs2yln2i4s5aihwlz103w5wvmcwqx7hz9q3fw3dm18k3fjmn2";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.4127";
|
||||
version = "1.0.4289";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "1jrrsvgysihd73pjqfv605ax01pg2gn76znr64v7nhli55ddgzqx";
|
||||
sha256 = "0hs6hjcb0cxmakx2na3xkz9bld0xcil5slp4wjl5xql3s00mk10v";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquidprompt";
|
||||
version = "unstable-2018-05-21";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nojhan";
|
||||
repo = pname;
|
||||
rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971";
|
||||
sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchFromGitHub, go-md2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.0";
|
||||
pname = "zfs-prune-snapshots";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bahamas10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09dz9v6m47dxfvfncz0k926dqfhagm87kd33dcw66cbw15ac3spx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-md2man ];
|
||||
|
||||
makeTargets = [ "man" ];
|
||||
|
||||
installPhase = ''
|
||||
install -m 755 -D zfs-prune-snapshots $out/bin/zfs-prune-snapshots
|
||||
install -m 644 -D man/zfs-prune-snapshots.1 $out/share/man/man1/zfs-prune-snapshots.1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Remove snapshots from one or more zpools that match given criteria";
|
||||
homepage = "https://github.com/bahamas10/zfs-prune-snapshots";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ymarkus ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gifski";
|
||||
version = "0.10.4";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
sha256 = "1ly465y435cha22rmnq632hgq2s7y0akrcna6m30f6l078br8mhn";
|
||||
sha256 = "0yziqgvjjb5bblmm060li7dv1i23gpn0f75jb72z8cdf2wg1qmxb";
|
||||
};
|
||||
|
||||
cargoSha256 = "0khfkh1ylqv4v5dsb4hsha5fh3b62hcvkp3swplv64h626p3q54s";
|
||||
cargoSha256 = "1y4q6p6hbmpwdpahmspgngm842qrq1srl7319wslq9ydl09m1x3x";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "du-dust";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootandy";
|
||||
repo = "dust";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l5fh7yl8mbgahvzfa251cyp8j5awqdl66jblz565b1wb536kig7";
|
||||
sha256 = "181xlm0zj9pb73ijwf202kwwm2jji0m11ynsbaxl44alva3xpvmk";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
extraPostFetch = ''
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoSha256 = "0s8z8cg9q0gfqm0ann8rkxwp5y25si97kgginh6b6lbnaai7y4fj";
|
||||
cargoSha256 = "1ypphm9n6wri5f03fj65i5p6lb11qj5zp8ddvybanaypv5llkfcb";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.20";
|
||||
version = "4.21";
|
||||
pname = "hebcal";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hebcal";
|
||||
repo = "hebcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "19siipj1svcj7rxgxmm3aaj4d43jx13fr7bghab8wak2dk1x0igb";
|
||||
sha256 = "0gqjhl5i0hvnpvsg6cfc2z5ckrs66h3jlrdgim62azn3hh5bday2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, fetchFromGitHub, libpng, rlottie, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "LottieConverter";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sot-tech";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
hash = "sha256-lAGzh6B2js2zDuN+1U8CZnse09RJGZRXbtmsheGKuYU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng rlottie zlib ];
|
||||
makeFlags = [ "CONF=Release" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -v dist/Release/GNU-Linux/lottieconverter $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/sot-tech/LottieConverter/";
|
||||
description = "Lottie converter utility";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ CRTified ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wob";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "francma";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02skvaj1q05c2r9fx83dlq44aksbw2fhpiv529rd154lh3pf07bc";
|
||||
sha256 = "0v7xm8zd9237v5j5h79pd0x6dkal5fgg1ly9knssjpv3hswwyv40";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
|
||||
|
|
|
|||
|
|
@ -1323,6 +1323,8 @@ in
|
|||
|
||||
quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
|
||||
|
||||
mirage-im = libsForQt5.callPackage ../applications/networking/instant-messengers/mirage {};
|
||||
|
||||
tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
|
||||
|
||||
libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
|
||||
|
|
@ -2274,6 +2276,8 @@ in
|
|||
|
||||
simg2img = callPackage ../tools/filesystems/simg2img { };
|
||||
|
||||
simplenes = callPackage ../misc/emulators/simplenes { };
|
||||
|
||||
snipes = callPackage ../games/snipes { };
|
||||
|
||||
snippetpixie = callPackage ../tools/text/snippetpixie { };
|
||||
|
|
@ -4776,6 +4780,8 @@ in
|
|||
|
||||
lolcat = callPackage ../tools/misc/lolcat { };
|
||||
|
||||
lottieconverter = callPackage ../tools/misc/lottieconverter { };
|
||||
|
||||
lsd = callPackage ../tools/misc/lsd { };
|
||||
|
||||
lsdvd = callPackage ../tools/cd-dvd/lsdvd {};
|
||||
|
|
@ -13938,7 +13944,9 @@ in
|
|||
python = python3;
|
||||
};
|
||||
|
||||
libxml2Python = pkgs.buildEnv { # slightly hacky
|
||||
libxml2Python = let
|
||||
libxml2 = python2Packages.libxml2;
|
||||
in pkgs.buildEnv { # slightly hacky
|
||||
name = "libxml2+py-${res.libxml2.version}";
|
||||
paths = with libxml2; [ dev bin py ];
|
||||
inherit (libxml2) passthru;
|
||||
|
|
@ -14843,6 +14851,8 @@ in
|
|||
|
||||
rlog = callPackage ../development/libraries/rlog { };
|
||||
|
||||
rlottie = callPackage ../development/libraries/rlottie { };
|
||||
|
||||
rocksdb = callPackage ../development/libraries/rocksdb { };
|
||||
|
||||
rocksdb_lite = rocksdb.override { enableLite = true; };
|
||||
|
|
@ -20000,6 +20010,8 @@ in
|
|||
|
||||
gcal = callPackage ../applications/misc/gcal { };
|
||||
|
||||
gcstar = callPackage ../applications/misc/gcstar { };
|
||||
|
||||
geany = callPackage ../applications/editors/geany { };
|
||||
geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
|
||||
|
||||
|
|
@ -27321,6 +27333,8 @@ in
|
|||
|
||||
kube3d = callPackage ../applications/networking/cluster/kube3d {};
|
||||
|
||||
zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {};
|
||||
|
||||
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
|
||||
|
||||
runwayml = callPackage ../applications/graphics/runwayml {};
|
||||
|
|
|
|||
|
|
@ -2218,6 +2218,20 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
CDDBFile = buildPerlPackage {
|
||||
pname = "CDDB-File";
|
||||
version = "1.05";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/T/TM/TMTM/CDDB-File-1.05.tar.gz;
|
||||
sha256 = "1jf7xhd4w9iwabhz2wajh6fid3nyvkid9q5gdhyff52w86f45rpb";
|
||||
};
|
||||
meta = {
|
||||
description = "Parse a CDDB/freedb data file";
|
||||
license = stdenv.lib.licenses.artistic1;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
CGI = buildPerlPackage {
|
||||
pname = "CGI";
|
||||
version = "4.49";
|
||||
|
|
@ -13892,6 +13906,41 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
MP3Info = buildPerlPackage {
|
||||
pname = "MP3-Info";
|
||||
version = "1.26";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/J/JM/JMERELO/MP3-Info-1.26.tar.gz;
|
||||
sha256 = "1rwbrsdw6y6jgcjvrlji6fbcvwl4wlka3mkhlw12a7s2683k8qjp";
|
||||
};
|
||||
meta = {
|
||||
description = "Manipulate / fetch info from MP3 audio files";
|
||||
license = with stdenv.lib.licenses; [ artistic1 ];
|
||||
};
|
||||
};
|
||||
|
||||
MP3Tag = buildPerlPackage {
|
||||
pname = "MP3-Tag";
|
||||
version = "1.15";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip;
|
||||
sha256 = "1lanbwv97sfsb7h4vsg1v0dv3yghpz01nf3rzl4a9p3ycgs4ib5a";
|
||||
};
|
||||
buildInputs = [ pkgs.unzip ];
|
||||
propagatedBuildInputs = [ CompressZlib ExtUtilsMakeMaker ];
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.PL --replace "'PL_FILES'" "#'PL_FILES'"
|
||||
'';
|
||||
postFixup = ''
|
||||
perl data_pod.PL PERL5LIB:$PERL5LIB
|
||||
'';
|
||||
outputs = [ "out" ];
|
||||
meta = {
|
||||
description = "Module for reading tags of MP3 audio files";
|
||||
license = with stdenv.lib.licenses; [ artistic1 ];
|
||||
};
|
||||
};
|
||||
|
||||
Mouse = buildPerlModule {
|
||||
pname = "Mouse";
|
||||
version = "2.5.10";
|
||||
|
|
@ -14324,6 +14373,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
NetFreeDB = buildPerlPackage {
|
||||
pname = "Net-FreeDB";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DS/DSHULTZ/Net-FreeDB-0.10.tar.gz;
|
||||
sha256 = "11dfi14qnzsnmr71cygir85zfj15n08b7d5g0i4cj5pb70if2hzp";
|
||||
};
|
||||
buildInputs = [ TestMost TestDeep TestWarn TestException TestDifferences ];
|
||||
propagatedBuildInputs = [ CDDBFile Moo libnet ];
|
||||
meta = {
|
||||
description = "Perl interface to freedb server(s)";
|
||||
license = with stdenv.lib.licenses; [ artistic1 ];
|
||||
};
|
||||
};
|
||||
|
||||
NetHTTP = buildPerlPackage {
|
||||
pname = "Net-HTTP";
|
||||
version = "6.19";
|
||||
|
|
@ -14872,6 +14936,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
OggVorbisHeaderPurePerl = buildPerlPackage {
|
||||
pname = "Ogg-Vorbis-Header-PurePerl";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DA/DANIEL/Ogg-Vorbis-Header-PurePerl-1.0.tar.gz;
|
||||
sha256 = "0kjqswnwhp7yf7czvhggdyp2pgg5wa58b4jwpn8j3km7h2ll8pmy";
|
||||
};
|
||||
buildInputs = [ TestMore ];
|
||||
# The testing mechanism is erorrneous upstream. See http://matrix.cpantesters.org/?dist=Ogg-Vorbis-Header-PurePerl+1.0
|
||||
doCheck = false;
|
||||
meta = {
|
||||
description = "An object-oriented interface to Ogg Vorbis information and comment fields";
|
||||
license = with stdenv.lib.licenses; [ artistic1 ];
|
||||
};
|
||||
};
|
||||
|
||||
OLEStorage_Lite = buildPerlPackage {
|
||||
pname = "OLE-Storage_Lite";
|
||||
version = "0.20";
|
||||
|
|
|
|||
|
|
@ -509,7 +509,9 @@ in {
|
|||
|
||||
baselines = callPackage ../development/python-modules/baselines { };
|
||||
|
||||
bash_kernel = callPackage ../development/python-modules/bash_kernel { };
|
||||
bash_kernel = callPackage ../development/python-modules/bash_kernel {
|
||||
inherit (pkgs) bash;
|
||||
};
|
||||
|
||||
bashlex = callPackage ../development/python-modules/bashlex { };
|
||||
|
||||
|
|
@ -3299,6 +3301,8 @@ in {
|
|||
|
||||
jupyter = callPackage ../development/python-modules/jupyter { };
|
||||
|
||||
jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };
|
||||
|
||||
jupyter_console = if pythonOlder "3.5" then
|
||||
callPackage ../development/python-modules/jupyter_console/5.nix { }
|
||||
else
|
||||
|
|
@ -4481,6 +4485,10 @@ in {
|
|||
|
||||
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
|
||||
|
||||
jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner {
|
||||
inherit (pkgs) bash;
|
||||
};
|
||||
|
||||
kaggle = callPackage ../development/python-modules/kaggle { };
|
||||
|
||||
keyring = if isPy3k then
|
||||
|
|
|
|||
Loading…
Reference in New Issue