Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0ae3aa5345
64 changed files with 795 additions and 510 deletions
|
|
@ -31,7 +31,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
|
|||
* `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
|
||||
* `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
|
||||
* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
|
||||
* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set).
|
||||
* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set).
|
||||
* `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`,
|
||||
* `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements,
|
||||
* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
|
||||
|
|
@ -39,8 +39,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
|
|||
* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
|
||||
* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
|
||||
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
|
||||
* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
|
||||
* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
|
||||
* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
|
||||
* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
|
||||
* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
|
||||
* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
|
||||
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
|
||||
|
|
|
|||
|
|
@ -503,14 +503,6 @@
|
|||
maintainer to update the package.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The (previously undocumented) Nixpkgs configuration option
|
||||
<literal>checkMeta</literal> now defaults to
|
||||
<literal>true</literal>. This may cause evaluation failures
|
||||
for packages with incorrect <literal>meta</literal> attribute.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xow package removed along with the
|
||||
|
|
|
|||
|
|
@ -172,9 +172,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
||||
|
||||
- The (previously undocumented) Nixpkgs configuration option `checkMeta` now defaults to `true`. This may cause evaluation
|
||||
failures for packages with incorrect `meta` attribute.
|
||||
|
||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||
|
||||
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
||||
|
|
|
|||
|
|
@ -91,8 +91,9 @@ in
|
|||
example = "nftables-multiport";
|
||||
description = lib.mdDoc ''
|
||||
Default banning action (e.g. iptables, iptables-new, iptables-multiport,
|
||||
shorewall, etc) It is used to define action_* variables. Can be overridden
|
||||
globally or per section within jail.local file
|
||||
iptables-ipset-proto6-allports, shorewall, etc) It is used to
|
||||
define action_* variables. Can be overridden globally or per
|
||||
section within jail.local file
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -212,10 +213,18 @@ in
|
|||
filter = apache-nohome
|
||||
action = iptables-multiport[name=HTTP, port="http,https"]
|
||||
logpath = /var/log/httpd/error_log*
|
||||
backend = auto
|
||||
findtime = 600
|
||||
bantime = 600
|
||||
maxretry = 5
|
||||
''';
|
||||
dovecot = '''
|
||||
# block IPs which failed to log-in
|
||||
# aggressive mode add blocking for aborted connections
|
||||
enabled = true
|
||||
filter = dovecot[mode=aggressive]
|
||||
maxretry = 3
|
||||
''';
|
||||
}
|
||||
'';
|
||||
type = types.attrsOf types.lines;
|
||||
|
|
|
|||
|
|
@ -20,10 +20,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
machine.wait_for_x()
|
||||
machine.execute("vengi-voxedit >&2 &")
|
||||
machine.wait_for_window("voxedit")
|
||||
# OCR on voxedit's window is very expensive, so we avoid wasting a try
|
||||
# by letting the window load fully first
|
||||
# Let the window load fully
|
||||
machine.sleep(15)
|
||||
machine.wait_for_text("Solid")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
|
|||
description = "The Linux desktop music player from the future";
|
||||
homepage = "https://tauonmusicbox.rocks/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ jansol ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1087,3 +1087,4 @@ https://github.com/ziglang/zig.vim/,,
|
|||
https://github.com/mickael-menu/zk-nvim/,HEAD,
|
||||
https://github.com/troydm/zoomwintab.vim/,,
|
||||
https://github.com/nanotee/zoxide.vim/,,
|
||||
https://github.com/anuvyklack/windows.nvim/,,
|
||||
|
|
|
|||
25
pkgs/applications/file-managers/felix-fm/default.nix
Normal file
25
pkgs/applications/file-managers/felix-fm/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, zoxide }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7WeikYd/mADsp9DQ0jelhuZo5ZiyJrHG9HBg/YLpjZY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IUiyDk+TRfODXQ+45ARcFximkLVk32pqvJfn23H0kAw=";
|
||||
|
||||
checkInputs = [ zoxide ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tui file manager with vim-like key mapping";
|
||||
homepage = "https://github.com/kyoheiu/felix";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "fx";
|
||||
};
|
||||
}
|
||||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgerhardy";
|
||||
repo = "vengi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4=";
|
||||
sha256 = "sha256-T9YBU/YhhOASdKnzLcwQGBLc4HcQspiOV9VRgotfq3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://www.etesync.com/";
|
||||
description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ valodim ];
|
||||
maintainers = with maintainers; [ thyol valodim ];
|
||||
broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, which
|
||||
, bzip2
|
||||
, cyrus_sasl
|
||||
, protobuf3_7
|
||||
, protobuf
|
||||
, snappy
|
||||
, zlib
|
||||
, zstd
|
||||
|
|
@ -92,8 +92,8 @@ in
|
|||
pname = "hadoop";
|
||||
platformAttrs = rec {
|
||||
x86_64-linux = {
|
||||
version = "3.3.3";
|
||||
hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
|
||||
version = "3.3.4";
|
||||
hash = "sha256-akg9GgsSNJDr2N8/cbZOs58zP3i5XwkK61jkM8vCQW0=";
|
||||
};
|
||||
x86_64-darwin = x86_64-linux;
|
||||
aarch64-linux = {
|
||||
|
|
@ -107,7 +107,7 @@ in
|
|||
jdk = jdk11_headless;
|
||||
inherit openssl;
|
||||
# TODO: Package and add Intel Storage Acceleration Library
|
||||
nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];
|
||||
nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ];
|
||||
libPatches = ''
|
||||
ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2
|
||||
ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/
|
||||
|
|
@ -119,14 +119,17 @@ in
|
|||
patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0
|
||||
# Java 8 has libjvm.so at a different path
|
||||
patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0
|
||||
# NixOS/nixpkgs#193370
|
||||
# This workaround is needed to use protobuf 3.19
|
||||
patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so
|
||||
'';
|
||||
tests = nixosTests.hadoop;
|
||||
};
|
||||
hadoop_3_2 = common rec {
|
||||
pname = "hadoop";
|
||||
platformAttrs.x86_64-linux = {
|
||||
version = "3.2.3";
|
||||
hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
|
||||
version = "3.2.4";
|
||||
hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw=";
|
||||
};
|
||||
jdk = jdk8_headless;
|
||||
# not using native libs because of broken openssl_1_0_2 dependency
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "372";
|
||||
version = "373";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE=";
|
||||
sha256 = "sha256-3rCYlHOmOQi1qNRN/uqDAchxD2zgH7V86MMAAjdXRrY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
, systemd
|
||||
, taglib
|
||||
, unzip
|
||||
, xlibsWrapper
|
||||
, xorg
|
||||
, zlib
|
||||
, chromecastSupport ? true, libmicrodns, protobuf
|
||||
|
|
@ -149,6 +150,7 @@ stdenv.mkDerivation rec {
|
|||
srt
|
||||
systemd
|
||||
taglib
|
||||
xlibsWrapper
|
||||
zlib
|
||||
]
|
||||
++ (with xorg; [
|
||||
|
|
@ -156,7 +158,6 @@ stdenv.mkDerivation rec {
|
|||
libXv
|
||||
libXvMC
|
||||
xcbutilkeysyms
|
||||
xlibsWrapper
|
||||
])
|
||||
++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555
|
||||
++ optional jackSupport libjack2
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, readline
|
||||
, shared-mime-info
|
||||
, xine-lib
|
||||
, xlibsWrapper
|
||||
, xorg
|
||||
}:
|
||||
|
||||
|
|
@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
|
|||
ncurses
|
||||
readline
|
||||
xine-lib
|
||||
xlibsWrapper
|
||||
] ++ (with xorg; [
|
||||
libXext
|
||||
libXft
|
||||
|
|
@ -54,7 +56,6 @@ stdenv.mkDerivation rec {
|
|||
libXtst
|
||||
libXv
|
||||
libXxf86vm
|
||||
xlibsWrapper
|
||||
xorgproto
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ in
|
|||
dropAttrs ? [],
|
||||
keepAttrs ? [],
|
||||
dropDerivationAttrs ? [],
|
||||
useDune2ifVersion ? (x: false),
|
||||
useDune2 ? false,
|
||||
useDuneifVersion ? (x: false),
|
||||
useDune ? false,
|
||||
opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])),
|
||||
...
|
||||
}@args:
|
||||
|
|
@ -44,7 +44,7 @@ let
|
|||
"extraBuildInputs" "extraNativeBuildInputs"
|
||||
"overrideBuildInputs" "overrideNativeBuildInputs"
|
||||
"namePrefix"
|
||||
"meta" "useDune2ifVersion" "useDune2" "opam-name"
|
||||
"meta" "useDuneifVersion" "useDune" "opam-name"
|
||||
"extraInstallFlags" "setCOQBIN" "mlPlugin"
|
||||
"dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs;
|
||||
fetch = import ../coq/meta-fetch/default.nix
|
||||
|
|
@ -65,7 +65,7 @@ let
|
|||
] "") + optionalString (v == null) "-broken";
|
||||
append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
|
||||
prefix-name = foldl append-version "" namePrefix;
|
||||
useDune2 = args.useDune2 or (useDune2ifVersion fetched.version);
|
||||
useDune = args.useDune or (useDuneifVersion fetched.version);
|
||||
coqlib-flags = switch coq.coq-version [
|
||||
{ case = v: versions.isLe "8.6" v && v != "dev" ;
|
||||
out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; }
|
||||
|
|
@ -85,8 +85,8 @@ stdenv.mkDerivation (removeAttrs ({
|
|||
|
||||
nativeBuildInputs = args.overrideNativeBuildInputs
|
||||
or ([ which coq.ocamlPackages.findlib ]
|
||||
++ optional useDune2 coq.ocamlPackages.dune_2
|
||||
++ optional (useDune2 || mlPlugin) coq.ocamlPackages.ocaml
|
||||
++ optional useDune coq.ocamlPackages.dune_3
|
||||
++ optional (useDune || mlPlugin) coq.ocamlPackages.ocaml
|
||||
++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs);
|
||||
buildInputs = args.overrideBuildInputs
|
||||
or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs);
|
||||
|
|
@ -107,7 +107,7 @@ stdenv.mkDerivation (removeAttrs ({
|
|||
coqlib-flags ++ docdir-flags ++
|
||||
extraInstallFlags;
|
||||
})
|
||||
// (optionalAttrs useDune2 {
|
||||
// (optionalAttrs useDune {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,30 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "ubuntu-font-family-0.83";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ubuntu-font-family";
|
||||
version = "0.83";
|
||||
|
||||
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
|
||||
src = fetchzip {
|
||||
url = "https://assets.ubuntu.com/v1/fad7939b-${pname}-${version}.zip";
|
||||
hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu
|
||||
installPhase = ''
|
||||
install -D -m 644 -t "$out/share/fonts/truetype" *.ttf
|
||||
'';
|
||||
|
||||
sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-EEcYtOeOd2DKyRLo1kG7lk8euaFilCFMXMJNAosxHiQ=";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Ubuntu Font Family";
|
||||
longDescription = "The Ubuntu typeface has been specially
|
||||
created to complement the Ubuntu tone of voice. It has a
|
||||
contemporary style and contains characteristics unique to
|
||||
the Ubuntu brand that convey a precise, reliable and free attitude.";
|
||||
homepage = "http://font.ubuntu.com/";
|
||||
license = lib.licenses.free;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.antono ];
|
||||
license = licenses.free;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ antono ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xlibsWrapper, glib, pango
|
||||
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
|
||||
, gnome_vfs, libgnome-keyring, libglade }:
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs =
|
||||
[ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ];
|
||||
[ xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ];
|
||||
|
||||
propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,26 +3,24 @@
|
|||
, cmake
|
||||
, pkg-config
|
||||
, libffi
|
||||
, llvm_6
|
||||
, doCheck ? false
|
||||
, llvm_13
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dale";
|
||||
version = "20181024";
|
||||
version = "20220411";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomhrr";
|
||||
repo = "dale";
|
||||
rev = "f5db8b486f4e7c423fc25941a8315f1209bc0e54";
|
||||
sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v";
|
||||
rev = "7386ef2d8912c60c6fb157a1e5cd772e15eaf658";
|
||||
sha256 = "sha256-LNWqrFuEjtL7zuPTBfe4qQWr8IrT/ldQWSeDTK3Wqmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config llvm_6.dev ];
|
||||
buildInputs = [ libffi llvm_6 ];
|
||||
nativeBuildInputs = [ cmake pkg-config llvm_13.dev ];
|
||||
buildInputs = [ libffi llvm_13 ];
|
||||
|
||||
inherit doCheck;
|
||||
checkInputs = [ perl ];
|
||||
|
||||
checkTarget = "tests";
|
||||
|
|
@ -36,8 +34,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/tomhrr/dale";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ amiloradovsky ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
# failed on Darwin: linker couldn't find the FFI lib
|
||||
# failed on AArch64: because LLVM 3.5 is failed there
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, testers }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, testers
|
||||
}:
|
||||
|
||||
let self = buildGoModule rec {
|
||||
pname = "go-jsonnet";
|
||||
|
|
@ -6,12 +11,20 @@ let self = buildGoModule rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-jsonnet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU=";
|
||||
hash = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fZBhlZrLcC4xj5uvb862lBOczGnJa9CceS3D8lUhBQo=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
|
||||
url = "https://github.com/google/go-jsonnet/commit/7032dd729f7e684dcfb2574f4fe99499165ef9cb.patch";
|
||||
hash = "sha256-emUcuE9Q4qkXFXLyLvLHjzrKAaQhjcSWLNafABvHxhM=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-H4vLVXpuPkECB15LHoS9N9IwUD7Fzccshwbo5hjeXXc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4c";
|
||||
version = "1.2.3.1";
|
||||
version = "1.2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4lang";
|
||||
repo = "p4c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mOswMUvr7LGN4GmczPUqNMUjs0c1Pc8SiC5k2Ou52Iw=";
|
||||
sha256 = "sha256-EeTYH7CsmPPBL05zJ+g4aM677n0NqDD+H40lBuKpY6M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ mkCoqDerivation {
|
|||
|
||||
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ];
|
||||
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
meta = {
|
||||
description = "Exponentiation algorithms following addition chains";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ with lib; mkCoqDerivation rec {
|
|||
'';
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
buildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec {
|
|||
mathcomp-zify
|
||||
];
|
||||
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
meta = {
|
||||
description = "Comparison between ordinals in Gaia and Hydra battles";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ with lib;
|
|||
{ case = range "8.11" "8.12"; out = "0.4"; }
|
||||
] null;
|
||||
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
meta = {
|
||||
description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ mkCoqDerivation {
|
|||
pname = "word";
|
||||
owner = "jasmin-lang";
|
||||
repo = "coqword";
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough,
|
||||
lib, version ? null, useDune2 ? false }@args:
|
||||
lib, version ? null, useDune ? false }@args:
|
||||
with lib; mkCoqDerivation {
|
||||
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
|
|
@ -31,7 +31,7 @@ with lib; mkCoqDerivation {
|
|||
"1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
|
||||
};
|
||||
|
||||
useDune2ifVersion = v: versions.isGe "1.5.3" v || v == "dev";
|
||||
useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs configure || true
|
||||
|
|
@ -45,4 +45,4 @@ with lib; mkCoqDerivation {
|
|||
license = licenses.cecill-c;
|
||||
};
|
||||
}
|
||||
// optionalAttrs (args?useDune2) { inherit useDune2; }
|
||||
// optionalAttrs (args?useDune) { inherit useDune; }
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ in
|
|||
{ case = isEq "8.10"; out = "8.10.0+0.7.2"; }
|
||||
] null;
|
||||
|
||||
useDune2 = true;
|
||||
useDune = true;
|
||||
|
||||
patches = [ ./janestreet-0.15.patch ];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ mkCoqDerivation rec {
|
|||
|
||||
propagatedBuildInputs = [ zorns-lemma ];
|
||||
|
||||
useDune2ifVersion = versions.isGe "9.0";
|
||||
useDuneifVersion = versions.isGe "9.0";
|
||||
|
||||
meta = {
|
||||
description = "General topology in Coq";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ with lib;
|
|||
{ case = "8.5"; out = "8.5.0"; }
|
||||
] null;
|
||||
|
||||
useDune2ifVersion = versions.isGe "9.0";
|
||||
useDuneifVersion = versions.isGe "9.0";
|
||||
|
||||
meta = {
|
||||
description = "Development of basic set theory";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "angelscript";
|
||||
version = "2.35.1";
|
||||
version = "2.36.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "12x12fs2bjkbh73n2w84wnqhg6xn6mnp6g79gbkwfl6gssv9c42w";
|
||||
sha256 = "sha256-M/lfdZe8DYiwl9NeexMg0VQZ/8V3mFHZ0qbMzsV4EbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip cmake ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ buildGoModule
|
||||
{ stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
|
|
@ -27,6 +27,14 @@ let p2 = buildGoModule rec {
|
|||
homepage = "https://github.com/gobuffalo/packr";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
|
||||
# golang.org/x/sys needs to be updated due to:
|
||||
#
|
||||
# https://github.com/golang/go/issues/49219
|
||||
#
|
||||
# but this package is no longer maintained.
|
||||
#
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
};
|
||||
p1 = buildGoModule rec {
|
||||
|
|
@ -51,6 +59,14 @@ p1 = buildGoModule rec {
|
|||
homepage = "https://github.com/gobuffalo/packr";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
|
||||
# golang.org/x/sys needs to be updated due to:
|
||||
#
|
||||
# https://github.com/golang/go/issues/49219
|
||||
#
|
||||
# but this package is no longer maintained.
|
||||
#
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, libusb1
|
||||
, zlib
|
||||
, boost
|
||||
, libev
|
||||
, libnova
|
||||
, curl
|
||||
, libjpeg
|
||||
|
|
@ -15,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indilib";
|
||||
version = "1.9.6";
|
||||
version = "1.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rElxc9q4i8FjjPmLXhu6GnHps6t3NWkfxtqAAeRq77M=";
|
||||
sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
curl
|
||||
cfitsio
|
||||
libev
|
||||
libusb1
|
||||
zlib
|
||||
boost
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt
|
||||
for f in {libfishcamp,libsbig,libqhy}/CMakeLists.txt
|
||||
do
|
||||
substituteInPlace $f --replace "/lib/firmware" "lib/firmware"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, callPackage, fetchFromGitHub, indilib }:
|
||||
|
||||
let
|
||||
indi-version = "1.9.3";
|
||||
indi-version = "1.9.8";
|
||||
indi-3rdparty-src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${indi-version}";
|
||||
sha256 = "sha256-TBccdheBEO48uIXd6tya6dytkzxaHg2+YancBkcL3bw=";
|
||||
sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg=";
|
||||
};
|
||||
indi-firmware = callPackage ./indi-firmware.nix {
|
||||
version = indi-version;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, curl
|
||||
}:
|
||||
let
|
||||
version = "2020.3.13";
|
||||
version = "2020.3.14";
|
||||
shortVersion = builtins.substring 0 6 version;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-3AmQb9qLGBD+LLIrX1Fx0gi6kBxbnTkLrW0fP9ZsUeg=";
|
||||
sha256 = "sha256-NbpHn1e9+TD+9/iSFBw16/CQMXYx3D/aSDhkSGdBT3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont
|
||||
|
||||
--- a/src/modules/perl/modperl_perl.c
|
||||
+++ a/src/modules/perl/modperl_perl.c
|
||||
@@ -268,7 +268,7 @@
|
||||
#ifdef MP_NEED_HASH_SEED_FIXUP
|
||||
if (MP_init_hash_seed_set) {
|
||||
#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
|
||||
- memcpy(&PL_hash_seed, &MP_init_hash_seed,
|
||||
+ memcpy(PL_hash_seed, &MP_init_hash_seed,
|
||||
sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
|
||||
sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
|
||||
PL_hash_seed_set = MP_init_hash_seed_set;
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-logging";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cZEhSRzDSe4/hGAPPCkWtbuV1oYLlNkNNPj2PZedEiA=";
|
||||
hash = "sha256-fWPl2SY0+NtnX70ErdiIf5B0qB/ULpuBn7py3YtSS2M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,14 @@
|
|||
, typed-ast
|
||||
, typing-extensions
|
||||
, tomli
|
||||
, types-setuptools
|
||||
, types-typed-ast
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy";
|
||||
version = "0.971";
|
||||
version = "0.981";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -32,12 +33,13 @@ buildPythonPackage rec {
|
|||
owner = "python";
|
||||
repo = "mypy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J1lUnJco9rLYgFpJkfujGfVq1CfC4pdvvDzoan3jGkU=";
|
||||
hash = "sha256-CkRK/j5DRUZU2enpZtqX4l+89E7ODDG9MeRYFQp9kSs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
types-typed-ast
|
||||
types-setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@ buildPythonPackage rec {
|
|||
substituteInPlace tensorboardX/pytorch_graph.py --replace \
|
||||
"torch.onnx.set_training(model, False)" \
|
||||
"torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
|
||||
|
||||
# Version detection seems broken here, the version reported by python is
|
||||
# newer than the protobuf package itself.
|
||||
sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py
|
||||
'';
|
||||
|
||||
# Wanted protobuf version is mentioned here:
|
||||
|
|
|
|||
|
|
@ -1,49 +1,56 @@
|
|||
{ lib, fetchFromGitHub, python3, nginx }:
|
||||
{ lib, fetchFromGitHub, buildPythonApplication, isPy27
|
||||
, aiohttp
|
||||
, appdirs
|
||||
, beautifulsoup4
|
||||
, defusedxml
|
||||
, devpi-common
|
||||
, execnet
|
||||
, itsdangerous
|
||||
, nginx
|
||||
, packaging
|
||||
, passlib
|
||||
, platformdirs
|
||||
, pluggy
|
||||
, pyramid
|
||||
, pytest-flake8
|
||||
, pytestCheckHook
|
||||
, repoze_lru
|
||||
, setuptools
|
||||
, strictyaml
|
||||
, waitress
|
||||
, webtest
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
# pyramid 2.0 no longer has a 'pyramid.compat' module
|
||||
pyramid = super.pyramid.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.10.8";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-t81mWVvvkvgXZLl23d4rL6jk9fMl4C9l9ux/NwiynPY=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in with py.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "devpi-server";
|
||||
version = "6.2.0";
|
||||
version = "6.7.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devpi";
|
||||
repo = "devpi";
|
||||
rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c";
|
||||
sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm";
|
||||
rev = "server-${version}";
|
||||
hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/server";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
py
|
||||
aiohttp
|
||||
appdirs
|
||||
devpi-common
|
||||
defusedxml
|
||||
devpi-common
|
||||
execnet
|
||||
itsdangerous
|
||||
repoze_lru
|
||||
packaging
|
||||
passlib
|
||||
platformdirs
|
||||
pluggy
|
||||
pyramid
|
||||
repoze_lru
|
||||
setuptools
|
||||
strictyaml
|
||||
waitress
|
||||
] ++ passlib.optional-dependencies.argon2;
|
||||
|
|
@ -51,10 +58,10 @@ buildPythonApplication rec {
|
|||
checkInputs = [
|
||||
beautifulsoup4
|
||||
nginx
|
||||
pytestCheckHook
|
||||
pytest-flake8
|
||||
pytestCheckHook
|
||||
webtest
|
||||
] ++ lib.optionals isPy27 [ mock ];
|
||||
];
|
||||
|
||||
# root_passwd_hash tries to write to store
|
||||
# TestMirrorIndexThings tries to write to /var through ngnix
|
||||
|
|
|
|||
22
pkgs/development/tools/fblog/default.nix
Normal file
22
pkgs/development/tools/fblog/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fblog";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1lj0cv1rmcqg36rxnnjh1dazn0sdggfc9kigjg3id6h0y8k7d9b3";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-xHvnxRPxe09EmxUK9j7+V2AA1xJFP3ibwbkSs3FBgcw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small command-line JSON log viewer";
|
||||
homepage = "https://github.com/brocode/fblog";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gtqPt59jA4NhbaE9ij45oFEaAJ+l984lWEjloQtBSSE=";
|
||||
sha256 = "sha256-59A3RPdltDfMDPTFbBHcnJoFEp718xvYgg6v4MvsxaQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j0bsuu+A5oCf+0pFM4PAQ3oqq9POc5rrzt5UR0RDnAw=";
|
||||
cargoSha256 = "sha256-GEttxHtdOYMijv1xxK7U0d8WNwJcpqJNgDYKgCV/zVw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_perl";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/perl/${pname}-${version}.tar.gz";
|
||||
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
|
||||
sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
|
||||
../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch
|
||||
];
|
||||
|
||||
buildInputs = [ apacheHttpd perl ];
|
||||
buildPhase = ''
|
||||
perl Makefile.PL \
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "darkhttpd";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emikulic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk";
|
||||
sha256 = "sha256-J/tjT3Rfhk5++jbmLBrZu9O4GgTBqeycuz82NliCBxw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.24.1";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
sha256 = "sha256-WxULVtqKxYXMWNY4l0wvTkqcDkPrlHcS70NgQhe8nzU=";
|
||||
sha256 = "sha256-VbcWYH3eSKfYlSoN9HpxvhtvW36M1aYn9nLDfEbIzTY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hdo8uiVJAMMPo1N8kLDFPSbyTr5WxNKtq8E7pj6Plak=";
|
||||
vendorSha256 = "sha256-VFTz9+nf4qH8bbFijpT1uIHSAhJy/aMMlIjkvnzzAD4=";
|
||||
|
||||
tags = [
|
||||
"nonetwork"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config
|
||||
, libsndfile, libtool, makeWrapper, perlPackages
|
||||
, xorg, libcap, alsa-lib, glib, dconf
|
||||
, xlibsWrapper, xorg, libcap, alsa-lib, glib, dconf
|
||||
, avahi, libjack2, libasyncns, lirc, dbus
|
||||
, sbc, bluez5, udev, openssl, fftwFloat
|
||||
, soxr, speexdsp, systemd, webrtc-audio-processing
|
||||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals (!libOnly) (
|
||||
[ libasyncns webrtc-audio-processing ]
|
||||
++ lib.optional jackaudioSupport libjack2
|
||||
++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ]
|
||||
++ lib.optionals x11Support [ xlibsWrapper xorg.libXtst xorg.libXi ]
|
||||
++ lib.optional useSystemd systemd
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib udev ]
|
||||
++ lib.optional airtunesSupport openssl
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
|
||||
, expat, libxml2, openssl, pkg-config, systemd
|
||||
, cppunit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -32,6 +33,22 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl)
|
||||
"--enable-linux-netfilter";
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ cppunit ];
|
||||
preCheck = ''
|
||||
# tests attempt to copy around "/bin/true" to make some things
|
||||
# no-ops but this doesn't work if our "true" is a multi-call
|
||||
# binary, so make our own fake "true" which will work when used
|
||||
# this way
|
||||
echo "#!$SHELL" > fake-true
|
||||
chmod +x fake-true
|
||||
grep -rlF '/bin/true' test-suite/ | while read -r filename ; do
|
||||
substituteInPlace "$filename" \
|
||||
--replace "$(type -P true)" "$(realpath fake-true)" \
|
||||
--replace "/bin/true" "$(realpath fake-true)"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
|
||||
homepage = "http://www.squid-cache.org";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,32 +1,32 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "400.0.0";
|
||||
version = "404.0.0";
|
||||
googleCloudSdkPkgs = {
|
||||
x86_64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz";
|
||||
sha256 = "0i9xvg26d4rl3nas49rmxbmbwq127nwvgp0di7rszddj63wj7py9";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86_64.tar.gz";
|
||||
sha256 = "0s2qr7krzd9z6s2i00qksxnxd1fcp318gxg8fm46rgh2r482k2k5";
|
||||
};
|
||||
x86_64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-x86_64.tar.gz";
|
||||
sha256 = "0ajywp16105yhxs5hv4cz7vg3jr9wqggb0fcimb23qpvn3xqh6xw";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-x86_64.tar.gz";
|
||||
sha256 = "11kzzny8a3xs1lijwwkv60qnmcxbfgzpmrdcqbcf6957b5ml6rsl";
|
||||
};
|
||||
aarch64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-arm.tar.gz";
|
||||
sha256 = "0dpl7cd1z05q0mgp5qxn23jjsvjhbfxhpjbd4pmhl62qp8x4m5mm";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-arm.tar.gz";
|
||||
sha256 = "11yzs4cc9cn8xwv51mc2qmx84nbvv1zragsdy38wrmfpd5m27jx3";
|
||||
};
|
||||
aarch64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-arm.tar.gz";
|
||||
sha256 = "16lxw3vrydzn36zwvl74akfgxx6m7mrjfd3dc8kvl1wvbbdqqz3j";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-darwin-arm.tar.gz";
|
||||
sha256 = "03bc1hk3blky9x8wf3lhpblxv1zyq23wimzwd7bb00h35935x449";
|
||||
};
|
||||
i686-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86.tar.gz";
|
||||
sha256 = "09mn21ii17h8rfcmkwgmm3wpkiykgw9kc1dxjpaazxvxbmx0bi2y";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-404.0.0-linux-x86.tar.gz";
|
||||
sha256 = "0zhx9xbp090acdxlii7m94j792nlbvl4agjy35q1z8pi45hc7nl9";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
|
|||
|
||||
# Version of Google Cloud SDK from
|
||||
# https://cloud.google.com/sdk/docs/release-notes
|
||||
VERSION="400.0.0"
|
||||
VERSION="404.0.0"
|
||||
|
||||
function genMainSrc() {
|
||||
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kopia";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HiM9rEdC9q3MxU6TugnyMOefakFY47HhbCdJG83m+C8=";
|
||||
sha256 = "sha256-5zocfkNHsTFl3Sjwkr7dGnDY+4WO20F5AMgjfFulNd0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7eT2HeYxyUb3MUhdjZoAFs+6GzAyTUbvE0QlXnt06uU=";
|
||||
vendorSha256 = "sha256-Xmd4Q2X0cur4XGEjy1ysEEQkNqch4G+jGkPnrepgP6g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
27
pkgs/tools/misc/lazycli/default.nix
Normal file
27
pkgs/tools/misc/lazycli/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lazycli";
|
||||
version = "0.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs=";
|
||||
|
||||
checkFlags = [
|
||||
# currently broken: https://github.com/jesseduffield/lazycli/pull/20
|
||||
"--skip=command::test_run_command_fail"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to static turn CLI commands into TUIs";
|
||||
homepage = "https://github.com/jesseduffield/lazycli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,11 +16,11 @@ let
|
|||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "04.00.03";
|
||||
version = "04.01.00";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-slTeBD7zk3aUxaRYBwrOtNz4cbWL0q57Me8SWwB3eHk=";
|
||||
sha256 = "sha256-P0aDmEHkxMGk3gwgDwFIlNNoLOfSZfOHU1VYQkOLQGE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wayshot";
|
||||
version = "1.1.9";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "waycrate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-4tzL/9p/qBCSWX+O7wZlKi9qb7mIt+hoxcQY7cWlFoU=";
|
||||
hash = "sha256-/uZ98ICdPTilUD3vBEbJ4AxGWY1xIbkK6O+bkhqIUKA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/FAI2VUoyQ1+3CuA7sEpeF5oeJdGB9CRZEp1leLnTh4=";
|
||||
cargoHash = "sha256-j/gSrXY5n/zW3IogHewyrupTKtEm5EtOzfOzglyTP9A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdaliclock";
|
||||
version = "2.45";
|
||||
version = "2.47";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-GHjSUuRHCAVwWcDMRb2ng1aNbheu+xnUBNLqSpPkZeQ=";
|
||||
hash = "sha256-1Jkv9iulvyY+b5KryDr8s+v8LU95hcVi7PJQsL1rUL4=";
|
||||
};
|
||||
|
||||
# Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "yutto";
|
||||
version = "2.0.0b13";
|
||||
version = "2.0.0b15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-XqfbvlaJoRPpwnaUA52KloOsEOIt3YM0cq36DZN6lR8=";
|
||||
hash = "sha256-TOFApMwY2WRYg2H2N0PIjylYFKnTHdszdU+AFgLYYwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X943wqbgFX4Y15kCf+bxQP7OOTWksmmYghlAWPC2zVs=";
|
||||
sha256 = "sha256-ZWDvFSx+zH/P0ZfdqxAe+c4jFUH8mfY1vpUXlIxw1sI=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-1BsnNDZAIdLj13e/qL//bPrhYKrTIBvtC1C65WmGHY0=";
|
||||
vendorSha256 = "sha256-LLvaaOZzp9b99eYOsfvbPRwZqSNfoinVUfYDmPiw5Mk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "quill";
|
||||
version = "0.2.7";
|
||||
version = "0.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfinity";
|
||||
repo = "quill";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3OlsCRpxRDKlfC0sa9MlFCupyRbDuqJQzDb9SQob1O0=";
|
||||
sha256 = "sha256-0DHTtnQU26l4DXUVDeHF+hkavlVY7rQykXxgWGSUc/k=";
|
||||
};
|
||||
|
||||
ic = fetchFromGitHub {
|
||||
|
|
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-YxuBABGaZ+ti31seEYR6bB+OMgrSvl1lZyu4bqdxPIk=";
|
||||
cargoSha256 = "sha256-QgvQ0ptfb4L465hn/aBpVAUwSvm4MkpZlBQaVrinkq4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config protobuf ];
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.29.2";
|
||||
version = "0.29.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wvnOKbxS1j+MhmOs9INPusA1whLDo1sLGNxmzBQWPWc=";
|
||||
sha256 = "sha256-jFj5iVUS7qpH4Aq35KS8IDKA7PzGgire+flBpkCgwuA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uR1hzP17hFo9DUNCeKcwepZSxJJoV8WBsX9l+1CR4Ek=";
|
||||
vendorSha256 = "sha256-GKohljwH4/kBPoI3/RfxYsvzISv1WmVAo96sjKJrnHk=";
|
||||
|
||||
# consul-template tests depend on vault and consul services running to
|
||||
# execute tests so we skip them here
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.14.03";
|
||||
version = "0.14.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-6aA0dWP6q6SJ8TYGctDE2rhDCO5QuAO4cx4J9id9hjY=";
|
||||
hash = "sha256-akWvX22oJT/V5Zvsk7AXXIFK1AjfWEzMZXAwpJCc0M0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xlibsWrapper, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ted";
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
|
||||
buildInputs = [ zlib pcre xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy rich text processor";
|
||||
|
|
|
|||
|
|
@ -1749,6 +1749,8 @@ with pkgs;
|
|||
inherit (qt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
felix-fm = callPackage ../applications/file-managers/felix-fm { };
|
||||
|
||||
joshuto = callPackage ../applications/file-managers/joshuto {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
|
||||
};
|
||||
|
|
@ -3918,6 +3920,8 @@ with pkgs;
|
|||
|
||||
faudio = callPackage ../development/libraries/faudio { };
|
||||
|
||||
fblog = callPackage ../development/tools/fblog { };
|
||||
|
||||
fd = callPackage ../tools/misc/fd { };
|
||||
|
||||
fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
|
||||
|
|
@ -8589,6 +8593,8 @@ with pkgs;
|
|||
|
||||
latexrun = callPackage ../tools/typesetting/tex/latexrun { };
|
||||
|
||||
lazycli = callPackage ../tools/misc/lazycli { };
|
||||
|
||||
lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
|
||||
|
||||
ldapmonitor = callPackage ../tools/security/ldapmonitor { };
|
||||
|
|
@ -13379,7 +13385,7 @@ with pkgs;
|
|||
|
||||
devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
|
||||
|
||||
devpi-server = callPackage ../development/tools/devpi-server {};
|
||||
devpi-server = python3Packages.callPackage ../development/tools/devpi-server {};
|
||||
|
||||
dictu = callPackage ../development/compilers/dictu { };
|
||||
|
||||
|
|
@ -23112,10 +23118,7 @@ with pkgs;
|
|||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
|
||||
|
|
@ -24118,7 +24121,7 @@ with pkgs;
|
|||
libdrm = if stdenv.isLinux then libdrm else null;
|
||||
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
|
||||
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
|
||||
}) // { inherit xlibsWrapper; } );
|
||||
}));
|
||||
|
||||
xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ let
|
|||
|
||||
checkMeta = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to check that the `meta` attribute of derivations are correct during evaluation time.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -15733,17 +15733,12 @@ let
|
|||
|
||||
mod_perl2 = buildPerlPackage {
|
||||
pname = "mod_perl";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
|
||||
hash = "sha256-yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q=";
|
||||
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz";
|
||||
hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
|
||||
../development/perl-modules/mod_perl2-PL_hash_seed.patch
|
||||
];
|
||||
|
||||
makeMakerFlags = "MP_AP_DESTDIR=$out";
|
||||
buildInputs = [ pkgs.apacheHttpd ];
|
||||
doCheck = false; # would try to start Apache HTTP server
|
||||
|
|
|
|||
Loading…
Reference in a new issue