mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a292b5fe68
40 changed files with 242 additions and 163 deletions
|
|
@ -73,6 +73,17 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
|
|||
|
||||
* `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. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs.
|
||||
* `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.
|
||||
For example, your project has a local dependency:
|
||||
```xml
|
||||
<ProjectReference Include="../foo/bar.fsproj" />
|
||||
```
|
||||
To enable discovery through `projectReferences` you would need to add:
|
||||
```xml
|
||||
<ProjectReference Include="../foo/bar.fsproj" />
|
||||
<PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>
|
||||
```
|
||||
* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`.
|
||||
* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
|
||||
* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.
|
||||
|
|
@ -83,15 +94,18 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
|
|||
* `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
|
||||
* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
|
||||
* `dotnetBuildFlags` can be used to pass flags to `dotnet build`.
|
||||
* `dotnetTestFlags` can be used to pass flags to `dotnet test`.
|
||||
* `dotnetTestFlags` can be used to pass flags to `dotnet test`. Used only if `doCheck` is set to `true`.
|
||||
* `dotnetInstallFlags` can be used to pass flags to `dotnet install`.
|
||||
* `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`.
|
||||
* `dotnetFlags` can be used to pass flags to all of the above phases.
|
||||
|
||||
Here is an example `default.nix`, using some of the previously discussed arguments:
|
||||
```nix
|
||||
{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }:
|
||||
|
||||
buildDotnetModule rec {
|
||||
let
|
||||
referencedProject = import ../../bar { ... };
|
||||
in buildDotnetModule rec {
|
||||
pname = "someDotnetApplication";
|
||||
version = "0.1";
|
||||
|
||||
|
|
@ -99,6 +113,7 @@ buildDotnetModule rec {
|
|||
|
||||
projectFile = "src/project.sln";
|
||||
nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`.
|
||||
projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_3_1;
|
||||
dotnet-runtime = dotnetCorePackages.net_5_0;
|
||||
|
|
@ -107,6 +122,8 @@ buildDotnetModule rec {
|
|||
executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
|
||||
executables = []; # Don't install any executables.
|
||||
|
||||
packNupkg = true; # This packs the project as "foo-0.1.nupkg" at `$out/share`.
|
||||
|
||||
runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`.
|
||||
}
|
||||
```
|
||||
|
|
|
|||
|
|
@ -118,8 +118,9 @@ in rec {
|
|||
# The actual generation of the xml file is done in nix purely for the convenience
|
||||
# of not having to generate the xml some other way
|
||||
optionsXML = pkgs.runCommand "options.xml" {} ''
|
||||
export NIX_STORE_DIR=$TMPDIR/store
|
||||
export NIX_STATE_DIR=$TMPDIR/state
|
||||
${pkgs.nix}/bin/nix-instantiate \
|
||||
--store dummy:// \
|
||||
--eval --xml --strict ${./optionsJSONtoXML.nix} \
|
||||
--argstr file ${optionsJSON}/share/doc/nixos/options.json \
|
||||
> "$out"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ in {
|
|||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.couchdb;
|
||||
defaultText = literalExpression "pkgs.couchdb";
|
||||
default = pkgs.couchdb3;
|
||||
defaultText = literalExpression "pkgs.couchdb3";
|
||||
description = ''
|
||||
CouchDB package to use.
|
||||
'';
|
||||
|
|
@ -150,6 +150,14 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
argsFile = mkOption {
|
||||
type = types.path;
|
||||
default = "${cfg.package}/etc/vm.args";
|
||||
description = ''
|
||||
vm.args configuration. Overrides Couchdb's Erlang VM parameters file.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
|
|
@ -186,12 +194,14 @@ in {
|
|||
'';
|
||||
|
||||
environment = {
|
||||
# we are actually specifying 4 configuration files:
|
||||
# we are actually specifying 5 configuration files:
|
||||
# 1. the preinstalled default.ini
|
||||
# 2. the module configuration
|
||||
# 3. the extraConfig from the module options
|
||||
# 4. the locally writable config file, which couchdb itself writes to
|
||||
ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
|
||||
# 5. the vm.args file
|
||||
COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -56,5 +56,8 @@ with lib;
|
|||
couchdb3.succeed(
|
||||
"${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}"
|
||||
)
|
||||
couchdb3.succeed(
|
||||
"${curlJqCheck testlogin "GET" "_node/couchdb@127.0.0.1" ".couchdb" "Welcome"}"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
server_wsdd.wait_for_unit("samba-wsdd")
|
||||
|
||||
client_wsdd.wait_until_succeeds(
|
||||
"echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
|
||||
"echo list | ${pkgs.libressl.nc}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
"x86_64-linux" = "x64";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango ];
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "ZlyteVTwP5oM32G+yUzCOmu6b/b19RVLmlEvyOz5hu0=";
|
||||
sha256 = "xHjT2QbZBfPc0i+tsY/hXo+oY8djJiMnM7GraHVvUHs=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,5 +33,6 @@ symlinkJoin {
|
|||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ smironov globin TethysSvensson ];
|
||||
mainProgram = "zathura";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.23.0";
|
||||
sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy";
|
||||
manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf";
|
||||
version = "0.24.0";
|
||||
sha256 = "025dynxkfqrnpqrvdq39394biky2ra1mfjirrigamngchifav3b3";
|
||||
manifestsSha256 = "0sbbvv40c66qdrhlvas42qcdmpgg1mb8zzcdrfr5yrkqwxnzis7x";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
url =
|
||||
"https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
sha256 = manifestsSha256;
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
in buildGoModule rec {
|
||||
pname = "fluxcd";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -23,15 +23,13 @@ buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0=";
|
||||
vendorSha256 = "0w1qzsri3dkyzwfh6s13np52j3xzxxhk02pqgfh7297djwbppnbs";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./patches/disable-tests-ssh_key.patch
|
||||
];
|
||||
patches = [ ./patches/disable-tests-ssh_key.patch ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
@ -39,7 +37,7 @@ buildGoModule rec {
|
|||
|
||||
# Required to workaround test error:
|
||||
# panic: mkdir /homeless-shelter: permission denied
|
||||
HOME="$TMPDIR";
|
||||
HOME = "$TMPDIR";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -58,7 +56,8 @@ buildGoModule rec {
|
|||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open and extensible continuous delivery solution for Kubernetes";
|
||||
description =
|
||||
"Open and extensible continuous delivery solution for Kubernetes";
|
||||
longDescription = ''
|
||||
Flux is a tool for keeping Kubernetes clusters in sync
|
||||
with sources of configuration (like Git repositories), and automating
|
||||
|
|
|
|||
|
|
@ -1,19 +1,17 @@
|
|||
diff --git a/cmd/flux/create_secret_git_test.go b/cmd/flux/create_secret_git_test.go
|
||||
index afa34ba..0d22cce 100644
|
||||
--- a/cmd/flux/create_secret_git_test.go
|
||||
+++ b/cmd/flux/create_secret_git_test.go
|
||||
@@ -20,16 +20,6 @@ func TestCreateGitSecret(t *testing.T) {
|
||||
--- flux/cmd/flux/create_secret_git_test.go.orig 2021-12-07 13:46:21.196278468 +0100
|
||||
+++ flux/cmd/flux/create_secret_git_test.go 2021-12-07 13:49:51.668566955 +0100
|
||||
@@ -20,16 +20,6 @@
|
||||
args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export",
|
||||
assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"),
|
||||
},
|
||||
- {
|
||||
- name: "ssh key",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa.private --namespace=my-namespace --export",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa.private --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"),
|
||||
- },
|
||||
- {
|
||||
- name: "ssh key with password",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa-password.private --password=password --namespace=my-namespace --export",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa-password.private --password=password --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"),
|
||||
- },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.8";
|
||||
version = "0.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-8b1VyukVMTXLAnvYcjXgTdPtMq3YxJgTpxe25Kj+Wpw=";
|
||||
sha256 = "sha256-mBPRsLBIwahKm2RR22pNXxJhdLaWHCKx0TKc4H4YIVY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catgirl";
|
||||
version = "1.9a";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-MEm5mrrWfNp+mBHFjGSOGvvfvBJ+Ho/K+mPUxzJDkV0=";
|
||||
sha256 = "sha256-rk6nvfyaFxJ/7JN92L5tDraTngffVb6u/U7dbNjK9jI=";
|
||||
};
|
||||
|
||||
# catgirl's configure script uses pkg-config --variable exec_prefix openssl
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "2.9.1.5500";
|
||||
version = "2.9.2.6206";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
|
||||
sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v";
|
||||
sha256 = "sha256-i6TmJFEuH4A1jTyoKiJoVU7yC+AXZIH4miYSk3XzVEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grisbi";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-4ykG310He1aFaUNo5fClaM3QWFBzKERGihYfqaxR1Vo=";
|
||||
sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
|
|
@ -13,22 +12,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pympress";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-f+OjE0x/3yfJYHCLB+on7TT7MJ2vNu87SHRi67qFDCM=";
|
||||
sha256 = "sha256-AxH0PyAWYEEIqQAx9gG2eYyXMijLZGZqXkRhld32ieE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Should not be needed once v1.6.4 is released
|
||||
(fetchpatch {
|
||||
name = "fix-setuptools-version-parsing.patch";
|
||||
url = "https://github.com/Cimbali/pympress/commit/474514d71396ac065e210fd846e07ed1139602d0.diff";
|
||||
sha256 = "sha256-eiw54sjMrXrNrhtkAXxiSTatzoA0NDA03L+HpTDax58=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, coreutils, fltk, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
pname = "seaview";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
|
||||
sha256 = "09yp8467h49qnj7gg0mbcdha4ai3bn6vgs00gb76dd6h3pzfflz1";
|
||||
sha256 = "sha256-zo9emLpHiDv6kekbx55NOibxWN2Zg7XngzGkUqSx+PI=";
|
||||
};
|
||||
|
||||
buildInputs = [ fltk libjpeg ];
|
||||
|
|
|
|||
|
|
@ -125,6 +125,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/32567
|
||||
(fetchSageDiff {
|
||||
base = "9.5.beta2";
|
||||
name = "arb-2.21.0-update.patch";
|
||||
rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb";
|
||||
sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/32797
|
||||
(fetchSageDiff {
|
||||
base = "9.5.beta7";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
archSha256 = sha256;
|
||||
arch = "x64";
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl.out ];
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl ];
|
||||
redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
, dotnetTestFlags ? []
|
||||
# Flags to pass to `dotnet install`.
|
||||
, dotnetInstallFlags ? []
|
||||
# Flags to pass to `dotnet pack`.
|
||||
, dotnetPackFlags ? []
|
||||
# Flags to pass to dotnet in all phases.
|
||||
, dotnetFlags ? []
|
||||
|
||||
|
|
@ -21,11 +23,22 @@
|
|||
# Unfortunately, dotnet has no method for doing this automatically.
|
||||
# If unset, all executables in the projects root will get installed. This may cause bloat!
|
||||
, executables ? null
|
||||
# Packs a 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 ? false
|
||||
# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well.
|
||||
, projectFile ? null
|
||||
# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched.
|
||||
# This can be generated using the `nuget-to-nix` tool.
|
||||
, nugetDeps ? null
|
||||
# A list of derivations containing nupkg packages for local project references.
|
||||
# Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag.
|
||||
# Since we are sharing them as nugets they must be added to csproj/fsproj files as `PackageReference` as well.
|
||||
# For example, your project has a local dependency:
|
||||
# <ProjectReference Include="../foo/bar.fsproj" />
|
||||
# To enable discovery through `projectReferences` you would need to add a line:
|
||||
# <ProjectReference Include="../foo/bar.fsproj" />
|
||||
# <PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>
|
||||
, projectReferences ? []
|
||||
# Libraries that need to be available at runtime should be passed through this.
|
||||
# These get wrapped into `LD_LIBRARY_PATH`.
|
||||
, runtimeDeps ? []
|
||||
|
|
@ -60,6 +73,7 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
});
|
||||
_localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences;
|
||||
|
||||
nuget-source = stdenvNoCC.mkDerivation rec {
|
||||
name = "${args.pname}-nuget-source";
|
||||
|
|
@ -72,6 +86,8 @@ let
|
|||
|
||||
nuget sources Add -Name nixos -Source "$out/lib"
|
||||
nuget init "${_nugetDeps}" "$out/lib"
|
||||
${lib.optionalString (projectReferences != [])
|
||||
"nuget init \"${_localDeps}\" \"$out/lib\""}
|
||||
|
||||
# Generates a list of all unique licenses' spdx ids.
|
||||
find "$out/lib" -name "*.nuspec" -exec sh -c \
|
||||
|
|
@ -167,7 +183,18 @@ let
|
|||
"''${dotnetInstallFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
'' + (if executables != null then ''
|
||||
'' + (lib.optionalString packNupkg ''
|
||||
for project in ''${projectFile[@]}; do
|
||||
dotnet pack "$project" \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output $out/share \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
"''${dotnetPackFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
'') + (if executables != null then ''
|
||||
for executable in $executables; do
|
||||
execPath="$out/lib/${args.pname}/$executable"
|
||||
|
||||
|
|
|
|||
28
pkgs/data/misc/v2ray-geoip/default.nix
Normal file
28
pkgs/data/misc/v2ray-geoip/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202112090029";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "97f4acb31d926ae31bb3cdc5c8948d8dcdddca79";
|
||||
sha256 = "sha256-kYMp/D7xVpBTu35YXq45bR2XebpVOW57UAc7H/6px/U=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GeoIP for V2Ray";
|
||||
homepage = "https://github.com/v2fly/geoip";
|
||||
license = licenses.cc-by-sa-40;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
6
pkgs/data/misc/v2ray-geoip/update.sh
Executable file
6
pkgs/data/misc/v2ray-geoip/update.sh
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p common-updater-scripts curl jq
|
||||
set -euo pipefail
|
||||
|
||||
COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1")
|
||||
update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)"
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arb";
|
||||
version = "2.20.0";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredrik-johansson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HOIbdkVV7NKowIGhDdn/S8unIRV469OnRHiuiCGaWgk=";
|
||||
sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI=";
|
||||
};
|
||||
|
||||
buildInputs = [ mpir gmp mpfr flint ];
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
|||
rev = "v${branchName}-lts";
|
||||
in
|
||||
{
|
||||
version = "${branchName}-${lib.substring 0 7 rev}";
|
||||
version = branchName;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, buildOcaml, fetchFromGitHub, type_conv, pa_ounit }:
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pa_bench";
|
||||
version = "113.00.00";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pa_bench";
|
||||
rev = version;
|
||||
sha256 = "sha256-WaXB3lgNPHy/z6D7uHxfD5W4HYuTZ+ieRbxxHlPao7c=";
|
||||
};
|
||||
|
||||
buildInputs = [ pa_ounit ];
|
||||
propagatedBuildInputs = [ type_conv ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pa_bench";
|
||||
description = "Syntax extension for inline benchmarks";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildOcaml, ocaml, fetchFromGitHub, ounit }:
|
||||
|
||||
if lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "pa_ounit is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pa_ounit";
|
||||
version = "113.00.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pa_ounit";
|
||||
rev = version;
|
||||
sha256 = "sha256-zzXN+mSJtlnQ3e1QoEukCiyfDEoe8cBdkAQ3U1dkvEk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ounit ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pa_ounit";
|
||||
description = "OCaml inline testing";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-agent-parameters-types";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "faraday_agent_parameters_types";
|
||||
inherit version;
|
||||
sha256 = "sha256-zH/ZkqL+kL3J1o7dhB4WYy2tbofFZm+kxEGn5+nRgjc=";
|
||||
sha256 = "6155669db477c3330c0850814eabe231bbbadf9d2ec57b4f734994f76eaee0e7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EW9p5r7RwWohNGwbITtDrEd1FYLtOwWXhVWFgPCG+Po=";
|
||||
sha256 = "1r415g2f0cid8nr3y27ipx9hvwzh70l5wp0d7nv25qblc7g38mms";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "542a300f4b79ed9574cdeb4eb47cf8899f0915041e8bf0058e8192a620087d30";
|
||||
sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus];
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
# rev is the commit of the tag, mainly for kustomize version command output
|
||||
rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";
|
||||
rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf";
|
||||
|
||||
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
||||
[
|
||||
|
|
@ -17,16 +17,15 @@ buildGoModule rec {
|
|||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "kustomize/v${version}";
|
||||
sha256 = "sha256-dHCUuKEUJ4xKMfeR629y/cdM7ZBgP3GxUSKGQYj9Ahg=";
|
||||
sha256 = "sha256-gq5SrI1f6ctGIL0Arf8HQMfgnlglwWlsn1r27Ug70gs=";
|
||||
};
|
||||
|
||||
# TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
# avoid finding test and development commands
|
||||
sourceRoot = "source/kustomize";
|
||||
|
||||
vendorSha256 = "sha256-jP3Jf8QtdNnCrXO3JfyQNCfMwz9d3UaKVTh8DSbx6vA=";
|
||||
vendorSha256 = "sha256-2GbRk7A8VwGONmL74cc2TA+MLyJrSSOQPLaded5s90k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Customization of kubernetes YAML configurations";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-bindgen";
|
||||
version = "0.59.1";
|
||||
version = "0.59.2";
|
||||
|
||||
RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
|
||||
|
||||
|
|
@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "rust-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nCww9sr6kF7nCQeIGtOXddxD3dR/SJ0rqAc+RlZnUkQ=";
|
||||
sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3EXYC/mwzVxo/ginvF1WFtS7ABE/ybyuKb58uMqfTDs=";
|
||||
cargoSha256 = "sha256-zhENlrqj611RkKDvpDtDFWc58wfQVamkJnpe2nvRieE=";
|
||||
|
||||
#for substituteAll
|
||||
libclang = llvmPackages_latest.libclang.lib;
|
||||
|
|
|
|||
|
|
@ -29,20 +29,20 @@ let
|
|||
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
||||
# build.gradle are replaced by a fixed version
|
||||
# (the current one at the time of release) (see postPatch).
|
||||
version = "126.1";
|
||||
version = "126.2";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
sha256 = "cyg4TofSSFLv8pM3zzvc0FxXMiTm+OIchBJF9PDQrkg=";
|
||||
sha256 = "URmjmfzQAVVl6erbh3+FVFdN7vGTNwYKPtcrwtt9vkg=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
sha256 = "uBIm82mt1etBB/HrNY6XGa7mmBfwd1E3RtqN8Rk5qeY=";
|
||||
sha256 = "pUUak5P9t4RmSdT+/oH/8oo6l7rjIN08XDJ06TcUn8I=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
|
|
@ -113,7 +113,7 @@ let
|
|||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "Mw8LZ1iW6vn4RkBBs8SWHp6mo2Bhj7tMZjLbyuJUqSI=";
|
||||
outputHash = "+7vSwQT6LwHgKE9DubISznq4G4DgvlnD7WaF1KywBzU=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,20 +1,63 @@
|
|||
{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw
|
||||
, pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bison
|
||||
, flex
|
||||
, perl
|
||||
, libpng
|
||||
, giflib
|
||||
, libjpeg
|
||||
, alsa-lib
|
||||
, readline
|
||||
, libGLU
|
||||
, libGL
|
||||
, libXaw
|
||||
, pkg-config
|
||||
, gtk2
|
||||
, SDL
|
||||
, SDL_image
|
||||
, autoreconfHook
|
||||
, makeDesktopItem
|
||||
, dos2unix
|
||||
, xa
|
||||
, file
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vice";
|
||||
version = "3.1";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz";
|
||||
sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
|
||||
sha256 = "sha256-Vrl4+q64solgMr1gTQPDUBACGH7vHKWM7O1A8Rpl3A4=";
|
||||
};
|
||||
|
||||
buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL
|
||||
pkg-config gtk2 SDL autoreconfHook libXaw ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
dos2unix
|
||||
file
|
||||
flex
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
giflib
|
||||
gtk2
|
||||
libGL
|
||||
libGLU
|
||||
libXaw
|
||||
libjpeg
|
||||
libpng
|
||||
perl
|
||||
readline
|
||||
SDL
|
||||
SDL_image
|
||||
xa
|
||||
];
|
||||
dontDisableStatic = true;
|
||||
configureFlags = [ "--enable-fullscreen --enable-gnomeui" ];
|
||||
configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "vice";
|
||||
|
|
@ -28,16 +71,10 @@ stdenv.mkDerivation rec {
|
|||
preBuild = ''
|
||||
for i in src/resid src/resid-dtv
|
||||
do
|
||||
mkdir -pv $i/src
|
||||
ln -sv ../../wrap-u-ar.sh $i/src
|
||||
mkdir -pv $i/src
|
||||
ln -sv ../../wrap-u-ar.sh $i/src
|
||||
done
|
||||
'';
|
||||
patchPhase = ''
|
||||
# Disable font-cache update
|
||||
sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
|
||||
'';
|
||||
|
||||
#NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
|
|
@ -46,7 +83,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Commodore 64, 128 and other emulators";
|
||||
homepage = "http://www.viceteam.org";
|
||||
homepage = "https://vice-emu.sourceforge.io/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "15.0.2";
|
||||
version = "15.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY=";
|
||||
sha256 = "0s8nvp1ca30569k1a7glbn2zvvchz35s2r8d08fbs5zjngnz3276";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena";
|
||||
version = "4.2.0";
|
||||
version = "4.3.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "02asp88smayn68hc019fwp0si9mc79vxn8py7qhx3qzwjk6j9p71";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "4.2.0";
|
||||
version = "4.3.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, writeText }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeText, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dokuwiki";
|
||||
|
|
@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
|
|||
cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dokuwiki;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple to use and highly versatile Open Source wiki software that doesn't require a database";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2pd";
|
||||
version = "2.39.0";
|
||||
version = "2.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo=";
|
||||
sha256 = "sha256-Cld5TP2YoLzm73q7uP/pwqEeUsT5uMPAUx9HABOVeZA=";
|
||||
};
|
||||
|
||||
buildInputs = with lib; [ boost zlib openssl ]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
|
||||
{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, zstd
|
||||
, makeWrapper, coreutils, autoreconfHook, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dpkg";
|
||||
version = "1.20.9";
|
||||
version = "1.20.9ubuntu2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
|
||||
sha256 = "sha256-XOJCgw8hO1Yg8I5sQYOtse9Nydoo0xmIonyHxx/lNM4=";
|
||||
url = "mirror://ubuntu/pool/main/d/dpkg/dpkg_${version}.tar.xz";
|
||||
sha256 = "sha256-BuCofGpi9R0cyhvkZqu9IxupqZvZhbE2J/B4wgUqMQw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||
(lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Nice: dpkg has a circular dependency on itself. Its configure
|
||||
# script calls scripts/dpkg-architecture, which calls "dpkg" in
|
||||
|
|
@ -49,8 +53,8 @@ stdenv.mkDerivation rec {
|
|||
--replace '"diff"' \"${coreutils}/bin/diff\"
|
||||
'';
|
||||
|
||||
buildInputs = [ perl zlib bzip2 xz ];
|
||||
nativeBuildInputs = [ makeWrapper perl ];
|
||||
buildInputs = [ perl zlib bzip2 xz zstd ];
|
||||
nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
|
|
|
|||
|
|
@ -10463,6 +10463,8 @@ with pkgs;
|
|||
|
||||
v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { };
|
||||
|
||||
v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };
|
||||
|
||||
vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
|
||||
|
||||
vampire = callPackage ../applications/science/logic/vampire {};
|
||||
|
|
|
|||
|
|
@ -1126,10 +1126,6 @@ let
|
|||
|
||||
ocurl = callPackage ../development/ocaml-modules/ocurl { };
|
||||
|
||||
pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };
|
||||
|
||||
pa_bench = callPackage ../development/ocaml-modules/pa_bench { };
|
||||
|
||||
parany = callPackage ../development/ocaml-modules/parany { };
|
||||
|
||||
pipebang = callPackage ../development/ocaml-modules/pipebang { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue