Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
+1
-1
@@ -19,7 +19,7 @@
|
||||
|
||||
# Libraries
|
||||
/lib @edolstra @nbp @infinisil
|
||||
/lib/systems @nbp @ericson2314 @matthewbauer
|
||||
/lib/systems @alyssais @nbp @ericson2314 @matthewbauer
|
||||
/lib/generators.nix @edolstra @nbp @Profpatsch
|
||||
/lib/cli.nix @edolstra @nbp @Profpatsch
|
||||
/lib/debug.nix @edolstra @nbp @Profpatsch
|
||||
|
||||
@@ -15,6 +15,6 @@ jobs:
|
||||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
# explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
|
||||
- run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'
|
||||
|
||||
@@ -28,7 +28,7 @@ jobs:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
if: env.PR_DIFF
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
if: env.PR_DIFF
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v12
|
||||
- uses: cachix/install-nix-action@v14
|
||||
- name: Check DocBook files generated from Markdown are consistent
|
||||
run: |
|
||||
nixos/doc/manual/md-to-db.sh
|
||||
|
||||
@@ -107,6 +107,7 @@ rec {
|
||||
else if final.isMips then "mips"
|
||||
else if final.isPower then "powerpc"
|
||||
else if final.isRiscV then "riscv"
|
||||
else if final.isS390 then "s390"
|
||||
else final.parsed.cpu.name;
|
||||
|
||||
qemuArch =
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux"
|
||||
"powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
|
||||
"riscv64-linux" "s390-linux" "x86_64-linux"
|
||||
"riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
|
||||
|
||||
# MMIXware
|
||||
"mmix-mmixware"
|
||||
@@ -41,7 +41,8 @@ let
|
||||
# none
|
||||
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none"
|
||||
"msp430-none" "or1k-none" "m68k-none" "powerpc-none"
|
||||
"riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none"
|
||||
"riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none"
|
||||
"x86_64-none"
|
||||
|
||||
# OpenBSD
|
||||
"i686-openbsd" "x86_64-openbsd"
|
||||
|
||||
@@ -152,6 +152,10 @@ rec {
|
||||
config = "s390-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
s390x = {
|
||||
config = "s390x-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
arm-embedded = {
|
||||
config = "arm-none-eabi";
|
||||
libc = "newlib";
|
||||
|
||||
@@ -106,6 +106,7 @@ rec {
|
||||
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
|
||||
|
||||
s390 = { bits = 32; significantByte = bigEndian; family = "s390"; };
|
||||
s390x = { bits = 64; significantByte = bigEndian; family = "s390"; };
|
||||
|
||||
sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };
|
||||
sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };
|
||||
|
||||
@@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests {
|
||||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
||||
@@ -9594,6 +9594,12 @@
|
||||
githubId = 115821;
|
||||
name = "Sam Rose";
|
||||
};
|
||||
samuela = {
|
||||
email = "skainsworth@gmail.com";
|
||||
github = "samuela";
|
||||
githubId = 226872;
|
||||
name = "Samuel Ainsworth";
|
||||
};
|
||||
samueldr = {
|
||||
email = "samuel@dionne-riel.com";
|
||||
github = "samueldr";
|
||||
|
||||
@@ -103,7 +103,7 @@ let
|
||||
pathContent = lib.attrByPath prefix null pkgs;
|
||||
in
|
||||
if pathContent == null then
|
||||
builtins.throw "Attribute path `${path}` does not exists."
|
||||
builtins.throw "Attribute path `${path}` does not exist."
|
||||
else
|
||||
packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg)
|
||||
pathContent;
|
||||
@@ -115,7 +115,7 @@ let
|
||||
package = lib.attrByPath (lib.splitString "." path) null pkgs;
|
||||
in
|
||||
if package == null then
|
||||
builtins.throw "Package with an attribute name `${path}` does not exists."
|
||||
builtins.throw "Package with an attribute name `${path}` does not exist."
|
||||
else if ! builtins.hasAttr "updateScript" package then
|
||||
builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined."
|
||||
else
|
||||
|
||||
@@ -551,6 +551,22 @@
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<option>--use-substitutes</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
When set, nixos-rebuild will add <option>--use-substitutes</option>
|
||||
to each invocation of nix-copy-closure. This will only affect the
|
||||
behavior of nixos-rebuild if <option>--target-host</option> or
|
||||
<option>--build-host</option> is also set. This is useful when
|
||||
the target-host connection to cache.nixos.org is faster than the
|
||||
connection between hosts.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<option>--use-remote-sudo</option>
|
||||
|
||||
@@ -4,7 +4,15 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.spotifyd;
|
||||
spotifydConf = pkgs.writeText "spotifyd.conf" cfg.config;
|
||||
toml = pkgs.formats.toml {};
|
||||
warnConfig =
|
||||
if cfg.config != ""
|
||||
then lib.trace "Using the stringly typed .config attribute is discouraged. Use the TOML typed .settings attribute instead."
|
||||
else id;
|
||||
spotifydConf =
|
||||
if cfg.settings != {}
|
||||
then toml.generate "spotify.conf" cfg.settings
|
||||
else warnConfig (pkgs.writeText "spotifyd.conf" cfg.config);
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -14,6 +22,16 @@ in
|
||||
config = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
(Deprecated) Configuration for Spotifyd. For syntax and directives, see
|
||||
<link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
default = {};
|
||||
type = toml.type;
|
||||
example = { global.bitrate = 320; };
|
||||
description = ''
|
||||
Configuration for Spotifyd. For syntax and directives, see
|
||||
<link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
|
||||
@@ -23,6 +41,13 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.config == "" || cfg.settings == {};
|
||||
message = "At most one of the .config attribute and the .settings attribute may be set";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.spotifyd = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" "sound.target" ];
|
||||
|
||||
@@ -324,7 +324,7 @@ in
|
||||
autoCreation = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description = "Automatically create the destination dataset if it does not exists.";
|
||||
description = "Automatically create the destination dataset if it does not exist.";
|
||||
};
|
||||
|
||||
zetup = mkOption {
|
||||
|
||||
@@ -41,7 +41,7 @@ let
|
||||
validated = pkgs.runCommand "nagios-checked.cfg" {preferLocalBuild=true;} ''
|
||||
cp ${file} nagios.cfg
|
||||
# nagios checks the existence of /var/lib/nagios, but
|
||||
# it does not exists in the build sandbox, so we fake it
|
||||
# it does not exist in the build sandbox, so we fake it
|
||||
mkdir lib
|
||||
lib=$(readlink -f lib)
|
||||
sed -i s@=${nagiosState}@=$lib@ nagios.cfg
|
||||
|
||||
@@ -119,7 +119,7 @@ in
|
||||
password, and the <option>syncserver.secret</option> setting is used by the server to
|
||||
generate cryptographically-signed authentication tokens.
|
||||
|
||||
If this file does not exists, then it is created with a generated
|
||||
If this file does not exist, then it is created with a generated
|
||||
<option>syncserver.secret</option> settings.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -61,6 +61,8 @@ let
|
||||
substituteInPlace $out/dry-activate --subst-var out
|
||||
chmod u+x $out/activate $out/dry-activate
|
||||
unset activationScript dryActivationScript
|
||||
${pkgs.runtimeShell} -n $out/activate
|
||||
${pkgs.runtimeShell} -n $out/dry-activate
|
||||
|
||||
cp ${config.system.build.bootStage2} $out/init
|
||||
substituteInPlace $out/init --subst-var-by systemConfig $out
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "3.5.0";
|
||||
version = "3.7.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg==";
|
||||
sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
@@ -34,7 +34,7 @@ in appimageTools.wrapType2 {
|
||||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.17.2.2";
|
||||
version = "0.17.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd";
|
||||
sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero";
|
||||
version = "0.17.2.0";
|
||||
version = "0.17.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6";
|
||||
sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "452";
|
||||
version = "454";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1";
|
||||
sha256 = "sha256-AX72fOiwp/CLaaGxBBKlcRskwayHCeUC2/FGUoXp3lU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU=";
|
||||
sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc=";
|
||||
vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
|
||||
|
||||
@@ -3,20 +3,20 @@
|
||||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18118";
|
||||
version = "18193";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym";
|
||||
sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
|
||||
sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397";
|
||||
sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
rev = version;
|
||||
sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1";
|
||||
sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --subst-var out
|
||||
patchShebangs bin/ulauncher-toggle
|
||||
substituteInPlace bin/ulauncher-toggle \
|
||||
--replace wmctrl ${wmctrl}/bin/wmctrl
|
||||
'';
|
||||
|
||||
# https://github.com/Ulauncher/Ulauncher/issues/390
|
||||
@@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# do not double wrap
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}")
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "94.0.4606.31",
|
||||
"sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf",
|
||||
"sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z",
|
||||
"version": "94.0.4606.41",
|
||||
"sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij",
|
||||
"sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,10 +7,10 @@ in
|
||||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "91.0.2";
|
||||
version = "92.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7";
|
||||
sha512 = "1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -32,10 +32,10 @@ rec {
|
||||
|
||||
firefox-esr-91 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.0.1esr";
|
||||
version = "91.1.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "79703b3ec615d10957350719b2c034df10fd47d140c3557cd7de665ef4430973b97c1906d5408ddaf8855c1424e87eb9b1b568322ad8fbdb956fca219a865d66";
|
||||
sha512 = "dad0249eb2ce66eb90ff5daf0dfb63105a19790dd45661d977f7cc889644e86b33b9b0c472f46d4032ae2e4fe02c2cf69d552156fb0ad4cf77a15b3542556ed3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -57,10 +57,10 @@ rec {
|
||||
|
||||
firefox-esr-78 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "78.13.0esr";
|
||||
version = "78.14.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef";
|
||||
sha512 = "5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9";
|
||||
sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.1.136";
|
||||
version = "3.1.137";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "v${version}";
|
||||
sha256 = "058sja2miwhr6lx5j8r9d97k4ywh6dsxd05nb5w19z6a0sq1vmyb";
|
||||
sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -25,7 +25,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.16.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.17.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j";
|
||||
sha256 = "1m3bkrshlipxlbf4xr7gpw3zn1k39cdysrqmw705hy2cwf7pw7yy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mailspring";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
|
||||
sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE=";
|
||||
sha256 = "sha256-o7w2XHd5FnPYt9j8IIGy6OgKtdeNb/qZ+EiXGEn0NUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch";
|
||||
version = "0.32.3";
|
||||
version = "0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
|
||||
sha256 = "114bbyjl2ppmy4pw0b5zwmi7lxiz6xd1k6zq0qcgdv7ahkwgybxy";
|
||||
hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||
doxygen # (optional) api docs
|
||||
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
|
||||
texinfo # (optional) documentation -> doc/INSTALL
|
||||
pythonPackages.cffi
|
||||
] ++ lib.optional withEmacs emacs;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
, xclip ? null
|
||||
, pbcopy ? null
|
||||
@@ -21,6 +21,15 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version >0.9.2 is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch";
|
||||
sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5";
|
||||
name = "replace-decodestring-with-decodebytes.patch";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with python3Packages; [
|
||||
python
|
||||
wrapPython
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvidia-container";
|
||||
version = "1.3.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp";
|
||||
sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/^REVISION :=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
|
||||
@@ -25,21 +25,20 @@ let
|
||||
in
|
||||
buildGoPackage rec {
|
||||
pname = "nvidia-container-runtime";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
|
||||
sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/${pname}/src";
|
||||
goPackagePath = "github.com/nvidia/nvidia-container-runtime";
|
||||
ldflags = [ "-s" "-w" ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{src,nvidia-container-runtime}
|
||||
mkdir -p $out/etc/nvidia-container-runtime
|
||||
|
||||
# nvidia-container-runtime invokes docker-runc or runc if that isn't
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nvidia-container-toolkit";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
|
||||
sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
|
||||
|
||||
@@ -15,11 +15,11 @@ with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "singularity";
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
|
||||
sha256 = "sha256-mWYR3sQCtNNyuLlFbdnsHLQ3EtCFAuRV84UhvRmYVtM=";
|
||||
sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/sylabs/singularity";
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.041";
|
||||
version = "0.042";
|
||||
|
||||
in
|
||||
fetchzip {
|
||||
name = "JuliaMono-ttf-${version}";
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
|
||||
sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360=";
|
||||
sha256 = "sha256-oXODkeLDT5GXO4+r1fGaRrRS/SSBhzro5XE0GOwl4mQ=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
@@ -25,7 +25,7 @@ fetchzip {
|
||||
'';
|
||||
maintainers = with maintainers; [ suhr ];
|
||||
platforms = with platforms; all;
|
||||
homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/";
|
||||
homepage = "https://juliamono.netlify.app/";
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
, rocm-runtime
|
||||
, rocm-thunk
|
||||
, rocminfo
|
||||
, writeScript
|
||||
, writeText
|
||||
}:
|
||||
|
||||
@@ -163,4 +164,19 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${lld}/bin --set NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt} 1 --prefix NIX_LDFLAGS ' ' -L${compiler-rt}/lib --prefix NIX_LDFLAGS_FOR_TARGET ' ' -L${compiler-rt}/lib
|
||||
wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version hip "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++ Heterogeneous-Compute Interface for Portability";
|
||||
homepage = "https://github.com/ROCm-Developer-Tools/HIP";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, cmake
|
||||
, python3
|
||||
, libxml2
|
||||
@@ -88,6 +89,23 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
passthru.src = src;
|
||||
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
|
||||
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
|
||||
current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)"
|
||||
if [[ "$version" != "$current_version" ]]; then
|
||||
tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")"
|
||||
tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))"
|
||||
sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \
|
||||
-e 's,version = "\(.*\)",version = "'"$version"'",' \
|
||||
-e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",'
|
||||
else
|
||||
echo rocm-llvm already up-to-date
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ROCm fork of the LLVM compiler infrastructure";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "8.3.9";
|
||||
version = "8.3.29";
|
||||
packInstall = swiplPath: pack:
|
||||
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
||||
'';
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz";
|
||||
sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.swi-prolog.org";
|
||||
description = "A Prolog compiler and interpreter";
|
||||
license = lib.licenses.bsd2;
|
||||
|
||||
mainProgram = "swipl";
|
||||
platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.meditans ];
|
||||
};
|
||||
|
||||
@@ -1,30 +1,39 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, shen-sources
|
||||
, sbcl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shen-sbcl-${version}";
|
||||
pname = "shen-sbcl";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz";
|
||||
sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz";
|
||||
};
|
||||
buildInputs = [
|
||||
sbcl shen-sources
|
||||
];
|
||||
buildPhase = ''
|
||||
|
||||
nativeBuildInputs = [ sbcl ];
|
||||
|
||||
preBuild = ''
|
||||
ln -s ${shen-sources} kernel
|
||||
make sbcl
|
||||
'';
|
||||
|
||||
buildFlags = [ "build-sbcl" ];
|
||||
|
||||
checkTarget = "test-sbcl";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://shenlanguage.org;
|
||||
homepage = "https://shenlanguage.org";
|
||||
description = "Port of Shen running on Steel Bank Common Lisp";
|
||||
changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md";
|
||||
platforms = sbcl.meta.platforms;
|
||||
maintainers = with maintainers; [ bsima ];
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shen-sources-${version}";
|
||||
version = "22.3";
|
||||
pname = "shen-sources";
|
||||
version = "22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz";
|
||||
sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q";
|
||||
sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260";
|
||||
};
|
||||
|
||||
buildInputs = [];
|
||||
buildPhase = "";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp . $out -R
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://shenlanguage.org;
|
||||
homepage = "https://shenlanguage.org";
|
||||
description = "Source code for the Shen Language";
|
||||
changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ bsima ];
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "3.120.3";
|
||||
version = "4.157.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80";
|
||||
sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml"
|
||||
"-Ddemos=false"
|
||||
"-Ddemos=false" # Don't build and install the demo programs
|
||||
"-Dd3d11=disabled" # Disable the Direct3D 11 based renderer
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -4,22 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liburing";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://git.kernel.dk/${pname}";
|
||||
rev = "liburing-${version}";
|
||||
sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn";
|
||||
sha256 = "sha256-7wSpKqjIdQeOdsQu4xN3kFHV49n6qQ3xVbjUcY1tmas=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build on 32-bit ARM
|
||||
(fetchpatch {
|
||||
url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch";
|
||||
sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
enableParallelBuilding = true;
|
||||
# Upstream's configure script is not autoconf generated, but a hand written one.
|
||||
|
||||
@@ -27,7 +27,7 @@ let
|
||||
# It will rebuild itself using the version of this package (NSS) and if
|
||||
# an update is required do the required changes to the expression.
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
version = "3.68";
|
||||
version = "3.70";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0nvj7h2brcw21p1z99nrsxka056d0r1yy9nqqg0lw0w3mhnb60n4";
|
||||
sha256 = "sha256-K4mruGAe5AW+isW1cD1x8fs4pRw6ZKPYNDh/eLMlURs=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
, clang
|
||||
@@ -51,6 +52,13 @@ stdenv.mkDerivation rec {
|
||||
--replace "/build/source/build" "$out"
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version rocclr "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Radeon Open Compute common language runtime";
|
||||
homepage = "https://github.com/ROCm-Developer-Tools/ROCclr";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, clang, rocm-device-libs, lld, llvm }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, lld, llvm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-comgr";
|
||||
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
|
||||
-i CMakeLists.txt
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
|
||||
update-source-version rocm-comgr "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "APIs for compiling and inspecting AMDGPU code objects";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, cmake
|
||||
, clang
|
||||
, clang-unwrapped
|
||||
@@ -30,6 +31,13 @@ stdenv.mkDerivation rec {
|
||||
"-DCLANG=${clang}/bin/clang"
|
||||
];
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
|
||||
update-source-version rocm-device-libs "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of AMD-specific device-side language runtime libraries";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, addOpenGLRunpath
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
@@ -74,6 +75,13 @@ stdenv.mkDerivation rec {
|
||||
echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version rocm-opencl-runtime "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, addOpenGLRunpath
|
||||
, clang-unwrapped
|
||||
, cmake
|
||||
@@ -41,6 +42,13 @@ stdenv.mkDerivation rec {
|
||||
rm -rf $out/hsa
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
|
||||
update-source-version rocm-runtime "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Platform runtime for ROCm";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, cmake
|
||||
, pkg-config
|
||||
, numactl
|
||||
@@ -28,6 +29,13 @@ stdenv.mkDerivation rec {
|
||||
cp -r $src/include $out
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version rocm-thunk "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Radeon open compute thunk interface";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zimg";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sekrit-twc";
|
||||
repo = "zimg";
|
||||
rev = "release-${version}";
|
||||
sha256 = "19qim6vyfas0m09piiw0pw7i0xjzi8vs6bx716gz472nflsg1604";
|
||||
sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
|
||||
|
||||
export ANDROID_SERIAL="emulator-$port"
|
||||
|
||||
# Create a virtual android device for testing if it does not exists
|
||||
# Create a virtual android device for testing if it does not exist
|
||||
${sdk}/libexec/android-sdk/tools/bin/avdmanager list target
|
||||
|
||||
if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ]
|
||||
|
||||
@@ -267,6 +267,18 @@ let
|
||||
meta.mainProgram = "postcss";
|
||||
};
|
||||
|
||||
prisma = super.prisma.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
--prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \
|
||||
--prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \
|
||||
--prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node"
|
||||
--prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \
|
||||
--prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt"
|
||||
'';
|
||||
};
|
||||
|
||||
pulp = super.pulp.override {
|
||||
# tries to install purescript
|
||||
npmFlags = "--ignore-scripts";
|
||||
|
||||
@@ -205,6 +205,7 @@
|
||||
, "postcss-cli"
|
||||
, "prettier"
|
||||
, "prettier-plugin-toml"
|
||||
, "prisma"
|
||||
, "pscid"
|
||||
, "pulp"
|
||||
, "purescript-language-server"
|
||||
|
||||
+117
-38
@@ -5206,6 +5206,15 @@ let
|
||||
sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA==";
|
||||
};
|
||||
};
|
||||
"@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = {
|
||||
name = "_at_prisma_slash_engines";
|
||||
packageName = "@prisma/engines";
|
||||
version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz";
|
||||
sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg==";
|
||||
};
|
||||
};
|
||||
"@protobufjs/aspromise-1.1.2" = {
|
||||
name = "_at_protobufjs_slash_aspromise";
|
||||
packageName = "@protobufjs/aspromise";
|
||||
@@ -5566,13 +5575,13 @@ let
|
||||
sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog==";
|
||||
};
|
||||
};
|
||||
"@serverless/utils-5.8.1" = {
|
||||
"@serverless/utils-5.9.0" = {
|
||||
name = "_at_serverless_slash_utils";
|
||||
packageName = "@serverless/utils";
|
||||
version = "5.8.1";
|
||||
version = "5.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.8.1.tgz";
|
||||
sha512 = "tUOvlGq9xpLrq6dguH4bjAJqycoOUx7aVJIjbX4T7MZxuovxg/x2ZXc+Hrfqq0t+jRKVm78ZjHCjCASJDxbYPA==";
|
||||
url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.9.0.tgz";
|
||||
sha512 = "cAPOndJ78N5o3Q4WVXfy/z1bE5QPCUwT2DPj06bd3DGHV3api+NZLeOECG4AdcyPREw/9w1oNxw9555q903KwA==";
|
||||
};
|
||||
};
|
||||
"@serverless/utils-china-1.1.4" = {
|
||||
@@ -25478,15 +25487,6 @@ let
|
||||
sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==";
|
||||
};
|
||||
};
|
||||
"fast-safe-stringify-2.1.0" = {
|
||||
name = "fast-safe-stringify";
|
||||
packageName = "fast-safe-stringify";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.0.tgz";
|
||||
sha512 = "xHSIyDJTOVQjtMBGcUokl3tpaOKgTyVTjlHj255V4Q4J1oho3cnrWrf5sCx8z1jq7gzNMv8y0PH53pYYuZUFPQ==";
|
||||
};
|
||||
};
|
||||
"fast-safe-stringify-2.1.1" = {
|
||||
name = "fast-safe-stringify";
|
||||
packageName = "fast-safe-stringify";
|
||||
@@ -34003,13 +34003,13 @@ let
|
||||
sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
|
||||
};
|
||||
};
|
||||
"jest-worker-27.1.0" = {
|
||||
"jest-worker-27.1.1" = {
|
||||
name = "jest-worker";
|
||||
packageName = "jest-worker";
|
||||
version = "27.1.0";
|
||||
version = "27.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz";
|
||||
sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg==";
|
||||
url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz";
|
||||
sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==";
|
||||
};
|
||||
};
|
||||
"jimp-compact-0.16.1" = {
|
||||
@@ -56400,6 +56400,33 @@ let
|
||||
sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39";
|
||||
};
|
||||
};
|
||||
"ssb-bendy-butt-0.12.3" = {
|
||||
name = "ssb-bendy-butt";
|
||||
packageName = "ssb-bendy-butt";
|
||||
version = "0.12.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz";
|
||||
sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw==";
|
||||
};
|
||||
};
|
||||
"ssb-bfe-3.1.1" = {
|
||||
name = "ssb-bfe";
|
||||
packageName = "ssb-bfe";
|
||||
version = "3.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz";
|
||||
sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA==";
|
||||
};
|
||||
};
|
||||
"ssb-bfe-spec-0.3.0" = {
|
||||
name = "ssb-bfe-spec";
|
||||
packageName = "ssb-bfe-spec";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz";
|
||||
sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q==";
|
||||
};
|
||||
};
|
||||
"ssb-blobs-1.2.2" = {
|
||||
name = "ssb-blobs";
|
||||
packageName = "ssb-blobs";
|
||||
@@ -56454,13 +56481,13 @@ let
|
||||
sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
|
||||
};
|
||||
};
|
||||
"ssb-db2-2.3.1" = {
|
||||
"ssb-db2-2.4.0" = {
|
||||
name = "ssb-db2";
|
||||
packageName = "ssb-db2";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz";
|
||||
sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q==";
|
||||
url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz";
|
||||
sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA==";
|
||||
};
|
||||
};
|
||||
"ssb-ebt-5.6.7" = {
|
||||
@@ -56697,6 +56724,15 @@ let
|
||||
sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg==";
|
||||
};
|
||||
};
|
||||
"ssb-typescript-2.5.0" = {
|
||||
name = "ssb-typescript";
|
||||
packageName = "ssb-typescript";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz";
|
||||
sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA==";
|
||||
};
|
||||
};
|
||||
"ssb-unix-socket-1.0.0" = {
|
||||
name = "ssb-unix-socket";
|
||||
packageName = "ssb-unix-socket";
|
||||
@@ -56706,6 +56742,15 @@ let
|
||||
sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA==";
|
||||
};
|
||||
};
|
||||
"ssb-uri2-1.5.2" = {
|
||||
name = "ssb-uri2";
|
||||
packageName = "ssb-uri2";
|
||||
version = "1.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz";
|
||||
sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ==";
|
||||
};
|
||||
};
|
||||
"ssb-validate-4.1.4" = {
|
||||
name = "ssb-validate";
|
||||
packageName = "ssb-validate";
|
||||
@@ -69128,7 +69173,7 @@ in
|
||||
sources."is-stream-2.0.1"
|
||||
sources."is-unicode-supported-0.1.0"
|
||||
sources."isexe-2.0.0"
|
||||
(sources."jest-worker-27.1.0" // {
|
||||
(sources."jest-worker-27.1.1" // {
|
||||
dependencies = [
|
||||
sources."supports-color-8.1.1"
|
||||
];
|
||||
@@ -72410,7 +72455,7 @@ in
|
||||
sources."es-to-primitive-1.2.1"
|
||||
sources."events-3.3.0"
|
||||
sources."evp_bytestokey-1.0.3"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."foreach-2.0.5"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
@@ -77339,7 +77384,7 @@ in
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."enabled-2.0.0"
|
||||
sources."eventemitter3-4.0.7"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fecha-4.2.1"
|
||||
sources."fn.name-1.1.0"
|
||||
sources."follow-redirects-1.14.3"
|
||||
@@ -84467,7 +84512,7 @@ in
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-glob-3.2.7"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."faye-websocket-0.10.0"
|
||||
sources."fecha-4.2.1"
|
||||
@@ -87330,7 +87375,7 @@ in
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fast-text-encoding-1.0.3"
|
||||
(sources."fast-url-parser-1.1.3" // {
|
||||
dependencies = [
|
||||
@@ -90628,7 +90673,7 @@ in
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-glob-3.2.7"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."figlet-1.5.0"
|
||||
sources."figures-3.2.0"
|
||||
@@ -98950,7 +98995,7 @@ in
|
||||
sources."extsprintf-1.3.0"
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fb-watchman-2.0.1"
|
||||
sources."figgy-pudding-3.5.2"
|
||||
sources."file-uri-to-path-1.0.0"
|
||||
@@ -100550,7 +100595,7 @@ in
|
||||
sources."diagnostics-1.1.1"
|
||||
sources."enabled-1.0.2"
|
||||
sources."env-variable-0.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fecha-2.3.3"
|
||||
sources."inherits-2.0.4"
|
||||
sources."is-arrayish-0.3.2"
|
||||
@@ -101469,7 +101514,7 @@ in
|
||||
sources."fast-equals-2.0.3"
|
||||
sources."fast-glob-2.2.7"
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."fd-slicer-1.1.0"
|
||||
sources."fecha-4.2.1"
|
||||
@@ -107653,6 +107698,27 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
prisma = nodeEnv.buildNodePackage {
|
||||
name = "prisma";
|
||||
packageName = "prisma";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz";
|
||||
sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one.";
|
||||
homepage = "https://www.prisma.io";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
pscid = nodeEnv.buildNodePackage {
|
||||
name = "pscid";
|
||||
packageName = "pscid";
|
||||
@@ -107791,7 +107857,7 @@ in
|
||||
sources."es6-promise-3.3.1"
|
||||
sources."events-2.1.0"
|
||||
sources."evp_bytestokey-1.0.3"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
sources."gaze-1.1.3"
|
||||
@@ -111833,7 +111899,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."@serverless/template-1.1.4"
|
||||
(sources."@serverless/utils-5.8.1" // {
|
||||
(sources."@serverless/utils-5.9.0" // {
|
||||
dependencies = [
|
||||
sources."cli-progress-footer-2.0.0"
|
||||
sources."get-stream-6.0.1"
|
||||
@@ -113282,10 +113348,10 @@ in
|
||||
snyk = nodeEnv.buildNodePackage {
|
||||
name = "snyk";
|
||||
packageName = "snyk";
|
||||
version = "1.698.0";
|
||||
version = "1.700.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/snyk/-/snyk-1.698.0.tgz";
|
||||
sha512 = "ivOZ1VCRwGvtOG6c3etxLPdwRjjnXvg9aSXRP7oOSZDQvEWouKDh9HpvkTHm8mZgFACw6hU1cmBseHyMfpYnkw==";
|
||||
url = "https://registry.npmjs.org/snyk/-/snyk-1.700.0.tgz";
|
||||
sha512 = "nhhgv2Dh8Wh/qrt5gjS+RrQjEUfwEOU4W6KZnnQrmVAfFwZ4Uis+pXcoTTJtsg/xJ0/eXV/v2UxA6PKPkYMeOw==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
@@ -113589,6 +113655,7 @@ in
|
||||
sources."base64-js-1.5.1"
|
||||
sources."base64-url-2.3.3"
|
||||
sources."bash-color-0.0.4"
|
||||
sources."bencode-2.0.2"
|
||||
sources."binary-extensions-1.13.1"
|
||||
sources."binary-search-1.3.6"
|
||||
sources."binary-search-bounds-2.0.5"
|
||||
@@ -114098,6 +114165,7 @@ in
|
||||
sources."push-stream-11.0.1"
|
||||
];
|
||||
})
|
||||
sources."querystringify-2.2.0"
|
||||
sources."quicktask-1.0.1"
|
||||
sources."railroad-diagrams-1.0.0"
|
||||
sources."randexp-0.4.6"
|
||||
@@ -114193,6 +114261,7 @@ in
|
||||
sources."remove-trailing-separator-1.1.0"
|
||||
sources."repeat-element-1.1.4"
|
||||
sources."repeat-string-1.6.1"
|
||||
sources."requires-port-1.0.0"
|
||||
sources."resolve-1.20.0"
|
||||
sources."resolve-url-0.2.1"
|
||||
sources."restore-cursor-1.0.1"
|
||||
@@ -114266,12 +114335,19 @@ in
|
||||
sources."source-map-url-0.4.1"
|
||||
sources."split-buffer-1.0.0"
|
||||
sources."split-string-3.1.0"
|
||||
(sources."ssb-bendy-butt-0.12.3" // {
|
||||
dependencies = [
|
||||
sources."ssb-keys-8.2.0"
|
||||
];
|
||||
})
|
||||
sources."ssb-bfe-3.1.1"
|
||||
sources."ssb-bfe-spec-0.3.0"
|
||||
sources."ssb-blobs-1.2.2"
|
||||
sources."ssb-caps-1.1.0"
|
||||
sources."ssb-client-4.9.0"
|
||||
sources."ssb-config-3.4.5"
|
||||
sources."ssb-db-19.2.0"
|
||||
(sources."ssb-db2-2.3.1" // {
|
||||
(sources."ssb-db2-2.4.0" // {
|
||||
dependencies = [
|
||||
sources."abstract-leveldown-6.2.3"
|
||||
(sources."flumecodec-0.0.1" // {
|
||||
@@ -114325,7 +114401,9 @@ in
|
||||
sources."ssb-query-2.4.5"
|
||||
sources."ssb-ref-2.16.0"
|
||||
sources."ssb-replicate-1.3.3"
|
||||
sources."ssb-typescript-2.5.0"
|
||||
sources."ssb-unix-socket-1.0.0"
|
||||
sources."ssb-uri2-1.5.2"
|
||||
(sources."ssb-validate-4.1.4" // {
|
||||
dependencies = [
|
||||
sources."ssb-keys-8.2.0"
|
||||
@@ -114418,6 +114496,7 @@ in
|
||||
})
|
||||
sources."untildify-2.1.0"
|
||||
sources."urix-0.1.0"
|
||||
sources."url-parse-1.5.3"
|
||||
sources."use-3.1.1"
|
||||
sources."user-home-2.0.0"
|
||||
sources."utf8-byte-length-1.0.4"
|
||||
@@ -120262,7 +120341,7 @@ in
|
||||
sources."isarray-0.0.1"
|
||||
sources."isexe-2.0.0"
|
||||
sources."isobject-3.0.1"
|
||||
sources."jest-worker-27.1.0"
|
||||
sources."jest-worker-27.1.1"
|
||||
sources."js-yaml-4.0.0"
|
||||
sources."json-parse-better-errors-1.0.2"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
@@ -122570,7 +122649,7 @@ in
|
||||
sources."glob-to-regexp-0.4.1"
|
||||
sources."graceful-fs-4.2.8"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."jest-worker-27.1.0"
|
||||
sources."jest-worker-27.1.1"
|
||||
sources."json-parse-better-errors-1.0.2"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
sources."loader-runner-4.2.0"
|
||||
|
||||
@@ -31,9 +31,17 @@ buildDunePackage rec {
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
||||
buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ];
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ ]
|
||||
else
|
||||
[ yojson stdlib-shims ocaml-syntax-shims ];
|
||||
|
||||
propagatedBuildInputs = [ ppx_yojson_conv_lib result ];
|
||||
propagatedBuildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ ]
|
||||
else
|
||||
[ ppx_yojson_conv_lib result ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jsonrpc protocol implementation in OCaml";
|
||||
|
||||
@@ -9,16 +9,21 @@
|
||||
, octavius
|
||||
, dune-build-info
|
||||
, uutf
|
||||
, re
|
||||
, pp
|
||||
, csexp
|
||||
, cmdliner
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
buildDunePackage rec {
|
||||
pname = "lsp";
|
||||
inherit (jsonrpc) version src;
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimumOCamlVersion =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
"4.12"
|
||||
else
|
||||
"4.06";
|
||||
|
||||
# unvendor some (not all) dependencies.
|
||||
# They are vendored by upstream only because it is then easier to install
|
||||
@@ -28,22 +33,24 @@ buildDunePackage {
|
||||
rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
dune-build-info
|
||||
omd
|
||||
cmdliner
|
||||
] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
[ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ]
|
||||
else
|
||||
[ cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
dune-build-info
|
||||
omd
|
||||
cmdliner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
csexp
|
||||
jsonrpc
|
||||
stdlib-shims
|
||||
uutf
|
||||
];
|
||||
] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
|
||||
|
||||
meta = jsonrpc.meta // {
|
||||
description = "LSP protocol implementation in OCaml";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certbot";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk=";
|
||||
sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/${pname}";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dpath";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
disabled = isPy27; # uses python3 imports
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64=";
|
||||
sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac=";
|
||||
};
|
||||
|
||||
# use pytest as nosetests hangs
|
||||
|
||||
@@ -1,30 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, envoy-utils
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pytest-asyncio
|
||||
, pytest-raises
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, respx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envoy-reader";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesserizzo";
|
||||
repo = "envoy_reader";
|
||||
rev = version;
|
||||
sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6";
|
||||
sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
envoy-utils
|
||||
httpx
|
||||
];
|
||||
|
||||
@@ -35,6 +32,11 @@ buildPythonPackage rec {
|
||||
respx
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner>=5.2" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "envoy_reader" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envoy-utils";
|
||||
version = "0.0.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "envoy_utils";
|
||||
inherit version;
|
||||
sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zeroconf
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "envoy_utils" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python utilities for the Enphase Envoy";
|
||||
homepage = "https://pypi.org/project/envoy-utils/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,6 @@
|
||||
, google-cloud-testutils
|
||||
, libcst
|
||||
, proto-plus
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
@@ -24,11 +23,6 @@ buildPythonPackage rec {
|
||||
sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
grpc-google-iam-v1
|
||||
google-api-core
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325";
|
||||
sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "1.42.0";
|
||||
version = "1.42.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae";
|
||||
sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ google-auth google-crc32c requests ];
|
||||
|
||||
checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
|
||||
preCheck = ''
|
||||
# prevent shadowing imports
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, lib
|
||||
# propagatedBuildInputs
|
||||
, absl-py, numpy, opt-einsum
|
||||
# checkInputs
|
||||
, jaxlib, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jax";
|
||||
version = "0.2.19";
|
||||
|
||||
# Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3.
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "jax-v${version}";
|
||||
sha256 = "sha256-pVn62G7pydR7ybkf7gSbu0FlEq2c0US6H2GTBAljup4=";
|
||||
};
|
||||
|
||||
# jaxlib is _not_ included in propagatedBuildInputs because there are
|
||||
# different versions of jaxlib depending on the desired target hardware. The
|
||||
# JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the
|
||||
# CPU wheel is packaged.
|
||||
propagatedBuildInputs = [ absl-py numpy opt-einsum ];
|
||||
|
||||
checkInputs = [ jaxlib pytestCheckHook ];
|
||||
# NOTE: Don't run the tests in the expiremental directory as they require flax
|
||||
# which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2.
|
||||
# Not a big deal, this is how the JAX docs suggest running the test suite
|
||||
# anyhow.
|
||||
pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Differentiate, compile, and transform Numpy code";
|
||||
homepage = "https://github.com/google/jax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
# For the moment we only support the CPU and GPU backends of jaxlib. The TPU
|
||||
# backend will require some additional work. Those wheels are located here:
|
||||
# https://storage.googleapis.com/jax-releases/libtpu_releases.html.
|
||||
|
||||
# For future reference, the easiest way to test the GPU backend is to run
|
||||
# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }"
|
||||
# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1
|
||||
# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'"
|
||||
# python -c "from jax import random; random.PRNGKey(0)"
|
||||
# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x"
|
||||
# There's no convenient way to test the GPU backend in the derivation since the
|
||||
# nix build environment blocks access to the GPU. See also:
|
||||
# * https://github.com/google/jax/issues/971#issuecomment-508216439
|
||||
# * https://github.com/google/jax/issues/5723#issuecomment-913038780
|
||||
|
||||
{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi
|
||||
, fetchurl, isPy39, lib, stdenv
|
||||
# propagatedBuildInputs
|
||||
, absl-py, flatbuffers, scipy, cudatoolkit_11
|
||||
# Options:
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
}:
|
||||
|
||||
assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1";
|
||||
|
||||
let
|
||||
device = if cudaSupport then "gpu" else "cpu";
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "jaxlib";
|
||||
version = "0.1.71";
|
||||
format = "wheel";
|
||||
|
||||
# At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting
|
||||
# all of them is a pain, so we focus on 3.9, the current nixpkgs python3
|
||||
# version.
|
||||
disabled = !isPy39;
|
||||
|
||||
src = {
|
||||
cpu = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl";
|
||||
sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6";
|
||||
};
|
||||
gpu = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl";
|
||||
sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89";
|
||||
};
|
||||
}.${device};
|
||||
|
||||
# Prebuilt wheels are dynamically linked against things that nix can't find.
|
||||
# Run `autoPatchelfHook` to automagically fix them.
|
||||
nativeBuildInputs = [ autoPatchelfHook ] ++ lib.optional cudaSupport addOpenGLRunpath;
|
||||
# Dynamic link dependencies
|
||||
buildInputs = [ stdenv.cc.cc ];
|
||||
|
||||
# jaxlib contains shared libraries that open other shared libraries via dlopen
|
||||
# and these implicit dependencies are not recognized by ldd or
|
||||
# autoPatchelfHook. That means we need to sneak them into rpath. This step
|
||||
# must be done after autoPatchelfHook and the automatic stripping of
|
||||
# artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the
|
||||
# patchPhase. Dependencies:
|
||||
# * libcudart.so.11.0 -> cudatoolkit_11.lib
|
||||
# * libcublas.so.11 -> cudatoolkit_11
|
||||
# * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib
|
||||
preInstallCheck = lib.optional cudaSupport ''
|
||||
shopt -s globstar
|
||||
|
||||
addOpenGLRunpath $out/**/*.so
|
||||
|
||||
for file in $out/**/*.so; do
|
||||
rpath=$(patchelf --print-rpath $file)
|
||||
# For some reason `makeLibraryPath` on `cudatoolkit_11` maps to
|
||||
# <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib.
|
||||
patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file
|
||||
done
|
||||
'';
|
||||
|
||||
# pip dependencies and optionally cudatoolkit.
|
||||
propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11;
|
||||
|
||||
pythonImportsCheck = [ "jaxlib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "XLA library for JAX";
|
||||
homepage = "https://github.com/google/jax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -2,14 +2,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulsectl";
|
||||
version = "21.5.18";
|
||||
version = "21.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0n448nkm2i4gnsq48vbj8sldmyx0b7c7rvzijg8h2pxdrmilbqql";
|
||||
sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# substitute library paths for libpulse and librt
|
||||
(substituteAll {
|
||||
src = ./library-paths.patch;
|
||||
libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{ buildPythonPackage, fetchPypi, lib, pytest, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qmk_dotty_dict";
|
||||
version = "1.3.0.post1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dictionary wrapper for quick access to deeply nested keys";
|
||||
homepage = "https://github.com/pawelzny/dotty_dict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ babariviere ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "robotframework";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09k008252x3l4agl9f8ai4a9mn0dp3m5s81mp1hnsf0hribb0s96";
|
||||
sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695";
|
||||
};
|
||||
|
||||
checkInputs = [ jsonschema ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
pname = "sphinxcontrib-bibtex";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1aae1005935ae8e6499750b4ef1c8251a14ba16e025d0c0154fe2b6bf45defc0";
|
||||
sha256 = "be503e2437651531e0512dbe732def518ad2b8d0d785c3b4f36508d814d22e46";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "youless-api";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "jongsoftdev";
|
||||
repo = "youless-python-bridge";
|
||||
rev = version;
|
||||
sha256 = "18hymahpblq87i7lv479sizj8mgxawjhj31g4j1lyna1mds3887k";
|
||||
sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -623,13 +623,6 @@ in
|
||||
buildInputs = [ taglib ];
|
||||
};
|
||||
|
||||
thrift = attrs: {
|
||||
# See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
|
||||
# Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
|
||||
buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
|
||||
"--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
|
||||
};
|
||||
|
||||
timfel-krb5-auth = attrs: {
|
||||
buildInputs = [ libkrb5 ];
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeScript, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version rocm-cmake "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CMake modules for common build tasks for the ROCm stack";
|
||||
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
|
||||
|
||||
@@ -19,9 +19,6 @@
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
pname = "github-actions-runner";
|
||||
version = "2.279.0";
|
||||
|
||||
deps = (import ./deps.nix { inherit fetchurl; });
|
||||
nugetPackages = map
|
||||
(x: {
|
||||
@@ -29,63 +26,20 @@ let
|
||||
path = "${x}";
|
||||
})
|
||||
deps;
|
||||
nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages;
|
||||
nugetSource = linkFarm "nuget-packages" nugetPackages;
|
||||
|
||||
dotnetSdk = dotnetCorePackages.sdk_3_1;
|
||||
runtimeId = "linux-x64";
|
||||
|
||||
disabledTest = [
|
||||
# Self-updating is patched out, hence this test will fail
|
||||
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
|
||||
] ++ map
|
||||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
"NotPullOrBuildImagesMultipleTimes_Legacy"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfileAndDockerfile"
|
||||
"RepositoryActionWithActionfileAndDockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerHubImage"
|
||||
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfile_Dockerfile"
|
||||
"RepositoryActionWithActionfile_Dockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
|
||||
"RepositoryActionWithActionfile_Node"
|
||||
"RepositoryActionWithActionfile_Node_Legacy"
|
||||
"RepositoryActionWithDockerfile"
|
||||
"RepositoryActionWithDockerfile_Legacy"
|
||||
"RepositoryActionWithDockerfileInRelativePath"
|
||||
"RepositoryActionWithDockerfileInRelativePath_Legacy"
|
||||
"RepositoryActionWithDockerfilePrepareActions_Repository"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
|
||||
] ++ map
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
|
||||
[
|
||||
"EnsureDotnetsdkBashDownloadScriptUpToDate"
|
||||
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
|
||||
];
|
||||
testFilterXml = lib.concatStringsSep "&" disabledTest;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
pname = "github-runner";
|
||||
version = "2.281.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version}
|
||||
sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms=";
|
||||
rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version}
|
||||
sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -125,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
# Disable specific tests
|
||||
substituteInPlace src/dir.proj \
|
||||
--replace 'dotnet test Test/Test.csproj' \
|
||||
"dotnet test Test/Test.csproj --filter '${testFilterXml}'"
|
||||
"dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'"
|
||||
|
||||
# We don't use a Git checkout
|
||||
substituteInPlace src/dir.proj \
|
||||
@@ -180,6 +134,49 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
disabledTests = [
|
||||
# Self-updating is patched out, hence this test will fail
|
||||
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
|
||||
] ++ map
|
||||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
"NotPullOrBuildImagesMultipleTimes_Legacy"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfileAndDockerfile"
|
||||
"RepositoryActionWithActionfileAndDockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerHubImage"
|
||||
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfile_Dockerfile"
|
||||
"RepositoryActionWithActionfile_Dockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
|
||||
"RepositoryActionWithActionfile_Node"
|
||||
"RepositoryActionWithActionfile_Node_Legacy"
|
||||
"RepositoryActionWithDockerfile"
|
||||
"RepositoryActionWithDockerfile_Legacy"
|
||||
"RepositoryActionWithDockerfileInRelativePath"
|
||||
"RepositoryActionWithDockerfileInRelativePath_Legacy"
|
||||
"RepositoryActionWithDockerfilePrepareActions_Repository"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
|
||||
] ++ map
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
|
||||
[
|
||||
"EnsureDotnetsdkBashDownloadScriptUpToDate"
|
||||
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
|
||||
];
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
checkPhase = ''
|
||||
@@ -240,6 +237,10 @@ stdenv.mkDerivation rec {
|
||||
# Stripping breaks the binaries
|
||||
dontStrip = true;
|
||||
|
||||
preFixup = ''
|
||||
patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
fix_rpath() {
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "2.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Remove test from compilation targets:
|
||||
# they add time to an already long compilation and some fail out-of-the-box.
|
||||
./no_tests.patch
|
||||
];
|
||||
|
||||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM=";
|
||||
|
||||
outputs = [ "out" "lib" "bin" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl protobuf ];
|
||||
|
||||
preBuild = ''
|
||||
export OPENSSL_DIR=${lib.getDev openssl}
|
||||
export OPENSSL_LIB_DIR=${openssl.out}/lib
|
||||
|
||||
export PROTOC=${protobuf}/bin/protoc
|
||||
export PROTOC_INCLUDE="${protobuf}/include";
|
||||
|
||||
export SQLITE_MAX_VARIABLE_NUMBER=250000
|
||||
export SQLITE_MAX_EXPR_DEPTH=10000
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node
|
||||
'';
|
||||
|
||||
# Tests are long to compile
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of engines that power the core stack for Prisma";
|
||||
homepage = "https://www.prisma.io/";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ pamplemousse ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,459 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 1070c7a30..310f7302f 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -479,18 +479,6 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
-[[package]]
|
||||
-name = "bitvec"
|
||||
-version = "0.19.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
|
||||
-dependencies = [
|
||||
- "funty",
|
||||
- "radium",
|
||||
- "tap",
|
||||
- "wyz",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.7.3"
|
||||
@@ -706,19 +694,6 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "console"
|
||||
-version = "0.14.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
|
||||
-dependencies = [
|
||||
- "encode_unicode",
|
||||
- "lazy_static",
|
||||
- "libc",
|
||||
- "terminal_size",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "const_fn"
|
||||
version = "0.4.5"
|
||||
@@ -1011,24 +986,12 @@ dependencies = [
|
||||
"uuid",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "dtoa"
|
||||
-version = "0.4.8"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
|
||||
-
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||
|
||||
-[[package]]
|
||||
-name = "encode_unicode"
|
||||
-version = "0.3.6"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
|
||||
-
|
||||
[[package]]
|
||||
name = "encoding"
|
||||
version = "0.2.33"
|
||||
@@ -1114,18 +1077,6 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "enum_dispatch"
|
||||
-version = "0.3.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e"
|
||||
-dependencies = [
|
||||
- "once_cell",
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.1"
|
||||
@@ -1261,12 +1212,6 @@ dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "funty"
|
||||
-version = "1.1.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
|
||||
-
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.13"
|
||||
@@ -1573,15 +1518,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "html-escape"
|
||||
-version = "0.2.7"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233"
|
||||
-dependencies = [
|
||||
- "utf8-width",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "http"
|
||||
version = "0.2.3"
|
||||
@@ -1744,21 +1680,6 @@ version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
|
||||
|
||||
-[[package]]
|
||||
-name = "insta"
|
||||
-version = "1.7.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244"
|
||||
-dependencies = [
|
||||
- "console",
|
||||
- "lazy_static",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "serde_yaml",
|
||||
- "similar",
|
||||
- "uuid",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.9"
|
||||
@@ -1804,34 +1725,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "introspection-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "barrel",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enumflags2",
|
||||
- "expect-test",
|
||||
- "indoc",
|
||||
- "introspection-connector",
|
||||
- "introspection-core",
|
||||
- "migration-connector",
|
||||
- "pretty_assertions",
|
||||
- "quaint",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "sql-introspection-connector",
|
||||
- "sql-migration-connector",
|
||||
- "sql-schema-describer",
|
||||
- "test-macros",
|
||||
- "test-setup",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "user-facing-errors",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "ipconfig"
|
||||
version = "0.2.2"
|
||||
@@ -2178,39 +2071,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "migration-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "bigdecimal",
|
||||
- "chrono",
|
||||
- "connection-string",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enumflags2",
|
||||
- "expect-test",
|
||||
- "indoc",
|
||||
- "migration-connector",
|
||||
- "migration-core",
|
||||
- "once_cell",
|
||||
- "pretty_assertions",
|
||||
- "prisma-value",
|
||||
- "quaint",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "sql-migration-connector",
|
||||
- "sql-schema-describer",
|
||||
- "tempfile",
|
||||
- "test-macros",
|
||||
- "test-setup",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "url",
|
||||
- "user-facing-errors",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.16"
|
||||
@@ -2517,19 +2377,6 @@ dependencies = [
|
||||
"socket2 0.4.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "nom"
|
||||
-version = "6.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
|
||||
-dependencies = [
|
||||
- "bitvec",
|
||||
- "funty",
|
||||
- "lexical-core",
|
||||
- "memchr",
|
||||
- "version_check",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "ntapi"
|
||||
version = "0.3.6"
|
||||
@@ -2773,18 +2620,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "parse-hyperlinks"
|
||||
-version = "0.19.6"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff"
|
||||
-dependencies = [
|
||||
- "html-escape",
|
||||
- "nom",
|
||||
- "percent-encoding",
|
||||
- "thiserror",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "pbkdf2"
|
||||
version = "0.7.5"
|
||||
@@ -3388,72 +3223,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "query-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "anyhow",
|
||||
- "base64 0.13.0",
|
||||
- "chrono",
|
||||
- "colored",
|
||||
- "datamodel-connector",
|
||||
- "indoc",
|
||||
- "insta",
|
||||
- "prisma-value",
|
||||
- "query-test-macros",
|
||||
- "query-tests-setup",
|
||||
- "serde_json",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "uuid",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "query-test-macros"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "darling",
|
||||
- "indoc",
|
||||
- "itertools 0.10.0",
|
||||
- "proc-macro2",
|
||||
- "query-tests-setup",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "query-tests-setup"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "async-trait",
|
||||
- "colored",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enum_dispatch",
|
||||
- "enumflags2",
|
||||
- "indoc",
|
||||
- "itertools 0.10.0",
|
||||
- "lazy_static",
|
||||
- "migration-core",
|
||||
- "mongodb-datamodel-connector",
|
||||
- "nom",
|
||||
- "parse-hyperlinks",
|
||||
- "prisma-models",
|
||||
- "query-core",
|
||||
- "regex",
|
||||
- "request-handlers",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "thiserror",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-error",
|
||||
- "tracing-futures",
|
||||
- "tracing-subscriber",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
@@ -3469,12 +3238,6 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "radium"
|
||||
-version = "0.5.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
|
||||
-
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
@@ -3922,18 +3685,6 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "serde_yaml"
|
||||
-version = "0.8.17"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
|
||||
-dependencies = [
|
||||
- "dtoa",
|
||||
- "linked-hash-map",
|
||||
- "serde",
|
||||
- "yaml-rust",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "serial_test"
|
||||
version = "0.5.1"
|
||||
@@ -4028,12 +3779,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "similar"
|
||||
-version = "1.3.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
|
||||
-
|
||||
[[package]]
|
||||
name = "simple-mutex"
|
||||
version = "1.1.5"
|
||||
@@ -4372,12 +4117,6 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
|
||||
|
||||
-[[package]]
|
||||
-name = "tap"
|
||||
-version = "1.0.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
-
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.2.0"
|
||||
@@ -4392,16 +4131,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "terminal_size"
|
||||
-version = "0.1.16"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
|
||||
-dependencies = [
|
||||
- "libc",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "test-cli"
|
||||
version = "0.1.0"
|
||||
@@ -5094,12 +4823,6 @@ dependencies = [
|
||||
"user-facing-error-macros",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "utf8-width"
|
||||
-version = "0.1.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa"
|
||||
-
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "0.8.2"
|
||||
@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "wyz"
|
||||
-version = "0.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
|
||||
-
|
||||
-[[package]]
|
||||
-name = "yaml-rust"
|
||||
-version = "0.4.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
|
||||
-dependencies = [
|
||||
- "linked-hash-map",
|
||||
-]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 2411986ea..2eb2bb82d 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -3,7 +3,6 @@ members = [
|
||||
"introspection-engine/connectors/introspection-connector",
|
||||
"introspection-engine/connectors/sql-introspection-connector",
|
||||
"introspection-engine/core",
|
||||
- "introspection-engine/introspection-engine-tests",
|
||||
"libs/datamodel/connectors/datamodel-connector",
|
||||
"libs/datamodel/connectors/sql-datamodel-connector",
|
||||
"libs/datamodel/connectors/mongodb-datamodel-connector",
|
||||
@@ -12,14 +11,12 @@ members = [
|
||||
"migration-engine/connectors/sql-migration-connector",
|
||||
"migration-engine/connectors/mongodb-migration-connector",
|
||||
"migration-engine/core",
|
||||
- "migration-engine/migration-engine-tests",
|
||||
"query-engine/connectors/query-connector",
|
||||
"query-engine/connectors/sql-query-connector",
|
||||
"query-engine/connectors/mongodb-query-connector",
|
||||
"query-engine/core",
|
||||
"query-engine/query-engine",
|
||||
"query-engine/query-engine-node-api",
|
||||
- "query-engine/connector-test-kit-rs/query-engine-tests",
|
||||
"query-engine/request-handlers",
|
||||
"prisma-fmt",
|
||||
"libs/datamodel/core",
|
||||
@@ -0,0 +1,25 @@
|
||||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mask";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakedeichert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc";
|
||||
};
|
||||
|
||||
cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963";
|
||||
|
||||
# tests require mask to be installed
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI task runner defined by a simple markdown file";
|
||||
homepage = "https://github.com/jakedeichert/mask";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "js_of_ocaml-compiler";
|
||||
version = "3.9.1";
|
||||
version = "3.10.0";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||
sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
|
||||
sha256 = "09k19bygxl766dmshrp5df3i99jfm8bmamb4jggm62p3hg19bzkv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo menhir ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep
|
||||
{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep
|
||||
# rocminfo requires that the calling user have a password and be in
|
||||
# the video group. If we let rocm_agent_enumerator rely upon
|
||||
# rocminfo's output, then it, too, has those requirements. Instead,
|
||||
@@ -35,4 +35,19 @@ stdenv.mkDerivation rec {
|
||||
'' + lib.optionalString (defaultTargets != []) ''
|
||||
echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
|
||||
update-source-version rocminfo "$version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ROCm Application for Reporting System Info";
|
||||
homepage = "https://github.com/RadeonOpenCompute/rocminfo";
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
@@ -23,14 +24,37 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config help2man ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
help2man
|
||||
];
|
||||
|
||||
buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ];
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
htmlcxx
|
||||
jsoncpp
|
||||
liboauth
|
||||
rhash
|
||||
tinyxml-2
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
if [[ "$("$out/bin/${pname}" --version)" == "LGOGDownloader ${version}" ]]; then
|
||||
echo '${pname} smoke check passed'
|
||||
else
|
||||
echo '${pname} smoke check failed'
|
||||
return 1
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader";
|
||||
homepage = "https://github.com/Sude-/lgogdownloader";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tome4";
|
||||
version = "1.6.7";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
|
||||
sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68";
|
||||
sha256 = "sha256-w1NPM/SMnPAnAl6z9E6Xsj3mEqZtXzFe1IMPmlKr8qQ=";
|
||||
};
|
||||
|
||||
desktop = makeDesktopItem {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
##User Input
|
||||
{ settings ? {}
|
||||
# if marked as true will create an empty json file if does not exists
|
||||
# if marked as true will create an empty json file if does not exist
|
||||
, createIfDoesNotExists ? true
|
||||
, vscodeSettingsFile ? ".vscode/settings.json"
|
||||
, userSettingsFolder ? ""
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.13.9";
|
||||
version = "5.13.15";
|
||||
suffix = "lqx1";
|
||||
in
|
||||
|
||||
@@ -14,7 +14,7 @@ buildLinux (args // {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "sha256-aAnwPw1qoGhUdWN/uaQa+5bi0DFZB/wDfNow7FgMMFE=";
|
||||
sha256 = "sha256-YDdBOB49NkX2V+lA7JeKRXfpo81/MSoLDOsPjphhBJA=";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
||||
@@ -16,6 +16,7 @@ showSyntax() {
|
||||
|
||||
# Parse the command line.
|
||||
origArgs=("$@")
|
||||
copyClosureFlags=()
|
||||
extraBuildFlags=()
|
||||
lockFlags=()
|
||||
flakeFlags=()
|
||||
@@ -60,6 +61,9 @@ while [ "$#" -gt 0 ]; do
|
||||
upgrade=1
|
||||
upgrade_all=1
|
||||
;;
|
||||
-s|--use-substitutes)
|
||||
copyClosureFlags+=("$i")
|
||||
;;
|
||||
--max-jobs|-j|--cores|-I|--builders)
|
||||
j="$1"; shift 1
|
||||
extraBuildFlags+=("$i" "$j")
|
||||
@@ -157,11 +161,11 @@ targetHostCmd() {
|
||||
copyToTarget() {
|
||||
if ! [ "$targetHost" = "$buildHost" ]; then
|
||||
if [ -z "$targetHost" ]; then
|
||||
NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1"
|
||||
NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1"
|
||||
elif [ -z "$buildHost" ]; then
|
||||
NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1"
|
||||
NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1"
|
||||
else
|
||||
buildHostCmd nix-copy-closure --to "$targetHost" "$1"
|
||||
buildHostCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -425,7 +429,7 @@ if [[ -n $buildNix && -z $flake ]]; then
|
||||
if [ -a "$nixDrv" ]; then
|
||||
nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null
|
||||
if [ -n "$buildHost" ]; then
|
||||
nix-copy-closure --to "$buildHost" "$nixDrv"
|
||||
nix-copy-closure "${copyClosureFlags[@]}" --to "$buildHost" "$nixDrv"
|
||||
# The nix build produces multiple outputs, we add them all to the remote path
|
||||
for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do
|
||||
remoteNix="$remoteNix${remoteNix:+:}$p/bin"
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
||||
, autoreconfHook, nixosTests
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c";
|
||||
sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
@@ -26,11 +25,6 @@ stdenv.mkDerivation rec {
|
||||
# They are later created from NixOS itself.
|
||||
./dont-create-run-time-dirs.patch
|
||||
./runtime-deps.patch
|
||||
# rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff";
|
||||
sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_auto_failover";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citusdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bg1qxjszqnv0c5k5vf60sh8lcfagp9d66sprkf0d83yjh5qpwlm";
|
||||
sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline libkrb5 ];
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }:
|
||||
{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "fzf.fish";
|
||||
version = "5.6";
|
||||
version = "7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PatrickF1";
|
||||
repo = "fzf.fish";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73";
|
||||
sha256 = "16mdfyznxjhv7x561srl559misn37a35d2q9fspxa7qg1d0sc3x9";
|
||||
};
|
||||
|
||||
checkInputs = [ fzf ];
|
||||
checkInputs = [ fzf fd util-linux ];
|
||||
checkPlugins = [ clownfish fishtape_3 ];
|
||||
checkFunctionDirs = [ "./functions" ];
|
||||
checkPhase = ''
|
||||
@@ -20,10 +20,16 @@ buildFishPlugin rec {
|
||||
rm -r tests/*git*
|
||||
|
||||
# Disable tests that are failing, probably because of our wrappers
|
||||
rm -r tests/configure_bindings
|
||||
rm -r tests/search_shell_variables
|
||||
|
||||
fishtape tests/*/*.fish
|
||||
'';
|
||||
# Disable tests that are failing, because there is not 'rev' command
|
||||
rm tests/preview_file/custom_file_preview.fish
|
||||
|
||||
'' + (
|
||||
if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"''
|
||||
else ''script -c 'fish -c "fishtape tests/*/*.fish"' ''
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Augment your fish command line with fzf key bindings";
|
||||
|
||||
@@ -1,68 +1,68 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.10.0";
|
||||
version = "3.12.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-linux-x64.tar.gz";
|
||||
sha256 = "0rhsdxiz5lz4hlw6a1pkjfblsh42vnk9bw8xg7wbjl9wpld3rys1";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-x64.tar.gz";
|
||||
sha256 = "19b8yndff9ziilrw1lrwjjcxl1lpn9q52z5swjc41rr0j751v8b0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-linux-amd64.tar.gz";
|
||||
sha256 = "1s8w5kh9nfdv1vcdrpa2m76r2470k0j4frc3j3ijmqq1i0vv5yhk";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-amd64.tar.gz";
|
||||
sha256 = "10hgsnab1472dzdb2qrx90mx1xaq8zifcnrsgqqvilzfjnfrd9ka";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "0scisiswjs3jx0wm6q8i7pgpr2js3kiilq7wc29afyjck6xa14rh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "0rk1irqnmlxzdwx1jnls30xmsrkdn7qin561waqwxq9qrm5012i5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "14s6jyackhp324gdlvvqnyi8s7hj0fb92ilrpd460p05p653zb4x";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "1f995sg2p1hpqagygsvyfq97gcmy4a925274p96vhy517568d5jg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "1hz4w44c31wyi3vbr9sbph1007rj65vwwbhwrrzyhxy0i75r3igq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-linux-amd64.tar.gz";
|
||||
sha256 = "1a62af80czj9sahb52fiz25p59nbzjlr1h7ycdxpjl9m1bxhvlfr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-amd64.tar.gz";
|
||||
sha256 = "1divf2nga5kc60mf0cjmyzyghpkkbw44jakfwc7fjiq6j4j0g2ia";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-linux-amd64.tar.gz";
|
||||
sha256 = "11m1f80i33m4dh13z96yh655pfiwvk46sjspwql7s80kapl93pq9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-amd64.tar.gz";
|
||||
sha256 = "1vryq0ki5iimqwxpnvc53m15641p1a1cdbf1xzn0ps4xdsg4xz7j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "159lk4iv9zi2ggcjwjsg9an4rfjc0lbyn8d3kbv10p6cx109ljzg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "1k7zd2cir6844awf1kpj7pifwvw74yfnrk78j0pall2jwmnf2zaa";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "0inx40vasjlxfvzr0pxbzm6rki50h5x5qkzx2wc51vv3gjln104q";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "0g6h9j64aqj64slp8707kn6dwg32nyqy06xgwycz8ywcw5b2llqp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-linux-amd64.tar.gz";
|
||||
sha256 = "19zvqxf13lr98sp3p1ry3q1fvzx0rpxwz5wbk331n5jn0ljzr783";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-amd64.tar.gz";
|
||||
sha256 = "0n7vlja8s854nba209sq2pwkd8jnmnmzya65ncqpb0aa9kn9lc2j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "0vyqzphk75h1mk9p6wblgsw2cypycv32glzrnk4fildj48dakm5y";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-amd64.tar.gz";
|
||||
sha256 = "07zmx5gdwqsrhzm50fj3y9q435ygwmb2j1r2pvpv0i1s66g92kij";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz";
|
||||
@@ -81,16 +81,16 @@
|
||||
sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "0s1fkj1s5qni84lz0gr1d10xyxp87877jana67lxbarskvzpys8r";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "0rmk55qivand0wa82mxgvyzgg16nz1r3q99k0n9zdlvh9dbffnc8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "1lmhsvzhryj9sl3v51dgq6rby3q5m169mc3dg1jbx1fvgwglmhqb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz";
|
||||
@@ -99,64 +99,64 @@
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-darwin-x64.tar.gz";
|
||||
sha256 = "18q1v1n3a497wbbzzjngpl90wpjnffn9wnpdp171r47k6xvbcsyq";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-x64.tar.gz";
|
||||
sha256 = "1dlgcap861a5fljbadqikn0lm9gz6f1rdn0qhf1f9vyrj1jmwcqf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1jnwlhfyyxz7196igi3gas3459k4nq1f4m1i4vdnxhkskp5838l0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-amd64.tar.gz";
|
||||
sha256 = "18n729y5r827ahaybz01q61r3cv5grxpnfqb0m8fzh2bd41izg4s";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0wy4ayrfqizf8izz5dgwv8xi5hvjh03jrg5lvglfph6549d4lpwc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "05z8zkbhpj0xsi7ffzd51j83sxx92k10r28gpznn43plnv1v5cjs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1bb78g8k6gnhyxxvcjspnhbw2fig58flr14zi5i1cbd89xkz0m3i";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "12nba4xjcrh4g9iy3mqalk56bga4l3izqm9rj0fg3cyivr9fffvr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0xknmx3d6083qvp3v2v8qwjlfihj35r8gzhmhbh759ccjf1d6h4h";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-darwin-amd64.tar.gz";
|
||||
sha256 = "062xzx7408xqlppw1nixs205i83436n0cbjngzc65wm03bzzj7mh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-amd64.tar.gz";
|
||||
sha256 = "00m9nn0mrjdqg0ijkv86376df9kpfd9alk8h2ynk53s6nbz9ff4b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-darwin-amd64.tar.gz";
|
||||
sha256 = "01vrivbdhsl50kiv092j2a5jvikhrw1kzpa5ags701l721zslycq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1cfxnshmc7b1ax819bvic4ih0gc1mi6rij1pp52nklzgby4zad6y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1iwx80r9kmlrf961zck3qz2jb9shpmywdm5nkflvz6mhwrfsbz72";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0fabb3zi5p24xfgsc0jn8ynavd1g0qrlm1yqifxv12zr5id4vcvk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0bj7ir7dpkfsb75bjl45irwi692zxnys0125kmwdn8gnamlij5fx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "03r5jxgjyrrpx082z785x2yxz3l4ja4al9yh2zhkvdcnjip88r35";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0i06q1hrxi84r8ss3ck7jgk3g4lblkjvgm3wx35v551l0ynmmqqw";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0l1wxnkik28y9y257jdxiq3m3njmfq1awxajp152k11izddxs05i";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0fwbh02n7cjmv6d9jbqpjnmvvdp1cnsyhy7gxd2863j4w5f17q48";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-amd64.tar.gz";
|
||||
sha256 = "0s8aaac55kdsid0ay2dm0if9irc55pslmy6lhf7v5bfpcb17i36w";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz";
|
||||
@@ -175,16 +175,16 @@
|
||||
sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1x5fm72v9h3lrqcyyq2xm14bc14rsqhjmc4mwa2wgbk4pvjgawyv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ay8d84fc1hr1n4fpy1a4nj7bmhxzp86p0x68gz4rr9iwrd7xfgl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "01rrmj95lhvwxi8f338f50l2zspnin41j8hi2j9pjsjwfayhpq93";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz";
|
||||
|
||||
@@ -3,32 +3,32 @@
|
||||
|
||||
# Version of Pulumi from
|
||||
# https://www.pulumi.com/docs/get-started/install/versions/
|
||||
VERSION="3.10.0"
|
||||
VERSION="3.12.0"
|
||||
|
||||
# Grab latest release ${VERSION} from
|
||||
# https://github.com/pulumi/pulumi-${NAME}/releases
|
||||
plugins=(
|
||||
"auth0=2.2.0"
|
||||
"aws=4.15.0"
|
||||
"cloudflare=3.4.0"
|
||||
"consul=3.2.0"
|
||||
"datadog=3.3.0"
|
||||
"digitalocean=4.6.0"
|
||||
"docker=3.0.0"
|
||||
"aws=4.19.0"
|
||||
"cloudflare=3.5.0"
|
||||
"consul=3.3.0"
|
||||
"datadog=4.1.0"
|
||||
"digitalocean=4.6.1"
|
||||
"docker=3.1.0"
|
||||
"equinix-metal=2.0.0"
|
||||
"gcp=5.15.0"
|
||||
"github=4.2.0"
|
||||
"gitlab=4.1.0"
|
||||
"hcloud=1.2.0"
|
||||
"kubernetes=3.6.0"
|
||||
"linode=3.3.0"
|
||||
"gcp=5.18.0"
|
||||
"github=4.3.0"
|
||||
"gitlab=4.2.0"
|
||||
"hcloud=1.4.0"
|
||||
"kubernetes=3.7.0"
|
||||
"linode=3.3.2"
|
||||
"mailgun=3.1.0"
|
||||
"mysql=3.0.0"
|
||||
"openstack=3.3.0"
|
||||
"packet=3.2.2"
|
||||
"postgresql=3.1.0"
|
||||
"postgresql=3.2.0"
|
||||
"random=4.2.0"
|
||||
"vault=4.3.0"
|
||||
"vault=4.4.0"
|
||||
"vsphere=4.0.1"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ gem 'fluent-plugin-s3'
|
||||
gem 'fluent-plugin-kinesis'
|
||||
gem 'fluent-plugin-kafka'
|
||||
gem 'fluent-plugin-elasticsearch'
|
||||
gem 'fluent-plugin-scribe'
|
||||
gem 'fluent-plugin-mongo'
|
||||
gem 'fluent-plugin-webhdfs'
|
||||
gem 'fluent-plugin-rewrite-tag-filter'
|
||||
|
||||
@@ -77,9 +77,6 @@ GEM
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
aws-sdk-sqs (~> 1.0)
|
||||
fluentd (>= 0.14.22, < 2)
|
||||
fluent-plugin-scribe (1.0.0)
|
||||
fluentd
|
||||
thrift (~> 0.8.0)
|
||||
fluent-plugin-webhdfs (1.2.4)
|
||||
fluentd (>= 0.14.22)
|
||||
webhdfs (>= 0.6.0)
|
||||
@@ -110,7 +107,6 @@ GEM
|
||||
sigdump (~> 0.2.2)
|
||||
sigdump (0.2.4)
|
||||
strptime (0.2.3)
|
||||
thrift (0.8.0)
|
||||
tzinfo (2.0.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
tzinfo-data (1.2019.2)
|
||||
@@ -131,7 +127,6 @@ DEPENDENCIES
|
||||
fluent-plugin-record-reformer
|
||||
fluent-plugin-rewrite-tag-filter
|
||||
fluent-plugin-s3
|
||||
fluent-plugin-scribe
|
||||
fluent-plugin-webhdfs
|
||||
fluentd
|
||||
|
||||
|
||||
@@ -321,17 +321,6 @@
|
||||
};
|
||||
version = "1.1.11";
|
||||
};
|
||||
fluent-plugin-scribe = {
|
||||
dependencies = ["fluentd" "thrift"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
fluent-plugin-webhdfs = {
|
||||
dependencies = ["fluentd" "webhdfs"];
|
||||
groups = ["default"];
|
||||
@@ -487,16 +476,6 @@
|
||||
};
|
||||
version = "0.2.3";
|
||||
};
|
||||
thrift = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default"];
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchpatch
|
||||
}:
|
||||
{ lib, python3, fetchpatch, writeText }:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
setuppy = writeText "setup.py" ''
|
||||
from setuptools import setup
|
||||
setup()
|
||||
'';
|
||||
in buildPythonApplication rec {
|
||||
pname = "qmk";
|
||||
version = "0.0.52";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ=";
|
||||
sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
@@ -27,7 +27,7 @@ buildPythonApplication rec {
|
||||
appdirs
|
||||
argcomplete
|
||||
colorama
|
||||
dotty-dict
|
||||
qmk-dotty-dict
|
||||
hid
|
||||
hjson
|
||||
jsonschema
|
||||
@@ -36,6 +36,10 @@ buildPythonApplication rec {
|
||||
pyusb
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
cp ${setuppy} setup.py
|
||||
'';
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
@@ -57,6 +61,6 @@ buildPythonApplication rec {
|
||||
- ... and many more!
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
maintainers = with maintainers; [ bhipple babariviere ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -63,6 +63,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
license = licenses.publicDomain;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 zowoq ];
|
||||
maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-09-03";
|
||||
version = "2021-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9roj5/DfbbN98jy/aO1Ua4pTMxgr4UbqXFicN2ONQgE=";
|
||||
sha256 = "sha256-q6XALX0sGzgUm2PRwlDfcQHZFH+8ExageMahXJ+EYdM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user