Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
01c08ff8bf
65
.github/CODEOWNERS
vendored
65
.github/CODEOWNERS
vendored
@ -10,9 +10,6 @@
|
||||
# IMPORTANT NOTE: in order to actually get pinged, commit access is required.
|
||||
# This also holds true for GitHub teams. Since almost none of our teams have write
|
||||
# permissions, you need to list all members of the team with commit access individually.
|
||||
# We still add the team to the list next to its members, this helps keeping things
|
||||
# in sync. (Put non team members before the team to distinguish them.)
|
||||
# See https://github.com/NixOS/nixpkgs/issues/124085 for more details
|
||||
|
||||
# This file
|
||||
/.github/CODEOWNERS @edolstra
|
||||
@ -39,10 +36,10 @@
|
||||
/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
|
||||
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/generic @Ericson2314 @matthewbauer @cab404
|
||||
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
|
||||
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
|
||||
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
|
||||
/pkgs/build-support/cc-wrapper @Ericson2314
|
||||
/pkgs/build-support/bintools-wrapper @Ericson2314
|
||||
/pkgs/build-support/setup-hooks @Ericson2314
|
||||
/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig
|
||||
|
||||
@ -97,8 +94,7 @@
|
||||
/pkgs/development/python-modules @FRidh @jonringer
|
||||
/doc/languages-frameworks/python.section.md @FRidh
|
||||
/pkgs/development/tools/poetry2nix @adisbladis
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau
|
||||
/pkgs/development/interpreters/python/conda @DavHau
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer
|
||||
|
||||
# Haskell
|
||||
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1
|
||||
@ -115,8 +111,8 @@
|
||||
/pkgs/development/perl-modules @stigtsp @zakame
|
||||
|
||||
# R
|
||||
/pkgs/applications/science/math/R @jbedo @bcdarwin
|
||||
/pkgs/development/r-modules @jbedo @bcdarwin
|
||||
/pkgs/applications/science/math/R @jbedo
|
||||
/pkgs/development/r-modules @jbedo
|
||||
|
||||
# Ruby
|
||||
/pkgs/development/interpreters/ruby @marsam
|
||||
@ -127,10 +123,6 @@
|
||||
/pkgs/build-support/rust @zowoq
|
||||
/doc/languages-frameworks/rust.section.md @zowoq
|
||||
|
||||
# Darwin-related
|
||||
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
|
||||
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
|
||||
|
||||
# C compilers
|
||||
/pkgs/development/compilers/gcc @matthewbauer
|
||||
/pkgs/development/compilers/llvm @matthewbauer
|
||||
@ -139,15 +131,6 @@
|
||||
/pkgs/top-level/unix-tools.nix @matthewbauer
|
||||
/pkgs/development/tools/xcbuild @matthewbauer
|
||||
|
||||
# Beam-related (Erlang, Elixir, LFE, etc)
|
||||
/pkgs/development/beam-modules @gleber
|
||||
/pkgs/development/interpreters/erlang @gleber
|
||||
/pkgs/development/interpreters/lfe @gleber
|
||||
/pkgs/development/interpreters/elixir @gleber
|
||||
/pkgs/development/tools/build-managers/rebar @gleber
|
||||
/pkgs/development/tools/build-managers/rebar3 @gleber
|
||||
/pkgs/development/tools/erlang @gleber
|
||||
|
||||
# Audio
|
||||
/nixos/modules/services/audio/botamusique.nix @mweinelt
|
||||
/nixos/modules/services/audio/snapserver.nix @mweinelt
|
||||
@ -215,7 +198,7 @@
|
||||
/pkgs/development/idris-modules @Infinisil
|
||||
|
||||
# Bazel
|
||||
/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
|
||||
/pkgs/development/tools/build-managers/bazel @Profpatsch
|
||||
|
||||
# NixOS modules for e-mail and dns services
|
||||
/nixos/modules/services/mail/mailman.nix @peti
|
||||
@ -243,22 +226,22 @@
|
||||
/nixos/tests/prometheus-exporters.nix @WilliButz
|
||||
|
||||
# PHP interpreter, packages, extensions, tests and documentation
|
||||
/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
|
||||
/doc/languages-frameworks/php.section.md @aanderse @etu @globin @ma27 @talyz
|
||||
/nixos/tests/php @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/build-support/build-pecl.nix @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/development/interpreters/php @jtojnar @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/development/php-packages @aanderse @etu @globin @ma27 @talyz
|
||||
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @etu @globin @ma27 @talyz
|
||||
|
||||
# Podman, CRI-O modules and related
|
||||
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis
|
||||
/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis
|
||||
/nixos/tests/podman @NixOS/podman @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis
|
||||
/nixos/modules/virtualisation/podman @zowoq @adisbladis
|
||||
/nixos/tests/cri-o.nix @zowoq @adisbladis
|
||||
/nixos/tests/podman @zowoq @adisbladis
|
||||
|
||||
# Docker tools
|
||||
/pkgs/build-support/docker @roberth @utdemir
|
||||
/pkgs/build-support/docker @roberth
|
||||
/nixos/tests/docker-tools-overlay.nix @roberth
|
||||
/nixos/tests/docker-tools.nix @roberth
|
||||
/doc/builders/images/dockertools.xml @roberth
|
||||
@ -273,8 +256,8 @@
|
||||
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
|
||||
|
||||
# GNOME
|
||||
/pkgs/desktops/gnome @NixOS/GNOME @jtojnar @hedning
|
||||
/pkgs/desktops/gnome/extensions @piegamesde @NixOS/GNOME @jtojnar @hedning
|
||||
/pkgs/desktops/gnome @jtojnar @hedning
|
||||
/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning
|
||||
|
||||
# Cinnamon
|
||||
/pkgs/desktops/cinnamon @mkg20001
|
||||
@ -295,10 +278,10 @@
|
||||
|
||||
# Matrix
|
||||
/pkgs/servers/heisenbridge @piegamesde
|
||||
/pkgs/servers/matrix-conduit @piegamesde @pstn
|
||||
/pkgs/servers/matrix-conduit @piegamesde
|
||||
/pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde
|
||||
/nixos/modules/services/misc/heisenbridge.nix @piegamesde
|
||||
/nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde
|
||||
/nixos/modules/services/misc/matrix-conduit.nix @piegamesde @pstn
|
||||
/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
|
||||
/nixos/tests/matrix-appservice-irc.nix @piegamesde
|
||||
/nixos/tests/matrix-conduit.nix @piegamesde @pstn
|
||||
/nixos/tests/matrix-conduit.nix @piegamesde
|
||||
|
||||
@ -18,7 +18,7 @@ Adding custom .vimrc lines can be done using the following code:
|
||||
|
||||
```nix
|
||||
vim_configurable.customize {
|
||||
# `name` specifies the name of the executable and package
|
||||
# `name` optionally specifies the name of the executable and package
|
||||
name = "vim-with-plugins";
|
||||
|
||||
vimrcConfig.customRC = ''
|
||||
@ -28,6 +28,9 @@ vim_configurable.customize {
|
||||
```
|
||||
|
||||
This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`.
|
||||
You can also omit `name` to customize Vim itself. See the
|
||||
[definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408)
|
||||
for all supported options.
|
||||
|
||||
For Neovim the `configure` argument can be overridden to achieve the same:
|
||||
|
||||
|
||||
@ -929,6 +929,12 @@
|
||||
githubId = 1296771;
|
||||
name = "Anders Riutta";
|
||||
};
|
||||
arjan-s = {
|
||||
email = "github@anymore.nl";
|
||||
github = "arjan-s";
|
||||
githubId = 10400299;
|
||||
name = "Arjan Schrijver";
|
||||
};
|
||||
arkivm = {
|
||||
email = "vikram186@gmail.com";
|
||||
github = "arkivm";
|
||||
@ -10306,6 +10312,16 @@
|
||||
githubId = 16487165;
|
||||
name = "Rafael Basso";
|
||||
};
|
||||
rbreslow = {
|
||||
name = "Rocky Breslow";
|
||||
email = "1774125+rbreslow@users.noreply.github.com";
|
||||
github = "rbreslow";
|
||||
githubId = 1774125;
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0xA0D32ACCA38B88ED";
|
||||
fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED";
|
||||
}];
|
||||
};
|
||||
rbrewer = {
|
||||
email = "rwb123@gmail.com";
|
||||
github = "rbrewer123";
|
||||
@ -13227,6 +13243,12 @@
|
||||
githubId = 34962284;
|
||||
name = "wchresta";
|
||||
};
|
||||
wdavidw = {
|
||||
name = "David Worms";
|
||||
email = "david@adaltas.com";
|
||||
github = "wdavidw";
|
||||
githubId = 46896;
|
||||
};
|
||||
wedens = {
|
||||
email = "kirill.wedens@gmail.com";
|
||||
name = "wedens";
|
||||
|
||||
@ -846,6 +846,54 @@
|
||||
LGPL3+ and BSD3 with optional unfree unRAR licensed code
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>vim.customize</literal> function produced by
|
||||
<literal>vimUtils.makeCustomizable</literal> now has a
|
||||
slightly different interface:
|
||||
</para>
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
The wrapper now includes everything in the given Vim
|
||||
derivation if <literal>name</literal> is
|
||||
<literal>"vim"</literal> (the default). This
|
||||
makes the <literal>wrapManual</literal> argument obsolete,
|
||||
but this behavior can be overriden by setting the
|
||||
<literal>standalone</literal> argument.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
All the executables present in the given derivation (or,
|
||||
in <literal>standalone</literal> mode, only the
|
||||
<literal>*vim</literal> ones) are wrapped. This makes the
|
||||
<literal>wrapGui</literal> argument obsolete.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>vimExecutableName</literal> and
|
||||
<literal>gvimExecutableName</literal> arguments were
|
||||
replaced by a single <literal>executableName</literal>
|
||||
argument in which the shell variable
|
||||
<literal>$exe</literal> can be used to refer to the
|
||||
wrapped executable’s name.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<para>
|
||||
See the comments in
|
||||
<literal>pkgs/applications/editors/vim/plugins/vim-utils.nix</literal>
|
||||
for more details.
|
||||
</para>
|
||||
<para>
|
||||
<literal>vimUtils.vimWithRC</literal> was removed. You should
|
||||
instead use <literal>customize</literal> on a Vim derivation,
|
||||
which now accepts <literal>vimrcFile</literal> and
|
||||
<literal>gvimrcFile</literal> arguments.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>tilp2</literal> was removed together with its module
|
||||
@ -1371,6 +1419,15 @@
|
||||
using this default will print a warning when rebuilt.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.unifi-video.openPorts</literal> option
|
||||
default value of <literal>true</literal> is now deprecated and
|
||||
will be changed to <literal>false</literal> in 22.11.
|
||||
Configurations using this default will print a warning when
|
||||
rebuilt.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>security.acme</literal> certificates will now
|
||||
|
||||
@ -329,6 +329,15 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code
|
||||
|
||||
- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:
|
||||
* The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument.
|
||||
* All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete.
|
||||
* The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name.
|
||||
|
||||
See the comments in `pkgs/applications/editors/vim/plugins/vim-utils.nix` for more details.
|
||||
|
||||
`vimUtils.vimWithRC` was removed. You should instead use `customize` on a Vim derivation, which now accepts `vimrcFile` and `gvimrcFile` arguments.
|
||||
|
||||
- `tilp2` was removed together with its module
|
||||
|
||||
- The F-PROT antivirus (`fprot` package) and its service module were removed because it
|
||||
@ -499,6 +508,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
|
||||
Configurations using this default will print a warning when rebuilt.
|
||||
|
||||
- The `services.unifi-video.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
|
||||
Configurations using this default will print a warning when rebuilt.
|
||||
|
||||
- `security.acme` certificates will now correctly check for CA
|
||||
revokation before reaching their minimum age.
|
||||
|
||||
|
||||
@ -118,6 +118,7 @@
|
||||
./misc/version.nix
|
||||
./misc/wordlist.nix
|
||||
./misc/nixops-autoluks.nix
|
||||
./programs/_1password.nix
|
||||
./programs/_1password-gui.nix
|
||||
./programs/adb.nix
|
||||
./programs/appgate-sdp.nix
|
||||
|
||||
46
nixos/modules/programs/_1password.nix
Normal file
46
nixos/modules/programs/_1password.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs._1password;
|
||||
in {
|
||||
options = {
|
||||
programs._1password = {
|
||||
enable = mkEnableOption "The 1Password CLI tool with biometric unlock and integration with the 1Password GUI.";
|
||||
|
||||
groupId = mkOption {
|
||||
type = types.int;
|
||||
example = literalExpression "5001";
|
||||
description = ''
|
||||
The GroupID to assign to the onepassword-cli group, which is needed for integration with the 1Password GUI. The group ID must be 1000 or greater.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs._1password;
|
||||
defaultText = literalExpression "pkgs._1password";
|
||||
example = literalExpression "pkgs._1password";
|
||||
description = ''
|
||||
The 1Password CLI derivation to use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
users.groups.onepassword-cli.gid = cfg.groupId;
|
||||
|
||||
security.wrappers = {
|
||||
"op" = {
|
||||
source = "${cfg.package}/bin/op";
|
||||
owner = "root";
|
||||
group = "onepassword-cli";
|
||||
setuid = false;
|
||||
setgid = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -53,6 +53,14 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
bind = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = ''
|
||||
The address to which the service should bind.
|
||||
'';
|
||||
};
|
||||
|
||||
admins = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
@ -241,6 +249,7 @@ in
|
||||
"${cfg.package}/bin/factorio"
|
||||
"--config=${cfg.configFile}"
|
||||
"--port=${toString cfg.port}"
|
||||
"--bind=${cfg.bind}"
|
||||
"--start-server=${mkSavePath cfg.saveName}"
|
||||
"--server-settings=${serverSettingsFile}"
|
||||
(optionalString (cfg.mods != []) "--mod-directory=${modDir}")
|
||||
|
||||
@ -22,13 +22,9 @@ with lib;
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
kernelPackages.hid-nintendo
|
||||
cfg.package
|
||||
];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
boot.extraModulePackages = [ kernelPackages.hid-nintendo ];
|
||||
boot.kernelModules = [ "hid_nintendo" ];
|
||||
boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;
|
||||
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
|
||||
@ -409,14 +409,14 @@ in
|
||||
to = mkOption {
|
||||
type = referenceAttrs;
|
||||
example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; };
|
||||
description = "The flake reference <option>from></option> is rewritten to.";
|
||||
description = "The flake reference <option>from</option> is rewritten to.";
|
||||
};
|
||||
flake = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
example = literalExpression "nixpkgs";
|
||||
description = ''
|
||||
The flake input <option>from></option> is rewritten to.
|
||||
The flake input <option>from</option> is rewritten to.
|
||||
'';
|
||||
};
|
||||
exact = mkOption {
|
||||
|
||||
@ -214,6 +214,11 @@ let
|
||||
type = types.path;
|
||||
description = "Path grafana will watch for dashboards.";
|
||||
};
|
||||
foldersFromFilesStructure = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Use folder names from filesystem to create folders in Grafana.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -25,6 +25,10 @@ in {
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
after = [
|
||||
"kea-dhcp4-server.service"
|
||||
"kea-dhcp6-server.service"
|
||||
];
|
||||
serviceConfig = {
|
||||
User = "kea";
|
||||
ExecStart = ''
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
cfg4 = config.services.dhcpd4;
|
||||
cfg6 = config.services.dhcpd6;
|
||||
|
||||
writeConfig = cfg: pkgs.writeText "dhcpd.conf"
|
||||
writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf"
|
||||
''
|
||||
default-lease-time 600;
|
||||
max-lease-time 7200;
|
||||
@ -21,7 +21,9 @@ let
|
||||
(machine: ''
|
||||
host ${machine.hostName} {
|
||||
hardware ethernet ${machine.ethernetAddress};
|
||||
fixed-address ${machine.ipAddress};
|
||||
fixed-address${
|
||||
optionalString (postfix == "6") postfix
|
||||
} ${machine.ipAddress};
|
||||
}
|
||||
'')
|
||||
cfg.machines
|
||||
@ -33,7 +35,7 @@ let
|
||||
configFile =
|
||||
if cfg.configFile != null
|
||||
then cfg.configFile
|
||||
else writeConfig cfg;
|
||||
else writeConfig postfix cfg;
|
||||
leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
|
||||
args = [
|
||||
"@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
|
||||
|
||||
32
nixos/modules/services/security/sslmate-agent.nix
Normal file
32
nixos/modules/services/security/sslmate-agent.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.sslmate-agent;
|
||||
|
||||
in {
|
||||
meta.maintainers = with maintainers; [ wolfangaukang ];
|
||||
|
||||
options = {
|
||||
services.sslmate-agent = {
|
||||
enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ sslmate-agent ];
|
||||
|
||||
systemd = {
|
||||
packages = [ pkgs.sslmate-agent ];
|
||||
services.sslmate-agent = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ConfigurationDirectory = "sslmate-agent";
|
||||
LogsDirectory = "sslmate-agent";
|
||||
StateDirectory = "sslmate-agent";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -16,7 +16,7 @@ let
|
||||
-pidfile ${cfg.pidFile} \
|
||||
-procname unifi-video \
|
||||
-Djava.security.egd=file:/dev/./urandom \
|
||||
-Xmx${cfg.maximumJavaHeapSize}M \
|
||||
-Xmx${toString cfg.maximumJavaHeapSize}M \
|
||||
-Xss512K \
|
||||
-XX:+UseG1GC \
|
||||
-XX:+UseStringDeduplication \
|
||||
@ -91,98 +91,102 @@ let
|
||||
stateDir = "/var/lib/unifi-video";
|
||||
|
||||
in
|
||||
{
|
||||
{
|
||||
|
||||
options.services.unifi-video = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether or not to enable the unifi-video service.
|
||||
'';
|
||||
};
|
||||
options.services.unifi-video = {
|
||||
|
||||
jrePackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.jre8;
|
||||
defaultText = literalExpression "pkgs.jre8";
|
||||
description = ''
|
||||
The JRE package to use. Check the release notes to ensure it is supported.
|
||||
'';
|
||||
};
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether or not to enable the unifi-video service.
|
||||
'';
|
||||
};
|
||||
|
||||
unifiVideoPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.unifi-video;
|
||||
defaultText = literalExpression "pkgs.unifi-video";
|
||||
description = ''
|
||||
The unifi-video package to use.
|
||||
'';
|
||||
};
|
||||
jrePackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.jre8;
|
||||
defaultText = literalExpression "pkgs.jre8";
|
||||
description = ''
|
||||
The JRE package to use. Check the release notes to ensure it is supported.
|
||||
'';
|
||||
};
|
||||
|
||||
mongodbPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.mongodb-4_0;
|
||||
defaultText = literalExpression "pkgs.mongodb";
|
||||
description = ''
|
||||
The mongodb package to use.
|
||||
'';
|
||||
};
|
||||
unifiVideoPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.unifi-video;
|
||||
defaultText = literalExpression "pkgs.unifi-video";
|
||||
description = ''
|
||||
The unifi-video package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
logDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${stateDir}/logs";
|
||||
description = ''
|
||||
Where to store the logs.
|
||||
'';
|
||||
};
|
||||
mongodbPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.mongodb-4_0;
|
||||
defaultText = literalExpression "pkgs.mongodb";
|
||||
description = ''
|
||||
The mongodb package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${stateDir}/data";
|
||||
description = ''
|
||||
Where to store the database and other data.
|
||||
'';
|
||||
};
|
||||
logDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${stateDir}/logs";
|
||||
description = ''
|
||||
Where to store the logs.
|
||||
'';
|
||||
};
|
||||
|
||||
openPorts = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether or not to open the required ports on the firewall.
|
||||
'';
|
||||
};
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${stateDir}/data";
|
||||
description = ''
|
||||
Where to store the database and other data.
|
||||
'';
|
||||
};
|
||||
|
||||
maximumJavaHeapSize = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = 1024;
|
||||
example = 4096;
|
||||
description = ''
|
||||
Set the maximimum heap size for the JVM in MB.
|
||||
'';
|
||||
};
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether or not to open the required ports on the firewall.
|
||||
'';
|
||||
};
|
||||
|
||||
pidFile = mkOption {
|
||||
type = types.path;
|
||||
default = "${cfg.dataDir}/unifi-video.pid";
|
||||
defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"'';
|
||||
description = "Location of unifi-video pid file.";
|
||||
};
|
||||
maximumJavaHeapSize = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = 1024;
|
||||
example = 4096;
|
||||
description = ''
|
||||
Set the maximimum heap size for the JVM in MB.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
pidFile = mkOption {
|
||||
type = types.path;
|
||||
default = "${cfg.dataDir}/unifi-video.pid";
|
||||
defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"'';
|
||||
description = "Location of unifi-video pid file.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users = {
|
||||
users.unifi-video = {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
warnings = optional
|
||||
(options.services.unifi-video.openFirewall.highestPrio >= (mkOptionDefault null).priority)
|
||||
"The current services.unifi-video.openFirewall = true default is deprecated and will change to false in 22.11. Set it explicitly to silence this warning.";
|
||||
|
||||
users.users.unifi-video = {
|
||||
description = "UniFi Video controller daemon user";
|
||||
home = stateDir;
|
||||
group = "unifi-video";
|
||||
isSystemUser = true;
|
||||
};
|
||||
groups.unifi-video = {};
|
||||
};
|
||||
users.groups.unifi-video = {};
|
||||
|
||||
networking.firewall = mkIf cfg.openPorts {
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
# https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used
|
||||
allowedTCPPorts = [
|
||||
7080 # HTTP portal
|
||||
@ -237,7 +241,6 @@ config = mkIf cfg.enable {
|
||||
"L+ '${stateDir}/conf/server.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/server.xml"
|
||||
"L+ '${stateDir}/conf/tomcat-users.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/tomcat-users.xml"
|
||||
"L+ '${stateDir}/conf/web.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/web.xml"
|
||||
|
||||
];
|
||||
|
||||
systemd.services.unifi-video = {
|
||||
@ -258,10 +261,11 @@ config = mkIf cfg.enable {
|
||||
WorkingDirectory = "${stateDir}";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ rsynnest ];
|
||||
};
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "unifi-video" "openPorts" ] [ "services" "unifi-video" "openFirewall" ])
|
||||
];
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ rsynnest ];
|
||||
}
|
||||
|
||||
@ -498,6 +498,10 @@ in
|
||||
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;
|
||||
services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
|
||||
|
||||
# VTE shell integration for gnome-console
|
||||
programs.bash.vteIntegration = mkDefault true;
|
||||
programs.zsh.vteIntegration = mkDefault true;
|
||||
|
||||
# Let nautilus find extensions
|
||||
# TODO: Create nautilus-with-extensions package
|
||||
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
||||
|
||||
@ -47,36 +47,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
devSize = mkOption {
|
||||
default = "5%";
|
||||
example = "32m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
devShmSize = mkOption {
|
||||
default = "50%";
|
||||
example = "256m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
runSize = mkOption {
|
||||
default = "25%";
|
||||
example = "256m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
systemdExecutable = mkOption {
|
||||
default = "systemd";
|
||||
type = types.str;
|
||||
|
||||
@ -215,6 +215,35 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
boot.devSize = mkOption {
|
||||
default = "5%";
|
||||
example = "32m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.devShmSize = mkOption {
|
||||
default = "50%";
|
||||
example = "256m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.runSize = mkOption {
|
||||
default = "25%";
|
||||
example = "256m";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
|
||||
for the accepted syntax.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -1451,7 +1451,7 @@ in
|
||||
sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl;
|
||||
in ''
|
||||
# enable and prefer IPv6 privacy addresses by default
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'"
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'"
|
||||
'';
|
||||
})
|
||||
(pkgs.writeTextFile rec {
|
||||
|
||||
@ -36,13 +36,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/pwHWmQTV1QBK+5SS0/NC6wMm2QQm+iCZArxiHjn4M4=";
|
||||
sha256 = "sha256-wa7r6maHAgCTD/TFjqtMuoRt1BqQ38T8KpbMUOoS2ZE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
60
pkgs/applications/audio/tonelib-metal/default.nix
Normal file
60
pkgs/applications/audio/tonelib-metal/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, alsa-lib
|
||||
, freetype
|
||||
, libglvnd
|
||||
, mesa
|
||||
, curl
|
||||
, libXcursor
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libjack2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tonelib-metal";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tonelib.net/download/220218/ToneLib-Metal-amd64.deb";
|
||||
sha256 = "sha256-F5EKwNQ9f/kdZLFI+QDZHvwevV/vDnxMdSmT/vnX6ug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg ];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
alsa-lib
|
||||
freetype
|
||||
libglvnd
|
||||
mesa
|
||||
] ++ runtimeDependencies;
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
curl
|
||||
libXcursor
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libjack2
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
mv usr $out
|
||||
substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ToneLib Metal – Guitar amp simulator targeted at metal players";
|
||||
homepage = "https://tonelib.net/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ dan4ik605743 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -5,6 +5,7 @@
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
, writeShellScriptBin
|
||||
, Security
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
@ -32,6 +33,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94=";
|
||||
|
||||
buildInputs = [ Security ];
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
|
||||
preBuild = ''
|
||||
@ -56,6 +59,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://polkadot.network";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, mono
|
||||
@ -12,6 +13,7 @@
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, python3
|
||||
, itstool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -25,11 +27,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed "s|get_option('tests')|false|g" -i meson.build
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gtk-sharp-2_0
|
||||
mono
|
||||
@ -47,8 +44,17 @@ stdenv.mkDerivation rec {
|
||||
libxslt
|
||||
docbook_xsl
|
||||
python3
|
||||
itstool
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtests=false" # requires NUnit
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib"
|
||||
wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluej";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
src = fetchurl {
|
||||
# We use the deb here. First instinct might be to go for the "generic" JAR
|
||||
# download, but that is actually a graphical installer that is much harder
|
||||
# to unpack than the deb.
|
||||
url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";
|
||||
sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE=";
|
||||
sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.159.0";
|
||||
version = "1.159.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o=";
|
||||
sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.23",
|
||||
"sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8="
|
||||
"rev": "2022.03.28",
|
||||
"sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.23",
|
||||
"sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0="
|
||||
"rev": "2022.03.28",
|
||||
"sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
, neovim
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
pname = "neovim-remote";
|
||||
version = "2.4.0";
|
||||
@ -35,11 +33,12 @@ with python3.pkgs; buildPythonApplication rec {
|
||||
"test_escape_double_quotes_in_filenames"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A tool that helps controlling nvim processes from a terminal";
|
||||
homepage = "https://github.com/mhinz/neovim-remote/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ edanaher ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "nvr";
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
|
||||
, libICE
|
||||
, vimPlugins
|
||||
, makeWrapper
|
||||
, makeWrapper, makeBinaryWrapper
|
||||
, wrapGAppsHook
|
||||
, runtimeShell
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
, ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys
|
||||
, darwinSupport ? config.vim.darwin or false # Enable Darwin support
|
||||
, ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support
|
||||
, ...
|
||||
}:
|
||||
|
||||
|
||||
@ -134,7 +133,9 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optional wrapPythonDrv makeWrapper
|
||||
++ lib.optional nlsSupport gettext
|
||||
++ lib.optional perlSupport perl
|
||||
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
|
||||
# Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv
|
||||
# (https://github.com/NixOS/nixpkgs/pull/164163)
|
||||
++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; })
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
@ -174,40 +175,12 @@ in stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
ln -s $out/bin/vim $out/bin/vi
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
patchelf --set-rpath \
|
||||
"$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \
|
||||
"$out"/bin/vim
|
||||
if [[ -e "$out"/bin/gvim ]]; then
|
||||
patchelf --set-rpath \
|
||||
"$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \
|
||||
"$out"/bin/gvim
|
||||
fi
|
||||
|
||||
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
|
||||
'' + lib.optionalString wrapPythonDrv ''
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString wrapPythonDrv ''
|
||||
wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \
|
||||
--set NIX_PYTHONPATH "${python3}/${python3.sitePackages}"
|
||||
'' + lib.optionalString (guiSupport == "gtk3") ''
|
||||
|
||||
rewrap () {
|
||||
rm -f "$out/bin/$1"
|
||||
echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1"
|
||||
chmod a+x "$out/bin/$1"
|
||||
}
|
||||
|
||||
rewrap ex -e
|
||||
rewrap view -R
|
||||
rewrap gvim -g
|
||||
rewrap gex -eg
|
||||
rewrap gview -Rg
|
||||
rewrap rvim -Z
|
||||
rewrap rview -RZ
|
||||
rewrap rgvim -gZ
|
||||
rewrap rgview -RgZ
|
||||
rewrap evim -y
|
||||
rewrap eview -yR
|
||||
rewrap vimdiff -d
|
||||
rewrap gvimdiff -gd
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
@ -5531,6 +5531,19 @@ final: prev:
|
||||
meta.homepage = "https://github.com/vim-python/python-syntax/";
|
||||
};
|
||||
|
||||
pywal-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "pywal.nvim";
|
||||
version = "2022-02-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlphaTechnolog";
|
||||
repo = "pywal.nvim";
|
||||
rev = "bd58195939d31dd0f15a720fba2956e91598cefe";
|
||||
sha256 = "10fs5assp96rvlcxckd8cwnkfwfckjmf0j8cqq91vb2wx8knxc8g";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
|
||||
};
|
||||
|
||||
QFEnter = buildVimPluginFrom2Nix {
|
||||
pname = "QFEnter";
|
||||
version = "2020-10-09";
|
||||
@ -7133,6 +7146,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/Shougo/unite.vim/";
|
||||
};
|
||||
|
||||
urlview-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "urlview.nvim";
|
||||
version = "2022-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "axieax";
|
||||
repo = "urlview.nvim";
|
||||
rev = "4ca1b22d914ff3187acd5a9486421769928c9d8f";
|
||||
sha256 = "1vy977y7favs76mpk6v3x18ph40y0d20kmm6bssvnlql1nh3ihbd";
|
||||
};
|
||||
meta.homepage = "https://github.com/axieax/urlview.nvim/";
|
||||
};
|
||||
|
||||
utl-vim = buildVimPluginFrom2Nix {
|
||||
pname = "utl.vim";
|
||||
version = "2010-10-18";
|
||||
|
||||
@ -13,6 +13,7 @@ akinsho/bufferline.nvim
|
||||
akinsho/toggleterm.nvim
|
||||
aklt/plantuml-syntax
|
||||
allendang/nvim-expand-expr
|
||||
AlphaTechnolog/pywal.nvim
|
||||
altercation/vim-colors-solarized
|
||||
alvan/vim-closetag
|
||||
alvarosevilla95/luatab.nvim
|
||||
@ -42,6 +43,7 @@ arthurxavierx/vim-unicoder
|
||||
artur-shaik/vim-javacomplete2
|
||||
autozimu/LanguageClient-neovim
|
||||
axelf4/vim-strip-trailing-whitespace
|
||||
axieax/urlview.nvim
|
||||
ayu-theme/ayu-vim
|
||||
b0o/SchemaStore.nvim
|
||||
b3nj5m1n/kommentary
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
# tests available at pkgs/test/vim
|
||||
{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin
|
||||
{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText
|
||||
, runCommand, makeWrapper
|
||||
, nix-prefetch-hg, nix-prefetch-git
|
||||
, fetchFromGitHub, runtimeShell
|
||||
, hasLuaModule
|
||||
@ -16,7 +17,7 @@ Install Vim like this eg using nixos option environment.systemPackages which wil
|
||||
vim-with-plugins in PATH:
|
||||
|
||||
vim_configurable.customize {
|
||||
name = "vim-with-plugins";
|
||||
name = "vim-with-plugins"; # optional
|
||||
|
||||
# add custom .vimrc lines like this:
|
||||
vimrcConfig.customRC = ''
|
||||
@ -404,64 +405,81 @@ rec {
|
||||
inherit vimrcContent;
|
||||
inherit packDir;
|
||||
|
||||
# shell script with custom name passing [-u vimrc] [-U gvimrc] to vim
|
||||
vimWithRC = {
|
||||
vimExecutable,
|
||||
gvimExecutable,
|
||||
vimManPages,
|
||||
wrapManual,
|
||||
wrapGui,
|
||||
name ? "vim",
|
||||
vimrcFile ? null,
|
||||
gvimrcFile ? null,
|
||||
vimExecutableName,
|
||||
gvimExecutableName,
|
||||
}:
|
||||
let
|
||||
rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}";
|
||||
vimWrapperScript = writeScriptBin vimExecutableName ''
|
||||
#!${runtimeShell}
|
||||
exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"
|
||||
'';
|
||||
gvimWrapperScript = writeScriptBin gvimExecutableName ''
|
||||
#!${stdenv.shell}
|
||||
exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"
|
||||
'';
|
||||
in
|
||||
buildEnv {
|
||||
inherit name;
|
||||
paths = [
|
||||
vimWrapperScript
|
||||
] ++ lib.optional wrapGui gvimWrapperScript
|
||||
++ lib.optional wrapManual vimManPages
|
||||
;
|
||||
};
|
||||
makeCustomizable = let
|
||||
mkVimrcFile = vimrcFile; # avoid conflict with argument name
|
||||
in vim: vim // {
|
||||
# Returns a customized vim that uses the specified vimrc configuration.
|
||||
customize =
|
||||
{ # The name of the derivation.
|
||||
name ? "vim"
|
||||
, # A shell word used to specify the names of the customized executables.
|
||||
# The shell variable $exe can be used to refer to the wrapped executable's name.
|
||||
# Examples: "my-$exe", "$exe-with-plugins", "\${exe/vim/v1m}"
|
||||
executableName ?
|
||||
if lib.hasInfix "vim" name then
|
||||
lib.replaceStrings [ "vim" ] [ "$exe" ] name
|
||||
else
|
||||
"\${exe/vim/${lib.escapeShellArg name}}"
|
||||
, # A custom vimrc configuration, treated as an argument to vimrcContent (see the documentation in this file).
|
||||
vimrcConfig ? null
|
||||
, # A custom vimrc file.
|
||||
vimrcFile ? null
|
||||
, # A custom gvimrc file.
|
||||
gvimrcFile ? null
|
||||
, # If set to true, return the *vim wrappers only.
|
||||
# If set to false, overlay the wrappers on top of the original vim derivation.
|
||||
# This ensures that things like man pages and .desktop files are available.
|
||||
standalone ? name != "vim" && wrapManual != true
|
||||
|
||||
# add a customize option to a vim derivation
|
||||
makeCustomizable = vim: vim // {
|
||||
customize = {
|
||||
name,
|
||||
vimrcConfig,
|
||||
wrapManual ? true,
|
||||
wrapGui ? false,
|
||||
vimExecutableName ? name,
|
||||
gvimExecutableName ? (lib.concatStrings [ "g" name ]),
|
||||
}: vimWithRC {
|
||||
vimExecutable = "${vim}/bin/vim";
|
||||
gvimExecutable = "${vim}/bin/gvim";
|
||||
inherit name wrapManual wrapGui vimExecutableName gvimExecutableName;
|
||||
vimrcFile = vimrcFile vimrcConfig;
|
||||
vimManPages = buildEnv {
|
||||
name = "vim-doc";
|
||||
paths = [ vim ];
|
||||
pathsToLink = [ "/share/man" ];
|
||||
};
|
||||
};
|
||||
, # deprecated arguments (TODO: remove eventually)
|
||||
wrapManual ? null, wrapGui ? null, vimExecutableName ? null, gvimExecutableName ? null,
|
||||
}:
|
||||
lib.warnIf (wrapManual != null) ''
|
||||
vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`.
|
||||
${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual."
|
||||
else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only."
|
||||
else ""}''
|
||||
lib.warnIf (wrapGui != null)
|
||||
"vim.customize: wrapGui is deprecated: gvim is now automatically included if present"
|
||||
lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null)
|
||||
"vim.customize: (g)vimExecutableName is deprecated: use executableName instead (see source code for examples)"
|
||||
(let
|
||||
vimrc =
|
||||
if vimrcFile != null then vimrcFile
|
||||
else if vimrcConfig != null then mkVimrcFile vimrcConfig
|
||||
else throw "at least one of vimrcConfig and vimrcFile must be specified";
|
||||
bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } ''
|
||||
vimrc=${lib.escapeShellArg vimrc}
|
||||
gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
for exe in ${
|
||||
if standalone then "{,g,r,rg,e}vim {,g}vimdiff"
|
||||
else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex"
|
||||
}; do
|
||||
if [[ -e ${vim}/bin/$exe ]]; then
|
||||
dest="$out/bin/${executableName}"
|
||||
if [[ -e $dest ]]; then
|
||||
echo "ambiguous executableName: ''${dest##*/} already exists"
|
||||
continue
|
||||
fi
|
||||
makeWrapper ${vim}/bin/"$exe" "$dest" \
|
||||
--add-flags "-u ''${vimrc@Q} ''${gvimrc:+-U ''${gvimrc@Q}}"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
in if standalone then bin else
|
||||
buildEnv {
|
||||
inherit name;
|
||||
paths = [ (lib.lowPrio vim) bin ];
|
||||
});
|
||||
|
||||
override = f: makeCustomizable (vim.override f);
|
||||
overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);
|
||||
};
|
||||
|
||||
vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";
|
||||
|
||||
pluginnames2Nix = {name, namefiles} : vim_configurable.customize {
|
||||
inherit name;
|
||||
vimrcConfig.vam.knownPlugins = vimPlugins;
|
||||
|
||||
52
pkgs/applications/emulators/flycast/default.nix
Normal file
52
pkgs/applications/emulators/flycast/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, libX11
|
||||
, libevdev
|
||||
, udev
|
||||
, libpulseaudio
|
||||
, SDL2
|
||||
, libzip
|
||||
, miniupnpc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flycast";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libX11
|
||||
libevdev
|
||||
udev
|
||||
libpulseaudio
|
||||
SDL2
|
||||
libzip
|
||||
miniupnpc
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/flyinghead/flycast";
|
||||
changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}";
|
||||
description = "A multi-platform Sega Dreamcast, Naomi and Atomiswave emulator";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, curl
|
||||
, alsa-lib
|
||||
, libGLU
|
||||
, libX11
|
||||
, libevdev
|
||||
, udev
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reicast";
|
||||
version = "20.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reicast";
|
||||
repo = "reicast-emulator";
|
||||
rev = "r${version}";
|
||||
sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
curl
|
||||
alsa-lib
|
||||
libGLU
|
||||
libX11
|
||||
libevdev
|
||||
udev
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
# No rule to make target 'install'
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D ./reicast $out/bin/reicast
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://reicast.com/";
|
||||
description = "A multi-platform Sega Dreamcast emulator";
|
||||
license = with licenses; [ bsd3 gpl2Only lgpl2Only ];
|
||||
platforms = ["x86_64-linux" ];
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "17.2.1";
|
||||
version = "17.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a";
|
||||
sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,28 +1,38 @@
|
||||
{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }:
|
||||
{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
fetch = srcPlatform: sha256: extension:
|
||||
let
|
||||
args = {
|
||||
url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}";
|
||||
inherit sha256;
|
||||
} // lib.optionalAttrs (extension == "zip") { stripRoot = false; };
|
||||
in
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password-cli";
|
||||
version = "1.12.2";
|
||||
version = "2.0.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
mainProgram = "op";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
src =
|
||||
if stdenv.isLinux then
|
||||
fetchzip
|
||||
{
|
||||
url = {
|
||||
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
|
||||
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
|
||||
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
sha256 = {
|
||||
"i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg=";
|
||||
"x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4=";
|
||||
"aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
stripRoot = false;
|
||||
} else
|
||||
fetchurl {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
|
||||
sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4=";
|
||||
};
|
||||
if (builtins.elem system platforms) then
|
||||
sources.${system}
|
||||
else
|
||||
throw "Source for ${pname} is not available for ${system}";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
|
||||
|
||||
@ -32,25 +42,27 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D op $out/bin/op
|
||||
install -D ${mainProgram} $out/bin/${mainProgram}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontStrip = stdenv.isDarwin;
|
||||
postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings
|
||||
(s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
dontStrip = stdenv.isDarwin;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/op --version
|
||||
$out/bin/${mainProgram} --version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "1Password command-line tool";
|
||||
homepage = "https://support.1password.com/command-line/";
|
||||
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
|
||||
homepage = "https://developer.1password.com/docs/cli/";
|
||||
downloadPage = "https://app-updates.agilebits.com/product_history/CLI2";
|
||||
maintainers = with maintainers; [ joelburget marsam ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
inherit mainProgram platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,9 +19,11 @@
|
||||
, javaPackages
|
||||
}:
|
||||
|
||||
javaPackages.mavenfod rec {
|
||||
(javaPackages.mavenfod.override {
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.0.1"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "22.0.1"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
@ -30,36 +32,9 @@ javaPackages.mavenfod rec {
|
||||
sha256 = "sha256-IG5YWwq3WVzQBvAslQ9Z2Ou6ADzf4n9NkQCtH4Jgkac=";
|
||||
};
|
||||
|
||||
|
||||
mvnSha256 = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210=";
|
||||
mvnSha256 = "WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
name = "dbeaver-${version}-maven-deps";
|
||||
inherit src;
|
||||
|
||||
buildInputs = [
|
||||
maven
|
||||
];
|
||||
|
||||
buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters}";
|
||||
|
||||
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
|
||||
installPhase = ''
|
||||
find $out -type f \
|
||||
-name \*.lastUpdated -or \
|
||||
-name resolver-status.properties -or \
|
||||
-name _remote.repositories \
|
||||
-delete
|
||||
'';
|
||||
|
||||
# don't do any fixup
|
||||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "0.13.31";
|
||||
version = "0.14.2";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
@ -21,23 +21,12 @@ let
|
||||
maintainers = with maintainers; [ conradmearns zaninime opeik ];
|
||||
};
|
||||
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}";
|
||||
inherit sha256;
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
|
||||
};
|
||||
|
||||
sha256 = rec {
|
||||
x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs=";
|
||||
x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU=";
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}.${system};
|
||||
|
||||
extension = rec {
|
||||
x86_64-linux = ".tar.gz";
|
||||
x86_64-darwin = "-universal.dmg";
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}.${system};
|
||||
|
||||
linux = stdenv.mkDerivation rec {
|
||||
icon = fetchurl {
|
||||
url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchgit, perl, makeWrapper
|
||||
{ lib, stdenv, fetchFromGitHub, perl, makeWrapper
|
||||
, makeDesktopItem, which, perlPackages, boost
|
||||
}:
|
||||
|
||||
@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
|
||||
version = "1.3.0";
|
||||
pname = "slic3r";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/alexrj/Slic3r";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexrj";
|
||||
repo = "Slic3r";
|
||||
rev = version;
|
||||
sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi";
|
||||
sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "99.0.4844.84",
|
||||
"sha256": "05bma8lsm5lad58mlfiv8bg0fw5k5mxh0v6g1ik7xp2bsd71iv10",
|
||||
"sha256bin64": "0sdnsnp7hnpip91hwbz3hiw2727g0a3ydf55ldqv9bgik3vn1wln",
|
||||
"version": "100.0.4896.60",
|
||||
"sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
|
||||
"sha256bin64": "07wavs9r6ilwx5rzyqvydcjskg6sml5b8m6mw7qzykvhs8bnvfh5",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-10",
|
||||
"version": "2022-01-21",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "80a40b07305373617eba2d5878d353532af77da3",
|
||||
"sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv"
|
||||
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
|
||||
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "99.0.4844.51",
|
||||
"sha256_linux": "1r5wbcfbj9s216jyjasmiscsrsix9ap3pplp12rznrwn4898p51y",
|
||||
"sha256_darwin": "1nak8p5hdrw94lx73m9c110zrwag4qr6487dhplm3qfrnrkdh8wp",
|
||||
"sha256_darwin_aarch64": "0hkcx6a8bcjlbmp6z3ld23mi1kpyjn2g7m3ns9qw6ns4x3rn5i3r"
|
||||
"version": "100.0.4896.20",
|
||||
"sha256_linux": "1d3g43s5adn1vs7iv5ccp0f376qvnvf67mhid7kxkysnqv55bxdw",
|
||||
"sha256_darwin": "129vw1ablb6xyr7j30zxkh7n835wi82ksd8c5m11mmdnrmrcdabv",
|
||||
"sha256_darwin_aarch64": "0zgnisvdvcc726q22jn1cyfg41zz1af5l3fy3m81jlfhph2ibbra"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "100.0.4896.56",
|
||||
"sha256": "0vdyddxhmkw9bqwx5j19h69swx9ysiipsmcc1sjl0qv8bn8f790z",
|
||||
"sha256bin64": "09h4fxsx0q5b0gn258xnmk11qz7ql8flpn4mq5x201abmv29y856",
|
||||
"version": "100.0.4896.60",
|
||||
"sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
|
||||
"sha256bin64": "059zrf3mm04iyzmgp594m3m7pw4458vym3wpawmdn94h5zi705i7",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-21",
|
||||
|
||||
@ -179,6 +179,14 @@ buildStdenv.mkDerivation ({
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# RDD Sandbox paths for NixOS, remove with Firefox>=100
|
||||
# https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1761692
|
||||
name = "mozbz-1761692-rdd-sandbox-paths.patch";
|
||||
url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";
|
||||
hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
|
||||
++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch
|
||||
|
||||
@ -20,11 +20,11 @@ let
|
||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "5.1.2567.66-1";
|
||||
version = "5.1.2567.73-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
|
||||
sha256 = "1v9hcjgvblscpsw8c2nm8x7frzkfv2ph8l5hibyidnfjppx1qqz2";
|
||||
sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argo-rollouts";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-rollouts";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qb1wbv3razwhqsv972ywfazaq73y83iw6f6qdjcbwwfwsybig21";
|
||||
sha256 = "sha256-RgjoRvLsd+WHTpFy1WbJtrVaMnRp6/7A921+abCMGu0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "00ic1nn3wgg495x2170ik1d1cha20b4w89j9jclq8p0b3nndv0c0";
|
||||
vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E=";
|
||||
|
||||
# Disable tests since some test fail because of missing test data
|
||||
doCheck = false;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.14";
|
||||
version = "0.8.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-XH7JtLv0J6bznZZ/L8wg5KB53OPe3KLiYujBlxP71pg=";
|
||||
sha256 = "sha256-NiUv7yl1nA7a826FHDF+1MhYscXkQjUpxZo2ZWrL+VQ=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
31
pkgs/applications/networking/cluster/krelay/default.nix
Normal file
31
pkgs/applications/networking/cluster/krelay/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "krelay";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knight42";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g=";
|
||||
|
||||
subPackages = [ "cmd/client" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/client $out/bin/kubectl-relay
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better alternative to `kubectl port-forward` that can forward TCP or UDP traffic to IP/Host which is accessible inside the cluster.";
|
||||
homepage = "https://github.com/knight42/krelay";
|
||||
changelog = "https://github.com/knight42/krelay/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivankovnatsky ];
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,13 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colorizes kubectl output";
|
||||
homepage = "https://github.com/hidetatz/kubecolor";
|
||||
changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivankovnatsky ];
|
||||
maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1141,6 +1141,15 @@
|
||||
"vendorSha256": null,
|
||||
"version": "1.31.0"
|
||||
},
|
||||
"utils": {
|
||||
"owner": "cloudposse",
|
||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "0.17.17",
|
||||
"sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=",
|
||||
"vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=",
|
||||
"version": "0.17.17"
|
||||
},
|
||||
"vault": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
|
||||
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UYvTsoNJwH8DOa/Ns9QlckcMVf/+k9/5UX8gO/el0jw=";
|
||||
sha256 = "sha256-jrVf6vNlEkTgALS93o3kIiticvsyFHm5oA2Fh1edAGY=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo
|
||||
, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }:
|
||||
|
||||
let
|
||||
@ -51,6 +51,9 @@ in stdenv.mkDerivation rec {
|
||||
mkdir -p $out
|
||||
cp -r ./!(build) $out
|
||||
install -D -t $out/build/Release build/Release/keytar.node
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/build/Release/keytar.node
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ stdenv.cc.cc ];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }:
|
||||
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
@ -48,8 +48,11 @@ in rustPlatform.buildRustPackage rec {
|
||||
rm -rf native/!(index.node)
|
||||
rm -rf node_modules $HOME
|
||||
cp -r . $out
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/native/index.node
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ stdenv.cc.cc ];
|
||||
|
||||
cargoSha256 = pinData.cargoHash;
|
||||
}
|
||||
|
||||
@ -1,15 +1,53 @@
|
||||
{ lib
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
}:
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "session-desktop-appimage";
|
||||
let
|
||||
version = "1.7.9";
|
||||
pname = "session-desktop-appimage";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
};
|
||||
appimage-contents = appimageTools.extractType2 {
|
||||
inherit version pname src;
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit version pname;
|
||||
src = appimage;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Session";
|
||||
desktopName = "Session";
|
||||
comment = "Onion routing based messenger";
|
||||
exec = "${appimage}/bin/session-desktop-appimage-${version}";
|
||||
icon = "${appimage-contents}/session-desktop.png";
|
||||
terminal = false;
|
||||
type = "Application";
|
||||
categories = [ "Network" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
cp -r bin $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Onion routing based messenger";
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2
|
||||
, boost, db, openssl, geoip, libiconv, miniupnpc
|
||||
, srcOnly, fetchgit
|
||||
, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly
|
||||
}:
|
||||
|
||||
let
|
||||
twisterHTML = srcOnly {
|
||||
name = "twister-html";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/miguelfreitas/twister-html.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelfreitas";
|
||||
repo = "twister-html";
|
||||
rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";
|
||||
sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";
|
||||
sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.3.1";
|
||||
version = "22.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "4d75684751a10f24d20d993b30748c7a09bd8bdfd4e1d4d5703746954a0f6bb2";
|
||||
sha256 = "bec1ee9735821a7c4556c00790e3acfef06f21490ec8b7d99d9e002c9c0a1207";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
49
pkgs/applications/science/biology/flywheel-cli/default.nix
Normal file
49
pkgs/applications/science/biology/flywheel-cli/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.targetPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
os = {
|
||||
x86_64-darwin = "darwin";
|
||||
x86_64-linux = "linux";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sha256 = {
|
||||
x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo=";
|
||||
x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flywheel-cli";
|
||||
version = "16.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/flywheel-dist/cli/${version}/fw-${os}_amd64-${version}.zip";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
unpackPhase = ''
|
||||
unzip ${src}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin ./${os}_amd64/fw
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and command line interface for interacting with a Flywheel site";
|
||||
homepage = "https://gitlab.com/flywheel-io/public/python-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rbreslow ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.4.1";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
sha256 = "sha256-pHomYKYpV60SIKLoST5y9i3FprMV1VGy+5GjhpRhBUo=";
|
||||
sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
|
||||
{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "darcs-to-git";
|
||||
version = "2015-06-04";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/purcell/darcs-to-git.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "purcell";
|
||||
repo = "darcs-to-git";
|
||||
rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
|
||||
sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji";
|
||||
sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";
|
||||
};
|
||||
|
||||
patchPhase = let
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "f1viewer";
|
||||
version = "2.6.0";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoMuchForSubtlety";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MY8xqpAzK1c4XL7w/LR83DyHFCI5X7wldosDDo7pXNI=";
|
||||
sha256 = "sha256-Z6rnkHypk7r9NnYwqZpWQOuGPbWn/EppS+46PQHIdDM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8c1+t6Lo11Q2kEDy9IWLw9bsZYtJFksE7Om3ysx7fc4=";
|
||||
vendorSha256 = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM=";
|
||||
sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
27
pkgs/data/fonts/dancing-script/default.nix
Normal file
27
pkgs/data/fonts/dancing-script/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
pname = "dancing-script";
|
||||
version = "2.0";
|
||||
in fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
owner = "impallari";
|
||||
repo = "DancingScript";
|
||||
rev = "f7f54bc1b8836601dae8696666bfacd306f77e34";
|
||||
sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dancing Script";
|
||||
longDescription = "A lively casual script where the letters bounce and change size slightly.";
|
||||
homepage = "https://github.com/impallari/DancingScript";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ wdavidw ];
|
||||
};
|
||||
}
|
||||
@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-color-manager";
|
||||
version = "3.36.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nduea2Ry4RmAE4H5CQUzLsHUJYmBchu6gxyiRs6zrTs=";
|
||||
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchpatch
|
||||
, accountsservice
|
||||
, adwaita-icon-theme
|
||||
, colord
|
||||
@ -78,6 +79,13 @@ stdenv.mkDerivation rec {
|
||||
inherit glibc libgnomekbd tzdata;
|
||||
inherit cups networkmanagerapplet;
|
||||
})
|
||||
|
||||
# Fix Online Accounts configuration on X11
|
||||
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch";
|
||||
sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.43.90";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pQpyOodNNkoP78GfmU2IVUWqYKUdaBimL/kPgv9TydY=";
|
||||
sha256 = "qpZxie62CUWebApGigHqcMuMRTDaHVALLT9PxDi4/io=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-IIglVqnF29MHWTAkXnA3HGusMOqnpe0Jx9sSfNogE/c=";
|
||||
sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,8 +3,15 @@
|
||||
, gjs
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, hddtemp
|
||||
, liquidctl
|
||||
, lm_sensors
|
||||
, netcat-gnu
|
||||
, nvme-cli
|
||||
, procps
|
||||
, pulseaudio
|
||||
, python3
|
||||
, smartmontools
|
||||
, substituteAll
|
||||
, touchegg
|
||||
, vte
|
||||
@ -51,6 +58,17 @@ super: lib.trivial.pipe super [
|
||||
'';
|
||||
}))
|
||||
|
||||
(patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch;
|
||||
inherit hddtemp liquidctl lm_sensors procps smartmontools;
|
||||
netcat = netcat-gnu;
|
||||
nvmecli = nvme-cli;
|
||||
})
|
||||
];
|
||||
}))
|
||||
|
||||
(patchExtension "gnome-shell-screenshot@ttll.de" (old: {
|
||||
# Requires gjs
|
||||
# https://github.com/NixOS/nixpkgs/issues/136112
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff --git a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js
|
||||
diff --git a/hddtempUtil.js b/hddtempUtil.js
|
||||
index e5d1d6d..856654b 100644
|
||||
--- a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js
|
||||
+++ b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js
|
||||
--- a/hddtempUtil.js
|
||||
+++ b/hddtempUtil.js
|
||||
@@ -7,7 +7,7 @@ var HddtempUtil = class extends CommandLineUtil.CommandLineUtil {
|
||||
|
||||
constructor() {
|
||||
@ -31,10 +31,10 @@ index e5d1d6d..856654b 100644
|
||||
if(output.length)
|
||||
pid = Number(output.trim());
|
||||
}
|
||||
diff --git a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js
|
||||
diff --git a/liquidctlUtil.js b/liquidctlUtil.js
|
||||
index 766bf62..7cd4e94 100644
|
||||
--- a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js
|
||||
+++ b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js
|
||||
--- a/liquidctlUtil.js
|
||||
+++ b/liquidctlUtil.js
|
||||
@@ -8,7 +8,7 @@ const commandLineUtil = Me.imports.commandLineUtil;
|
||||
var LiquidctlUtil = class extends commandLineUtil.CommandLineUtil {
|
||||
constructor() {
|
||||
@ -44,10 +44,10 @@ index 766bf62..7cd4e94 100644
|
||||
this._argv = path ? [path, 'status', '--json'] : null;
|
||||
}
|
||||
|
||||
diff --git a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js
|
||||
diff --git a/nvmecliUtil.js b/nvmecliUtil.js
|
||||
index ae2ea93..2349b9e 100644
|
||||
--- a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js
|
||||
+++ b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js
|
||||
--- a/nvmecliUtil.js
|
||||
+++ b/nvmecliUtil.js
|
||||
@@ -3,7 +3,7 @@ const GLib = imports.gi.GLib;
|
||||
const Me = imports.misc.extensionUtils.getCurrentExtension();
|
||||
|
||||
@ -57,10 +57,10 @@ index ae2ea93..2349b9e 100644
|
||||
return JSON.parse(GLib.spawn_command_line_sync(`${nvme} ${argv} -o json`)[1].toString())
|
||||
}
|
||||
|
||||
diff --git a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js
|
||||
diff --git a/sensorsUtil.js b/sensorsUtil.js
|
||||
index 62fa580..c017748 100644
|
||||
--- a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js
|
||||
+++ b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js
|
||||
--- a/sensorsUtil.js
|
||||
+++ b/sensorsUtil.js
|
||||
@@ -7,7 +7,7 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil {
|
||||
|
||||
constructor() {
|
||||
@ -70,16 +70,16 @@ index 62fa580..c017748 100644
|
||||
// -A: Do not show adapter -j: JSON output
|
||||
this._argv = path ? [path, '-A', '-j'] : null;
|
||||
}
|
||||
diff --git a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js
|
||||
diff --git a/smartctlUtil.js b/smartctlUtil.js
|
||||
index 03d469b..6057a3b 100644
|
||||
--- a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js
|
||||
+++ b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js
|
||||
--- a/smartctlUtil.js
|
||||
+++ b/smartctlUtil.js
|
||||
@@ -3,7 +3,7 @@ const GLib = imports.gi.GLib;
|
||||
const Me = imports.misc.extensionUtils.getCurrentExtension();
|
||||
const ByteArray = imports.byteArray;
|
||||
function getSmartData (argv){
|
||||
- const smartctl = GLib.find_program_in_path('smartctl')
|
||||
+ const smartctl = GLib.find_program_in_path('@smartmontools@/bin/smartctl')
|
||||
return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`'${smartctl}' ${argv} -j`)[1] ))
|
||||
return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`${smartctl} ${argv} -j`)[1] ))
|
||||
}
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, substituteAll
|
||||
, hddtemp
|
||||
, liquidctl
|
||||
, lm_sensors
|
||||
, netcat-gnu
|
||||
, nvme-cli
|
||||
, procps
|
||||
, smartmontools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-freon";
|
||||
version = "unstable-2022-02-05";
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "freon@UshakovVasilii_Github.yahoo.com";
|
||||
extensionPortalSlug = "freon";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UshakovVasilii";
|
||||
repo = "gnome-shell-extension-freon";
|
||||
rev = "010c363d9bff8ed28000cbf8df2226dad65078fb";
|
||||
hash = "sha256-Fb8y+HoWq+205gqwAD2DVYym1eThGZqDML5HlyhS+4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix_paths.patch;
|
||||
inherit hddtemp liquidctl lm_sensors procps smartmontools;
|
||||
netcat = netcat-gnu;
|
||||
nvmecli = nvme-cli;
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas"
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ justinas ];
|
||||
homepage = "https://github.com/UshakovVasilii/gnome-shell-extension-freon";
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,6 @@
|
||||
"drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { };
|
||||
"EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
|
||||
"emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
|
||||
"freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { };
|
||||
"gsconnect@andyholmes.github.io" = callPackage ./gsconnect { };
|
||||
"icon-hider@kalnitsky.org" = callPackage ./icon-hider { };
|
||||
"impatience@gfxmonk.net" = callPackage ./impatience { };
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
{ lib, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libpulseaudio
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-sound-output-device-chooser";
|
||||
version = "39";
|
||||
# For gnome 42 support many commits not tagged yet are needed.
|
||||
version = "unstable-2022-03-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kgshank";
|
||||
repo = "gse-sound-output-device-chooser";
|
||||
rev = version;
|
||||
sha256 = "sha256-RFdBdpKsz2MjdzxWX4UFwah+e68dqrkvm7ql0RAZZwg=";
|
||||
rev = "76f7f59d23f5ffcd66555c7662f43c9cc1ce4742";
|
||||
sha256 = "sha256-iPc95LmDsYizLg45wpU+vFx/N6MR2hewSHqoRsePC/4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-backgrounds";
|
||||
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61, can be removed on next update.
|
||||
# https://github.com/mate-desktop/mate-backgrounds/pull/39
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch";
|
||||
sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
|
||||
, containers, deepseq, directory, dlist, fetchgit, ghc-prim
|
||||
, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim
|
||||
, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
|
||||
, quickcheck-unicode, random, scientific, test-framework
|
||||
, test-framework-hunit, test-framework-quickcheck2, text, time
|
||||
@ -9,10 +9,11 @@
|
||||
mkDerivation {
|
||||
pname = "ghcjs-base";
|
||||
version = "0.2.0.3";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ghcjs/ghcjs-base";
|
||||
sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghcjs";
|
||||
repo = "ghcjs-base";
|
||||
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
|
||||
sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base binary bytestring containers deepseq dlist
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.11.0.1097";
|
||||
version = "1.11.0.1100";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "sha256-8n/XOguemlqzVq9Vihd3QT5PsHSKcW3tTlOJtClrzKs=";
|
||||
sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace '`svnversion -n`' "${version}"
|
||||
'';
|
||||
@ -46,6 +48,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/zsaleeba/picoc";
|
||||
downloadPage = "https://code.google.com/p/picoc/downloads/list";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "scsh";
|
||||
version = "0.7pre";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/scheme/scsh.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scheme";
|
||||
repo = "scsh";
|
||||
rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
|
||||
sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation (rec {
|
||||
runHook preBuild
|
||||
|
||||
mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)
|
||||
mvn package --offline "-Dmaven.repo.local=$mvnDeps/.m2" -P desktop,all-platforms
|
||||
mvn package --offline "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnParameters}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vte";
|
||||
version = "0.67.90";
|
||||
version = "0.68.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-RkCe1x/DqkfX3DkCSaU+i4E6xsCYvawVFuEL23wg2zg=";
|
||||
sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
buildDunePackage rec {
|
||||
pname = "ipaddr-cstruct";
|
||||
|
||||
inherit (ipaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (ipaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ipaddr cstruct ];
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
buildDunePackage rec {
|
||||
pname = "ipaddr";
|
||||
|
||||
inherit (macaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
buildDunePackage rec {
|
||||
pname = "ipaddr-sexp";
|
||||
|
||||
inherit (ipaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (ipaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ipaddr ];
|
||||
|
||||
|
||||
@ -5,9 +5,7 @@
|
||||
buildDunePackage {
|
||||
pname = "macaddr-cstruct";
|
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ macaddr cstruct ];
|
||||
|
||||
|
||||
@ -4,15 +4,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "macaddr";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz";
|
||||
sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec";
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
|
||||
sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
|
||||
};
|
||||
|
||||
checkInputs = [ ppx_sexp_conv ounit ];
|
||||
|
||||
@ -5,9 +5,7 @@
|
||||
buildDunePackage {
|
||||
pname = "macaddr-sexp";
|
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ppx_sexp_conv ];
|
||||
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
, fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt
|
||||
, alcotest, alcotest-lwt, bigstringaf, bigarray-compat
|
||||
, fmt, mirage-flow, cstruct, logs, ke, lwt
|
||||
, alcotest, alcotest-lwt, bigstringaf
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mimic";
|
||||
version = "0.0.4";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
|
||||
@ -19,8 +18,6 @@ buildDunePackage rec {
|
||||
fmt
|
||||
lwt
|
||||
mirage-flow
|
||||
result
|
||||
rresult
|
||||
logs
|
||||
];
|
||||
|
||||
@ -29,7 +26,6 @@ buildDunePackage rec {
|
||||
alcotest
|
||||
alcotest-lwt
|
||||
bigstringaf
|
||||
bigarray-compat
|
||||
cstruct
|
||||
ke
|
||||
];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jMmPACC8eVDYqBI2642R/ChKFObmK+yWRzRBQUmi1C0=";
|
||||
hash = "sha256-R5OK/B7fq15lpt8nKECiHMmfK9xmiLPtoKC65C7H/7c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
66
pkgs/development/python-modules/ansible-compat/default.nix
Normal file
66
pkgs/development/python-modules/ansible-compat/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ansible
|
||||
, flaky
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, setuptools-scm
|
||||
, subprocess-tee
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-compat";
|
||||
version = "2.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xlGZXcMj7xRbq4V/7mVA/ryIH7cbf+r+gWPUnicxY6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
subprocess-tee
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH=$PATH:$out/bin
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
ansible
|
||||
flaky
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# require network
|
||||
"test_prepare_environment_with_collections"
|
||||
"test_prerun_reqs_v1"
|
||||
"test_prerun_reqs_v2"
|
||||
"test_require_collection_wrong_version"
|
||||
"test_require_collection"
|
||||
"test_install_collection"
|
||||
"test_install_collection_dest"
|
||||
"test_upgrade_collection"
|
||||
"test_require_collection_no_cache_dir"
|
||||
"test_runtime"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ansible_compat" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python package containing functions that help interacting with various versions of Ansible";
|
||||
homepage = "https://github.com/ansible/ansible-compat";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.6";
|
||||
version = "2.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY=";
|
||||
hash = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,49 +1,58 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, ansible-base
|
||||
, ansible-compat
|
||||
, ansible-core
|
||||
, enrich
|
||||
, flaky
|
||||
, pyyaml
|
||||
, rich
|
||||
, ruamel-yaml
|
||||
, tenacity
|
||||
, wcmatch
|
||||
, yamllint
|
||||
, pythonOlder
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "5.3.2";
|
||||
disabled = isPy27;
|
||||
version = "6.0.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg=";
|
||||
sha256 = "sha256-tTm8ItE+beDMLiV1jh0osrwBVhpBSuN87aNwi1oqee0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# it is fine if lint tools are missing
|
||||
substituteInPlace conftest.py \
|
||||
--replace "sys.exit(1)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansible-base
|
||||
ansible-compat
|
||||
ansible-core
|
||||
enrich
|
||||
flaky
|
||||
pyyaml
|
||||
rich
|
||||
ruamel-yaml
|
||||
tenacity
|
||||
wcmatch
|
||||
yamllint
|
||||
];
|
||||
|
||||
# tests can't be easily run without installing things from ansible-galaxy
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
flaky
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
@ -55,7 +64,7 @@ buildPythonPackage rec {
|
||||
preCheck = ''
|
||||
# ansible wants to write to $HOME and crashes if it can't
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH=$PATH:${lib.makeBinPath [ ansible-base ]}
|
||||
export PATH=$PATH:${lib.makeBinPath [ ansible-core ]}
|
||||
|
||||
# create a working ansible-lint executable
|
||||
export PATH=$PATH:$PWD/src/ansiblelint
|
||||
@ -82,7 +91,7 @@ buildPythonPackage rec {
|
||||
"test_discover_lintables_umlaut"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ];
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ansible-community/ansible-lint";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-administration";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb";
|
||||
sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,16 +5,20 @@
|
||||
, azure-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-certificates";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87";
|
||||
hash = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -24,11 +28,16 @@ buildPythonPackage rec {
|
||||
msrestazure
|
||||
];
|
||||
|
||||
pythonNamespaces = [ "azure.keyvault" ];
|
||||
pythonNamespaces = [
|
||||
"azure.keyvault"
|
||||
];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "azure.keyvault.certificates" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"azure.keyvault.certificates"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Key Vault Certificates Client Library for Python";
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ lib, buildPythonPackage, isPy27, fetchPypi
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, azure-common
|
||||
, azure-core
|
||||
@ -9,13 +12,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.4.0";
|
||||
disabled = isPy27;
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0";
|
||||
hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -25,11 +30,17 @@ buildPythonPackage rec {
|
||||
cryptography
|
||||
];
|
||||
|
||||
pythonNamespaces = [ "azure.keyvault" ];
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonNamespaces = [
|
||||
"azure.keyvault"
|
||||
];
|
||||
|
||||
# requires relative paths to utilities in the mono-repo
|
||||
doCheck = false;
|
||||
checkInputs = [ aiohttp pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"azure"
|
||||
|
||||
@ -3,10 +3,7 @@
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, isPy3k
|
||||
, pytest
|
||||
, pytest-black
|
||||
, pytest-flake8
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -20,12 +17,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ];
|
||||
# ironically, they fail a linting test, and pytest.ini forces that test suite
|
||||
checkPhase = ''
|
||||
rm backports/functools_lru_cache.py
|
||||
pytest -k 'not format'
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Test fail on Python 2
|
||||
doCheck = isPy3k;
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc=";
|
||||
sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0=";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
||||
@ -5,6 +5,14 @@
|
||||
, importlib-metadata
|
||||
, locale
|
||||
, pytestCheckHook
|
||||
|
||||
# large-rebuild downstream dependencies
|
||||
, flask
|
||||
, black
|
||||
|
||||
# applications
|
||||
, magic-wormhole
|
||||
, mitmproxy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -29,6 +37,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit black flask magic-wormhole mitmproxy;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://click.palletsprojects.com/";
|
||||
description = "Create beautiful command line interfaces in Python";
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-auth-oauthlib";
|
||||
version = "0.4.6";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno=";
|
||||
sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.18.5";
|
||||
version = "1.18.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rsD8euVGf1nbIHnDyxbyW7LJWtUSsc4Uf3c5OmgYpMY=";
|
||||
sha256 = "sha256-yk6Rg9DwilG8OWmT7SF80eYRsRwDwJp+mx2Yv2Gg+ak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://jinja.pocoo.org/";
|
||||
homepage = "https://jinja.palletsprojects.com/";
|
||||
description = "Stand-alone template engine";
|
||||
license = licenses.bsd3;
|
||||
longDescription = ''
|
||||
|
||||
@ -1,21 +1,45 @@
|
||||
{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }:
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonApplication
|
||||
, editorconfig
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "jsbeautifier";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
propagatedBuildInputs = [ six editorconfig ];
|
||||
checkInputs = [ pytest ];
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c";
|
||||
hash = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
editorconfig
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsbeautifier"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"jsbeautifier/tests/testindentation.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://jsbeautifier.org";
|
||||
description = "JavaScript unobfuscator and beautifier.";
|
||||
license = licenses.mit;
|
||||
description = "JavaScript unobfuscator and beautifier";
|
||||
homepage = "http://jsbeautifier.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ apeyroux ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
{ lib
|
||||
, black
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, isort
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
@ -50,9 +48,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
black
|
||||
isort
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "7.5.3";
|
||||
version = "7.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "vemel";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = version;
|
||||
hash = "sha256-nG4V2xA5nZfprMjiP+QePHelE0ZvryYH+kCfobKpAMQ=";
|
||||
hash = "sha256-NS8lFetL/8hcvCnIHw+GDtdEKFsN81MPybEA4PGaP/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
52
pkgs/development/python-modules/notifymuch/default.nix
Normal file
52
pkgs/development/python-modules/notifymuch/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, notmuch
|
||||
, pygobject3
|
||||
, gobject-introspection
|
||||
, libnotify
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "notifymuch";
|
||||
version = "0.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kspi";
|
||||
repo = "notifymuch";
|
||||
# https://github.com/kspi/notifymuch/issues/11
|
||||
rev = "9d4aaf54599282ce80643b38195ff501120807f0";
|
||||
sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
notmuch
|
||||
pygobject3
|
||||
libnotify
|
||||
gtk3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Display desktop notifications for unread mail in a notmuch database";
|
||||
homepage = "https://github.com/kspi/notifymuch";
|
||||
maintainers = with maintainers; [ arjan-s ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "osmnx";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gboeing";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb";
|
||||
sha256 = "sha256-qrTAXZFm88elMrVjvGwfdNwTA/PRdCOHFqpcgoKVGNk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ];
|
||||
|
||||
@ -9,16 +9,17 @@
|
||||
, pynacl
|
||||
, pytest-relaxed
|
||||
, pytestCheckHook
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "paramiko";
|
||||
version = "2.9.2";
|
||||
version = "2.10.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b";
|
||||
sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -48,6 +49,15 @@ buildPythonPackage rec {
|
||||
"paramiko"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix usage of dsa keys
|
||||
# https://github.com/paramiko/paramiko/pull/1606/
|
||||
(fetchpatch {
|
||||
url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";
|
||||
sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";
|
||||
})
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user