Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
b47bf79d2a
37 changed files with 5217 additions and 3330 deletions
|
|
@ -358,6 +358,7 @@
|
|||
./services/development/jupyter/default.nix
|
||||
./services/development/jupyterhub/default.nix
|
||||
./services/development/lorri.nix
|
||||
./services/display-managers/greetd.nix
|
||||
./services/editors/emacs.nix
|
||||
./services/editors/infinoted.nix
|
||||
./services/games/factorio.nix
|
||||
|
|
|
|||
106
nixos/modules/services/display-managers/greetd.nix
Normal file
106
nixos/modules/services/display-managers/greetd.nix
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.greetd;
|
||||
tty = "tty${toString cfg.vt}";
|
||||
settingsFormat = pkgs.formats.toml {};
|
||||
in
|
||||
{
|
||||
options.services.greetd = {
|
||||
enable = mkEnableOption "greetd";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.greetd.greetd;
|
||||
defaultText = "pkgs.greetd.greetd";
|
||||
description = "The greetd package that should be used.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = literalExample ''
|
||||
{
|
||||
default_session = {
|
||||
command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
greetd configuration (<link xlink:href="https://man.sr.ht/~kennylevinsen/greetd/">documentation</link>)
|
||||
as a Nix attribute set.
|
||||
'';
|
||||
};
|
||||
|
||||
vt = mkOption {
|
||||
type = types.int;
|
||||
default = 1;
|
||||
description = ''
|
||||
The virtual console (tty) that greetd should use. This option also disables getty on that tty.
|
||||
'';
|
||||
};
|
||||
|
||||
restart = mkOption {
|
||||
type = types.bool;
|
||||
default = !(cfg.settings ? initial_session);
|
||||
defaultText = "!(config.services.greetd.settings ? initial_session)";
|
||||
description = ''
|
||||
Wether to restart greetd when it terminates (e.g. on failure).
|
||||
This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin),
|
||||
because every greetd restart will trigger the autologin again.
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.greetd.settings.terminal.vt = mkDefault cfg.vt;
|
||||
services.greetd.settings.default_session = mkDefault "greeter";
|
||||
|
||||
security.pam.services.greetd = {
|
||||
allowNullPassword = true;
|
||||
startSession = true;
|
||||
};
|
||||
|
||||
# This prevents nixos-rebuild from killing greetd by activating getty again
|
||||
systemd.services."autovt@${tty}".enable = false;
|
||||
|
||||
systemd.services.greetd = {
|
||||
unitConfig = {
|
||||
Wants = [
|
||||
"systemd-user-sessions.service"
|
||||
];
|
||||
After = [
|
||||
"systemd-user-sessions.service"
|
||||
"plymouth-quit-wait.service"
|
||||
"getty@${tty}.service"
|
||||
];
|
||||
Conflicts = [
|
||||
"getty@${tty}.service"
|
||||
];
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.greetd.greetd}/bin/greetd --config ${settingsFormat.generate "greetd.toml" cfg.settings}";
|
||||
|
||||
Restart = mkIf cfg.restart "always";
|
||||
|
||||
# Defaults from greetd upstream configuration
|
||||
IgnoreSIGPIPE = false;
|
||||
SendSIGHUP = true;
|
||||
TimeoutStopSec = "30s";
|
||||
KeyringMode = "shared";
|
||||
};
|
||||
|
||||
# Don't kill a user session when using nixos-rebuild
|
||||
restartIfChanged = false;
|
||||
|
||||
wantedBy = [ "graphical.target" ];
|
||||
};
|
||||
|
||||
systemd.defaultUnit = "graphical.target";
|
||||
|
||||
users.users.greeter.isSystemUser = true;
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ queezle ];
|
||||
}
|
||||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
|
||||
pkg-config, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
|
||||
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
|
||||
pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools,
|
||||
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection,
|
||||
libsoup, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "font-manager";
|
||||
version = "0.7.9";
|
||||
version = "0.8.5-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FontManager";
|
||||
repo = "master";
|
||||
rev = version;
|
||||
sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q";
|
||||
sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,9 +34,10 @@ stdenv.mkDerivation rec {
|
|||
libxml2
|
||||
json-glib
|
||||
sqlite
|
||||
librsvg
|
||||
gtk3
|
||||
gnome3.adwaita-icon-theme
|
||||
libsoup
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -55,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
Font Manager is NOT a professional-grade font management solution.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
, python37Packages
|
||||
, stdenv
|
||||
, systemd
|
||||
, xdg-utils
|
||||
, zlib
|
||||
}:
|
||||
with lib;
|
||||
|
|
@ -171,6 +172,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]}
|
||||
wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH
|
||||
wrapProgram $out/bin/appgate --prefix PATH : ${xdg-utils}/bin
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Appgate SDP (Software Defined Perimeter) desktop client";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
excludedPackages = "tools";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+9VtFHZ4ZZiX04u5YvPoQaelH9Q9oKMrbFHFFiNUxBA=";
|
||||
sha256 = "sha256-u9P+7qNomamd4BkqWBxA6rDom0hF6t10QfDTjqOMGeE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA=";
|
||||
sha256 = "sha256-4NIyit2HnDXWnHALGzz5KWxe4PU8CwMRwCoIlN/WX78=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM=";
|
||||
vendorSha256 = "sha256-qwUAC8LURsn6C3zKzcsuFsOTurjPV9V8Z/1Y9G0eohk=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,13 +26,14 @@
|
|||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.8.9";
|
||||
version = "1.9.1";
|
||||
code = "XZXB3fXZgXyQbnTkTm5XOJH9i6NsKX9lL21V";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
# Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=XZjfKzXZ6h3uGRFId48VRNHHkuqajhRvMlPV&filename=${name}.zip";
|
||||
hash = "sha256:1bwdwfwgy3wwzlggi8qhf5q2bq2kqiqi3mgvsr9w0mxyaxxv13r8";
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip";
|
||||
hash = "sha256-vUrz4thp9tcU9T8d52DJUAbt6Jnv+E3pbUytzMR8d/E=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -1,44 +1,52 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, python3
|
||||
, fetchpatch
|
||||
, makeDesktopItem
|
||||
, makePythonPath
|
||||
, dateutil
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pyenchant
|
||||
, pyqt5
|
||||
, pytest
|
||||
, python
|
||||
, qtsvg
|
||||
, runtimeShell
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pyspread";
|
||||
version = "1.99.5";
|
||||
version = "1.99.6";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg=";
|
||||
sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8=";
|
||||
};
|
||||
|
||||
pythonLibs = [
|
||||
patches = [
|
||||
# https://gitlab.com/pyspread/pyspread/-/merge_requests/34
|
||||
(fetchpatch {
|
||||
name = "entry-points.patch";
|
||||
url = "https://gitlab.com/pyspread/pyspread/-/commit/3d8da6a7a7d76f7027d77ca95fac103961d729a2.patch";
|
||||
excludes = [ "bin/pyspread" "bin/pyspread.bat" ];
|
||||
sha256 = "1l614k7agv339hrin23jj7s1mq576vkdfkdim6wp224k7y37bnil";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dateutil
|
||||
markdown2
|
||||
matplotlib
|
||||
numpy
|
||||
pyenchant
|
||||
pyqt5
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
buildInputs = pythonLibs ++ [
|
||||
qtsvg
|
||||
setuptools
|
||||
];
|
||||
|
||||
doCheck = false; # it fails miserably with a core dump
|
||||
|
||||
pythonImportsCheck = [ "pyspread" ];
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = pname;
|
||||
exec = name;
|
||||
|
|
@ -50,20 +58,11 @@ buildPythonApplication rec {
|
|||
};
|
||||
|
||||
postInstall = ''
|
||||
runHook preInstall
|
||||
install -D $out/share/applications
|
||||
install -m 644 $desktopItem/share/applications/* $out/share/applications
|
||||
runHook postInstall
|
||||
install -m 444 -Dt $out/share/applications ${desktopItem}/share/applications/*
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread
|
||||
wrapProgram $out/bin/pyspread \
|
||||
--prefix PYTHONPATH ':' $(toPythonPath $out):${makePythonPath pythonLibs} \
|
||||
--prefix PATH ':' ${python}/bin/ \
|
||||
''${qtWrapperArgs[@]}
|
||||
runHook postFixup
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
continue
|
||||
- ui.write('<tag revision="%d" node="%s" name="%s"/>\n'
|
||||
+ ui.write(b'<tag revision="%d" node="%s" name="%s"/>\n'
|
||||
% (r, _x(node.hex(n)), _x(t)))
|
||||
% (r, _x(node.hex(n)), _u(t)))
|
||||
|
||||
def _branches(ui, repo):
|
||||
@@ -104,136 +107,148 @@ def _branches(ui, repo):
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
if lookup(r, n) in branchheads(t):
|
||||
- ui.write('<branch revision="%d" node="%s" name="%s"/>\n'
|
||||
+ ui.write(b'<branch revision="%d" node="%s" name="%s"/>\n'
|
||||
% (r, _x(node.hex(n)), _x(t)))
|
||||
% (r, _x(node.hex(n)), _u(t)))
|
||||
|
||||
def _manifest(ui, repo, path, rev):
|
||||
ctx = _changectx(repo, rev)
|
||||
|
|
|
|||
|
|
@ -1,28 +1,34 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
|
||||
gem "bundler", ">= 1.5.0"
|
||||
ruby '>= 2.4.0', '< 2.8.0'
|
||||
gem 'bundler', '>= 1.12.0'
|
||||
|
||||
gem 'rails', '5.2.4.5'
|
||||
gem 'rails', '5.2.5'
|
||||
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
||||
gem "rouge", "~> 3.12.0"
|
||||
gem "request_store", "~> 1.4.1"
|
||||
gem 'rouge', '~> 3.26.0'
|
||||
gem 'request_store', '~> 1.5.0'
|
||||
gem "mini_mime", "~> 1.0.1"
|
||||
gem "actionpack-xml_parser"
|
||||
gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
|
||||
gem "mimemagic"
|
||||
gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')
|
||||
gem 'marcel'
|
||||
gem "mail", "~> 2.7.1"
|
||||
gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
|
||||
gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
|
||||
gem "i18n", "~> 1.6.0"
|
||||
gem 'i18n', '~> 1.8.2'
|
||||
gem "rbpdf", "~> 1.20.0"
|
||||
gem 'addressable'
|
||||
gem 'rubyzip', '~> 2.3.0'
|
||||
|
||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||
|
||||
# TOTP-based 2-factor authentication
|
||||
gem 'rotp'
|
||||
gem 'rqrcode'
|
||||
|
||||
# Optional gem for LDAP authentication
|
||||
group :ldap do
|
||||
gem "net-ldap", "~> 0.16.0"
|
||||
gem 'net-ldap', '~> 0.17.0'
|
||||
end
|
||||
|
||||
# Optional gem for OpenID authentication
|
||||
|
|
@ -33,7 +39,7 @@ end
|
|||
|
||||
# Optional gem for exporting the gantt to a PNG file
|
||||
group :minimagick do
|
||||
gem "mini_magick", "~> 4.9.5"
|
||||
gem 'mini_magick', '~> 4.11.0'
|
||||
end
|
||||
|
||||
# Optional Markdown support, not for JRuby
|
||||
|
|
@ -43,7 +49,7 @@ end
|
|||
|
||||
# Include database gems for the database adapters NixOS supports
|
||||
gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
|
||||
gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
|
||||
gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw]
|
||||
|
||||
group :development do
|
||||
gem "yard"
|
||||
|
|
@ -52,16 +58,17 @@ end
|
|||
group :test do
|
||||
gem "rails-dom-testing"
|
||||
gem 'mocha', '>= 1.4.0'
|
||||
gem "simplecov", "~> 0.17.0", :require => false
|
||||
gem 'simplecov', '~> 0.18.5', :require => false
|
||||
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
|
||||
# For running system tests
|
||||
gem 'puma', '~> 3.7'
|
||||
gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
|
||||
gem 'puma'
|
||||
gem 'capybara', '~> 3.31.0'
|
||||
gem "selenium-webdriver"
|
||||
gem 'webdrivers', '~> 4.4', require: false
|
||||
# RuboCop
|
||||
gem 'rubocop', '~> 0.76.0'
|
||||
gem 'rubocop-performance', '~> 1.5.0'
|
||||
gem 'rubocop-rails', '~> 2.3.0'
|
||||
gem 'rubocop', '~> 1.12.0'
|
||||
gem 'rubocop-performance', '~> 1.10.1'
|
||||
gem 'rubocop-rails', '~> 2.9.0'
|
||||
end
|
||||
|
||||
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
actioncable (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailer (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activejob (= 5.2.4.5)
|
||||
actionmailer (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activejob (= 5.2.5)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
actionpack (5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -21,26 +21,26 @@ GEM
|
|||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actionview (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
actionview (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
activejob (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
activerecord (5.2.4.5)
|
||||
activemodel (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
activemodel (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activerecord (5.2.5)
|
||||
activemodel (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
arel (>= 9.0)
|
||||
activestorage (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
activerecord (= 5.2.4.5)
|
||||
marcel (~> 0.3.1)
|
||||
activesupport (5.2.4.5)
|
||||
activestorage (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
activerecord (= 5.2.5)
|
||||
marcel (~> 1.0.0)
|
||||
activesupport (5.2.5)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -50,7 +50,7 @@ GEM
|
|||
arel (9.0.0)
|
||||
ast (2.4.2)
|
||||
builder (3.2.4)
|
||||
capybara (3.25.0)
|
||||
capybara (3.31.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (~> 1.8)
|
||||
|
|
@ -59,6 +59,7 @@ GEM
|
|||
regexp_parser (~> 1.5)
|
||||
xpath (~> 3.2)
|
||||
childprocess (3.0.0)
|
||||
chunky_png (1.4.0)
|
||||
concurrent-ruby (1.1.8)
|
||||
crass (1.0.6)
|
||||
css_parser (1.9.0)
|
||||
|
|
@ -69,26 +70,22 @@ GEM
|
|||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.6.0)
|
||||
i18n (1.8.9)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jaro_winkler (1.5.4)
|
||||
json (2.5.1)
|
||||
loofah (2.9.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
marcel (0.3.3)
|
||||
mimemagic (~> 0.3.2)
|
||||
marcel (1.0.0)
|
||||
method_source (1.0.0)
|
||||
mimemagic (0.3.5)
|
||||
mini_magick (4.9.5)
|
||||
mini_mime (1.0.2)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.3)
|
||||
mini_portile2 (2.5.0)
|
||||
minitest (5.14.4)
|
||||
mocha (1.12.0)
|
||||
mysql2 (0.5.3)
|
||||
net-ldap (0.16.3)
|
||||
net-ldap (0.17.0)
|
||||
nio4r (2.5.7)
|
||||
nokogiri (1.11.2)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
|
|
@ -96,9 +93,10 @@ GEM
|
|||
parallel (1.20.1)
|
||||
parser (3.0.0.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.1.4)
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (3.12.6)
|
||||
puma (5.2.2)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
rack-openid (1.4.2)
|
||||
|
|
@ -106,27 +104,27 @@ GEM
|
|||
ruby-openid (>= 2.1.8)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (5.2.4.5)
|
||||
actioncable (= 5.2.4.5)
|
||||
actionmailer (= 5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
actionview (= 5.2.4.5)
|
||||
activejob (= 5.2.4.5)
|
||||
activemodel (= 5.2.4.5)
|
||||
activerecord (= 5.2.4.5)
|
||||
activestorage (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
rails (5.2.5)
|
||||
actioncable (= 5.2.5)
|
||||
actionmailer (= 5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activejob (= 5.2.5)
|
||||
activemodel (= 5.2.5)
|
||||
activerecord (= 5.2.5)
|
||||
activestorage (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.2.4.5)
|
||||
railties (= 5.2.5)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.4.5)
|
||||
actionpack (= 5.2.4.5)
|
||||
activesupport (= 5.2.4.5)
|
||||
railties (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
|
|
@ -138,38 +136,49 @@ GEM
|
|||
rbpdf-font (1.19.1)
|
||||
redcarpet (3.5.1)
|
||||
regexp_parser (1.8.2)
|
||||
request_store (1.4.1)
|
||||
request_store (1.5.0)
|
||||
rack (>= 1.4)
|
||||
rexml (3.2.4)
|
||||
roadie (4.0.0)
|
||||
css_parser (~> 1.4)
|
||||
nokogiri (~> 1.8)
|
||||
roadie-rails (2.1.1)
|
||||
railties (>= 5.1, < 6.1)
|
||||
roadie-rails (2.2.0)
|
||||
railties (>= 5.1, < 6.2)
|
||||
roadie (>= 3.1, < 5.0)
|
||||
rouge (3.12.0)
|
||||
rubocop (0.76.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
rotp (6.2.0)
|
||||
rouge (3.26.0)
|
||||
rqrcode (1.2.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 0.2)
|
||||
rqrcode_core (0.2.0)
|
||||
rubocop (1.12.0)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.6)
|
||||
parser (>= 3.0.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml
|
||||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 1.7)
|
||||
rubocop-performance (1.5.2)
|
||||
rubocop (>= 0.71.0)
|
||||
rubocop-rails (2.3.2)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.4.1)
|
||||
parser (>= 2.7.1.5)
|
||||
rubocop-performance (1.10.2)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
rubocop-ast (>= 0.4.0)
|
||||
rubocop-rails (2.9.1)
|
||||
activesupport (>= 4.2.0)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 0.72.0)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
ruby-openid (2.9.2)
|
||||
ruby-progressbar (1.11.0)
|
||||
rubyzip (2.3.0)
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
simplecov (0.17.1)
|
||||
simplecov (0.18.5)
|
||||
docile (~> 1.1)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.2)
|
||||
simplecov-html (~> 0.11)
|
||||
simplecov-html (0.12.3)
|
||||
sprockets (4.0.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
|
|
@ -181,7 +190,11 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (1.6.1)
|
||||
unicode-display_width (2.0.0)
|
||||
webdrivers (4.6.0)
|
||||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (>= 3.0, < 4.0)
|
||||
websocket-driver (0.7.3)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
|
|
@ -194,36 +207,41 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
actionpack-xml_parser
|
||||
bundler (>= 1.5.0)
|
||||
capybara (~> 3.25.0)
|
||||
addressable
|
||||
bundler (>= 1.12.0)
|
||||
capybara (~> 3.31.0)
|
||||
csv (~> 3.1.1)
|
||||
ffi
|
||||
i18n (~> 1.6.0)
|
||||
i18n (~> 1.8.2)
|
||||
mail (~> 2.7.1)
|
||||
mimemagic
|
||||
mini_magick (~> 4.9.5)
|
||||
marcel
|
||||
mini_magick (~> 4.11.0)
|
||||
mini_mime (~> 1.0.1)
|
||||
mocha (>= 1.4.0)
|
||||
mysql2 (~> 0.5.0)
|
||||
net-ldap (~> 0.16.0)
|
||||
net-ldap (~> 0.17.0)
|
||||
nokogiri (~> 1.11.1)
|
||||
pg (~> 1.1.4)
|
||||
puma (~> 3.7)
|
||||
pg (~> 1.2.2)
|
||||
puma
|
||||
rack-openid
|
||||
rails (= 5.2.4.5)
|
||||
rails (= 5.2.5)
|
||||
rails-dom-testing
|
||||
rbpdf (~> 1.20.0)
|
||||
redcarpet (~> 3.5.1)
|
||||
request_store (~> 1.4.1)
|
||||
roadie-rails (~> 2.1.0)
|
||||
rouge (~> 3.12.0)
|
||||
rubocop (~> 0.76.0)
|
||||
rubocop-performance (~> 1.5.0)
|
||||
rubocop-rails (~> 2.3.0)
|
||||
request_store (~> 1.5.0)
|
||||
roadie-rails (~> 2.2.0)
|
||||
rotp
|
||||
rouge (~> 3.26.0)
|
||||
rqrcode
|
||||
rubocop (~> 1.12.0)
|
||||
rubocop-performance (~> 1.10.1)
|
||||
rubocop-rails (~> 2.9.0)
|
||||
ruby-openid (~> 2.9.2)
|
||||
rubyzip (~> 2.3.0)
|
||||
selenium-webdriver
|
||||
simplecov (~> 0.17.0)
|
||||
simplecov (~> 0.18.5)
|
||||
tzinfo-data
|
||||
webdrivers (~> 4.4)
|
||||
yard
|
||||
|
||||
RUBY VERSION
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.1.2";
|
||||
version = "4.2.0";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky";
|
||||
sha256 = "1r87gy73dclnvcz55vziv6kbgyck0v8jlzx1wwkak8mgh32n8n19";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j";
|
||||
sha256 = "16g623zz4nnwj236xms4n85jbc2b1imddqsx3gd4x4b7xqlwlw9p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp";
|
||||
sha256 = "1ifmlwlm4bs6gm3y4c701wkhyf4ym4kia44npz9fbc92ariawn2z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq";
|
||||
sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
actionpack-xml_parser = {
|
||||
dependencies = ["actionpack" "railties"];
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c";
|
||||
sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya";
|
||||
sha256 = "00k5fl4bx9qmrkwn8mdfdh8h2did0bnr3nc3g0fdyvm7ql9981jc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m";
|
||||
sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport" "arel"];
|
||||
|
|
@ -82,10 +82,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg";
|
||||
sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
activestorage = {
|
||||
dependencies = ["actionpack" "activerecord" "marcel"];
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081";
|
||||
sha256 = "1706qircxl9agrq5423zv0i9p7gvcxcligw8vvclk049hks87gqd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
|
||||
sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
|
|
@ -156,10 +156,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx";
|
||||
sha256 = "0fhgnw6xgnphaka50b995mcmc2pjifmlr8ypz6dw2a6jkz3qqlcl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.25.0";
|
||||
version = "3.31.0";
|
||||
};
|
||||
childprocess = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -171,6 +171,16 @@
|
|||
};
|
||||
version = "3.0.0";
|
||||
};
|
||||
chunky_png = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
|
|
@ -259,30 +269,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
|
||||
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
};
|
||||
jaro_winkler = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.4";
|
||||
};
|
||||
json = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
version = "1.8.9";
|
||||
};
|
||||
loofah = {
|
||||
dependencies = ["crass" "nokogiri"];
|
||||
|
|
@ -307,15 +297,14 @@
|
|||
version = "2.7.1";
|
||||
};
|
||||
marcel = {
|
||||
dependencies = ["mimemagic"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
|
||||
sha256 = "1vhp6lifwvqs2b0a276lj61n86c1l7d1xiswjj2w23f54gl51mpk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
version = "1.0.0";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default"];
|
||||
|
|
@ -327,35 +316,25 @@
|
|||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
mimemagic = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.5";
|
||||
};
|
||||
mini_magick = {
|
||||
groups = ["minimagick"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
|
||||
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.9.5";
|
||||
version = "4.11.0";
|
||||
};
|
||||
mini_mime = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
|
||||
sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -410,13 +389,13 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
|
||||
sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.16.3";
|
||||
version = "0.17.0";
|
||||
};
|
||||
nio4r = {
|
||||
groups = ["default"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
|
|
@ -470,10 +449,10 @@
|
|||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
|
||||
sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.4";
|
||||
version = "1.2.3";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -486,14 +465,15 @@
|
|||
version = "4.0.6";
|
||||
};
|
||||
puma = {
|
||||
dependencies = ["nio4r"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a";
|
||||
sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.12.6";
|
||||
version = "5.2.2";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -543,10 +523,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd";
|
||||
sha256 = "1p0sa36sngmfkmykcv5qhpr7rzsrc42cd9flhnxjs3r5b0jsl52c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
rails-dom-testing = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
|
|
@ -576,10 +556,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd";
|
||||
sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.5";
|
||||
version = "5.2.5";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -648,10 +628,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d";
|
||||
sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.4";
|
||||
};
|
||||
roadie = {
|
||||
dependencies = ["css_parser" "nokogiri"];
|
||||
|
|
@ -670,53 +660,95 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fmn7kkbpgipjsx65rw7hqa3bwinlqykx5qf1x28ya9ag8v2q0ph";
|
||||
sha256 = "0jjcqnp37z65dksykzwjiz149kx65nw70lyx8dkw1fm5x7yraqvh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
};
|
||||
rotp = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.2.0";
|
||||
};
|
||||
rouge = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw";
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.12.0";
|
||||
version = "3.26.0";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png" "rqrcode_core"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0f1cv9a9sjqc898qm3h7zmkhwglrjw5blsskbg3gsaws01d4bc47";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
rqrcode_core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00kqasqja8zyzqvlgiwd9r0wndqk01qk5j68a8lhlz4ayrd4qy0y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0";
|
||||
sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.76.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop"];
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2";
|
||||
sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
version = "1.10.2";
|
||||
};
|
||||
rubocop-rails = {
|
||||
dependencies = ["rack" "rubocop"];
|
||||
dependencies = ["activesupport" "rack" "rubocop"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf";
|
||||
sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
version = "2.9.1";
|
||||
};
|
||||
ruby-openid = {
|
||||
groups = ["openid"];
|
||||
|
|
@ -760,25 +792,25 @@
|
|||
version = "3.142.7";
|
||||
};
|
||||
simplecov = {
|
||||
dependencies = ["docile" "json" "simplecov-html"];
|
||||
dependencies = ["docile" "simplecov-html"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
|
||||
sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.17.1";
|
||||
version = "0.18.5";
|
||||
};
|
||||
simplecov-html = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
|
||||
sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.2";
|
||||
version = "0.12.3";
|
||||
};
|
||||
sprockets = {
|
||||
dependencies = ["concurrent-ruby" "rack"];
|
||||
|
|
@ -838,10 +870,21 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
|
||||
sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
webdrivers = {
|
||||
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
};
|
||||
websocket-driver = {
|
||||
dependencies = ["websocket-extensions"];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,76 @@
|
|||
{ lib, stdenv, requireFile, unzip }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, python3
|
||||
, config
|
||||
, acceptLicense ? config.input-fonts.acceptLicense or false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
let
|
||||
|
||||
throwLicense = throw ''
|
||||
Input is available free of charge for private/unpublished usage. This includes things like your personal coding app or for composing plain text documents.
|
||||
To use it, you need to agree to its license: https://input.djr.com/license/
|
||||
|
||||
You can express acceptance by setting acceptLicense to true in your
|
||||
configuration. Note that this is not a free license so it requires allowing
|
||||
unfree licenses.
|
||||
|
||||
configuration.nix:
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.input-fonts.acceptLicense = true;
|
||||
|
||||
config.nix:
|
||||
allowUnfree = true;
|
||||
input-fonts.acceptLicense = true;
|
||||
|
||||
If you would like to support this project, consider purchasing a license at <http://input.djr.com/buy>.
|
||||
'';
|
||||
|
||||
releaseDate = "2015-06-24";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "input-fonts";
|
||||
version = "2019-11-25"; # date of the download and checksum
|
||||
version = "1.2";
|
||||
|
||||
src = requireFile {
|
||||
name = "Input-Font.zip";
|
||||
url = "https://input.fontbureau.com/download/";
|
||||
sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b";
|
||||
src =
|
||||
assert !acceptLicense -> throwLicense;
|
||||
fetchzip {
|
||||
name = "input-fonts-${version}";
|
||||
# Add .zip parameter so that zip unpackCmd can match it.
|
||||
url = "https://input.djr.com/build/?fontSelection=whole&a=0&g=0&i=0&l=0&zero=0&asterisk=0&braces=0&preset=default&line-height=1.2&accept=I+do&email=&.zip";
|
||||
sha256 = "BESZ4Bjgm2hvQ7oPpMvYSlE8EqvQjqHZtXWIovqyIzA=";
|
||||
stripRoot = false;
|
||||
|
||||
extraPostFetch = ''
|
||||
# Reset the timestamp to release date for determinism.
|
||||
PATH=${lib.makeBinPath [ python3.pkgs.fonttools ]}:$PATH
|
||||
for ttf_file in $out/Input_Fonts/*/*/*.ttf; do
|
||||
ttx_file=$(dirname "$ttf_file")/$(basename "$ttf_file" .ttf).ttx
|
||||
ttx "$ttf_file"
|
||||
rm "$ttf_file"
|
||||
touch -m -t ${builtins.replaceStrings [ "-" ] [ "" ] releaseDate}0000 "$ttx_file"
|
||||
ttx --recalc-timestamp "$ttx_file"
|
||||
rm "$ttx_file"
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
sourceRoot = ".";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
find Input_Fonts -name "*.ttf" -exec cp -a {} "$out"/share/fonts/truetype/ \;
|
||||
mkdir -p "$out"/share/doc
|
||||
cp -a *.txt "$out"/share/doc/
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv";
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fonts for Code, from Font Bureau";
|
||||
|
|
@ -42,9 +87,12 @@ stdenv.mkDerivation {
|
|||
generous spacing, large punctuation, and easily distinguishable
|
||||
characters — but without the limitations of a fixed width.
|
||||
'';
|
||||
homepage = "https://input.fontbureau.com";
|
||||
homepage = "https://input.djr.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = with maintainers; [
|
||||
jtojnar
|
||||
romildo
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, docbook_xml_dtd_45
|
||||
, docbook-xsl-nons
|
||||
|
|
@ -93,6 +94,15 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/NixOS/nixpkgs/issues/43581
|
||||
./use-flatpak-from-path.patch
|
||||
|
||||
# Hardcode flatpak binary path for flatpak-spawn.
|
||||
# When calling the portal’s Spawn command with FLATPAK_SPAWN_FLAGS_CLEAR_ENV flag,
|
||||
# it will clear environment, including PATH, making the flatpak run fail.
|
||||
# https://github.com/flatpak/flatpak/pull/4174
|
||||
(fetchpatch {
|
||||
url = "https://github.com/flatpak/flatpak/commit/495449daf6d3c072519a36c9e4bc6cc1da4d31db.patch";
|
||||
sha256 = "gOX/sGupAE7Yg3MVrMhFXzWHpFn+izVyjtkuPzIckuY=";
|
||||
})
|
||||
|
||||
# Nix environment hacks should not leak into the apps.
|
||||
# https://github.com/NixOS/nixpkgs/issues/53441
|
||||
./unset-env-vars.patch
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,10 +91,12 @@
|
|||
, "firebase-tools"
|
||||
, "fixjson"
|
||||
, "fkill-cli"
|
||||
, "fleek-cli"
|
||||
, "flood"
|
||||
, "forever"
|
||||
, "fx"
|
||||
, "ganache-cli"
|
||||
, "gatsby-cli"
|
||||
, "get-graphql-schema"
|
||||
, "git-run"
|
||||
, "git-ssb"
|
||||
|
|
|
|||
7172
pkgs/development/node-packages/node-packages.nix
generated
7172
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "HAP-python";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# pypi package does not include tests
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "ikalchev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mkrs3fwiyp4am9fx1dnhd9h7rphfwymr46khw40xavrfb5jmsa7";
|
||||
sha256 = "sha256-tZ6Zwlx5J62Xqpxxmt8Phdd9ngtKYhP/p3uor1dRfK8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -58,6 +58,7 @@ buildPythonPackage rec {
|
|||
"test_idle_connection_cleanup"
|
||||
"test_we_can_start_stop"
|
||||
"test_push_event"
|
||||
"test_bridge_run_stop"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "21.2.3";
|
||||
version = "21.4.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UQ77ot1JXZZAKD/ijw+FBYJnDLJyD7jLrKANksBIM2Y=";
|
||||
sha256 = "sha256-ulByke1sKVcDdBhAz/fxdNFJ0PSjYVdnBcO+GYEnZUQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
37
pkgs/development/python-modules/openhomedevice/default.nix
Normal file
37
pkgs/development/python-modules/openhomedevice/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, async-upnp-client
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openhomedevice";
|
||||
version = "1.0.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazwilliams";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04qdlyzc8xsk7qxyn9l59pbwnlw49zknw0r5lqwx402va12g4ra0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-upnp-client
|
||||
lxml
|
||||
];
|
||||
|
||||
# Tests are currently outdated
|
||||
# https://github.com/bazwilliams/openhomedevice/issues/20
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "openhomedevice" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to access Linn Ds and Openhome devices";
|
||||
homepage = "https://github.com/bazwilliams/openhomedevice";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,15 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, prompt_toolkit
|
||||
, pygments
|
||||
, pyserial
|
||||
, pyserial-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, redis
|
||||
, sqlalchemy
|
||||
, tornado
|
||||
|
|
@ -15,17 +18,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymodbus";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riptideio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ri4sy5axs4a1wg1qffp0k2z5v309612y8mfbxnb06fizqdkbclf";
|
||||
sha256 = "sha256-b85jfBZfMZtqtmID+tGBgOe9o0BbmBH83UV71lYAI5c=";
|
||||
};
|
||||
|
||||
# Twisted asynchronous version is not supported due to a missing dependency
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
click
|
||||
prompt_toolkit
|
||||
pygments
|
||||
pyserial
|
||||
pyserial-asyncio
|
||||
tornado
|
||||
|
|
@ -34,11 +41,9 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
asynctest
|
||||
mock
|
||||
pyserial-asyncio
|
||||
pytestCheckHook
|
||||
redis
|
||||
sqlalchemy
|
||||
tornado
|
||||
twisted
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, typing-extensions
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytube";
|
||||
version = "10.6.1";
|
||||
version = "10.7.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -16,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "pytube";
|
||||
repo = "pytube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b0tN4m3/+K243zQ7L4wW4crk9r69Tj64is6C4I5oFZU=";
|
||||
sha256 = "sha256-a9MYEQFJXfPXYkWiuZkjt/PGs73Dm5614/Xvv6Nn8RA=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "packer";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "packer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PZwKvb43Xf8HaC148Xo076u3sP53nwC4fJ2X7HU0gDo=";
|
||||
sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -735,7 +735,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "1f8ns3a5am9jb52niy3ass9hpzymjml62f3d7vyl1fvk3rriq4jw";
|
||||
cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -355,6 +355,7 @@ megaannum/forms
|
|||
megaannum/self
|
||||
mengelbrecht/lightline-bufferline
|
||||
metakirby5/codi.vim
|
||||
metalelf0/jellybeans-nvim@main
|
||||
mfukar/robotframework-vim
|
||||
mfussenegger/nvim-dap
|
||||
mfussenegger/nvim-jdtls
|
||||
|
|
@ -424,7 +425,7 @@ noc7c9/vim-iced-coffee-script
|
|||
norcalli/nvim-colorizer.lua
|
||||
norcalli/nvim-terminal.lua
|
||||
norcalli/snippets.nvim
|
||||
npxbr/glow.nvim
|
||||
npxbr/glow.nvim@main
|
||||
ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
nvie/vim-flake8
|
||||
|
|
@ -554,6 +555,7 @@ shumphrey/fugitive-gitlab.vim
|
|||
sickill/vim-pasta
|
||||
SidOfc/mkdx
|
||||
simnalamburt/vim-mundo
|
||||
simrat39/rust-tools.nvim
|
||||
SirVer/ultisnips
|
||||
sjl/gundo.vim
|
||||
sjl/splice.vim
|
||||
|
|
@ -606,6 +608,7 @@ tommcdo/vim-lion
|
|||
tommcdo/vim-ninja-feet
|
||||
tomtom/tcomment_vim
|
||||
tomtom/tlib_vim
|
||||
tools-life/taskwiki
|
||||
tpope/vim-abolish
|
||||
tpope/vim-capslock
|
||||
tpope/vim-commentary
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@
|
|||
"openexchangerates" = ps: with ps; [ ];
|
||||
"opengarage" = ps: with ps; [ ]; # missing inputs: open-garage
|
||||
"openhardwaremonitor" = ps: with ps; [ ];
|
||||
"openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice
|
||||
"openhome" = ps: with ps; [ openhomedevice ];
|
||||
"opensensemap" = ps: with ps; [ opensensemap-api ];
|
||||
"opensky" = ps: with ps; [ ];
|
||||
"opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
substituteInPlace setup.py \
|
||||
--replace "aiohttp==3.7.4" "aiohttp>=3.7.3" \
|
||||
--replace "attrs==19.3.0" "attrs>=19.3.0" \
|
||||
--replace "awesomeversion==21.2.3" "awesomeversion>=21.2.3" \
|
||||
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
|
||||
--replace "cryptography==3.3.2" "cryptography" \
|
||||
--replace "httpx==0.16.1" "httpx>=0.16.1" \
|
||||
|
|
|
|||
|
|
@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
|
|||
}) {};
|
||||
|
||||
xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
|
||||
name = "xf86-input-libinput-0.30.0";
|
||||
name = "xf86-input-libinput-1.0.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2";
|
||||
sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr";
|
||||
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2";
|
||||
sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
|
|||
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0p9hslaawnqnnf1s6hj3vdh11ncq7mrb4w4i933mdkychw5jav38";
|
||||
sha256 = "sha256-q0rAAD6du0WLcd46LUpkG3gBIvmtOE/foEMW5QCoIak=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
|
||||
vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw=";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
# directories flags
|
||||
"--sysconfdir=${placeholder "out"}/etc"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--with-dbusconfdir=${placeholder "out"}/share"
|
||||
"--with-dbusdatadir=${placeholder "out"}/share"
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "ghidra";
|
||||
version = "9.2.1";
|
||||
versiondate = "20201215";
|
||||
version = "9.2.2";
|
||||
versiondate = "20201229";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
|
||||
sha256 = "0rjzmx0nbv9flb666mk3w2dqliyfzjyc4ldjfmb5d29wpgnf9bnz";
|
||||
sha256 = "1xahkwiqdcwxssah16hhgrmyam49cb341xp5ysycj1h0kkm8p53s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7608,9 +7608,7 @@ in
|
|||
|
||||
pympress = callPackage ../applications/office/pympress { };
|
||||
|
||||
pyspread = python3Packages.callPackage ../applications/office/pyspread {
|
||||
inherit (qt5) qtsvg wrapQtAppsHook;
|
||||
};
|
||||
pyspread = libsForQt5.callPackage ../applications/office/pyspread { };
|
||||
|
||||
pythonIRClib = pythonPackages.pythonIRClib;
|
||||
|
||||
|
|
|
|||
|
|
@ -4452,6 +4452,8 @@ in {
|
|||
pythonPackages = self;
|
||||
});
|
||||
|
||||
openhomedevice = callPackage ../development/python-modules/openhomedevice { };
|
||||
|
||||
openidc-client = callPackage ../development/python-modules/openidc-client { };
|
||||
|
||||
openpyxl = callPackage ../development/python-modules/openpyxl { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue