Merge master into haskell-updates
This commit is contained in:
commit
524447ebae
|
@ -4474,7 +4474,7 @@
|
|||
gordias = {
|
||||
name = "Gordias";
|
||||
email = "gordias@disroot.org";
|
||||
github = "NotGordias";
|
||||
github = "gordiasdot";
|
||||
githubId = 94724133;
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0x5D47284830FAA4FA";
|
||||
|
|
|
@ -169,6 +169,13 @@
|
|||
<link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>,
|
||||
an online collaborative spreadsheet. Available as
|
||||
<link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://timetagger.app">timetagger</link>,
|
||||
|
@ -515,6 +522,14 @@
|
|||
wrapper for <literal>assert</literal> conditions.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to
|
||||
<link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link>
|
||||
(formerly refers to
|
||||
<link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>).
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
@ -51,6 +51,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
|
||||
|
||||
- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative
|
||||
spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable).
|
||||
|
||||
- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).
|
||||
|
||||
- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
|
||||
|
@ -157,6 +160,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions.
|
||||
|
||||
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
|
||||
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
|
|
@ -1005,6 +1005,7 @@
|
|||
./services/web-apps/documize.nix
|
||||
./services/web-apps/dokuwiki.nix
|
||||
./services/web-apps/engelsystem.nix
|
||||
./services/web-apps/ethercalc.nix
|
||||
./services/web-apps/fluidd.nix
|
||||
./services/web-apps/galene.nix
|
||||
./services/web-apps/gerrit.nix
|
||||
|
|
|
@ -69,7 +69,8 @@ let
|
|||
set -e
|
||||
set +o pipefail
|
||||
NIX_CONF_DIR=$PWD \
|
||||
${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \
|
||||
${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
||||
${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
||||
|& sed -e 's/^warning:/error:/' \
|
||||
| (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')
|
||||
set -o pipefail
|
||||
|
@ -88,7 +89,7 @@ let
|
|||
requireSignedBinaryCaches = "require-sigs";
|
||||
trustedUsers = "trusted-users";
|
||||
allowedUsers = "allowed-users";
|
||||
systemFeatures = "system-feature";
|
||||
systemFeatures = "system-features";
|
||||
};
|
||||
|
||||
semanticConfType = with types;
|
||||
|
|
|
@ -183,6 +183,20 @@ in
|
|||
|
||||
config = mkIf enableDHCP {
|
||||
|
||||
assertions = [ {
|
||||
# dhcpcd doesn't start properly with malloc ∉ [ libc scudo ]
|
||||
# see https://github.com/NixOS/nixpkgs/issues/151696
|
||||
assertion =
|
||||
dhcpcd.enablePrivSep
|
||||
-> elem config.environment.memoryAllocator.provider [ "libc" "scudo" ];
|
||||
message = ''
|
||||
dhcpcd with privilege separation is incompatible with chosen system malloc.
|
||||
Currently only the `libc` and `scudo` allocators are known to work.
|
||||
To disable dhcpcd's privilege separation, overlay Nixpkgs and override dhcpcd
|
||||
to set `enablePrivSep = false`.
|
||||
'';
|
||||
} ];
|
||||
|
||||
systemd.services.dhcpcd = let
|
||||
cfgN = config.networking;
|
||||
hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")
|
||||
|
|
62
nixos/modules/services/web-apps/ethercalc.nix
Normal file
62
nixos/modules/services/web-apps/ethercalc.nix
Normal file
|
@ -0,0 +1,62 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.ethercalc;
|
||||
in {
|
||||
options = {
|
||||
services.ethercalc = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
ethercalc, an online collaborative spreadsheet server.
|
||||
|
||||
Persistent state will be maintained under
|
||||
<filename>/var/lib/ethercalc</filename>. Upstream supports using a
|
||||
redis server for storage and recommends the redis backend for
|
||||
intensive use; however, the Nix module doesn't currently support
|
||||
redis.
|
||||
|
||||
Note that while ethercalc is a good and robust project with an active
|
||||
issue tracker, there haven't been new commits since the end of 2020.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.ethercalc;
|
||||
defaultText = literalExpression "pkgs.ethercalc";
|
||||
type = types.package;
|
||||
description = "Ethercalc package to use.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = "Address to listen on (use 0.0.0.0 to allow access from any address).";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8000;
|
||||
description = "Port to bind to.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.ethercalc = {
|
||||
description = "Ethercalc service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}";
|
||||
Restart = "always";
|
||||
StateDirectory = "ethercalc";
|
||||
WorkingDirectory = "/var/lib/ethercalc";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -10,8 +10,7 @@ in {
|
|||
enable = mkEnableOption "plausible";
|
||||
|
||||
releaseCookiePath = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr (either str path);
|
||||
type = with types; either str path;
|
||||
description = ''
|
||||
The path to the file with release cookie. (used for remote connection to the running node).
|
||||
'';
|
||||
|
@ -235,6 +234,8 @@ in {
|
|||
script = ''
|
||||
export CONFIG_DIR=$CREDENTIALS_DIRECTORY
|
||||
|
||||
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
|
||||
|
||||
# setup
|
||||
${pkgs.plausible}/createdb.sh
|
||||
${pkgs.plausible}/migrate.sh
|
||||
|
@ -243,10 +244,8 @@ in {
|
|||
psql -d plausible <<< "UPDATE users SET email_verified=true;"
|
||||
fi
|
||||
''}
|
||||
${optionalString (cfg.releaseCookiePath != null) ''
|
||||
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
|
||||
''}
|
||||
plausible start
|
||||
|
||||
exec plausible start
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
@ -257,8 +256,8 @@ in {
|
|||
LoadCredential = [
|
||||
"ADMIN_USER_PWD:${cfg.adminUser.passwordFile}"
|
||||
"SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}"
|
||||
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]
|
||||
++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"];
|
||||
"RELEASE_COOKIE:${cfg.releaseCookiePath}"
|
||||
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -306,6 +306,9 @@ let
|
|||
# The test cannot access the network, so any packages we
|
||||
# need must be included in the VM.
|
||||
system.extraDependencies = with pkgs; [
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
desktop-file-utils
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
|
@ -315,6 +318,7 @@ let
|
|||
ntp
|
||||
perlPackages.ListCompare
|
||||
perlPackages.XMLLibXML
|
||||
python3Minimal
|
||||
shared-mime-info
|
||||
sudo
|
||||
texinfo
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
inherit (pkgs.darwin) cctools;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
});
|
||||
mysqlPackage = {
|
||||
mysqlPackages = {
|
||||
inherit (pkgs) mysql57 mysql80;
|
||||
};
|
||||
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
|
||||
|
|
|
@ -142,7 +142,7 @@ let
|
|||
in
|
||||
lib.mapAttrs (_: package: makeMySQLTest {
|
||||
inherit package;
|
||||
hasRocksDB = false; hasMroonga = false;
|
||||
hasRocksDB = false; hasMroonga = false; useSocketAuth = false;
|
||||
}) mysqlPackages
|
||||
// (lib.mapAttrs (_: package: makeMySQLTest {
|
||||
inherit package;
|
||||
|
|
|
@ -8,6 +8,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
virtualisation.memorySize = 4096;
|
||||
services.plausible = {
|
||||
enable = true;
|
||||
releaseCookiePath = "${pkgs.runCommand "cookie" { } ''
|
||||
${pkgs.openssl}/bin/openssl rand -base64 64 >"$out"
|
||||
''}";
|
||||
adminUser = {
|
||||
email = "admin@example.org";
|
||||
passwordFile = "${pkgs.writeText "pwd" "foobar"}";
|
||||
|
|
53
pkgs/applications/audio/ChowCentaur/default.nix
Normal file
53
pkgs/applications/audio/ChowCentaur/default.nix
Normal file
|
@ -0,0 +1,53 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon
|
||||
, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor
|
||||
, alsa-lib, libjack2, lv2, gcc-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ChowCentaur";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "KlonCentaur";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
cairo
|
||||
libxkbcommon
|
||||
xcbutilcursor
|
||||
xcbutilkeysyms
|
||||
xcbutil
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXcursor
|
||||
alsa-lib
|
||||
libjack2
|
||||
lv2
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
|
||||
"-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
|
||||
"-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2 $out/lib/vst3
|
||||
cd ChowCentaur/ChowCentaur_artefacts/Release
|
||||
cp -r LV2/ChowCentaur.lv2 $out/lib/lv2
|
||||
cp -r VST3/ChowCentaur.vst3 $out/lib/vst3
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more";
|
||||
homepage = "https://github.com/jatinchowdhury18/KlonCentaur";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
};
|
||||
}
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.43";
|
||||
version = "6.46";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E=";
|
||||
aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw=";
|
||||
x86_64-linux = "sha256-cHjiO2hRK8gUaq2VfuE9GOtRJ0JyfH2rhdIbK+RxoEM=";
|
||||
aarch64-linux = "sha256-j+05SdyDWzI1fekwwQ2RAGontEvppkUWPYfZEtOVXYg=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20211116";
|
||||
version = "20220125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz";
|
||||
sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
|
||||
, python2, qtbase, qttools }:
|
||||
, python3, qtbase, qttools }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tiled";
|
||||
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [ python2 qtbase qttools ];
|
||||
buildInputs = [ python3 qtbase qttools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy to use and flexible tile map editor";
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "16.4.0";
|
||||
version = "16.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "624f776478b6960adb1be565077f79aed72c95de5e995fc1216b78978c9c6857";
|
||||
sha256 = "a8ebf2560820d2d05677b9b16fc863f555dde8235b3e34acd7916eee3544eaa9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-qt";
|
||||
version = "3.1.4";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002";
|
||||
sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "99.0.4840.0",
|
||||
"sha256": "0l1azyd7an8nw2gjnn313gn6sljvw6lbd9g59s7d59lpn2bmbc7j",
|
||||
"sha256bin64": "145qjhdmi39aaw0a3sarlgi67rjhik1xbm62rw7ba0wgnrbvvrjb",
|
||||
"version": "99.0.4844.11",
|
||||
"sha256": "1jkcif839yrhsckx5j1jqsmkhlvhm1gqk3mhvji1mfi4rg1dfd0l",
|
||||
"sha256bin64": "01vl7ah3jkryrfnjidv8yq490hyqll6gd0vddy0b98wgyn3h593h",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-10",
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
{ callPackage
|
||||
, buildGoPackage
|
||||
, nvidia_x11
|
||||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.13";
|
||||
sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8";
|
||||
}
|
|
@ -4,7 +4,7 @@
|
|||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./genericModule.nix {
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.8";
|
||||
sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./genericModule.nix {
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.2.3";
|
||||
sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i";
|
||||
|
|
|
@ -1,27 +1,30 @@
|
|||
{ lib
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, version
|
||||
, sha256
|
||||
, vendorSha256
|
||||
, nvidiaGpuSupport
|
||||
, patchelf
|
||||
, nvidia_x11
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "nomad";
|
||||
inherit version;
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/nomad";
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev sha256;
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit vendorSha256;
|
||||
|
||||
nativeBuildInputs = lib.optionals nvidiaGpuSupport [
|
||||
patchelf
|
||||
];
|
||||
|
@ -39,6 +42,8 @@ buildGoPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, version
|
||||
, sha256
|
||||
, vendorSha256
|
||||
, nvidiaGpuSupport
|
||||
, patchelf
|
||||
, nvidia_x11
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nomad";
|
||||
inherit version;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit vendorSha256;
|
||||
|
||||
nativeBuildInputs = lib.optionals nvidiaGpuSupport [
|
||||
patchelf
|
||||
];
|
||||
|
||||
# ui:
|
||||
# Nomad release commits include the compiled version of the UI, but the file
|
||||
# is only included if we build with the ui tag.
|
||||
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
|
||||
|
||||
# The dependency on NVML isn't explicit. We have to make it so otherwise the
|
||||
# binary will not know where to look for the relevant symbols.
|
||||
postFixup = lib.optionalString nvidiaGpuSupport ''
|
||||
for bin in $out/bin/*; do
|
||||
patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin"
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
|
||||
};
|
||||
}
|
|
@ -33,13 +33,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "sdrangel";
|
||||
version = "6.17.2";
|
||||
version = "6.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sMD2JTJJlssMdXCUHdFYjEqGknhGGuG4szfnvFFN7t4=";
|
||||
sha256 = "sha256-L/D8uEWiFGkAXcxnwDWcPQmc3FvXrG6xs9japMmTHys=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bowtie2";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BenLangmead";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2B6w6c/qztyBb1jNA0zg+udQm41ouT1DyB6Ygpi5nC8=";
|
||||
sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -1,25 +1,31 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, perl, flex, bison, python3
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, perl, flex, bison, python3, autoconf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.210";
|
||||
version = "4.218";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
|
||||
sha256 = "sha256-KoIfJeV2aITnwiB2eQgQo4ZyXfMe6erFiGKXezR+IBg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ perl ];
|
||||
nativeBuildInputs = [ flex bison python3 ];
|
||||
nativeBuildInputs = [ flex bison python3 autoconf ];
|
||||
|
||||
# these tests need some interpreter paths patched early on...
|
||||
# see https://github.com/NixOS/nix/issues/1205
|
||||
doCheck = false;
|
||||
checkTarget = "test";
|
||||
|
||||
preConfigure = ''
|
||||
autoconf
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
src/flexfix \
|
||||
|
|
|
@ -1,18 +1,43 @@
|
|||
{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, resholvePackage
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, bash
|
||||
, openssl
|
||||
, gawk
|
||||
/*
|
||||
TODO: yadm can use git-crypt and transcrypt
|
||||
but it does so in a way that resholve 0.6.0
|
||||
can't yet do anything smart about. It looks
|
||||
like these are for interactive use, so the
|
||||
main impact should just be that users still
|
||||
need both of these packages in their profile
|
||||
to support their use in yadm.
|
||||
*/
|
||||
# , git-crypt
|
||||
# , transcrypt
|
||||
, j2cli
|
||||
, esh
|
||||
, gnupg
|
||||
, coreutils
|
||||
, gnutar
|
||||
, installShellFiles
|
||||
, runCommand
|
||||
, yadm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
resholvePackage rec {
|
||||
pname = "yadm";
|
||||
version = "3.1.1";
|
||||
|
||||
buildInputs = [ git gnupg ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheLocehiliosan";
|
||||
repo = "yadm";
|
||||
rev = version;
|
||||
sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk=";
|
||||
hash = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -31,6 +56,72 @@ stdenv.mkDerivation rec {
|
|||
--bash completion/bash/yadm
|
||||
'';
|
||||
|
||||
solutions = {
|
||||
yadm = {
|
||||
scripts = [ "bin/yadm" ];
|
||||
interpreter = "${bash}/bin/sh";
|
||||
inputs = [
|
||||
git
|
||||
gnupg
|
||||
openssl
|
||||
gawk
|
||||
# see head comment
|
||||
# git-crypt
|
||||
# transcrypt
|
||||
j2cli
|
||||
esh
|
||||
bash
|
||||
coreutils
|
||||
gnutar
|
||||
];
|
||||
fake = {
|
||||
external = if stdenv.isCygwin then [ ] else [ "cygpath" ];
|
||||
};
|
||||
fix = {
|
||||
"$GPG_PROGRAM" = [ "gpg" ];
|
||||
"$OPENSSL_PROGRAM" = [ "openssl" ];
|
||||
"$GIT_PROGRAM" = [ "git" ];
|
||||
"$AWK_PROGRAM" = [ "awk" ];
|
||||
# see head comment
|
||||
# "$GIT_CRYPT_PROGRAM" = [ "git-crypt" ];
|
||||
# "$TRANSCRYPT_PROGRAM" = [ "transcrypt" ];
|
||||
"$J2CLI_PROGRAM" = [ "j2" ];
|
||||
"$ESH_PROGRAM" = [ "esh" ];
|
||||
# not in nixpkgs (yet)
|
||||
# "$ENVTPL_PROGRAM" = [ "envtpl" ];
|
||||
# "$LSB_RELEASE_PROGRAM" = [ "lsb_release" ];
|
||||
};
|
||||
keep = {
|
||||
"$YADM_COMMAND" = true; # internal cmds
|
||||
"$template_cmd" = true; # dynamic, template-engine
|
||||
"$SHELL" = true; # probably user env? unsure
|
||||
"$hook_command" = true; # ~git hooks?
|
||||
"exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script
|
||||
|
||||
# not in nixpkgs
|
||||
"$ENVTPL_PROGRAM" = true;
|
||||
"$LSB_RELEASE_PROGRAM" = true;
|
||||
};
|
||||
/*
|
||||
TODO: these should be dropped as fast as they can be dealt
|
||||
with properly in binlore and/or resholve.
|
||||
*/
|
||||
execer = [
|
||||
"cannot:${j2cli}/bin/j2"
|
||||
"cannot:${esh}/bin/esh"
|
||||
"cannot:${git}/bin/git"
|
||||
"cannot:${gnupg}/bin/gpg"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
minimal = runCommand "${pname}-test" {} ''
|
||||
export HOME=$out
|
||||
${yadm}/bin/yadm init
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/TheLocehiliosan/yadm";
|
||||
description = "Yet Another Dotfiles Manager";
|
||||
|
@ -40,6 +131,7 @@ stdenv.mkDerivation rec {
|
|||
* Provides a way to use alternate files on a specific OS or host.
|
||||
* Supplies a method of encrypting confidential data so it can safely be stored in your repository.
|
||||
'';
|
||||
changelog = "https://github.com/TheLocehiliosan/yadm/blob/${version}/CHANGES";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ abathur ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
# the gstreamer toolsdir points to the wrong derivation output
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \
|
||||
--replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -229,5 +229,6 @@ in stdenv.mkDerivation {
|
|||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [ sander ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "VirtualBox";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,25 +2,25 @@
|
|||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, git
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "garble";
|
||||
version = "20200107";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burrowers";
|
||||
repo = pname;
|
||||
rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1";
|
||||
sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA==";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek=";
|
||||
vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4=";
|
||||
|
||||
preBuild = ''
|
||||
# https://github.com/burrowers/garble/issues/184
|
||||
substituteInPlace testdata/scripts/tiny.txt \
|
||||
--replace "{6,8}" "{4,8}"
|
||||
'' + lib.optionalString (!stdenv.isx86_64) ''
|
||||
# Used for some of the tests.
|
||||
checkInputs = [git];
|
||||
|
||||
preBuild = lib.optionalString (!stdenv.isx86_64) ''
|
||||
# The test assumex amd64 assembly
|
||||
rm testdata/scripts/asm.txt
|
||||
'';
|
||||
|
|
|
@ -31,7 +31,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
|
|||
|
||||
# Paths in cpio archives *must* be relative, otherwise the kernel
|
||||
# won't unpack 'em.
|
||||
(cd root && cp -prd --parents $storePaths .)
|
||||
(cd root && cp -prP --parents $storePaths .)
|
||||
|
||||
|
||||
# Put the closure in a gzipped cpio archive.
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202201200035";
|
||||
version = "202201270031";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "8d388b019028fb6fa9f0756b745331ffb9eb7c03";
|
||||
sha256 = "sha256-ymXaDmmMucTuvJRqjJv6n22e7ONRt1awtOMABFJ+Y/w=";
|
||||
rev = "236a5edc951685cf11d5fcbd08d82d74bd425f92";
|
||||
sha256 = "sha256-y2hVSlfUwbbKpd2O8VBwTEL/djhXjd2XhBbDlmmqJCc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mate-tweak";
|
||||
version = "21.10.0";
|
||||
version = "22.04.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu-mate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn";
|
||||
sha256 = "yCML+RdN7/dCCx5x1m8fUIkBrnfKztwqplpu1wXwDvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -20,10 +20,6 @@ rustPlatform.buildRustPackage {
|
|||
# (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm)
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
export CARGO_TARGET_DIR="$(pwd)/target"
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver
|
||||
'';
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL2_ttf";
|
||||
version = "2.0.15";
|
||||
version = "2.0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
|
||||
sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
meta = with lib; {
|
||||
description = "SDL TrueType library";
|
||||
description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
homepage = "https://www.libsdl.org/projects/SDL_ttf/";
|
||||
homepage = "https://github.com/libsdl-org/SDL_ttf";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dlib";
|
||||
version = "19.22";
|
||||
version = "19.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davisking";
|
||||
repo = "dlib";
|
||||
rev ="v${version}";
|
||||
sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ=";
|
||||
sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "double-conversion";
|
||||
version = "3.1.5";
|
||||
version = "3.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "double-conversion";
|
||||
rev = "v${version}";
|
||||
sha256 = "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv";
|
||||
sha256 = "sha256-Tg8hndib4EYSYDuEYVssv15w4pQyW5Jk+MwGJWOVQXE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
22
pkgs/development/libraries/judy/cross.patch
Normal file
22
pkgs/development/libraries/judy/cross.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
--- a/src/Judy1/Makefile.am
|
||||
+++ b/src/Judy1/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
|
||||
|
||||
Judy1Tables.c: Judy1TablesGen.c
|
||||
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
|
||||
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
|
||||
|
||||
Judy1ByCount.c:../JudyCommon/JudyByCount.c
|
||||
cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c
|
||||
--- a/src/JudyL/Makefile.am
|
||||
+++ b/src/JudyL/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
|
||||
|
||||
JudyLTables.c: JudyLTablesGen.c
|
||||
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
|
||||
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
|
||||
|
||||
JudyLByCount.c: ../JudyCommon/JudyByCount.c
|
||||
cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c
|
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "judy";
|
||||
|
@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j";
|
||||
};
|
||||
|
||||
# gcc 4.8 optimisations break judy.
|
||||
# https://sourceforge.net/p/judy/mailman/message/31995144/
|
||||
preConfigure = lib.optionalString stdenv.cc.isGNU ''
|
||||
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
|
||||
'';
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
|
||||
patches = [ ./cross.patch ];
|
||||
|
||||
# Disable parallel builds as manpages lack some dependencies:
|
||||
# ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nuspell";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nuspell";
|
||||
repo = "nuspell";
|
||||
rev = "v${version}";
|
||||
sha256 = "039ryhwfbbrrhavzyr999kngj10nk9n81i6qigxj6igfl4fzjy87";
|
||||
sha256 = "sha256-ogA7ycqdMUTN/KHV2oZzytnhZ7XVuhx+ArXZqLlmwjk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config pandoc ];
|
||||
|
|
|
@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];
|
||||
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang
|
||||
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland
|
||||
;
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "float-features";
|
||||
version = "20210228-git";
|
||||
|
||||
description = "A portability library for IEEE float features not covered by the CL standard.";
|
||||
|
||||
deps = [ args."documentation-utils" args."trivial-indent" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz";
|
||||
sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd";
|
||||
};
|
||||
|
||||
packageName = "float-features";
|
||||
|
||||
asdFilesToKeep = ["float-features.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM float-features DESCRIPTION
|
||||
A portability library for IEEE float features not covered by the CL standard.
|
||||
SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL
|
||||
http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz
|
||||
MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME
|
||||
float-features DEPS
|
||||
((NAME documentation-utils FILENAME documentation-utils)
|
||||
(NAME trivial-indent FILENAME trivial-indent))
|
||||
DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git
|
||||
SIBLINGS (float-features-tests) PARASITES NIL) */
|
|
@ -0,0 +1,37 @@
|
|||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "lisp-binary";
|
||||
version = "20210411-git";
|
||||
|
||||
description = "Declare binary formats as structs and then read and write them.";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz";
|
||||
sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb";
|
||||
};
|
||||
|
||||
packageName = "lisp-binary";
|
||||
|
||||
asdFilesToKeep = ["lisp-binary.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM lisp-binary DESCRIPTION
|
||||
Declare binary formats as structs and then read and write them. SHA256
|
||||
1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL
|
||||
http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz
|
||||
MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop)
|
||||
(NAME flexi-streams FILENAME flexi-streams)
|
||||
(NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities)
|
||||
(NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0)
|
||||
(NAME trivial-features FILENAME trivial-features)
|
||||
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
|
||||
DEPENDENCIES
|
||||
(alexandria babel cffi closer-mop flexi-streams iterate moptilities
|
||||
quasiquote-2.0 trivial-features trivial-gray-streams)
|
||||
VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */
|
|
@ -0,0 +1,31 @@
|
|||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "quasiquote-2_dot_0";
|
||||
version = "20150505-git";
|
||||
|
||||
parasites = [ "quasiquote-2.0-tests" ];
|
||||
|
||||
description = "Writing macros that write macros. Effortless.";
|
||||
|
||||
deps = [ args."fiveam" args."iterate" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
|
||||
sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974";
|
||||
};
|
||||
|
||||
packageName = "quasiquote-2.0";
|
||||
|
||||
asdFilesToKeep = ["quasiquote-2.0.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM quasiquote-2.0 DESCRIPTION
|
||||
Writing macros that write macros. Effortless. SHA256
|
||||
0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL
|
||||
http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz
|
||||
MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME
|
||||
quasiquote-2_dot_0 DEPS
|
||||
((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate))
|
||||
DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES
|
||||
(quasiquote-2.0-tests)) */
|
|
@ -137,6 +137,7 @@ fast-io
|
|||
file-attributes
|
||||
fiveam
|
||||
flexi-streams
|
||||
float-features
|
||||
form-fiddle
|
||||
fset
|
||||
generic-cl
|
||||
|
@ -162,6 +163,7 @@ lfarm-client
|
|||
lfarm-server
|
||||
lfarm-ssl
|
||||
lift
|
||||
lisp-binary
|
||||
lisp-namespace
|
||||
lla
|
||||
local-time
|
||||
|
|
|
@ -345,6 +345,16 @@ let quicklisp-to-nix-packages = rec {
|
|||
}));
|
||||
|
||||
|
||||
"quasiquote-2_dot_0" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."quasiquote-2_dot_0" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/quasiquote-2_dot_0.nix {
|
||||
inherit fetchurl;
|
||||
"fiveam" = quicklisp-to-nix-packages."fiveam";
|
||||
"iterate" = quicklisp-to-nix-packages."iterate";
|
||||
}));
|
||||
|
||||
|
||||
"lfarm-common" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lfarm-common" or (x: {}))
|
||||
|
@ -2836,6 +2846,24 @@ let quicklisp-to-nix-packages = rec {
|
|||
}));
|
||||
|
||||
|
||||
"lisp-binary" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lisp-binary" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/lisp-binary.nix {
|
||||
inherit fetchurl;
|
||||
"alexandria" = quicklisp-to-nix-packages."alexandria";
|
||||
"babel" = quicklisp-to-nix-packages."babel";
|
||||
"cffi" = quicklisp-to-nix-packages."cffi";
|
||||
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
|
||||
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
|
||||
"iterate" = quicklisp-to-nix-packages."iterate";
|
||||
"moptilities" = quicklisp-to-nix-packages."moptilities";
|
||||
"quasiquote-2_dot_0" = quicklisp-to-nix-packages."quasiquote-2_dot_0";
|
||||
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
|
||||
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
|
||||
}));
|
||||
|
||||
|
||||
"lift" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lift" or (x: {}))
|
||||
|
@ -3257,6 +3285,16 @@ let quicklisp-to-nix-packages = rec {
|
|||
}));
|
||||
|
||||
|
||||
"float-features" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."float-features" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/float-features.nix {
|
||||
inherit fetchurl;
|
||||
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
|
||||
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
|
||||
}));
|
||||
|
||||
|
||||
"flexi-streams" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."flexi-streams" or (x: {}))
|
||||
|
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, appdirs
|
||||
, tabulate
|
||||
, msgpack
|
||||
, orjson
|
||||
, semver
|
||||
, packageurl-python
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
appdirs
|
||||
tabulate
|
||||
msgpack
|
||||
orjson
|
||||
semver
|
||||
packageurl-python
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov-append --cov-report term --cov vdb" ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_bulk_search"
|
||||
"test_download_recent"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vdb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm";
|
||||
homepage = "https://github.com/appthreat/vulnerability-db";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -9,11 +9,14 @@
|
|||
, numpy
|
||||
, pandas
|
||||
, pytest
|
||||
, cloudpickle
|
||||
, scipy
|
||||
, setuptools
|
||||
, tensorflow-probability
|
||||
, typing-extensions
|
||||
# , tensorflow-probability (incompatible version)
|
||||
, xarray
|
||||
#, h5py (used by disabled tests)
|
||||
, zarr
|
||||
, h5py
|
||||
#, pymc3 (broken)
|
||||
#, pyro-ppl (broken)
|
||||
#, pystan (not packaged)
|
||||
|
@ -45,28 +48,36 @@ buildPythonPackage rec {
|
|||
scipy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
bokeh
|
||||
emcee
|
||||
numba
|
||||
pytest
|
||||
tensorflow-probability
|
||||
#h5py (used by disabled tests)
|
||||
#pymc3 (broken)
|
||||
#pyro-ppl (broken)
|
||||
cloudpickle
|
||||
zarr
|
||||
#tensorflow-probability (used by disabled tests)
|
||||
h5py
|
||||
#pymc3 (broken, used by disabled tests)
|
||||
#pyro-ppl (broken, used by disabled tests)
|
||||
#pystan (not packaged)
|
||||
#numpyro (not packaged)
|
||||
#numpyro (not packaged, used by disabled tests)
|
||||
];
|
||||
|
||||
# check requires pymc3 and pyro-ppl, which are currently broken, and pystan
|
||||
# and numpyro, which are not yet packaged, some checks also need to make
|
||||
# and numpyro, which are not yet packaged, and an incompatible (old) version
|
||||
# of tensorflow-probability. some checks also need to make
|
||||
# directories and do not have permission to do so. So we can only check part
|
||||
# of the package
|
||||
# Additionally, there are some failures with the plots test, which revolve
|
||||
# around attempting to output .mp4 files through an interface that only wants
|
||||
# to output .html files.
|
||||
# The following test have been disabled as a result: data_cmdstanpy,
|
||||
# data_numpyro, data_pyro, data_pystan, and plots.
|
||||
# data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots.
|
||||
checkPhase = ''
|
||||
cd arviz/tests/
|
||||
export HOME=$TMPDIR
|
||||
|
@ -76,11 +87,13 @@ buildPythonPackage rec {
|
|||
base_tests/test_plot_utils.py \
|
||||
base_tests/test_rcparams.py \
|
||||
base_tests/test_stats.py \
|
||||
base_tests/test_stats_numba.py \
|
||||
base_tests/test_stats_utils.py \
|
||||
base_tests/test_utils.py \
|
||||
base_tests/test_utils_numba.py \
|
||||
base_tests/test_data_zarr.py \
|
||||
external_tests/test_data_cmdstan.py \
|
||||
external_tests/test_data_emcee.py \
|
||||
external_tests/test_data_tfp.py
|
||||
external_tests/test_data_emcee.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,20 +1,32 @@
|
|||
{ lib
|
||||
, asn1crypto
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asysocks";
|
||||
version = "0.1.2";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv";
|
||||
sha256 = "sha256-uXrJBc1Moeeo58KV+csiztXf0/F+iI5xy/BaHWek05M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
];
|
||||
|
||||
# Upstream hasn't release the tests yet
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "asysocks" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asysocks"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Socks4/5 client and server library";
|
||||
|
|
|
@ -10,17 +10,21 @@
|
|||
, pytest-mock
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0RvA5qkwQJGyy81D5kW+IR6LbaD/KBwMy6kYxTETubg=";
|
||||
sha256 = "sha256-qEHB90xzettkX/9ojCQ8AZYnTJaL+8n87SmlBOBSDWQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "9.1.7";
|
||||
version = "9.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41";
|
||||
sha256 = "sha256-gSclZatH5r3r6o8K2gXaNlkowQxFT7h0t/0ubr3d0n0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6";
|
||||
sha256 = "sha256-dL1d1bF+hHIQrsyk6t1Afj22yNC/cIpuID5Ajgal5bA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -86,5 +86,6 @@ in buildPythonPackage {
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # depends on older TensorFlow version than is currently packaged
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.27.2";
|
||||
version = "0.28.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE=";
|
||||
sha256 = "sha256-zYSJMP/uwgyIHdI8E7NHLaHrpAQeLpaEcXXXlzIO5ns=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k=";
|
||||
sha256 = "sha256-ZOvp7vCvAf0AFtHogUwuUqDc5wfdXQHHJwl+4F/AI+g=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20fae3cf1b329451eb3cba55d6b3c5b44501db5a23e49f47bc770e7461308672";
|
||||
sha256 = "sha256-66idXGSSQaM2eDnr0cAzO5qeT+UUdG4kamofLLe94m4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.11.19";
|
||||
version = "0.12.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = version;
|
||||
sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM=";
|
||||
sha256 = "sha256-zXvZpX8yKPJpmhKdPhlxYUWUadGlr4WsmfJMgE3kzyQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -68,5 +68,8 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/pymc-devs/pymc3";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ilya-kolpakov ];
|
||||
# several dependencies are not declared and in the end it requires theano-pymc3
|
||||
# instead of Theano. The former is currently not packaged.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847";
|
||||
sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2021.12.2";
|
||||
version = "2022.01.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XVSoPPBdjSQBYrUs0AFGsGFRrQOWbPzlB2mmEBSbFI4=";
|
||||
sha256 = "sha256-dU7zyLSqUX4AM1MLaF9zHbbc2EfsJDtzIwmzy/xiLu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.1.12";
|
||||
version = "1.1.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8=";
|
||||
sha256 = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bazel_0_26
|
||||
, buildBazelPackage
|
||||
, buildPythonPackage
|
||||
, python
|
||||
|
@ -11,47 +9,33 @@
|
|||
, tensorflow
|
||||
, six
|
||||
, numpy
|
||||
, dm-tree
|
||||
, keras
|
||||
, decorator
|
||||
, cloudpickle
|
||||
, gast
|
||||
, hypothesis
|
||||
, scipy
|
||||
, pandas
|
||||
, mpmath
|
||||
, matplotlib
|
||||
, mock
|
||||
, pytest
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.8.0";
|
||||
version = "0.15.0";
|
||||
pname = "tensorflow_probability";
|
||||
|
||||
# first build all binaries and generate setup.py using bazel
|
||||
bazel-wheel = buildBazelPackage {
|
||||
bazel = bazel_0_26;
|
||||
|
||||
name = "${pname}-${version}-py2.py3-none-any.whl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "probability";
|
||||
rev = version;
|
||||
sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
|
||||
rev = "v" + version;
|
||||
sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gast-0.3.patch";
|
||||
url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch";
|
||||
sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a";
|
||||
excludes = ["testing/*"];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "cloudpickle-1.2.patch";
|
||||
url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch";
|
||||
sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
# needed to create the output wheel in installPhase
|
||||
python
|
||||
|
@ -64,7 +48,7 @@ let
|
|||
bazelTarget = ":pip_pkg";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8";
|
||||
sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
@ -98,34 +82,31 @@ in buildPythonPackage {
|
|||
decorator
|
||||
cloudpickle
|
||||
gast
|
||||
dm-tree
|
||||
keras
|
||||
];
|
||||
|
||||
# Listed here:
|
||||
# https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58
|
||||
# https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytest
|
||||
scipy
|
||||
pandas
|
||||
mpmath
|
||||
matplotlib
|
||||
mock
|
||||
];
|
||||
|
||||
# actual checks currently fail because for some reason
|
||||
# tf.enable_eager_execution is called too late. Probably because upstream
|
||||
# intents these tests to be run by bazel, not plain pytest.
|
||||
# checkPhase = ''
|
||||
# # tests need to import from other test files
|
||||
# export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH"
|
||||
# py.test
|
||||
# '';
|
||||
# Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available.
|
||||
# But it seems not guaranteed that running the tests with pytest will even work, see
|
||||
# https://github.com/tensorflow/probability/blob/c2a10877feb2c4c06a4dc58281e69c37a11315b9/CONTRIBUTING.md?plain=1#L69
|
||||
# Ideally, tests would be run using Bazel. For now, lets's do a...
|
||||
|
||||
# sanity check
|
||||
checkPhase = ''
|
||||
python -c 'import tensorflow_probability'
|
||||
'';
|
||||
pythonImportsCheck = [ "tensorflow_probability" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2
|
||||
description = "Library for probabilistic reasoning and statistical analysis";
|
||||
homepage = "https://www.tensorflow.org/probability/";
|
||||
license = licenses.asl20;
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, numpy
|
||||
, wheel
|
||||
, werkzeug
|
||||
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
pname = "tensorflow-tensorboard";
|
||||
version = "2.6.0";
|
||||
format = "wheel";
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tensorboard";
|
||||
|
|
52
pkgs/development/tools/appthreat-depscan/default.nix
Normal file
52
pkgs/development/tools/appthreat-depscan/default.nix
Normal file
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appthreat-vulnerability-db
|
||||
defusedxml
|
||||
pyyaml
|
||||
rich
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov-append --cov-report term --cov depscan" ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Assertion Error
|
||||
"test_query_metadata2"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"depscan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to audit dependencies based on known vulnerabilities and advisories";
|
||||
homepage = "https://github.com/AppThreat/dep-scan";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "evans";
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ktr0731";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ftt3lnwLk2Zx1DxDmZx2hBqXcxzqUb6I/gEdQJuFsCc=";
|
||||
sha256 = "sha256-F9URMwQaSAQZaiZ95rDZqe8+YcJ9aMInSTIgQ7JLyOw=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-WclmINHcgRtbRSZGv+lOgwuImHKVC9cfK8C+f9JBcts=";
|
||||
vendorSha256 = "sha256-bFTmr/xQ12cboH1MGvHDUpLM0dMkxMeLgwG0VbhMEnc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "More expressive universal gRPC client";
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k=";
|
||||
sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
|
|
@ -11,19 +11,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LYXwdOopQkgq7i4l8dqQFkNLB3r+CVRor4BVeoj0DPs=";
|
||||
sha256 = "sha256-LsRky7hc7mgx1iRpJZICmP/ofdfD9r3D5LURTqfI9Fo=";
|
||||
};
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-SdbDWw4GOvCTKN7vBjhLU5rhdVIpyO+AWaFbo06HXfU=";
|
||||
cargoSha256 = "sha256-7WGNaad00MqEM/OdUaLJ3McXlUQyQwPezbMbL+4se5A=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/EmbarkStudios/cargo-deny";
|
||||
changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda matthiasbeyer ];
|
||||
maintainers = with maintainers; [ figsoda matthiasbeyer jk ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ov2zCINh4uH5pvhML1fgpnxFhWs680bdv9oqUESFkpw=";
|
||||
sha256 = "sha256-YaQOYhnbzoLyMpEPYyGXdVTWKN8dvcpLcb++8HO51qQ=";
|
||||
};
|
||||
cargoSha256 = "sha256-qYz5p+3QNA/zir2M9/aWxKYOMYI01OsIWZCJ4njjFPc=";
|
||||
cargoSha256 = "sha256-2+77mILB5vaiejeXJ75l5LedQ55ibq/nlEzxfbANvgI=";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "beep";
|
||||
version = "1.4.9";
|
||||
version = "1.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spkr-beep";
|
||||
repo = "beep";
|
||||
rev = "v${version}";
|
||||
sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o=";
|
||||
sha256 = "sha256-8g9Nni9lalQvrffhwIv2LFRtLrioUL+lMeDTHH6l6Sk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=\${out}" "prefix="];
|
||||
|
|
|
@ -94,7 +94,6 @@ mapAliases (with prev; {
|
|||
neosnippet = neosnippet-vim;
|
||||
The_NERD_Commenter = nerdcommenter;
|
||||
The_NERD_tree = nerdtree;
|
||||
onedark-nvim = onedarkpro-nvim; # added 2021-10-22
|
||||
open-browser = open-browser-vim;
|
||||
pathogen = vim-pathogen;
|
||||
polyglot = vim-polyglot;
|
||||
|
|
|
@ -65,8 +65,16 @@
|
|||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
|
||||
# vim-clap dependencies
|
||||
# sniprun dependencies
|
||||
, bashInteractive
|
||||
, coreutils
|
||||
, curl
|
||||
, gnugrep
|
||||
, gnused
|
||||
, makeWrapper
|
||||
, procps
|
||||
|
||||
# vim-clap dependencies
|
||||
, libgit2
|
||||
, libiconv
|
||||
, openssl
|
||||
|
@ -76,7 +84,6 @@
|
|||
, asmfmt
|
||||
, delve
|
||||
, errcheck
|
||||
, gnused
|
||||
, go-motion
|
||||
, go-tools
|
||||
, gocode
|
||||
|
@ -536,6 +543,43 @@ self: super: {
|
|||
dependencies = with self; [ skim ];
|
||||
});
|
||||
|
||||
sniprun =
|
||||
let
|
||||
version = "1.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelb";
|
||||
repo = "sniprun";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4=";
|
||||
};
|
||||
sniprun-bin = rustPlatform.buildRustPackage {
|
||||
pname = "sniprun-bin";
|
||||
inherit version src;
|
||||
|
||||
cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/sniprun \
|
||||
--prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]}
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
};
|
||||
in
|
||||
buildVimPluginFrom2Nix {
|
||||
pname = "sniprun";
|
||||
inherit version src;
|
||||
|
||||
patches = [ ./patches/sniprun/fix-paths.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin}
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ sniprun-bin ];
|
||||
};
|
||||
|
||||
sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
|
||||
postPatch = let
|
||||
libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
|
36
pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch
Normal file
36
pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch
Normal file
|
@ -0,0 +1,36 @@
|
|||
diff --git a/lua/sniprun.lua b/lua/sniprun.lua
|
||||
index aa39e0b..188d54a 100644
|
||||
--- a/lua/sniprun.lua
|
||||
+++ b/lua/sniprun.lua
|
||||
@@ -4,9 +4,7 @@ M.custom_highlight=false
|
||||
M.info_floatwin = {}
|
||||
|
||||
-- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua
|
||||
-local binary_path = vim.fn.fnamemodify(
|
||||
- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h")
|
||||
- .. "/target/release/sniprun"
|
||||
+local binary_path = "@sniprun_bin@/bin/sniprun"
|
||||
|
||||
local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."
|
||||
|
||||
diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh
|
||||
index 2e6264d..0eab1c6 100644
|
||||
--- a/ressources/init_repl.sh
|
||||
+++ b/ressources/init_repl.sh
|
||||
@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe
|
||||
touch $working_dir/$out
|
||||
sleep 36000 > $working_dir/$pipe &
|
||||
|
||||
-echo "/bin/cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh
|
||||
+echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh
|
||||
chmod +x $working_dir/real_launcher.sh
|
||||
|
||||
echo $repl " process started at $(date +"%F %T")." >> $working_dir/log
|
||||
diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh
|
||||
index feaa91e..749c55e 100755
|
||||
--- a/ressources/launcher_repl.sh
|
||||
+++ b/ressources/launcher_repl.sh
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/bash
|
||||
-/bin/cat $1 > $2
|
||||
+cat $1 > $2
|
|
@ -693,8 +693,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.1.0";
|
||||
sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0=";
|
||||
version = "9.2.0";
|
||||
sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
|
@ -1462,8 +1462,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.11.0";
|
||||
sha256 = "1l2s8j645riqjmj09i3v71s8ycin5vd6brdp35z472fnk6wyi1y6";
|
||||
version = "4.12.1";
|
||||
sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, lib
|
||||
, kernel
|
||||
, fetchurl
|
||||
, pkg-config, meson, ninja
|
||||
, pkg-config, meson, ninja, makeWrapper
|
||||
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core
|
||||
, doxygen, python3
|
||||
, doxygen, python3, pciutils
|
||||
, withExamples ? []
|
||||
, shared ? false }:
|
||||
|
||||
|
@ -20,6 +20,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
doxygen
|
||||
meson
|
||||
ninja
|
||||
|
@ -31,22 +32,27 @@ in stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
jansson
|
||||
libbpf
|
||||
libbsd
|
||||
libelf
|
||||
libpcap
|
||||
numactl
|
||||
openssl.dev
|
||||
zlib
|
||||
python3
|
||||
] ++ lib.optionals mod kernel.moduleBuildDependencies;
|
||||
|
||||
# Propagated to support current DPDK users in nixpkgs which statically link
|
||||
# with the framework (e.g. odp-dpdk).
|
||||
propagatedBuildInputs = [
|
||||
# Propagated to support current DPDK users in nixpkgs which statically link
|
||||
# with the framework (e.g. odp-dpdk).
|
||||
rdma-core
|
||||
# Requested by pkg-config.
|
||||
libbsd
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs config/arm buildtools
|
||||
'' + lib.optionalString mod ''
|
||||
# kernel_install_dir is hardcoded to `/lib/modules`; patch that.
|
||||
sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -59,30 +65,25 @@ in stdenv.mkDerivation rec {
|
|||
++ lib.optional (!shared) "-Ddefault_library=static"
|
||||
++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"
|
||||
++ lib.optional stdenv.isAarch64 "-Dmachine=generic"
|
||||
++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"
|
||||
++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
|
||||
|
||||
# dpdk meson script does not support separate kernel source and installion
|
||||
# dirs (except via destdir), so we temporarily link the former into the latter.
|
||||
preConfigure = lib.optionalString mod ''
|
||||
mkdir -p $kmod/lib/modules/${kernel.modDirVersion}
|
||||
ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
|
||||
$kmod/lib/modules/${kernel.modDirVersion}
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString mod ''
|
||||
rm -f $kmod/lib/modules/${kernel.modDirVersion}/build
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Remove Sphinx cache files. Not only are they not useful, but they also
|
||||
# contain store paths causing spurious dependencies.
|
||||
rm -rf $out/share/doc/dpdk/html/.doctrees
|
||||
|
||||
wrapProgram $out/bin/dpdk-devbind.py \
|
||||
--prefix PATH : "${lib.makeBinPath [ pciutils ]}"
|
||||
'' + lib.optionalString (withExamples != []) ''
|
||||
find examples -type f -executable -exec install {} $out/bin \;
|
||||
mkdir -p $examples/bin
|
||||
find examples -type f -executable -exec install {} $examples/bin \;
|
||||
'';
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional mod "kmod";
|
||||
outputs =
|
||||
[ "out" "doc" ]
|
||||
++ lib.optional mod "kmod"
|
||||
++ lib.optional (withExamples != []) "examples";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of libraries and drivers for fast packet processing";
|
||||
|
|
36
pkgs/os-specific/linux/lsirec/default.nix
Normal file
36
pkgs/os-specific/linux/lsirec/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsirec";
|
||||
version = "unstable-2019-03-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcan";
|
||||
repo = "lsirec";
|
||||
rev = "2dfb6dc92649feb01a3ddcfd117d4a99098084f2";
|
||||
sha256 = "sha256-8v+KKjAJlJNpUT0poedRTQfPiDiwahrosXD35Bmh3jM=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 'lsirec' "$out/bin/lsirec"
|
||||
install -Dm755 'sbrtool.py' "$out/bin/sbrtool"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "LSI SAS2008/SAS2108 low-level recovery tool for Linux";
|
||||
homepage = "https://github.com/marcan/lsirec";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agate";
|
||||
version = "3.1.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrubeck";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA=";
|
||||
sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4=";
|
||||
cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "postgres_exporter";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wrouesnel";
|
||||
owner = "prometheus-community";
|
||||
repo = "postgres_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw=";
|
||||
sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY=";
|
||||
vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, nixosTests
|
||||
{ lib, stdenv, fetchurl, nixosTests, buildPackages
|
||||
# Native buildInputs components
|
||||
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
|
||||
# Common components
|
||||
|
@ -18,7 +18,7 @@ let # in mariadb # spans the whole file
|
|||
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
|
||||
mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
|
||||
|
||||
mariadbPackage = packageSettings: (server packageSettings) // {
|
||||
client = client packageSettings; # MariaDB Client
|
||||
|
@ -208,6 +208,10 @@ in stdenv.mkDerivation (common // {
|
|||
"-DPLUGIN_AUTH_PAM=OFF"
|
||||
"-DWITHOUT_OQGRAPH=1"
|
||||
"-DWITHOUT_PLUGIN_S3=1"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# revisit this if nixpkgs supports any architecture whose stack grows upwards
|
||||
"-DSTACK_DIRECTION=-1"
|
||||
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
|
||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||
, cctools, CoreServices, developer_cmds
|
||||
, libtirpc, rpcsvc-proto
|
||||
, libtirpc, rpcsvc-proto, nixosTests
|
||||
}:
|
||||
|
||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||
|
@ -9,11 +9,11 @@
|
|||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "mysql";
|
||||
version = "5.7.27";
|
||||
version = "5.7.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
||||
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
|
||||
sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0=";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec {
|
|||
connector-c = self;
|
||||
server = self;
|
||||
mysqlVersion = "5.7";
|
||||
tests = nixosTests.mysql.mysql57;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,17 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "t-rex";
|
||||
version = "0.14.3-beta4";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t-rex-tileserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE=";
|
||||
|
||||
hash = "sha256-LUVk5li2cl/LKbhKOh6Bbwav0GEuI/vUbDPLn7NSRIs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc=";
|
||||
cargoHash = "sha256-I4QmjTTKUp9iugEwzM0xCcNLvF5ozeBdYmbi8sytY88=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -21,6 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Vector tile server specialized on publishing MVT tiles";
|
||||
homepage = "https://t-rex.tileserver.ch/";
|
||||
changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
@ -16,9 +16,9 @@ let
|
|||
owner = "gravitational";
|
||||
repo = "teleport";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-02Wsj2V7RNjKlkgAqj7IqyRGCxml8pw5h0vflqcGAB8=";
|
||||
sha256 = "sha256-/Dn2X1VMQI1OYHmvNDlAjrLI64DFxmVmS3PeEKLFVjQ=";
|
||||
};
|
||||
version = "8.0.6";
|
||||
version = "8.1.1";
|
||||
|
||||
roleTester = rustPlatform.buildRustPackage {
|
||||
name = "teleport-roletester";
|
||||
|
@ -39,8 +39,8 @@ let
|
|||
webassets = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "webassets";
|
||||
rev = "240464d54ac498281592eb0b30c871dc3c7ce09b";
|
||||
sha256 = "sha256-8gt8x2fNh8mA1KCop5dEZmpBWBu7HsrTY5zVUlmKDgs=";
|
||||
rev = "36ba49bb58dd6933d5ed5c9599e86d2b6c828137";
|
||||
sha256 = "sha256-XgH+IjTsaJUdM54Y+L8Rf/bt6y0vB4t8IcRES2EG70s=";
|
||||
};
|
||||
in
|
||||
buildGo117Module rec {
|
||||
|
|
27
pkgs/servers/web-apps/ethercalc/default.nix
Normal file
27
pkgs/servers/web-apps/ethercalc/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, nodejs-14_x
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-14_x;
|
||||
|
||||
nodePackages = import ./node-packages.nix {
|
||||
inherit pkgs nodejs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
};
|
||||
|
||||
ethercalc = lib.head (lib.attrValues nodePackages);
|
||||
|
||||
combined = ethercalc.override {
|
||||
meta = with lib; {
|
||||
description = "Online collaborative spreadsheet";
|
||||
license = with licenses; [ cpal10 artistic2 mit asl20 cc0 mpl20 ];
|
||||
homepage = "https://github.com/audreyt/ethercalc";
|
||||
maintainers = with maintainers; [ iblech ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
combined
|
15
pkgs/servers/web-apps/ethercalc/generate.sh
Executable file
15
pkgs/servers/web-apps/ethercalc/generate.sh
Executable file
|
@ -0,0 +1,15 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix
|
||||
|
||||
# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
|
||||
# Else `nix-shell` will not find this script.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd -- "$(dirname -- "$BASH_SOURCE[0]")"
|
||||
|
||||
node2nix \
|
||||
--input node-packages.json \
|
||||
--output node-packages-generated.nix \
|
||||
--composition node-packages.nix \
|
||||
--node-env ../../../development/node-packages/node-env.nix
|
2086
pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
Normal file
2086
pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
Normal file
File diff suppressed because it is too large
Load diff
3
pkgs/servers/web-apps/ethercalc/node-packages.json
Normal file
3
pkgs/servers/web-apps/ethercalc/node-packages.json
Normal file
|
@ -0,0 +1,3 @@
|
|||
[
|
||||
{ "whitebophir": "git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" }
|
||||
]
|
17
pkgs/servers/web-apps/ethercalc/node-packages.nix
generated
Normal file
17
pkgs/servers/web-apps/ethercalc/node-packages.nix
generated
Normal file
|
@ -0,0 +1,17 @@
|
|||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages-generated.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
let
|
||||
pname = "plausible";
|
||||
version = "1.4.0";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plausible";
|
||||
repo = "analytics";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d31y7mwvml17w97dm5c4312n0ciq39kf4hz3g80hdzbbn72mi4q";
|
||||
sha256 = "1aa5nkwb4qz599zb77dhwrvn5gwcdiyji4vbxmayn2zhv2vhj36d";
|
||||
};
|
||||
|
||||
# TODO consider using `mix2nix` as soon as it supports git dependencies.
|
||||
|
|
|
@ -64,5 +64,5 @@
|
|||
"webpack-bundle-analyzer": "^4.4.2"
|
||||
},
|
||||
"name": "plausible",
|
||||
"version": "v1.4.0"
|
||||
"version": "v1.4.3"
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -34,28 +34,28 @@ let
|
|||
tomlplusplus = fetchFromGitHub {
|
||||
owner = "marzer";
|
||||
repo = "tomlplusplus";
|
||||
rev = "47216c8a73d77e7431ec536fb3e251aed06cc420";
|
||||
sha256 = "sha256-cwAzWu5j3ch/56a6JmEoKCsxVNTk6tiZswNdNT6qzX0=";
|
||||
rev = "8e669aa6990e0ed219c169d491472d749f54c393";
|
||||
sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";
|
||||
};
|
||||
|
||||
# Derived from vst3.wrap
|
||||
vst3 = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = "vst3sdk";
|
||||
rev = "v3.7.3_build_20-patched";
|
||||
rev = "v3.7.4_build_25-patched";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ=";
|
||||
sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A=";
|
||||
};
|
||||
in multiStdenv.mkDerivation rec {
|
||||
pname = "yabridge";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
||||
src = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dz7kScNrVUsjokJntzUCJzDIboqi3vQI+RpXl0UFmUQ=";
|
||||
sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY=";
|
||||
};
|
||||
|
||||
# Unpack subproject sources
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 8eae0442..ec0649da 100644
|
||||
index 95ecb728..cb30f3af 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -196,6 +196,7 @@ if with_32bit_libraries or with_bitbridge
|
||||
@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge
|
||||
'boost_filesystem',
|
||||
static : with_static_boost,
|
||||
dirs : [
|
||||
|
@ -10,7 +10,7 @@ index 8eae0442..ec0649da 100644
|
|||
# Used by Arch based distros
|
||||
'/usr/local/lib32',
|
||||
'/usr/lib32',
|
||||
@@ -219,7 +220,7 @@ if is_64bit_system
|
||||
@@ -224,7 +225,7 @@ if is_64bit_system
|
||||
xcb_64bit_dep = dependency('xcb')
|
||||
endif
|
||||
if with_32bit_libraries or with_bitbridge
|
||||
|
@ -20,7 +20,7 @@ index 8eae0442..ec0649da 100644
|
|||
|
||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||
index 6e32b4c9..f6eb09eb 100644
|
||||
index 1a457f03..20ca1e63 100644
|
||||
--- a/src/plugin/utils.cpp
|
||||
+++ b/src/plugin/utils.cpp
|
||||
@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const {
|
||||
|
|
|
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
src = yabridge.src;
|
||||
sourceRoot = "source/tools/yabridgectl";
|
||||
cargoSha256 = "sha256-/VREh/f4bAt2DXCqK0noEjn+4hcK5VZUn+gdbYbeAmk=";
|
||||
cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8=";
|
||||
|
||||
patches = [
|
||||
# By default, yabridgectl locates libyabridge.so by using
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
|
||||
index bc5ccfc4..c6d119bc 100644
|
||||
index bc5f6a81..0fcd38d3 100644
|
||||
--- a/tools/yabridgectl/src/config.rs
|
||||
+++ b/tools/yabridgectl/src/config.rs
|
||||
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};
|
||||
|
@ -10,7 +10,7 @@ index bc5ccfc4..c6d119bc 100644
|
|||
use std::path::{Path, PathBuf};
|
||||
use which::which;
|
||||
use xdg::BaseDirectories;
|
||||
@@ -233,34 +234,24 @@ impl Config {
|
||||
@@ -235,34 +236,27 @@ impl Config {
|
||||
}
|
||||
}
|
||||
None => {
|
||||
|
@ -20,6 +20,8 @@ index bc5ccfc4..c6d119bc 100644
|
|||
- // in the error message when `libyabridge-vst2.so` can't be found.
|
||||
- let system_path = Path::new("/usr/lib");
|
||||
+ // Search through NIX_PROFILES & data home directory if no path was set explicitly.
|
||||
+ // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to
|
||||
+ // the least specific (the system profile).
|
||||
+ let nix_profiles = env::var("NIX_PROFILES");
|
||||
let user_path = xdg_dirs.get_data_home();
|
||||
- let lib_directories = [
|
||||
|
@ -35,6 +37,7 @@ index bc5ccfc4..c6d119bc 100644
|
|||
- ];
|
||||
+ let lib_directories = nix_profiles.iter()
|
||||
+ .flat_map(|profiles| profiles.split(' ')
|
||||
+ .rev()
|
||||
+ .map(|profile| Path::new(profile).join("lib")))
|
||||
+ .chain(iter::once(user_path.clone()));
|
||||
+
|
||||
|
@ -56,12 +59,12 @@ index bc5ccfc4..c6d119bc 100644
|
|||
));
|
||||
}
|
||||
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
|
||||
index 8c273f92..432619ec 100644
|
||||
index 48cce4fa..209e40e4 100644
|
||||
--- a/tools/yabridgectl/src/main.rs
|
||||
+++ b/tools/yabridgectl/src/main.rs
|
||||
@@ -148,7 +148,7 @@ fn main() -> Result<()> {
|
||||
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
|
||||
.long_about(
|
||||
@@ -151,7 +151,7 @@ fn main() -> Result<()> {
|
||||
.help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
|
||||
.long_help(
|
||||
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
|
||||
- is not set, then yabridgectl will look in both '/usr/lib' and \
|
||||
+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fd";
|
||||
version = "8.3.1";
|
||||
version = "8.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "fd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o=";
|
||||
sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo=";
|
||||
cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm2pgsql";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ=";
|
||||
sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vivid";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA=";
|
||||
sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg=";
|
||||
cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A generator for LS_COLORS with support for multiple color themes";
|
||||
|
|
|
@ -34,12 +34,16 @@ stdenv.mkDerivation rec {
|
|||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
]
|
||||
++ lib.optionals enablePrivSep [
|
||||
"--enable-privsep"
|
||||
# dhcpcd disables privsep if it can't find the default user,
|
||||
# so we explicitly specify a user.
|
||||
"--privsepuser=dhcpcd"
|
||||
];
|
||||
++ (
|
||||
if ! enablePrivSep
|
||||
then [ "--disable-privsep" ]
|
||||
else [
|
||||
"--enable-privsep"
|
||||
# dhcpcd disables privsep if it can't find the default user,
|
||||
# so we explicitly specify a user.
|
||||
"--privsepuser=dhcpcd"
|
||||
]
|
||||
);
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
|
@ -50,7 +54,10 @@ stdenv.mkDerivation rec {
|
|||
# Check that the udev plugin got built.
|
||||
postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
|
||||
|
||||
passthru.tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; };
|
||||
passthru = {
|
||||
inherit enablePrivSep;
|
||||
tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue