mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
49b8cab0d8
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
with lib;
|
||||
|
||||
{
|
||||
let cfg = config.programs.evince;
|
||||
|
||||
in {
|
||||
|
||||
# Added 2019-08-09
|
||||
imports = [
|
||||
|
|
@ -22,6 +24,13 @@ with lib;
|
|||
enable = mkEnableOption
|
||||
"Evince, the GNOME document viewer";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.evince;
|
||||
defaultText = literalExpression "pkgs.evince";
|
||||
description = "Evince derivation to use.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -31,11 +40,11 @@ with lib;
|
|||
|
||||
config = mkIf config.programs.evince.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.evince ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
services.dbus.packages = [ pkgs.evince ];
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
|
||||
systemd.packages = [ pkgs.evince ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -219,6 +219,7 @@ in
|
|||
] config.environment.pantheon.excludePackages);
|
||||
|
||||
programs.evince.enable = mkDefault true;
|
||||
programs.evince.package = pkgs.pantheon.evince;
|
||||
programs.file-roller.enable = mkDefault true;
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
|
|
|
|||
|
|
@ -118,6 +118,13 @@ in {
|
|||
OVMF package to use.
|
||||
'';
|
||||
};
|
||||
qemuSwtpm = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Allows libvirtd to use swtpm to create an emulated TPM.
|
||||
'';
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
|
|
@ -257,7 +264,8 @@ in {
|
|||
] ++ cfg.extraOptions);
|
||||
|
||||
path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
|
||||
++ optional vswitch.enable vswitch.package;
|
||||
++ optional vswitch.enable vswitch.package
|
||||
++ optional cfg.qemuSwtpm pkgs.swtpm;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
|
|||
version = "1.3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
repo = "mimic1";
|
||||
owner = "MycroftAI";
|
||||
repo = "mimic1";
|
||||
rev = version;
|
||||
sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "rstudio";
|
||||
repo = "rstudio";
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
, gtk4
|
||||
, gst_all_1
|
||||
, libadwaita
|
||||
, appstream-glib
|
||||
, libsoup
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -32,6 +34,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils # for update-desktop-database
|
||||
glib
|
||||
gobject-introspection
|
||||
|
|
@ -53,6 +56,7 @@ stdenv.mkDerivation rec {
|
|||
gst_all_1.gst-plugins-ugly
|
||||
gtk4
|
||||
libadwaita
|
||||
libsoup
|
||||
wayland
|
||||
wayland-protocols
|
||||
];
|
||||
|
|
|
|||
|
|
@ -47,9 +47,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/browser
|
||||
./dark-style.patch
|
||||
./navigation-buttons.patch
|
||||
# The patch currently differs from upstream (updated for epiphany 40 and 41).
|
||||
./pantheon-dark-style.patch
|
||||
./pantheon-navigation-buttons.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -95,7 +97,9 @@ stdenv.mkDerivation rec {
|
|||
p11-kit
|
||||
sqlite
|
||||
webkitgtk
|
||||
] ++ lib.optional withPantheon pantheon.granite;
|
||||
] ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
# Tests need an X display
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, pantheon
|
||||
, python3
|
||||
, texlive
|
||||
, t1lib
|
||||
|
|
@ -40,6 +41,7 @@
|
|||
, supportMultimedia ? true # PDF multimedia
|
||||
, libgxps
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
, withPantheon ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -53,6 +55,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/evince
|
||||
# The patch currently differs from upstream (updated for evince 41).
|
||||
./pantheon-dark-style.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
|
|
@ -96,9 +105,18 @@ stdenv.mkDerivation rec {
|
|||
poppler
|
||||
t1lib
|
||||
texlive.bin.core # kpathsea for DVI support
|
||||
] ++ lib.optional supportXPS libgxps
|
||||
++ lib.optionals supportMultimedia (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
|
||||
] ++ lib.optionals supportXPS [
|
||||
libgxps
|
||||
] ++ lib.optionals supportMultimedia (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
]) ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dnautilus=false"
|
||||
|
|
@ -128,8 +146,8 @@ stdenv.mkDerivation rec {
|
|||
on the GNOME Desktop with a single simple application.
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.gnome.members;
|
||||
maintainers = teams.gnome.members ++ teams.pantheon.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
86
pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch
Normal file
86
pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index bcb69cf7..4a18c08c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0')
|
||||
gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version)
|
||||
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
|
||||
gthread_dep = dependency('gthread-2.0', version: glib_req_version)
|
||||
+granite_dep = dependency('granite')
|
||||
# Keep the version here synchronised with subprojects/libhandy.wrap
|
||||
hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep'])
|
||||
|
||||
diff --git a/shell/ev-application.c b/shell/ev-application.c
|
||||
index e704bda2..d705328c 100644
|
||||
--- a/shell/ev-application.c
|
||||
+++ b/shell/ev-application.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <glib/gi18n.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
+#include <granite.h>
|
||||
#include <handy.h>
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
#include <gdk/gdkx.h>
|
||||
@@ -176,7 +177,7 @@ ev_spawn (const char *uri,
|
||||
|
||||
g_string_append_printf (cmd, " %s", path);
|
||||
g_free (path);
|
||||
-
|
||||
+
|
||||
/* Page label */
|
||||
if (dest) {
|
||||
switch (ev_link_dest_get_dest_type (dest)) {
|
||||
@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application)
|
||||
g_free (old_accels);
|
||||
}
|
||||
|
||||
+static void
|
||||
+ev_application_set_prefers_color_scheme ()
|
||||
+{
|
||||
+ GtkSettings* gtk_settings = gtk_settings_get_default ();
|
||||
+ GraniteSettings* granite_settings = granite_settings_get_default ();
|
||||
+
|
||||
+ g_object_set (
|
||||
+ gtk_settings,
|
||||
+ "gtk-application-prefer-dark-theme",
|
||||
+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK,
|
||||
+ NULL
|
||||
+ );
|
||||
+}
|
||||
+
|
||||
static void
|
||||
ev_application_startup (GApplication *gapplication)
|
||||
{
|
||||
@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication)
|
||||
|
||||
EvApplication *application = EV_APPLICATION (gapplication);
|
||||
const gchar **it;
|
||||
+ GraniteSettings* granite_settings = granite_settings_get_default ();
|
||||
|
||||
g_application_set_resource_base_path (gapplication, "/org/gnome/evince");
|
||||
|
||||
@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication)
|
||||
|
||||
hdy_init ();
|
||||
|
||||
+ ev_application_set_prefers_color_scheme ();
|
||||
+
|
||||
+ g_signal_connect (granite_settings, "notify::prefers-color-scheme",
|
||||
+ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL);
|
||||
+
|
||||
for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1)
|
||||
gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
|
||||
}
|
||||
diff --git a/shell/meson.build b/shell/meson.build
|
||||
index 7cbc48f2..a3089b13 100644
|
||||
--- a/shell/meson.build
|
||||
+++ b/shell/meson.build
|
||||
@@ -52,6 +52,7 @@ sources += gnome.compile_resources(
|
||||
deps = [
|
||||
gdk_pixbuf_dep,
|
||||
gnome_desktop_dep,
|
||||
+ granite_dep,
|
||||
hdy_dep,
|
||||
libevmisc_dep,
|
||||
libevproperties_dep,
|
||||
|
|
@ -71,6 +71,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
epiphany = pkgs.epiphany.override { withPantheon = true; };
|
||||
|
||||
evince = pkgs.evince.override { withPantheon = true; };
|
||||
|
||||
sideload = callPackage ./apps/sideload { };
|
||||
|
||||
#### DESKTOP
|
||||
|
|
|
|||
203
pkgs/development/interpreters/gnudatalanguage/default.nix
Normal file
203
pkgs/development/interpreters/gnudatalanguage/default.nix
Normal file
|
|
@ -0,0 +1,203 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, wrapGAppsHook
|
||||
, readline
|
||||
, ncurses
|
||||
, zlib
|
||||
, gsl
|
||||
, openmp
|
||||
, graphicsmagick
|
||||
, fftw
|
||||
, fftwFloat
|
||||
, fftwLongDouble
|
||||
, proj
|
||||
, shapelib
|
||||
, expat
|
||||
, udunits
|
||||
, eigen
|
||||
, pslib
|
||||
, eccodes
|
||||
, glpk
|
||||
, libpng
|
||||
, plplot
|
||||
, libtiff
|
||||
, libgeotiff
|
||||
, libjpeg
|
||||
# We enable it in hdf4 and use libtirpc as a dependency here from the passthru
|
||||
# of hdf4
|
||||
, enableLibtirpc ? stdenv.isLinux
|
||||
, libtirpc
|
||||
, python3
|
||||
, enableMPI ? (stdenv.isLinux || stdenv.isDarwin)
|
||||
# Choose MPICH over OpenMPI because it currently builds on AArch and Darwin
|
||||
, mpi
|
||||
# Unfree optional dependency for hdf4 and hdf5
|
||||
, enableSzip ? false
|
||||
, szip
|
||||
, enableHDF4 ? true
|
||||
, hdf4
|
||||
, hdf4-forced ? null
|
||||
, enableHDF5 ? true
|
||||
# HDF5 format version (API version) 1.10 and 1.12 is not fully compatible
|
||||
# Specify if the API version should default to 1.10
|
||||
# netcdf currently depends on hdf5 with `usev110Api=true`
|
||||
# If you wish to use HDF5 API version 1.12 (`useHdf5v110Api=false`),
|
||||
# you will need to turn NetCDF off.
|
||||
, useHdf5v110Api ? true
|
||||
, hdf5
|
||||
, hdf5-forced ? null
|
||||
, enableNetCDF ? true
|
||||
, netcdf
|
||||
, netcdf-forced ? null
|
||||
, plplot-forced ? null
|
||||
# wxWidgets is preferred over X11 for this project but we only have it on Linux
|
||||
# and Darwin. Also, we use the wxWidgets dependency here from the passthru of
|
||||
# plplot.
|
||||
, enableWX ? (stdenv.isLinux || stdenv.isDarwin)
|
||||
# X11: OFF by default for platform consistency. Use X where WX is not available
|
||||
, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin)
|
||||
}:
|
||||
|
||||
let
|
||||
hdf4-custom =
|
||||
if hdf4-forced != null
|
||||
then hdf4-forced
|
||||
else
|
||||
hdf4.override {
|
||||
uselibtirpc = enableLibtirpc;
|
||||
szipSupport = enableSzip;
|
||||
inherit szip;
|
||||
};
|
||||
hdf5-custom =
|
||||
if hdf5-forced != null
|
||||
then hdf5-forced
|
||||
else
|
||||
hdf5.override {
|
||||
usev110Api = useHdf5v110Api;
|
||||
mpiSupport = enableMPI;
|
||||
inherit mpi;
|
||||
szipSupport = enableSzip;
|
||||
inherit szip;
|
||||
};
|
||||
netcdf-custom =
|
||||
if netcdf-forced != null
|
||||
then netcdf-forced
|
||||
else
|
||||
netcdf.override {
|
||||
hdf5 = hdf5-custom;
|
||||
};
|
||||
enablePlplotDrivers = enableWX || enableXWin;
|
||||
plplot-with-drivers =
|
||||
if plplot-forced != null
|
||||
then plplot-forced
|
||||
else
|
||||
plplot.override {
|
||||
inherit
|
||||
enableWX
|
||||
enableXWin
|
||||
;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnudatalanguage";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "gdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y9LVRaWjQqpWqjNngxB406PE/rl/9S8rs0u0CK5ivUA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
ncurses
|
||||
zlib
|
||||
gsl
|
||||
openmp
|
||||
graphicsmagick
|
||||
fftw
|
||||
fftwFloat
|
||||
fftwLongDouble
|
||||
proj
|
||||
shapelib
|
||||
expat
|
||||
mpi
|
||||
udunits
|
||||
eigen
|
||||
pslib
|
||||
eccodes
|
||||
glpk
|
||||
libpng
|
||||
libtiff
|
||||
libgeotiff
|
||||
libjpeg
|
||||
hdf4-custom
|
||||
hdf5-custom
|
||||
netcdf-custom
|
||||
plplot-with-drivers
|
||||
] ++ lib.optional enableXWin plplot-with-drivers.libX11
|
||||
++ lib.optional enableWX plplot-with-drivers.wxWidgets
|
||||
++ lib.optional enableMPI mpi
|
||||
++ lib.optional enableLibtirpc hdf4-custom.libtirpc
|
||||
++ lib.optional enableSzip szip;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
(python3.withPackages (ps: with ps; [ numpy ]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optional enableWX wrapGAppsHook;
|
||||
|
||||
cmakeFlags = lib.optional (!enableHDF4) "-DHDF=OFF"
|
||||
++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ]
|
||||
++ lib.optional (!enableNetCDF) "-DNETCDF=OFF"
|
||||
++ lib.optional (!enablePlplotDrivers) "-DINTERACTIVE_GRAPHICS=OFF"
|
||||
++ lib.optional (!enableWX) "-DWXWIDGETS=OFF"
|
||||
++ lib.optional enableSzip "-DSZIPDIR=${szip}"
|
||||
++ lib.optionals enableXWin [ "-DX11=ON" "-DX11DIR=${plplot-with-drivers.libX11}" ]
|
||||
++ lib.optionals enableMPI [ "-DMPI=ON" "-DMPIDIR=${mpi}" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Opt-out unstable tests
|
||||
# https://github.com/gnudatalanguage/gdl/issues/482
|
||||
# https://github.com/gnudatalanguage/gdl/issues/1079
|
||||
# https://github.com/gnudatalanguage/gdl/issues/460
|
||||
preCheck = ''
|
||||
checkFlagsArray+=("ARGS=-E 'test_tic_toc.pro|test_byte_conversion.pro|test_bytscl.pro|test_call_external.pro'")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
hdf4 = hdf4-custom;
|
||||
hdf5 = hdf5-custom;
|
||||
netcdf = netcdf-custom;
|
||||
plplot = plplot-with-drivers;
|
||||
python = python3;
|
||||
inherit
|
||||
enableMPI
|
||||
mpi
|
||||
useHdf5v110Api
|
||||
enableSzip
|
||||
enableWX
|
||||
enableXWin
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free incremental compiler of IDL";
|
||||
longDescription = ''
|
||||
GDL (GNU Data Language) is a free/libre/open source incremental compiler
|
||||
compatible with IDL (Interactive Data Language) and to some extent with PV-WAVE.
|
||||
GDL is aimed as a drop-in replacement for IDL.
|
||||
'';
|
||||
homepage = "https://github.com/gnudatalanguage/gdl";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "gdl";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,8 +8,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
mpiSupport = hdf5.mpiSupport;
|
||||
mpi = hdf5.mpi;
|
||||
inherit (hdf5) mpiSupport mpi;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "netcdf";
|
||||
version = "4.8.0"; # Remove patch mentioned below on upgrade
|
||||
|
|
@ -44,8 +43,7 @@ in stdenv.mkDerivation rec {
|
|||
buildInputs = [ hdf5 curl mpi ];
|
||||
|
||||
passthru = {
|
||||
mpiSupport = mpiSupport;
|
||||
inherit mpi;
|
||||
inherit mpiSupport mpi;
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, enableWX ? false
|
||||
, wxGTK31, wxmac
|
||||
, enableXWin ? false
|
||||
, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK31);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "plplot";
|
||||
version = "5.15.0";
|
||||
|
||||
|
|
@ -11,6 +21,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optional enableWX wxWidgets
|
||||
++ lib.optional enableXWin libX11;
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
enableWX
|
||||
wxWidgets
|
||||
enableXWin
|
||||
libX11
|
||||
;
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bond-api";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prystupa";
|
||||
repo = "bond-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v3bwbpn98fjm8gza2k7fb7w5ps3982kfvbck5x0fh2xq2825b80";
|
||||
sha256 = "0s7an6kbib1immrbwrh4pzj812zwf8kj3kgky5k3qwxzrj0iv6ak";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulsectl";
|
||||
version = "21.10.4";
|
||||
version = "21.10.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c9593a54d01dc1ab47ef20464aa7d00433690c86ae840c58f458fe6dedd6b41a";
|
||||
sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -327,6 +327,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/rbgrouleff/bclose.vim/";
|
||||
};
|
||||
|
||||
better-escape-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "better-escape.nvim";
|
||||
version = "2021-10-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "max397574";
|
||||
repo = "better-escape.nvim";
|
||||
rev = "a644df43e4607df2e645cb7b6f50ede79fffe477";
|
||||
sha256 = "1kjc1h35xfqgsqbg00hsvg52wkjskfilxxsxnnlimcsv9v8iadmh";
|
||||
};
|
||||
meta.homepage = "https://github.com/max397574/better-escape.nvim/";
|
||||
};
|
||||
|
||||
BetterLua-vim = buildVimPluginFrom2Nix {
|
||||
pname = "BetterLua.vim";
|
||||
version = "2020-08-14";
|
||||
|
|
@ -449,12 +461,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-10-16";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "949731d96f14872bb6764f305f38415d70c220a3";
|
||||
sha256 = "1lq4c47i55gza7mdn1nzsfxq78vkl5hhsrfv2dk97sbmbyfmr83j";
|
||||
rev = "63259154cae7c01a877cd493c7ff53d8bbaf36a8";
|
||||
sha256 = "0072yqwcs23j1q5akybc9q933lg3davrbh10rjqs690b8p69rz0p";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -617,12 +629,12 @@ final: prev:
|
|||
|
||||
cmp-nvim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-nvim-lsp";
|
||||
version = "2021-09-30";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "cmp-nvim-lsp";
|
||||
rev = "f93a6cf9761b096ff2c28a4f0defe941a6ffffb5";
|
||||
sha256 = "02x4jp79lll4fm34x7rjkimlx32gfp2jd1kl6zjwszbfg8wziwmx";
|
||||
rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8";
|
||||
sha256 = "1dqx6yrd60x9ncjnpja87wv5zgnij7qmzbyh5xfyslk67c0i6mwm";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
|
||||
};
|
||||
|
|
@ -856,6 +868,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/wincent/command-t/";
|
||||
};
|
||||
|
||||
comment-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "comment.nvim";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "a86384dc153e86a9a3cbec1436a8acfa4b07690d";
|
||||
sha256 = "043nczs67sa7i2nmmadhrd52d3yzjr1kcm3bgb4q5zig1a7r4dcj";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
|
||||
committia-vim = buildVimPluginFrom2Nix {
|
||||
pname = "committia.vim";
|
||||
version = "2020-08-27";
|
||||
|
|
@ -2964,12 +2988,12 @@ final: prev:
|
|||
|
||||
lir-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lir.nvim";
|
||||
version = "2021-09-20";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamago324";
|
||||
repo = "lir.nvim";
|
||||
rev = "bc14ddcb173d332e62ce3712eb0ca3ac6d9fa59a";
|
||||
sha256 = "1sh13m98dni9dspjiwsaafzvg3nlwd41v5ma5achpzla80hzm2h1";
|
||||
rev = "5a7b21b0fdafe73719902b9848880fb3eb8500aa";
|
||||
sha256 = "0pdswmrmc2nicii5szhig4qnmcx2cks6rc5g7s787cc0c458l98p";
|
||||
};
|
||||
meta.homepage = "https://github.com/tamago324/lir.nvim/";
|
||||
};
|
||||
|
|
@ -3924,12 +3948,12 @@ final: prev:
|
|||
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-10-15";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "2cab63437f05551d79ee959eb88fee1ba437a5a7";
|
||||
sha256 = "14zrgri491jshg57wcw8nf5nzviw1b6a88qkx0km1v15knihbc68";
|
||||
rev = "7becc6bc9d8baa62eb0dbf65305f8e7f1470ace7";
|
||||
sha256 = "1ihz1kci00r93f52fzz5nx9byh7rrax1sknmj9q232z1wv7dxb06";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||
};
|
||||
|
|
@ -4140,12 +4164,12 @@ final: prev:
|
|||
|
||||
nvim-hlslens = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-hlslens";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-hlslens";
|
||||
rev = "0bbfcaf40b8c3fee758eda51e728a5b7aff08412";
|
||||
sha256 = "07n8i6ggk4qnhr3zda2qpfvqfnilnnkymak1dw6f0wcjbfqdk8h6";
|
||||
rev = "5217443bb675539d87b90133a91a7e36ad1e517d";
|
||||
sha256 = "17p3x7s50r5fj1fhzx7nm7hk81h85hihk6svsgp99a1cjys6w9zk";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
|
||||
};
|
||||
|
|
@ -4176,12 +4200,12 @@ final: prev:
|
|||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2021-10-16";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "9838d3a0f9268d89c9f238c67928d3b6a0ceaaf5";
|
||||
sha256 = "157x2i6paqz626bvbjly5k1yg2939v6j8riicrw8gxbb3s5z5fh5";
|
||||
rev = "66223954d7bd7d4358c36d157c25503168d04319";
|
||||
sha256 = "0jghq2fkvibilb1zglkckhpmq6dgi1q87fcwpvcv9slk1qlgw19d";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
|
|
@ -4200,12 +4224,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-10-16";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "28a8e5258cb8140cc50a030b9b3c15e39376028a";
|
||||
sha256 = "02n5kacdb6my8mn0iayr5l1rm6nx4pqc6fx6a7l5minww9vh8na2";
|
||||
rev = "9661d267f64a872a451dab0453b2b951e55cef27";
|
||||
sha256 = "0hv77ridsxi5n2qibrp9a66kbmlw1c9yl8gpakr1iz2hhazq58x9";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -5069,8 +5093,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "rust-tools.nvim";
|
||||
rev = "e3b0ace51db01e6fbecae489645b911a8f4b3441";
|
||||
sha256 = "0syshs383j1fhj381fy9d9chrqa11fk333c2kzak08j5l471z486";
|
||||
rev = "441e0104648e1bae89e3eac6857590a64f17583d";
|
||||
sha256 = "13g6vlg3r49vmzl0q6z2mqwz2p2chcjc74bfgn89c284bjri8x94";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||
};
|
||||
|
|
@ -5644,12 +5668,12 @@ final: prev:
|
|||
|
||||
tagalong-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tagalong.vim";
|
||||
version = "2021-10-15";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "tagalong.vim";
|
||||
rev = "9d37eeb2463bfa1150a9353d3bf9a4f6d7395ab9";
|
||||
sha256 = "0i2vnd0rhp5ix0p78np0vk45pnpidi1y7z6b5z8pwh442ma8f86f";
|
||||
rev = "18c010e0f28fea012f537bc1abd468a063c36b9c";
|
||||
sha256 = "0qq1saqkk0cd09zppz469idzvl5d0aagq5gw908whz5dd72yl8al";
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/";
|
||||
};
|
||||
|
|
@ -5714,6 +5738,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
|
||||
};
|
||||
|
||||
telescope-cheat-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-cheat.nvim";
|
||||
version = "2021-09-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-cheat.nvim";
|
||||
rev = "4a58b92fc70af622ddc115f843b0e552ca5bd6ea";
|
||||
sha256 = "132drgpak97sbwjma6h7zwflg386xhqmdb3rqvzgxav36p9f0xsw";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/";
|
||||
};
|
||||
|
||||
telescope-coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-coc.nvim";
|
||||
version = "2021-10-13";
|
||||
|
|
@ -7546,8 +7582,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "rbong";
|
||||
repo = "vim-flog";
|
||||
rev = "1cb504538bf1e46b16d239cfc7fa22229dd1301b";
|
||||
sha256 = "1z5dggdjfc7fi7q58rfbh5whw7qw6jzfxbf87mlnyr9vij72v53q";
|
||||
rev = "d8e62cea4c57c9284a0d6bc92140deb1a7034a1d";
|
||||
sha256 = "0a5yh0w143lvg934pwsln2n34zh7x2d6bxfp9cmw897nl6qlzrdj";
|
||||
};
|
||||
meta.homepage = "https://github.com/rbong/vim-flog/";
|
||||
};
|
||||
|
|
@ -7602,12 +7638,12 @@ final: prev:
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-10-16";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "0615cd2baf15ed0aebacd3546015a89d491553ef";
|
||||
sha256 = "0j6hl5561jhhcbxwiwc1030ip4bzqypqnj1ycxhg3vl630d18kla";
|
||||
rev = "93f41ace7dc068cf89314bcea23bdf8da686407a";
|
||||
sha256 = "0hbif3hndmn7jll4w1kci6x3j7379wmpp9rnxg8rlbbnyxl2fpxj";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
@ -9705,12 +9741,12 @@ final: prev:
|
|||
|
||||
vim-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "vim-snippets";
|
||||
version = "2021-10-07";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "honza";
|
||||
repo = "vim-snippets";
|
||||
rev = "be519f70ab806c290a7b3d2e38fc22da07834052";
|
||||
sha256 = "0d22x0az6ca232x04mvkk9jphn3qfcz24a9wwvz0jdyy3pk8zfbi";
|
||||
rev = "c28bef69fdb26825a93ac1e90ca6f5ba19116d88";
|
||||
sha256 = "1fg60jfm5bw1m20133vl06nb8z9ckrwqq37jz493xi34j5fymi4w";
|
||||
};
|
||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -560,6 +560,10 @@ self: super: {
|
|||
};
|
||||
});
|
||||
|
||||
telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ sqlite-lua telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ sqlite-lua telescope-nvim ];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -429,6 +429,7 @@ mattn/emmet-vim
|
|||
mattn/vim-gist
|
||||
mattn/webapi-vim
|
||||
matze/vim-move
|
||||
max397574/better-escape.nvim
|
||||
maximbaz/lightline-ale
|
||||
MaxMEllon/vim-jsx-pretty
|
||||
mbbill/undotree
|
||||
|
|
@ -518,6 +519,7 @@ norcalli/nvim-terminal.lua
|
|||
norcalli/snippets.nvim
|
||||
ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
numtostr/comment.nvim
|
||||
nvie/vim-flake8
|
||||
nvim-lua/completion-nvim
|
||||
nvim-lua/diagnostic-nvim
|
||||
|
|
@ -526,6 +528,7 @@ nvim-lua/lsp_extensions.nvim
|
|||
nvim-lua/plenary.nvim
|
||||
nvim-lua/popup.nvim
|
||||
nvim-neorg/neorg@main
|
||||
nvim-telescope/telescope-cheat.nvim
|
||||
nvim-telescope/telescope-dap.nvim
|
||||
nvim-telescope/telescope-frecency.nvim
|
||||
nvim-telescope/telescope-fzf-native.nvim@main
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
buildPythonApplication rec {
|
||||
|
||||
pname = "catcli";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadc0de6";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03yf9sjqdg3xcbvkn1591zxd2d0r8wz1b749zrn55k3a03c7jzf5";
|
||||
sha256 = "1mzhfcf67dc5m0i9b216m58qg36g63if6273ch5bsckd0yrwdk8x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docopt anytree ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
, uselibtirpc ? stdenv.isLinux
|
||||
, libtirpc
|
||||
, zlib
|
||||
, szip ? null
|
||||
, szipSupport ? false
|
||||
, szip
|
||||
, javaSupport ? false
|
||||
, jdk
|
||||
}:
|
||||
|
|
@ -55,10 +56,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
szip
|
||||
zlib
|
||||
]
|
||||
++ lib.optional javaSupport jdk
|
||||
++ lib.optional szipSupport szip
|
||||
++ lib.optional uselibtirpc libtirpc;
|
||||
|
||||
preConfigure = lib.optionalString uselibtirpc ''
|
||||
|
|
@ -66,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace config/cmake/FindXDR.cmake \
|
||||
--replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \
|
||||
'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)'
|
||||
'' + lib.optionalString (szip != null) ''
|
||||
'' + lib.optionalString szipSupport ''
|
||||
export SZIP_INSTALL=${szip}
|
||||
'';
|
||||
|
||||
|
|
@ -85,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
"-DJAVA_HOME=${jdk}"
|
||||
"-DJAVA_AWT_LIBRARY=${javabase}/libawt.so"
|
||||
"-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so"
|
||||
] ++ lib.optionals (szip != null) [
|
||||
] ++ lib.optionals szipSupport [
|
||||
"-DHDF4_ENABLE_SZIP_ENCODING=ON"
|
||||
"-DHDF4_ENABLE_SZIP_SUPPORT=ON"
|
||||
];
|
||||
|
|
@ -119,6 +120,17 @@ stdenv.mkDerivation rec {
|
|||
moveToOutput bin "$bin"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
uselibtirpc
|
||||
libtirpc
|
||||
szipSupport
|
||||
szip
|
||||
javaSupport
|
||||
jdk
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data model, library, and file format for storing and managing data";
|
||||
homepage = "https://support.hdfgroup.org/products/hdf4/";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, removeReferencesTo
|
||||
, zlib ? null
|
||||
, zlibSupport ? true
|
||||
, zlib
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, javaSupport ? false
|
||||
, jdk
|
||||
|
|
@ -24,10 +26,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ removeReferencesTo ];
|
||||
|
||||
propagatedBuildInputs = optional (zlib != null) zlib;
|
||||
propagatedBuildInputs = optional zlibSupport zlib;
|
||||
|
||||
configureFlags = []
|
||||
++ optional enableShared "--enable-shared"
|
||||
configureFlags = optional enableShared "--enable-shared"
|
||||
++ optional javaSupport "--enable-java";
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, removeReferencesTo
|
||||
, cpp ? false
|
||||
, gfortran ? null
|
||||
, zlib ? null
|
||||
, szip ? null
|
||||
, cppSupport ? false
|
||||
, fortranSupport ? false
|
||||
, fortran
|
||||
, zlibSupport ? true
|
||||
, zlib
|
||||
, szipSupport ? false
|
||||
, szip
|
||||
, mpiSupport ? false
|
||||
, mpi
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
|
|
@ -15,7 +19,7 @@
|
|||
|
||||
# cpp and mpi options are mutually exclusive
|
||||
# (--enable-unsupported could be used to force the build)
|
||||
assert !cpp || !mpiSupport;
|
||||
assert !cppSupport || !mpiSupport;
|
||||
|
||||
let inherit (lib) optional optionals; in
|
||||
|
||||
|
|
@ -28,28 +32,35 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
passthru = {
|
||||
inherit mpiSupport;
|
||||
inherit mpi;
|
||||
inherit
|
||||
cppSupport
|
||||
fortranSupport
|
||||
fortran
|
||||
zlibSupport
|
||||
zlib
|
||||
szipSupport
|
||||
szip
|
||||
mpiSupport
|
||||
mpi
|
||||
;
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo ]
|
||||
++ optional (gfortran != null) gfortran;
|
||||
++ optional fortranSupport fortran;
|
||||
|
||||
buildInputs = []
|
||||
++ optional (szip != null) szip
|
||||
buildInputs = optional fortranSupport fortran
|
||||
++ optional szipSupport szip
|
||||
++ optional javaSupport jdk;
|
||||
|
||||
propagatedBuildInputs = []
|
||||
++ optional (zlib != null) zlib
|
||||
propagatedBuildInputs = optional zlibSupport zlib
|
||||
++ optional mpiSupport mpi;
|
||||
|
||||
configureFlags = []
|
||||
++ optional cpp "--enable-cxx"
|
||||
++ optional (gfortran != null) "--enable-fortran"
|
||||
++ optional (szip != null) "--with-szlib=${szip}"
|
||||
++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
|
||||
configureFlags = optional cppSupport "--enable-cxx"
|
||||
++ optional fortranSupport "--enable-fortran"
|
||||
++ optional szipSupport "--with-szlib=${szip}"
|
||||
++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ]
|
||||
++ optional enableShared "--enable-shared"
|
||||
++ optional javaSupport "--enable-java"
|
||||
++ optional usev110Api "--with-default-api-version=v110";
|
||||
|
|
|
|||
25
pkgs/tools/misc/rates/default.nix
Normal file
25
pkgs/tools/misc/rates/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rates";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunush";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh";
|
||||
};
|
||||
|
||||
cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool that brings currency exchange rates right into your terminal";
|
||||
homepage = "https://github.com/lunush/rates";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "auto-cpufreq";
|
||||
version = "1.6.9";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdnanHodzic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pri182cgbrhr0adq2784gpv6q8c8kjr0jsh8wpvd1wvfsbqywrm";
|
||||
sha256 = "0b6j26glg1ffihdr2h7dlr1lrbhkclgp17dxmkjgg5gk4mhz799r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ click distro psutil ];
|
||||
|
|
|
|||
29
pkgs/tools/text/tidy-viewer/default.nix
Normal file
29
pkgs/tools/text/tidy-viewer/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tidy-viewer";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexhallam";
|
||||
repo = "tv";
|
||||
rev = version;
|
||||
sha256 = "1zjnc2b9y2f6x114svp31r1lzkak4xfn71qrxch30mq2aj4yzd2l";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-M6HInLevKvF4zBNe+Sg8fQK6koefRaO0l5AcrFhH+vI=";
|
||||
|
||||
# this test parses command line arguments
|
||||
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
checkFlags = [
|
||||
"--skip=build_reader_can_create_reader_without_file_specified"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";
|
||||
homepage = "https://github.com/alexhallam/tv";
|
||||
changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6000,7 +6000,9 @@ with pkgs;
|
|||
|
||||
pixz = callPackage ../tools/compression/pixz { };
|
||||
|
||||
plplot = callPackage ../development/libraries/plplot { };
|
||||
plplot = callPackage ../development/libraries/plplot {
|
||||
inherit (xorg) libX11;
|
||||
};
|
||||
|
||||
pxattr = callPackage ../tools/archivers/pxattr { };
|
||||
|
||||
|
|
@ -6067,28 +6069,25 @@ with pkgs;
|
|||
|
||||
hddtemp = callPackage ../tools/misc/hddtemp { };
|
||||
|
||||
hdf4 = callPackage ../tools/misc/hdf4 {
|
||||
szip = null;
|
||||
};
|
||||
hdf4 = callPackage ../tools/misc/hdf4 { };
|
||||
|
||||
hdf5 = callPackage ../tools/misc/hdf5 {
|
||||
gfortran = null;
|
||||
szip = null;
|
||||
fortranSupport = false;
|
||||
fortran = gfortran;
|
||||
};
|
||||
|
||||
hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { };
|
||||
|
||||
hdf5-mpi = appendToName "mpi" (hdf5.override {
|
||||
szip = null;
|
||||
mpiSupport = true;
|
||||
});
|
||||
|
||||
hdf5-cpp = appendToName "cpp" (hdf5.override {
|
||||
cpp = true;
|
||||
cppSupport = true;
|
||||
});
|
||||
|
||||
hdf5-fortran = appendToName "fortran" (hdf5.override {
|
||||
inherit gfortran;
|
||||
fortranSupport = true;
|
||||
});
|
||||
|
||||
hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: {
|
||||
|
|
@ -9778,6 +9777,8 @@ with pkgs;
|
|||
|
||||
thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
|
||||
|
||||
tidy-viewer = callPackage ../tools/text/tidy-viewer { };
|
||||
|
||||
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
|
||||
|
||||
tiledb = callPackage ../development/libraries/tiledb { };
|
||||
|
|
@ -12267,7 +12268,10 @@ with pkgs;
|
|||
/**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7)
|
||||
else if platform.isFreeBSD then 7
|
||||
else if platform.isAndroid then 12
|
||||
else if platform.isLinux then (if platform.isRiscV then 11 else 7)
|
||||
else if platform.isLinux then
|
||||
/**/ if platform.isRiscV then 11
|
||||
else if platform.isMusl then 11
|
||||
else 7
|
||||
else if platform.isWasm then 8
|
||||
else latest_version;
|
||||
# We take the "max of the mins". Why? Since those are lower bounds of the
|
||||
|
|
@ -13089,6 +13093,12 @@ with pkgs;
|
|||
|
||||
inherit (beam.packages.erlangR21) lfe lfe_1_3;
|
||||
|
||||
gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
|
||||
inherit (llvmPackages) openmp;
|
||||
# MPICH currently build on Darwin
|
||||
mpi = mpich;
|
||||
};
|
||||
|
||||
groovy = callPackage ../development/interpreters/groovy { };
|
||||
|
||||
inherit (callPackages ../applications/networking/cluster/hadoop {
|
||||
|
|
@ -32366,6 +32376,8 @@ with pkgs;
|
|||
|
||||
qdl = callPackage ../tools/misc/qdl { };
|
||||
|
||||
rates = callPackage ../tools/misc/rates { };
|
||||
|
||||
rargs = callPackage ../tools/misc/rargs { };
|
||||
|
||||
rancher = callPackage ../applications/networking/cluster/rancher { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue