Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/python-modules/google-auth-oauthlib/default.nix
This commit is contained in:
Alyssa Ross
commit
22c23dbb8d
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -849,6 +849,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
|
||||
|
|
@ -1374,6 +1422,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
|
||||
|
|
|
|||
|
|
@ -331,6 +331,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
|
||||
|
|
@ -501,6 +510,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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
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,7 +33,7 @@ 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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
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,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=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-auth-oauthlib";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BsTOs6sqk7hbiXa76Gy7gq4dHALS3tPP0IR6i2lVJjs=";
|
||||
sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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,10 +1,8 @@
|
|||
{ lib
|
||||
, black
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, isort
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
|
|
@ -63,8 +61,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
black
|
||||
isort
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
, pandas-stubs
|
||||
, requests
|
||||
, tqdm
|
||||
, wandb
|
||||
|
||||
# Check dependencies
|
||||
, pytest-mock
|
||||
|
|
@ -35,6 +36,7 @@ buildPythonPackage rec {
|
|||
pandas-stubs
|
||||
requests
|
||||
tqdm
|
||||
wandb
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "openai" ];
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
, pythonOlder
|
||||
, scandir ? null
|
||||
, glibcLocales
|
||||
, mock ? null
|
||||
, mock
|
||||
, typing
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -17,16 +18,19 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;
|
||||
checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock;
|
||||
propagatedBuildInputs = [ six ]
|
||||
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
|
||||
checkInputs = [ glibcLocales ]
|
||||
++ lib.optional (pythonOlder "3.3") mock;
|
||||
|
||||
preCheck = ''
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
|
||||
homepage = "https://pypi.python.org/pypi/pathlib2/";
|
||||
license = with lib.licenses; [ mit ];
|
||||
homepage = "https://pypi.org/project/pathlib2/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/test_portend.py b/test_portend.py
|
||||
index b2de8c2..3f90276 100644
|
||||
--- a/test_portend.py
|
||||
+++ b/test_portend.py
|
||||
@@ -21,7 +21,7 @@ def socket_infos():
|
||||
|
||||
|
||||
def id_for_info(info):
|
||||
- af, = info[:1]
|
||||
+ (af,) = info[:1]
|
||||
return str(af)
|
||||
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }:
|
||||
, pytestCheckHook, setuptools-scm, tempora }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "portend";
|
||||
|
|
@ -10,19 +10,11 @@ buildPythonPackage rec {
|
|||
sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini --replace "--flake8" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ tempora ];
|
||||
|
||||
checkInputs = [ pytest pytest-black pytest-cov ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Some of the tests use localhost networking.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, bson
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, setuptools
|
||||
|
|
@ -23,9 +20,15 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=pymarshal --cov-report=html --cov-report=term" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -35,8 +38,6 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
pytestCheckHook
|
||||
bson
|
||||
pytest
|
||||
pytest-cov
|
||||
pyyaml
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "1.4.9";
|
||||
version = "1.4.12";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pyrogram";
|
||||
inherit version;
|
||||
hash = "sha256-iAPzQDHRyFl8m/23zTGOFXA3v5ONU5BGp7KT1ZSywA4=";
|
||||
hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, buildPythonPackage
|
||||
, cachetools
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rokuecp";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,12 +25,11 @@ buildPythonPackage rec {
|
|||
owner = "ctalkington";
|
||||
repo = "python-rokuecp";
|
||||
rev = version;
|
||||
hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4=";
|
||||
hash = "sha256-MeugjIZorwO8d0Yb7bthI6f4NNo6GX9JrRbxrVSdWv0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
# Requires poetry not poetry-core
|
||||
poetry
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -50,12 +49,14 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"' \
|
||||
--replace " --cov" ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/ctalkington/python-rokuecp/issues/249
|
||||
# Network related tests are having troube in the sandbox
|
||||
"test_resolve_hostname"
|
||||
"test_get_dns_state"
|
||||
# Assertion issue
|
||||
"test_guess_stream_format"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-VWdewy4sfnM5zwDmeL8PdNZINN07rBosg4+GOWkkhVE=";
|
||||
hash = "sha256-/J8cCcGAWGrJmUvznOKXtNiHasdOJ3CzsGMeakgL0sY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, pythonOlder
|
||||
, requests
|
||||
, websocket-client
|
||||
, websockets
|
||||
|
|
@ -9,14 +10,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = version;
|
||||
hash = "sha256-oekzLnEQleJPYO6QI2EwflXsbnrQVbqXQOZOnCfEHdg=";
|
||||
hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,6 +10,13 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# on non-x86 Linux platforms, sip incorrectly detects the manylinux version
|
||||
# and PIP will refuse to install the resulting wheel.
|
||||
# remove once upstream fixes this, hopefully in 6.5.2
|
||||
./fix-manylinux-version.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ packaging toml ];
|
||||
|
||||
# There aren't tests
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
diff --git a/sipbuild/project.py b/sipbuild/project.py
|
||||
--- a/sipbuild/project.py
|
||||
+++ b/sipbuild/project.py
|
||||
@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable):
|
||||
# We expect a two part tag so leave anything else unchanged.
|
||||
parts = platform_tag.split('-')
|
||||
if len(parts) == 2:
|
||||
- if self.minimum_glibc_version > (2, 17):
|
||||
+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:
|
||||
# PEP 600.
|
||||
parts[0] = 'manylinux'
|
||||
parts.insert(1,
|
||||
'{}.{}'.format(self.minimum_glibc_version[0],
|
||||
self.minimum_glibc_version[1]))
|
||||
- elif self.minimum_glibc_version > (2, 12):
|
||||
+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}:
|
||||
# PEP 599.
|
||||
parts[0] = 'manylinux2014'
|
||||
elif self.minimum_glibc_version > (2, 5):
|
||||
|
|
@ -114,6 +114,10 @@ buildPythonPackage rec {
|
|||
"tests/test_tables.py"
|
||||
];
|
||||
|
||||
# Disable test that fails on darwin due to issue with python3Packages.psutil:
|
||||
# https://github.com/giampaolo/psutil/issues/1219
|
||||
disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats";
|
||||
|
||||
checkInputs = [
|
||||
azure-core
|
||||
bokeh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, rustPlatform, fetchCrate, git }:
|
||||
{ lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fac-build";
|
||||
|
|
@ -10,6 +10,8 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI=";
|
||||
};
|
||||
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
|
||||
|
||||
# fac includes a unit test called ls_files_works which assumes it's
|
||||
|
|
@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
homepage = "https://physics.oregonstate.edu/~roundyd/fac";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dpercy ];
|
||||
mainProgram = "fac";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.02.23-12.12.12";
|
||||
version = "2022.03.26-18.47.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw=";
|
||||
sha256 = "sha256-tlI4h9/DTc3JwqCM58YC5x4FDpuPm7Qeik3PJe64nVA=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo=";
|
||||
sha256 = "4973f5cf45f0b8120206d057d88d6a7fca03e071c8ad1ecd7229db46a0604ed2";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
@ -42,9 +42,9 @@ buildGraalvmNativeImage rec {
|
|||
|
||||
latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name)
|
||||
|
||||
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
|
||||
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
|
||||
|
||||
curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar
|
||||
curl -o clojure-lsp-standalone.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar
|
||||
new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g')
|
||||
|
||||
rm -f clojure-lsp-standalone.jar
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, glib, pkg-config, scons }:
|
||||
{ lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hammer";
|
||||
version = "e7aa734";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/UpstandingHackers/hammer";
|
||||
sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38";
|
||||
src = fetchFromGitHub {
|
||||
owner = "UpstandingHackers";
|
||||
repo = "hammer";
|
||||
rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
|
||||
sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
|
|
|
|||
40
pkgs/development/tools/sslmate-agent/default.nix
Normal file
40
pkgs/development/tools/sslmate-agent/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslmate-agent";
|
||||
version = "1.99.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
unpackCmd = ''
|
||||
dpkg-deb -x ${src} ./sslmate-agent-${pname}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# Not moving etc because it only contains init.rd setttings
|
||||
mv usr $out
|
||||
mv lib $out
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/sslmate-agent.service \
|
||||
--replace "/usr/s" "$out/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Daemon for managing SSL/TLS certificates on a server";
|
||||
homepage = "https://sslmate.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,10 +18,12 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
buildInputs = [ xorg.libX11 ];
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A multi-player version of the classical game of Tetris, for the X Window system";
|
||||
homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, libX11 }:
|
||||
{ lib, stdenv, fetchFromGitHub, libX11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "disk-indicator";
|
||||
version = "unstable-2014-05-19";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/MeanEYE/Disk-Indicator.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MeanEYE";
|
||||
repo = "Disk-Indicator";
|
||||
rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
|
||||
sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd";
|
||||
sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
, libaio
|
||||
, enableCmdlib ? false
|
||||
, enableDmeventd ? false
|
||||
, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null
|
||||
, onlyLib ? stdenv.targetPlatform.isStatic
|
||||
, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null
|
||||
, onlyLib ? stdenv.hostPlatform.isStatic
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals udevSupport [
|
||||
"--enable-udev_rules"
|
||||
"--enable-udev_sync"
|
||||
] ++ lib.optionals stdenv.targetPlatform.isStatic [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
"--enable-static_link"
|
||||
];
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";
|
||||
sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";
|
||||
})
|
||||
] ++ lib.optionals stdenv.targetPlatform.isStatic [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
./no-shared.diff
|
||||
];
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = lib.optionalString onlyLib ''
|
||||
install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"}
|
||||
install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"}
|
||||
make -C libdm install_include
|
||||
make -C libdm install_pkgconfig
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "21.8.12.29";
|
||||
version = "22.3.2.2";
|
||||
|
||||
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "ClickHouse";
|
||||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl";
|
||||
sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
|
||||
|
|
@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
|
|||
--replace 'git rev-parse --show-toplevel' '$src'
|
||||
substituteInPlace utils/check-style/check-ungrouped-includes.sh \
|
||||
--replace 'git rev-parse --show-toplevel' '$src'
|
||||
substituteInPlace utils/generate-ya-make/generate-ya-make.sh \
|
||||
--replace 'git rev-parse --show-toplevel' '$src'
|
||||
substituteInPlace utils/list-licenses/list-licenses.sh \
|
||||
--replace 'git rev-parse --show-toplevel' '$src'
|
||||
substituteInPlace utils/check-style/check-style \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.3.7";
|
||||
version = "2022.3.8";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ let
|
|||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.3.7";
|
||||
hassVersion = "2022.3.8";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-AewJf4GS3jfEN8Xq82NDV8PNpXXZIs2DHix/+tJpB8c=";
|
||||
hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0=";
|
||||
sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E=";
|
||||
vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
};
|
||||
|
||||
unifi7 = generic {
|
||||
version = "7.0.23";
|
||||
sha256 = "1y2z02blgbqa6xvwjrvzx6mfwbbbmmv50rq409rsg1hkkzispxmw";
|
||||
version = "7.0.25";
|
||||
sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
|
||||
{ lib, stdenv, fetchFromGitHub, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "pa-applet";
|
||||
version = "unstable-2012-04-11";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/fernandotcl/pa-applet.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fernandotcl";
|
||||
repo = "pa-applet";
|
||||
rev = "005f192df9ba6d2e6491f9aac650be42906b135a";
|
||||
sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";
|
||||
sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gotify-desktop";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE=";
|
||||
sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo=";
|
||||
cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
|
||||
};
|
||||
|
||||
buildInputs = [ stdenv.cc.libc.static ];
|
||||
prePatch = ''
|
||||
substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\""
|
||||
substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile --replace "-static" ""
|
||||
'';
|
||||
preBuild = ''
|
||||
makeFlagsArray=(CC=$CC)
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp nbench $out/bin
|
||||
|
|
@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html";
|
||||
description = "A synthetic computing benchmark program";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ bennofs ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,35 @@
|
|||
{ lib, stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender
|
||||
, freetype, zlib, fontconfig
|
||||
}:
|
||||
{ lib, stdenv, fetchzip, glib, zlib, libglvnd, python3, autoPatchelfHook }:
|
||||
|
||||
let
|
||||
maybe64 = if stdenv.isx86_64 then "_64" else "";
|
||||
libPath = lib.makeLibraryPath
|
||||
[ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype
|
||||
zlib fontconfig
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.16";
|
||||
version = "3.5";
|
||||
pname = "sam-ba";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";
|
||||
sha256 = "18lsi4747900cazq3bf0a87n3pc7751j5papj9sxarjymcz9vks4";
|
||||
url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${version}-linux_x86_64.tar.gz";
|
||||
sha256 = "1k0nbgyc98z94nphm2q7s82b274clfnayf4a2kv93l5594rzdbp1";
|
||||
};
|
||||
|
||||
# Pre-built binary package. Install everything to /opt/sam-ba to not mess up
|
||||
# the internal directory structure. Then create wrapper in /bin. Attemts to
|
||||
# use "patchelf --set-rpath" instead of setting LD_PRELOAD_PATH failed.
|
||||
buildInputs = [
|
||||
glib
|
||||
libglvnd
|
||||
zlib
|
||||
|
||||
(python3.withPackages (ps: [ps.pyserial]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin/" \
|
||||
"$out/opt/sam-ba/"
|
||||
cp -a . "$out/opt/sam-ba/"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}"
|
||||
cat > "$out/bin/sam-ba" << EOF
|
||||
export LD_LIBRARY_PATH="${libPath}"
|
||||
exec "$out/opt/sam-ba/sam-ba${maybe64}"
|
||||
EOF
|
||||
chmod +x "$out/bin/sam-ba"
|
||||
'';
|
||||
ln -sr "$out/opt/sam-ba/sam-ba" "$out/bin/"
|
||||
ln -sr "$out/opt/sam-ba/multi_sam-ba.py" "$out/bin/"
|
||||
|
||||
# Do our own thing
|
||||
dontPatchELF = true;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers";
|
||||
|
|
@ -42,10 +37,10 @@ stdenv.mkDerivation rec {
|
|||
Atmel SAM-BA software provides an open set of tools for programming the
|
||||
Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers.
|
||||
'';
|
||||
# Alternatively: https://www.microchip.com/en-us/development-tool/SAM-BA-In-system-Programmer
|
||||
homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools";
|
||||
# License in <source>/doc/readme.txt
|
||||
license = "BSD-like (partly binary-only)"; # according to Buildroot
|
||||
platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "carddav";
|
||||
version = "0.1-2014-02-26";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ljanyst/carddav-util";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ljanyst";
|
||||
repo = "carddav-util";
|
||||
rev = "53b181faff5f154bcd180467dd04c0ce69405564";
|
||||
sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";
|
||||
sha256 = "sha256-9iRCNDC0FJ+JD2Hk5TC0w4QMjJ9mMtct5WIA35xTGTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
|
||||
{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem
|
||||
, writeScript }:
|
||||
let
|
||||
version = "0.2.1";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/matejc/nixui.git";
|
||||
rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";
|
||||
sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara";
|
||||
};
|
||||
nixui = (import ./nixui.nix {
|
||||
inherit pkgs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -24,9 +18,15 @@ let
|
|||
genericName = "NixUI";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nixui";
|
||||
inherit version src;
|
||||
version = "0.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "matejc";
|
||||
repo = "nixui";
|
||||
rev = version;
|
||||
sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s=";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${script} $out/bin/nixui
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monit";
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}dist/monit-${version}.tar.gz";
|
||||
sha256 = "sha256-6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU=";
|
||||
url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";
|
||||
sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue