Merge staging-next into staging
This commit is contained in:
commit
cea2503d73
|
@ -302,7 +302,7 @@ buildImage {
|
||||||
|
|
||||||
runAsRoot = ''
|
runAsRoot = ''
|
||||||
#!${pkgs.runtimeShell}
|
#!${pkgs.runtimeShell}
|
||||||
${shadowSetup}
|
${pkgs.dockerTools.shadowSetup}
|
||||||
groupadd -r redis
|
groupadd -r redis
|
||||||
useradd -r -g redis redis
|
useradd -r -g redis redis
|
||||||
mkdir /data
|
mkdir /data
|
||||||
|
|
|
@ -72,7 +72,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given
|
||||||
To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
|
To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
|
||||||
|
|
||||||
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
|
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
|
||||||
* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. A script to fetch these is available as `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs.
|
* `nugetDeps` takes either a path to a `deps.nix` file, or a derivation. The `deps.nix` file can be generated using the script attached to `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs. If the argument is a derivation, it will be used directly and assume it has the same output as `mkNugetDeps`.
|
||||||
* `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
|
* `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
|
||||||
* `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
|
* `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
|
||||||
For example, your project has a local dependency:
|
For example, your project has a local dependency:
|
||||||
|
|
|
@ -3087,6 +3087,12 @@
|
||||||
githubId = 17111639;
|
githubId = 17111639;
|
||||||
name = "Devin Singh";
|
name = "Devin Singh";
|
||||||
};
|
};
|
||||||
|
devusb = {
|
||||||
|
email = "mhelton@devusb.us";
|
||||||
|
github = "devusb";
|
||||||
|
githubId = 4951663;
|
||||||
|
name = "Morgan Helton";
|
||||||
|
};
|
||||||
dezgeg = {
|
dezgeg = {
|
||||||
email = "tuomas.tynkkynen@iki.fi";
|
email = "tuomas.tynkkynen@iki.fi";
|
||||||
github = "dezgeg";
|
github = "dezgeg";
|
||||||
|
@ -8987,7 +8993,7 @@
|
||||||
githubId = 4323933;
|
githubId = 4323933;
|
||||||
name = "Naïm Favier";
|
name = "Naïm Favier";
|
||||||
keys = [{
|
keys = [{
|
||||||
fingerprint = "51A0 705E 7DD2 3CBC 5EAA B43E 49B0 7322 580B 7EE2";
|
fingerprint = "F3EB 4BBB 4E71 99BC 299C D4E9 95AF CE82 1190 8325";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
nckx = {
|
nckx = {
|
||||||
|
|
|
@ -88,20 +88,22 @@ in
|
||||||
# more likely to result in interfaces being configured to
|
# more likely to result in interfaces being configured to
|
||||||
# use DHCP when they shouldn't.
|
# use DHCP when they shouldn't.
|
||||||
|
|
||||||
# We set RequiredForOnline to false, because it's fairly
|
# When wait-online.anyInterface is enabled, RequiredForOnline really
|
||||||
# common for such devices to have multiple interfaces and
|
# means "sufficient for online", so we can enable it.
|
||||||
# only one of them to be connected (e.g. a laptop with
|
# Otherwise, don't block the network coming online because of default networks.
|
||||||
# ethernet and WiFi interfaces). Maybe one day networkd will
|
|
||||||
# support "any"-style RequiredForOnline...
|
|
||||||
matchConfig.Name = ["en*" "eth*"];
|
matchConfig.Name = ["en*" "eth*"];
|
||||||
DHCP = "yes";
|
DHCP = "yes";
|
||||||
linkConfig.RequiredForOnline = lib.mkDefault false;
|
linkConfig.RequiredForOnline =
|
||||||
|
lib.mkDefault config.systemd.network.wait-online.anyInterface;
|
||||||
|
networkConfig.IPv6PrivacyExtensions = "kernel";
|
||||||
};
|
};
|
||||||
networks."99-wireless-client-dhcp" = lib.mkIf cfg.useDHCP {
|
networks."99-wireless-client-dhcp" = lib.mkIf cfg.useDHCP {
|
||||||
# Like above, but this is much more likely to be correct.
|
# Like above, but this is much more likely to be correct.
|
||||||
matchConfig.WLANInterfaceType = "station";
|
matchConfig.WLANInterfaceType = "station";
|
||||||
DHCP = "yes";
|
DHCP = "yes";
|
||||||
linkConfig.RequiredForOnline = lib.mkDefault false;
|
linkConfig.RequiredForOnline =
|
||||||
|
lib.mkDefault config.systemd.network.wait-online.anyInterface;
|
||||||
|
networkConfig.IPv6PrivacyExtensions = "kernel";
|
||||||
# We also set the route metric to one more than the default
|
# We also set the route metric to one more than the default
|
||||||
# of 1024, so that Ethernet is preferred if both are
|
# of 1024, so that Ethernet is preferred if both are
|
||||||
# available.
|
# available.
|
||||||
|
|
|
@ -185,20 +185,20 @@ rec {
|
||||||
|
|
||||||
anyedittools = buildEclipsePlugin rec {
|
anyedittools = buildEclipsePlugin rec {
|
||||||
name = "anyedit-${version}";
|
name = "anyedit-${version}";
|
||||||
version = "2.7.1.201709201439";
|
version = "2.7.2.202006062100";
|
||||||
|
|
||||||
srcFeature = fetchurl {
|
srcFeature = fetchurl {
|
||||||
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
|
url = "https://github.com/iloveeclipse/plugins/blob/latest/features/AnyEditTools_${version}.jar";
|
||||||
sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
|
sha256 = "0dwwwvz8by10f5gnws1ahmg02g6v4xbaqcwc0cydvv1h52cyb40g";
|
||||||
};
|
};
|
||||||
|
|
||||||
srcPlugin = fetchurl {
|
srcPlugin = fetchurl {
|
||||||
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
|
url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
|
||||||
sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
|
sha256 = "1ip8dk92ka7bczw1bkbs3zkclmwr28ds5q1wrzh525wb70x8v6fi";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://andrei.gmxhome.de/anyedit/";
|
homepage = "https://github.com/iloveeclipse/plugins";
|
||||||
description = "Adds new tools to the context menu of text-based editors";
|
description = "Adds new tools to the context menu of text-based editors";
|
||||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
license = licenses.epl10;
|
license = licenses.epl10;
|
||||||
|
@ -231,20 +231,20 @@ rec {
|
||||||
|
|
||||||
bytecode-outline = buildEclipsePlugin rec {
|
bytecode-outline = buildEclipsePlugin rec {
|
||||||
name = "bytecode-outline-${version}";
|
name = "bytecode-outline-${version}";
|
||||||
version = "2.5.0.201711011753-5a57fdf";
|
version = "1.0.1.202006062100";
|
||||||
|
|
||||||
srcFeature = fetchurl {
|
srcFeature = fetchurl {
|
||||||
url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar";
|
url = "https://github.com/iloveeclipse/plugins/blob/latest/features/org.eclipse.jdt.bcoview.feature_${version}.jar";
|
||||||
sha256 = "0yciqhcq0n5i326mwy57r4ywmkz2c2jky7r4pcmznmhvks3z65ps";
|
sha256 = "0zbcph72lgv8cb5n4phcl3qsybc5q5yviwbv8yjv4v12m4l15wpk";
|
||||||
};
|
};
|
||||||
|
|
||||||
srcPlugin = fetchurl {
|
srcPlugin = fetchurl {
|
||||||
url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar";
|
url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/org.eclipse.jdt.bcoview_${version}.jar";
|
||||||
sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw";
|
sha256 = "1bx860k4haqcnhy8825kn4df0pyzd680qbnvjmxfrlxrqhr66fbb";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://andrei.gmxhome.de/bytecode/";
|
homepage = "https://github.com/iloveeclipse/plugins";
|
||||||
description = "Shows disassembled bytecode of current java editor or class file";
|
description = "Shows disassembled bytecode of current java editor or class file";
|
||||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "ghostwriter";
|
pname = "ghostwriter";
|
||||||
version = "2.1.3";
|
version = "2.1.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wereturtle";
|
owner = "wereturtle";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-U6evyaC7fLFyKzeDNAI3U3/IcCk8DTY8pb3e3xqSfwk=";
|
hash = "sha256-Vr1w9bAtjQK1ZevFDWQ7xNsUrdv5qrP+JHe1Cuc2CvE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, vscode-utils, extractNuGet
|
{ lib, stdenv, fetchurl, fetchpatch, vscode-utils, extractNuGet
|
||||||
, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook
|
, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook
|
||||||
, python3, musl
|
, python3, musl
|
||||||
, pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified.
|
, pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified.
|
||||||
|
@ -28,6 +28,17 @@ let
|
||||||
url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2";
|
url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2";
|
||||||
sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
|
sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
|
||||||
};
|
};
|
||||||
|
patches = (oldAttrs.patches or []) ++ [
|
||||||
|
# Pull upstream fix for -fno-common toolchain. Without it build fails on
|
||||||
|
# upstream gcc-10 as:
|
||||||
|
# ld: libustsnprintf.a(libustsnprintf_la-core.o):snprintf/core.c:23: multiple definition of
|
||||||
|
# `ust_loglevel'; ustctl.o:liblttng-ust-ctl/ustctl.c:80: first defined here
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/lttng/lttng-ust/commit/21a934df4c683e73e0a66a9afca33573fcf9d789.patch";
|
||||||
|
sha256 = "122lw9rdmr80gmz7814235ibqs47c6pzvg0ryh01805x0cymx74z";
|
||||||
|
})
|
||||||
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python";
|
pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python";
|
||||||
|
|
|
@ -22,11 +22,11 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "bikeshed";
|
pname = "bikeshed";
|
||||||
version = "3.5.2";
|
version = "3.7.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-fa9z/y4Enrei8gb48MSS7vzDcttZVO7MJkdEIaDZb0I=";
|
sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Relax requirements from "==" to ">="
|
# Relax requirements from "==" to ">="
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "signal-cli";
|
pname = "signal-cli";
|
||||||
version = "0.10.2";
|
version = "0.10.8";
|
||||||
|
|
||||||
# Building from source would be preferred, but is much more involved.
|
# Building from source would be preferred, but is much more involved.
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
|
||||||
sha256 = "sha256-etCO7sy48A7aL3mnXWitClNiw/E122G4eD6YfVmXEPw=";
|
sha256 = "sha256-vZBFYPim/qBC8hJHvp5gK6P2JxIs9rzR/hIMjW3kNM8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||||
|
|
|
@ -71,7 +71,7 @@ let
|
||||||
in
|
in
|
||||||
env.mkDerivation rec {
|
env.mkDerivation rec {
|
||||||
pname = "telegram-desktop";
|
pname = "telegram-desktop";
|
||||||
version = "3.7.3";
|
version = "4.0.0";
|
||||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||||
|
|
||||||
# Telegram-Desktop with submodules
|
# Telegram-Desktop with submodules
|
||||||
|
@ -80,7 +80,7 @@ env.mkDerivation rec {
|
||||||
repo = "tdesktop";
|
repo = "tdesktop";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
sha256 = "01b3nrhfbxhq4w63nsjnrhyfsdq3fm4l7sfkasbh8ib4qk3c9vwz";
|
sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "tg_owt";
|
pname = "tg_owt";
|
||||||
version = "unstable-2022-04-14";
|
version = "unstable-2022-05-08";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "desktop-app";
|
owner = "desktop-app";
|
||||||
repo = "tg_owt";
|
repo = "tg_owt";
|
||||||
rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396";
|
rev = "10d5f4bf77333ef6b43516f90d2ce13273255f41";
|
||||||
sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM=";
|
sha256 = "02sky7sx73rj8xm1f70vy94zxaab6qiif742fv0vi4y6pfqrngn7";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,14 +17,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "warp";
|
pname = "warp";
|
||||||
version = "0.1.2";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = "warp";
|
repo = "warp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-6KWTjfrJr0QkiYHkwy4IKrzQuVUMHc1yILM7ixHBHSQ=";
|
hash = "sha256-AtSU/vN20ePyxhSSl0RB2a4KKpd6PTUCC4n5RIuYVr4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-Xy/tn5iUqwlmztmTmqUbISAk1xu9vkbMk4CvK4j2ttM=";
|
hash = "sha256-DbKoZLB8XIZy5bIOC6blrNa3x4oCVG0Bl9xp6ARgw0c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert }:
|
{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly }:
|
||||||
|
|
||||||
{ name ? "${args.pname}-${args.version}"
|
{ name ? "${args.pname}-${args.version}"
|
||||||
, pname ? name
|
, pname ? name
|
||||||
|
@ -78,7 +78,9 @@ let
|
||||||
then linkFarmFromDrvs "${name}-project-references" projectReferences
|
then linkFarmFromDrvs "${name}-project-references" projectReferences
|
||||||
else null;
|
else null;
|
||||||
|
|
||||||
_nugetDeps = mkNugetDeps { inherit name; nugetDeps = import nugetDeps; };
|
_nugetDeps = if lib.isDerivation nugetDeps
|
||||||
|
then nugetDeps
|
||||||
|
else mkNugetDeps { inherit name; nugetDeps = import nugetDeps; };
|
||||||
|
|
||||||
nuget-source = mkNugetSource {
|
nuget-source = mkNugetSource {
|
||||||
name = "${name}-nuget-source";
|
name = "${name}-nuget-source";
|
||||||
|
@ -115,7 +117,7 @@ in stdenvNoCC.mkDerivation (args // {
|
||||||
export HOME=$(mktemp -d)
|
export HOME=$(mktemp -d)
|
||||||
deps_file="/tmp/${pname}-deps.nix"
|
deps_file="/tmp/${pname}-deps.nix"
|
||||||
|
|
||||||
store_src="${args.src}"
|
store_src="${srcOnly args}"
|
||||||
src="$(mktemp -d /tmp/${pname}.XXX)"
|
src="$(mktemp -d /tmp/${pname}.XXX)"
|
||||||
cp -rT "$store_src" "$src"
|
cp -rT "$store_src" "$src"
|
||||||
chmod -R +w "$src"
|
chmod -R +w "$src"
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
{ linkFarmFromDrvs, fetchurl }:
|
{ linkFarmFromDrvs, fetchurl }:
|
||||||
{ name, nugetDeps }:
|
{ name, nugetDeps }:
|
||||||
linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {
|
linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {
|
||||||
fetchNuGet = { pname, version, sha256 }: fetchurl {
|
fetchNuGet = { pname, version, sha256
|
||||||
|
, url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:
|
||||||
|
fetchurl {
|
||||||
name = "${pname}-${version}.nupkg";
|
name = "${pname}-${version}.nupkg";
|
||||||
url = "https://www.nuget.org/api/v2/package/${pname}/${version}";
|
inherit url sha256;
|
||||||
inherit sha256;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
, coreutils
|
, coreutils
|
||||||
, findutils
|
, findutils
|
||||||
, gnused
|
, gnused
|
||||||
|
, jq
|
||||||
|
, curl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
runCommandLocal "nuget-to-nix" {
|
runCommandLocal "nuget-to-nix" {
|
||||||
|
@ -18,6 +20,8 @@ runCommandLocal "nuget-to-nix" {
|
||||||
coreutils
|
coreutils
|
||||||
findutils
|
findutils
|
||||||
gnused
|
gnused
|
||||||
|
jq
|
||||||
|
curl
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,8 @@ pkgs=$1
|
||||||
tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
|
tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
|
||||||
trap "rm -f ${tmpfile}" EXIT
|
trap "rm -f ${tmpfile}" EXIT
|
||||||
|
|
||||||
|
declare -A nuget_sources_cache
|
||||||
|
|
||||||
echo "{ fetchNuGet }: ["
|
echo "{ fetchNuGet }: ["
|
||||||
|
|
||||||
while read pkg_spec; do
|
while read pkg_spec; do
|
||||||
|
@ -21,7 +23,14 @@ while read pkg_spec; do
|
||||||
sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")
|
sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")
|
||||||
pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
|
pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
|
||||||
|
|
||||||
echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" >> ${tmpfile}
|
pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
|
||||||
|
if [[ $pkg_src != https://api.nuget.org/* ]]; then
|
||||||
|
pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
|
||||||
|
pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg"
|
||||||
|
echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}
|
||||||
|
else
|
||||||
|
echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" >> ${tmpfile}
|
||||||
|
fi
|
||||||
done < <(find $1 -name '*.nuspec')
|
done < <(find $1 -name '*.nuspec')
|
||||||
|
|
||||||
LC_ALL=C sort --ignore-case ${tmpfile}
|
LC_ALL=C sort --ignore-case ${tmpfile}
|
||||||
|
|
|
@ -7,25 +7,13 @@
|
||||||
#
|
#
|
||||||
# > srcOnly pkgs.hello
|
# > srcOnly pkgs.hello
|
||||||
#
|
#
|
||||||
{ name
|
attrs:
|
||||||
, src
|
let
|
||||||
, stdenv ? orig.stdenv
|
args = if builtins.hasAttr "drvAttrs" attrs then attrs.drvAttrs else attrs;
|
||||||
, patches ? []
|
name = if builtins.hasAttr "name" args then args.name else "${args.pname}-${args.version}";
|
||||||
, # deprecated, use the nativeBuildInputs
|
in
|
||||||
buildInputs ? []
|
stdenv.mkDerivation (args // {
|
||||||
, # used to pass extra unpackers
|
name = "${name}-source";
|
||||||
nativeBuildInputs ? []
|
|
||||||
, # needed when passing an existing derivation
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit
|
|
||||||
buildInputs
|
|
||||||
name
|
|
||||||
nativeBuildInputs
|
|
||||||
patches
|
|
||||||
src
|
|
||||||
;
|
|
||||||
installPhase = "cp -r . $out";
|
installPhase = "cp -r . $out";
|
||||||
phases = ["unpackPhase" "patchPhase" "installPhase"];
|
phases = ["unpackPhase" "patchPhase" "installPhase"];
|
||||||
}
|
})
|
||||||
|
|
|
@ -101,9 +101,12 @@
|
||||||
, libXext ? null # Xlib support
|
, libXext ? null # Xlib support
|
||||||
, libxml2 ? null # libxml2 support, for IMF and DASH demuxers
|
, libxml2 ? null # libxml2 support, for IMF and DASH demuxers
|
||||||
, xz ? null # xz-utils
|
, xz ? null # xz-utils
|
||||||
, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support
|
, nv-codec-headers ? null
|
||||||
|
, nvdec ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVDEC support
|
||||||
|
, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVENC support
|
||||||
, openal ? null # OpenAL 1.1 capture support
|
, openal ? null # OpenAL 1.1 capture support
|
||||||
#, opencl ? null # OpenCL code
|
, ocl-icd ? null # OpenCL ICD
|
||||||
|
, opencl-headers ? null # OpenCL headers
|
||||||
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
|
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
|
||||||
#, opencv ? null # Video filtering
|
#, opencv ? null # Video filtering
|
||||||
, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering
|
, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering
|
||||||
|
@ -164,7 +167,7 @@
|
||||||
*
|
*
|
||||||
* Not packaged:
|
* Not packaged:
|
||||||
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
|
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
|
||||||
* libnut libquvi nvenc opencl oss shine twolame
|
* libnut libquvi nvenc oss shine twolame
|
||||||
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
|
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
|
||||||
*
|
*
|
||||||
* Need fixes to support Darwin:
|
* Need fixes to support Darwin:
|
||||||
|
@ -375,9 +378,11 @@ stdenv.mkDerivation rec {
|
||||||
(enableFeature libxcbshapeExtlib "libxcb-shape")
|
(enableFeature libxcbshapeExtlib "libxcb-shape")
|
||||||
(enableFeature (libxml2 != null) "libxml2")
|
(enableFeature (libxml2 != null) "libxml2")
|
||||||
(enableFeature (xz != null) "lzma")
|
(enableFeature (xz != null) "lzma")
|
||||||
|
(enableFeature nvdec "cuvid")
|
||||||
|
(enableFeature nvdec "nvdec")
|
||||||
(enableFeature nvenc "nvenc")
|
(enableFeature nvenc "nvenc")
|
||||||
(enableFeature (openal != null) "openal")
|
(enableFeature (openal != null) "openal")
|
||||||
#(enableFeature opencl "opencl")
|
(enableFeature (ocl-icd != null && opencl-headers != null) "opencl")
|
||||||
(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
|
(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
|
||||||
#(enableFeature (opencv != null) "libopencv")
|
#(enableFeature (opencv != null) "libopencv")
|
||||||
(enableFeature openglExtlib "opengl")
|
(enableFeature openglExtlib "opengl")
|
||||||
|
@ -431,7 +436,7 @@ stdenv.mkDerivation rec {
|
||||||
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
|
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
|
||||||
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
|
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
|
||||||
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
|
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
|
||||||
libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
|
libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
|
||||||
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
|
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
|
||||||
zeromq4 zimg zlib openh264
|
zeromq4 zimg zlib openh264
|
||||||
] ++ optionals openglExtlib [ libGL libGLU ]
|
] ++ optionals openglExtlib [ libGL libGLU ]
|
||||||
|
@ -441,7 +446,7 @@ stdenv.mkDerivation rec {
|
||||||
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
|
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
|
||||||
++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ]
|
++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ]
|
||||||
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
|
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
|
||||||
++ optional nvenc nv-codec-headers
|
++ optional (nvdec || nvenc) nv-codec-headers
|
||||||
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
|
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
|
||||||
MediaToolbox VideoDecodeAcceleration
|
MediaToolbox VideoDecodeAcceleration
|
||||||
libiconv ];
|
libiconv ];
|
||||||
|
|
|
@ -10,18 +10,24 @@ let param =
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h";
|
sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h";
|
||||||
};
|
};
|
||||||
|
NIX_CFLAGS_COMPILE = null;
|
||||||
} else if check "3.12" then {
|
} else if check "3.12" then {
|
||||||
version = "2.18.5";
|
version = "2.18.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz";
|
url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz";
|
||||||
sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib";
|
sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib";
|
||||||
};
|
};
|
||||||
|
# Workaround build failure on -fno-common toolchains like upstream
|
||||||
|
# gcc-10. Otherwise build fails as:
|
||||||
|
# ld: ml_gtktree.o:(.bss+0x0): multiple definition of
|
||||||
|
# `ml_table_extension_events'; ml_gdkpixbuf.o:(.bss+0x0): first defined here
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||||
} else throw "lablgtk is not available for OCaml ${ocaml.version}";
|
} else throw "lablgtk is not available for OCaml ${ocaml.version}";
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "lablgtk";
|
pname = "lablgtk";
|
||||||
inherit (param) version src;
|
inherit (param) version src NIX_CFLAGS_COMPILE;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ocaml findlib ];
|
nativeBuildInputs = [ pkg-config ocaml findlib ];
|
||||||
buildInputs = [ gtk2 libgnomecanvas gtksourceview ];
|
buildInputs = [ gtk2 libgnomecanvas gtksourceview ];
|
||||||
|
|
36
pkgs/development/python-modules/archspec/default.nix
Normal file
36
pkgs/development/python-modules/archspec/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, poetry-core
|
||||||
|
, click
|
||||||
|
, six
|
||||||
|
, pytestCheckHook
|
||||||
|
, jsonschema
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "archspec";
|
||||||
|
version = "0.1.4";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = pname;
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
sha256 = "sha256-ScigEpYNArveqi5tlqiA7LwsVs2RkjT+GChxhSy/ndw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ poetry-core ];
|
||||||
|
propagatedBuildInputs = [ click six ];
|
||||||
|
checkInputs = [ pytestCheckHook jsonschema ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "archspec" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A library for detecting, labeling, and reasoning about microarchitectures";
|
||||||
|
homepage = "https://archspec.readthedocs.io/en/latest/";
|
||||||
|
license = with licenses; [ mit asl20 ];
|
||||||
|
maintainers = with maintainers; [ atila ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -25,14 +25,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "datashader";
|
pname = "datashader";
|
||||||
version = "0.14.0";
|
version = "0.14.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-VKEDOJV2ITO1gxKLbFQbcem0gEd/fzTIo+QSmZVsMGI=";
|
hash = "sha256-VGF6351lVCBat68EY9IY9lHk1hDMcjBcrVdPSliFq4Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -11,14 +11,16 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "django-debug-toolbar";
|
pname = "django-debug-toolbar";
|
||||||
version = "3.2.4";
|
version = "3.4";
|
||||||
disabled = pythonOlder "3.6";
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jazzband";
|
owner = "jazzband";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "1008yzxxs1cp1wc0xcc9xskc3f7naxc4srv1sikiank1bc3479ha";
|
hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -42,11 +44,15 @@ buildPythonPackage rec {
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
pythonImportsCheck = [
|
||||||
|
"debug_toolbar"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "Configurable set of panels that display debug information about the current request/response";
|
description = "Configurable set of panels that display debug information about the current request/response";
|
||||||
homepage = "https://github.com/jazzband/django-debug-toolbar";
|
homepage = "https://github.com/jazzband/django-debug-toolbar";
|
||||||
changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html";
|
changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html";
|
||||||
maintainers = with lib.maintainers; [ yuu ];
|
license = licenses.bsd3;
|
||||||
license = lib.licenses.bsd3;
|
maintainers = with maintainers; [ yuu ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
39
pkgs/development/python-modules/hpccm/default.nix
Normal file
39
pkgs/development/python-modules/hpccm/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, buildPythonPackage
|
||||||
|
, six
|
||||||
|
, archspec
|
||||||
|
, pytestCheckHook
|
||||||
|
, pytest-xdist
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "hpccm";
|
||||||
|
version = "22.5.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "NVIDIA";
|
||||||
|
repo = "hpc-container-maker";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-zR5+X9BKaUvLPQ05FnfU817esgxVqP8n+wfdWy20BN4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ six archspec ];
|
||||||
|
checkInputs = [ pytestCheckHook pytest-xdist ];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# tests require git
|
||||||
|
"test_commit"
|
||||||
|
"test_tag"
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "hpccm" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "HPC Container Maker";
|
||||||
|
homepage = "https://github.com/NVIDIA/hpc-container-maker";
|
||||||
|
license = licenses.asl20;
|
||||||
|
platforms = platforms.x86;
|
||||||
|
maintainers = with maintainers; [ atila ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, atpublic
|
, atpublic
|
||||||
|
@ -73,6 +74,14 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-7ywDMAHQAl39kiHfxVkq7voUEKqbb9Zq8qlaug7+ukI=";
|
hash = "sha256-7ywDMAHQAl39kiHfxVkq7voUEKqbb9Zq8qlaug7+ukI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/ibis-project/ibis/commit/a6f64c6c32b49098d39bb205952cbce4bdfea657.patch";
|
||||||
|
sha256 = "sha256-puVMjiJXWk8C9yhuXPD9HKrgUBYcYmUPacQz5YO5xYQ=";
|
||||||
|
includes = [ "pyproject.toml" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ poetry-core ];
|
nativeBuildInputs = [ poetry-core ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
diff --git a/src/hydra-eval-jobs/Makefile.am b/src/hydra-eval-jobs/Makefile.am
|
|
||||||
index 7a4e9c91..90742a30 100644
|
|
||||||
--- a/src/hydra-eval-jobs/Makefile.am
|
|
||||||
+++ b/src/hydra-eval-jobs/Makefile.am
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
bin_PROGRAMS = hydra-eval-jobs
|
|
||||||
|
|
||||||
hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
|
|
||||||
-hydra_eval_jobs_LDADD = $(NIX_LIBS)
|
|
||||||
+hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd
|
|
||||||
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra
|
|
|
@ -126,16 +126,22 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hydra";
|
pname = "hydra";
|
||||||
version = "2022-05-03";
|
version = "2022-06-16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "hydra";
|
repo = "hydra";
|
||||||
rev = "7c133a98f8e689cdc13f8a1adaaa9cd75d039a35";
|
rev = "fb26435fe9a54f13143e69a545b8f3cecffaed96";
|
||||||
sha256 = "sha256-LqBLIXYssvDoSp2Hf2+vDDB9O8VSF48HAGwL8pI2WZY=";
|
sha256 = "sha256-kmgN7D7tUC3Ki70D+rdS19PW/lrANlU3tc8gu5gsld0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./eval.patch ];
|
patches = [
|
||||||
|
# https://github.com/NixOS/hydra/pull/1215: scmdiff: Hardcode --git-dir
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/NixOS/hydra/commit/b6ea85a601ddac9cb0716d8cb4d446439fa0778f.patch";
|
||||||
|
sha256 = "sha256-QHjwLYQucdkBs6OsFI8kWo5ugkPXXlTgdbGFxKBHAHo=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env nix-shell
|
|
||||||
#!nix-shell -I nixpkgs=../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
cat << EOL
|
|
||||||
{ fetchurl }: [
|
|
||||||
EOL
|
|
||||||
|
|
||||||
# enter a temporary directory containing the source code, copied from the derivation
|
|
||||||
srcdir="$(mktemp -d)"
|
|
||||||
cp -r "$(nix-build -A omnisharp-roslyn.src ../../../..)"/. "$srcdir"
|
|
||||||
rm -f "$srcdir"/global.json
|
|
||||||
|
|
||||||
pushd $srcdir >&2
|
|
||||||
|
|
||||||
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
|
|
||||||
|
|
||||||
mapfile -t repos < <(
|
|
||||||
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.Config |
|
|
||||||
while IFS= read index
|
|
||||||
do
|
|
||||||
curl --compressed -fsL "$index" | \
|
|
||||||
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
|
|
||||||
done
|
|
||||||
)
|
|
||||||
|
|
||||||
dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
|
|
||||||
-p:RestoreNoCache=true -p:RestoreForce=true \
|
|
||||||
"$srcdir/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj" >&2
|
|
||||||
|
|
||||||
cd "$tmpdir"
|
|
||||||
for package in *
|
|
||||||
do
|
|
||||||
cd "$package"
|
|
||||||
for version in *
|
|
||||||
do
|
|
||||||
found=false
|
|
||||||
for repo in "${repos[@]}"
|
|
||||||
do
|
|
||||||
url="$repo$package/$version/$package.$version.nupkg"
|
|
||||||
if curl -fsL "$url" -o /dev/null
|
|
||||||
then
|
|
||||||
found=true
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if ! $found
|
|
||||||
then
|
|
||||||
echo "couldn't find $package $version" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
|
|
||||||
cat << EOL
|
|
||||||
{
|
|
||||||
pname = "$package";
|
|
||||||
version = "$version";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "$url";
|
|
||||||
sha256 = "$sha256";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
EOL
|
|
||||||
done
|
|
||||||
cd ..
|
|
||||||
done
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
cat << EOL
|
|
||||||
]
|
|
||||||
EOL
|
|
||||||
|
|
||||||
popd >&2
|
|
|
@ -1,68 +1,9 @@
|
||||||
{ lib, stdenv
|
{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages }:
|
||||||
, fetchFromGitHub
|
|
||||||
, fetchurl
|
|
||||||
, dotnetCorePackages
|
|
||||||
, makeWrapper
|
|
||||||
, unzip
|
|
||||||
, writeText
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
sdkVersion = dotnetCorePackages.sdk_6_0.version;
|
||||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
in
|
||||||
|
buildDotnetModule rec {
|
||||||
deps = map (package: stdenv.mkDerivation (with package; {
|
|
||||||
inherit pname version src;
|
|
||||||
|
|
||||||
buildInputs = [ unzip ];
|
|
||||||
unpackPhase = ''
|
|
||||||
unzip $src
|
|
||||||
chmod -R u+r .
|
|
||||||
function traverseRename () {
|
|
||||||
for e in *
|
|
||||||
do
|
|
||||||
t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")"
|
|
||||||
[ "$t" != "$e" ] && mv -vn "$e" "$t"
|
|
||||||
if [ -d "$t" ]
|
|
||||||
then
|
|
||||||
cd "$t"
|
|
||||||
traverseRename
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
traverseRename
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
package=$out/lib/dotnet/${pname}/${version}
|
|
||||||
mkdir -p $package
|
|
||||||
cp -r . $package
|
|
||||||
echo "{}" > $package/.nupkg.metadata
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontFixup = true;
|
|
||||||
}))
|
|
||||||
(import ./deps.nix { inherit fetchurl; });
|
|
||||||
|
|
||||||
nuget-config = writeText "NuGet.Config" ''
|
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<packageSources>
|
|
||||||
<clear />
|
|
||||||
</packageSources>
|
|
||||||
<fallbackPackageFolders>
|
|
||||||
${lib.concatStringsSep "\n" (map (package: "<add key=\"${package}\" value=\"${package}/lib/dotnet\"/>") deps)}
|
|
||||||
</fallbackPackageFolders>
|
|
||||||
</configuration>
|
|
||||||
'';
|
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "omnisharp-roslyn";
|
pname = "omnisharp-roslyn";
|
||||||
version = "1.38.2";
|
version = "1.38.2";
|
||||||
|
|
||||||
|
@ -73,36 +14,21 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "7XJIdotfffu8xo+S6xlc1zcK3oY9QIg1CJhCNJh5co0=";
|
sha256 = "7XJIdotfffu8xo+S6xlc1zcK3oY9QIg1CJhCNJh5co0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper dotnet-sdk ];
|
projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
|
||||||
|
nugetDeps = ./deps.nix;
|
||||||
|
|
||||||
|
dotnetInstallFlags = [ "--framework net6.0" ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Relax the version requirement
|
# Relax the version requirement
|
||||||
substituteInPlace global.json \
|
substituteInPlace global.json \
|
||||||
--replace '6.0.100' '${dotnet-sdk.version}'
|
--replace '6.0.100' '${sdkVersion}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
postFixup = ''
|
||||||
runHook preBuild
|
|
||||||
|
|
||||||
HOME=$(pwd)/fake-home dotnet msbuild -r \
|
|
||||||
-p:Configuration=Release \
|
|
||||||
-p:RestoreConfigFile=${nuget-config} \
|
|
||||||
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
|
|
||||||
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src
|
|
||||||
|
|
||||||
# Delete files to mimick hacks in https://github.com/OmniSharp/omnisharp-roslyn/blob/bdc14ca/build.cake#L594
|
# Delete files to mimick hacks in https://github.com/OmniSharp/omnisharp-roslyn/blob/bdc14ca/build.cake#L594
|
||||||
rm $out/src/NuGet.*.dll
|
rm $out/lib/omnisharp-roslyn/NuGet.*.dll
|
||||||
rm $out/src/System.Configuration.ConfigurationManager.dll
|
rm $out/lib/omnisharp-roslyn/System.Configuration.ConfigurationManager.dll
|
||||||
|
|
||||||
makeWrapper $out/src/OmniSharp $out/bin/omnisharp \
|
|
||||||
--prefix DOTNET_ROOT : ${dotnet-sdk} \
|
|
||||||
--suffix PATH : ${dotnet-sdk}/bin
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -114,8 +40,7 @@ in stdenv.mkDerivation rec {
|
||||||
binaryNativeCode # dependencies
|
binaryNativeCode # dependencies
|
||||||
];
|
];
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ tesq0 ericdallo corngood ];
|
maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ];
|
||||||
mainProgram = "omnisharp";
|
mainProgram = "OmniSharp";
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
3215
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
3215
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -1,19 +1,19 @@
|
||||||
{ stdenv, lib, fetchurl, unzip }:
|
{ stdenv, lib, fetchurl, unzip }:
|
||||||
let
|
let
|
||||||
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
||||||
version = "4.0.60";
|
version = "4.4.40";
|
||||||
supportedPlatforms = {
|
supportedPlatforms = {
|
||||||
"x86_64-linux" = {
|
"x86_64-linux" = {
|
||||||
name = "x86_64-unknown-linux-musl";
|
name = "x86_64-unknown-linux-musl";
|
||||||
sha256 = "sha256-v5UxRMDDQxpqIKMe9mYMXcpWiacdXzFfaQ6bgab/WmQ=";
|
sha256 = "sha256-goPPGU4oZWBD/C15rbbX5YMqua16A4MdLhBoC4JxaCI=";
|
||||||
};
|
};
|
||||||
"x86_64-darwin" = {
|
"x86_64-darwin" = {
|
||||||
name = "x86_64-apple-darwin";
|
name = "x86_64-apple-darwin";
|
||||||
sha256 = "sha256-vFMMzMatuu1TY6dnBXycv0HxvkOj4Axfx8p0VW0hOic=";
|
sha256 = "sha256-CgYHQ91U6K3+kMyOSSia2B7IncR5u0eq9h3EZiBsRdU=";
|
||||||
};
|
};
|
||||||
"aarch64-darwin" = {
|
"aarch64-darwin" = {
|
||||||
name = "aarch64-apple-darwin";
|
name = "aarch64-apple-darwin";
|
||||||
sha256 = "sha256-DUeDQLtvSY7W2nG60UunluCSO0ijJP2CYxpRIZA4LTE=";
|
sha256 = "sha256-JwX3TdKYmLQO3mWb15Ds/60VAAurGxqfJlMCQqy2pxg=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
platform =
|
platform =
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "Tautulli";
|
pname = "Tautulli";
|
||||||
version = "2.9.5";
|
version = "2.10.1";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
pythonPath = [ setuptools ];
|
pythonPath = [ setuptools ];
|
||||||
|
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
||||||
owner = "Tautulli";
|
owner = "Tautulli";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-agkYfLWmeQOD+dtoYvTcNPXjfU3kv56c15AFeB7eVTw=";
|
sha256 = "sha256-qM3PiBZD0AfbhIdJFYFUGYhsB4U6ZZEW4i7S9waP7VE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
25
pkgs/tools/admin/aws-sso-cli/default.nix
Normal file
25
pkgs/tools/admin/aws-sso-cli/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ buildGoModule, fetchFromGitHub, lib }:
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "aws-sso-cli";
|
||||||
|
version = "1.9.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "synfinatic";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "9/dZfRmFAyE5NEMmuiVsRvwgqQrTNhXkTR9N0d3zgfk=";
|
||||||
|
};
|
||||||
|
vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4=";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/cmd $out/bin/aws-sso
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/synfinatic/aws-sso-cli";
|
||||||
|
description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ devusb ];
|
||||||
|
mainProgram = "aws-sso";
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "boundary";
|
pname = "boundary";
|
||||||
version = "0.8.1";
|
version = "0.9.0";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
let
|
let
|
||||||
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||||
aarch64-darwin = "darwin_arm64";
|
aarch64-darwin = "darwin_arm64";
|
||||||
};
|
};
|
||||||
sha256 = selectSystem {
|
sha256 = selectSystem {
|
||||||
x86_64-linux = "sha256-JvWzDdslO1S/nVsIwvFAEhLo/kkHIE1AVwoI980LV4Y=";
|
x86_64-linux = "sha256-+Ewk+tLLwp8xszDS3RadeAOpS261wSG5NC8Gk2OwHiY=";
|
||||||
aarch64-linux = "sha256-IwD7iazbh94c9CZfFsg5t39D8oVWgpfXP1H0/GsTe3Y=";
|
aarch64-linux = "sha256-knEI3a4xL+kAllNColEXBCKhnWoM3Fcso3cwFGaA1fQ=";
|
||||||
x86_64-darwin = "sha256-SkNSZVdbR6KW/vChDdvHMP+fGQp+mPVxKpEHb7BR4+4=";
|
x86_64-darwin = "sha256-jPdW3ovcb5yhQHJGUEBB2hou2og4tMIGtr5V+W6vNlc=";
|
||||||
aarch64-darwin = "sha256-Mx9YhMk5eBgtDiYWPq7jfhrM3TjH0VCUE1QXycz5Cfc=";
|
aarch64-darwin = "sha256-8Fx6lQUHna5J8M67wSzpRmAGZlZbQdpMxgSa6/07g/Y=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
fetchzip {
|
fetchzip {
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fancy-motd";
|
pname = "fancy-motd";
|
||||||
version = "unstable-2021-07-15";
|
version = "unstable-2022-06-06";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bcyran";
|
owner = "bcyran";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "e8d2d2602d9b9fbc132ddc4f9fbf22428d715721";
|
rev = "812c58f04f65053271f866f3797baa2eba7324f5";
|
||||||
sha256 = "10fxr1grsiwvdc5m2wd4n51lvz0zd4sldg9rzviaim18nw68gdq3";
|
sha256 = "sha256-O/euB63Dyj+NyfZK42egSEYwZhL8B0jCxSSDYoT4cpo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bc curl figlet fortune gawk iproute2 ];
|
buildInputs = [ bc curl figlet fortune gawk iproute2 ];
|
||||||
|
|
|
@ -1931,6 +1931,8 @@ with pkgs;
|
||||||
|
|
||||||
aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
|
aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
|
||||||
|
|
||||||
|
aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { };
|
||||||
|
|
||||||
aws-vault = callPackage ../tools/admin/aws-vault { };
|
aws-vault = callPackage ../tools/admin/aws-vault { };
|
||||||
|
|
||||||
aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };
|
aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };
|
||||||
|
@ -7077,6 +7079,8 @@ with pkgs;
|
||||||
|
|
||||||
hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
|
hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
|
||||||
|
|
||||||
|
hpccm = with python3Packages; toPythonApplication hpccm;
|
||||||
|
|
||||||
hping = callPackage ../tools/networking/hping { };
|
hping = callPackage ../tools/networking/hping { };
|
||||||
|
|
||||||
hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
|
hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
|
||||||
|
@ -18049,7 +18053,7 @@ with pkgs;
|
||||||
|
|
||||||
hwloc = callPackage ../development/libraries/hwloc {};
|
hwloc = callPackage ../development/libraries/hwloc {};
|
||||||
|
|
||||||
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_8; };
|
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_9; };
|
||||||
|
|
||||||
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
||||||
|
|
||||||
|
|
|
@ -617,6 +617,8 @@ in {
|
||||||
|
|
||||||
archinfo = callPackage ../development/python-modules/archinfo { };
|
archinfo = callPackage ../development/python-modules/archinfo { };
|
||||||
|
|
||||||
|
archspec = callPackage ../development/python-modules/archspec { };
|
||||||
|
|
||||||
area = callPackage ../development/python-modules/area { };
|
area = callPackage ../development/python-modules/area { };
|
||||||
|
|
||||||
arelle = callPackage ../development/python-modules/arelle {
|
arelle = callPackage ../development/python-modules/arelle {
|
||||||
|
@ -4017,6 +4019,8 @@ in {
|
||||||
|
|
||||||
hpack = callPackage ../development/python-modules/hpack { };
|
hpack = callPackage ../development/python-modules/hpack { };
|
||||||
|
|
||||||
|
hpccm = callPackage ../development/python-modules/hpccm { };
|
||||||
|
|
||||||
hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
|
hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
|
||||||
|
|
||||||
hsluv = callPackage ../development/python-modules/hsluv { };
|
hsluv = callPackage ../development/python-modules/hsluv { };
|
||||||
|
|
Loading…
Reference in a new issue