Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
f1c18d7ae4
|
|
@ -77,7 +77,7 @@ There is a special handling of the `debug` output, described at [](#stdenv-separ
|
|||
|
||||
A commonly adopted convention in `nixpkgs` is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the `perl` package contains a `perl` executable it can be referenced as `${pkgs.perl}/bin/perl` within a Nix derivation that needs to execute a Perl script.
|
||||
|
||||
The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${stdenv.glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${stdenv.glibc.bin}/bin/ldd`).
|
||||
The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${lib.getBin stdenv.cc.libc}/bin/ldd`).
|
||||
|
||||
The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf) for more details).
|
||||
|
||||
|
|
|
|||
|
|
@ -79,8 +79,6 @@ rec {
|
|||
useLLVM = true;
|
||||
};
|
||||
|
||||
scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
|
||||
|
||||
pogoplug4 = {
|
||||
config = "armv5tel-unknown-linux-gnueabi";
|
||||
} // platforms.pogoplug4;
|
||||
|
|
|
|||
|
|
@ -242,13 +242,6 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
scaleway-c1 = armv7l-hf-multiplatform // {
|
||||
gcc = {
|
||||
cpu = "cortex-a9";
|
||||
fpu = "vfpv3";
|
||||
};
|
||||
};
|
||||
|
||||
utilite = {
|
||||
linux-kernel = {
|
||||
name = "utilite";
|
||||
|
|
|
|||
|
|
@ -1170,6 +1170,12 @@
|
|||
githubId = 706854;
|
||||
name = "Etienne Laurin";
|
||||
};
|
||||
atry = {
|
||||
name = "Bo Yang";
|
||||
email = "atry@fb.com";
|
||||
github = "Atry";
|
||||
githubId = 601530;
|
||||
};
|
||||
attila-lendvai = {
|
||||
name = "Attila Lendvai";
|
||||
email = "attila@lendvai.name";
|
||||
|
|
@ -6680,7 +6686,7 @@
|
|||
};
|
||||
khushraj = {
|
||||
email = "khushraj.rathod@gmail.com";
|
||||
github = "KhushrajRathod";
|
||||
github = "khrj";
|
||||
githubId = 44947946;
|
||||
name = "Khushraj Rathod";
|
||||
keys = [{
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ for bin in $(find $binaryDist -executable -type f) :; do
|
|||
uniq;
|
||||
)
|
||||
|
||||
if test "$names" = "glibc"; then names="stdenv.glibc"; fi
|
||||
if test "$names" = "glibc"; then names="glibc"; fi
|
||||
if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.cc"; fi
|
||||
|
||||
if test $lib != $libPath; then
|
||||
|
|
|
|||
|
|
@ -308,6 +308,10 @@ The option set can be defined directly
|
|||
([Example: Directly defined submodule](#ex-submodule-direct)) or as reference
|
||||
([Example: Submodule defined as a reference](#ex-submodule-reference)).
|
||||
|
||||
Note that even if your submodule’s options all have a default value,
|
||||
you will still need to provide a default value (e.g. an empty attribute set)
|
||||
if you want to allow users to leave it undefined.
|
||||
|
||||
::: {#ex-submodule-direct .example}
|
||||
::: {.title}
|
||||
**Example: Directly defined submodule**
|
||||
|
|
|
|||
|
|
@ -617,6 +617,12 @@
|
|||
(<link linkend="ex-submodule-reference">Example: Submodule defined
|
||||
as a reference</link>).
|
||||
</para>
|
||||
<para>
|
||||
Note that even if your submodule’s options all have a default
|
||||
value, you will still need to provide a default value (e.g. an
|
||||
empty attribute set) if you want to allow users to leave it
|
||||
undefined.
|
||||
</para>
|
||||
<anchor xml:id="ex-submodule-direct" />
|
||||
<para>
|
||||
<emphasis role="strong">Example: Directly defined
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@
|
|||
};
|
||||
|
||||
extraConfigFiles = [
|
||||
/run/keys/matrix-synapse/secrets.yaml
|
||||
"/run/keys/matrix-synapse/secrets.yaml"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1014,7 +1014,9 @@
|
|||
<para>
|
||||
The secrets in your original config should be migrated into a
|
||||
YAML file that is included via
|
||||
<literal>extraConfigFiles</literal>.
|
||||
<literal>extraConfigFiles</literal>. The filename must be
|
||||
quoted to prevent nix from copying it to the (world readable)
|
||||
store.
|
||||
</para>
|
||||
<para>
|
||||
Additionally a few option defaults have been synced up with
|
||||
|
|
|
|||
|
|
@ -388,13 +388,13 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
};
|
||||
|
||||
extraConfigFiles = [
|
||||
/run/keys/matrix-synapse/secrets.yaml
|
||||
"/run/keys/matrix-synapse/secrets.yaml"
|
||||
];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`.
|
||||
The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. The filename must be quoted to prevent nix from copying it to the (world readable) store.
|
||||
|
||||
Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default
|
||||
`media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ rec {
|
|||
)];
|
||||
};
|
||||
in
|
||||
lib.warnIf (t?machine) "In test `${name}': The `machine' attribute in NixOS tests (pkgs.nixosTest / make-test-pyton.nix / testing-python.nix / makeTest) is deprecated. Please use the equivalent `nodes.machine'."
|
||||
lib.warnIf (t?machine) "In test `${name}': The `machine' attribute in NixOS tests (pkgs.nixosTest / make-test-python.nix / testing-python.nix / makeTest) is deprecated. Please use the equivalent `nodes.machine'."
|
||||
build-vms.buildVirtualNetwork (
|
||||
nodes // lib.optionalAttrs (machine != null) { inherit machine; }
|
||||
);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
attrsToText = attrs:
|
||||
concatStringsSep "\n" (
|
||||
mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs
|
||||
);
|
||||
) + "\n";
|
||||
|
||||
osReleaseContents = {
|
||||
NAME = "NixOS";
|
||||
|
|
|
|||
|
|
@ -197,6 +197,13 @@ in
|
|||
Whether to allow note creation by accessing a nonexistent note URL.
|
||||
'';
|
||||
};
|
||||
requireFreeURLAuthentication = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to require authentication for FreeURL mode style note creation.
|
||||
'';
|
||||
};
|
||||
defaultPermission = mkOption {
|
||||
type = types.enum [ "freely" "editable" "limited" "locked" "private" ];
|
||||
default = "editable";
|
||||
|
|
@ -431,7 +438,7 @@ in
|
|||
Minio secret key.
|
||||
'';
|
||||
};
|
||||
endpoint = mkOption {
|
||||
endPoint = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
Minio endpoint.
|
||||
|
|
|
|||
|
|
@ -830,7 +830,7 @@ in {
|
|||
${occ}/bin/nextcloud-occ config:system:delete trusted_domains
|
||||
|
||||
${optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) ''
|
||||
# Try to enable apps (don't fail when one of them cannot be enabled , eg. due to incompatible version)
|
||||
# Try to enable apps
|
||||
${occ}/bin/nextcloud-occ app:enable ${concatStringsSep " " (attrNames cfg.extraApps)}
|
||||
''}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cp -r . "$out/libexec/baudline/"
|
||||
|
||||
interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
|
||||
interpreter="$(echo ${stdenv.cc.libc}/lib/ld-linux*)"
|
||||
for prog in "$out"/libexec/baudline/baudline*; do
|
||||
patchelf --interpreter "$interpreter" "$prog"
|
||||
ln -sr "$prog" "$out/bin/"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
{ lib, python3Packages, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.20";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
psutil
|
||||
dnspython
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
|
|
@ -17,10 +11,22 @@ python3Packages.buildPythonApplication rec {
|
|||
sha256 = "sha256-wSu6vTvBkH7vC2c+jj6zaRaR1Poarsgxa5i2mN0dnoE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
psutil
|
||||
dnspython
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/pyradio --help
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage *.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.coderholic.com/pyradio/";
|
||||
description = "Curses based internet radio player";
|
||||
|
|
|
|||
|
|
@ -37,15 +37,21 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wa7r6maHAgCTD/TFjqtMuoRt1BqQ38T8KpbMUOoS2ZE=";
|
||||
hash = "sha256-UjmrU/SA8gf+HwyCb6hm8IClUaEXvWGmIy3xDJPIsgE=";
|
||||
};
|
||||
|
||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||
postPatch = ''
|
||||
substituteInPlace src/context/contextalbum.cpp \
|
||||
--replace pictures/strawberry.png pictures/strawberry-grey.png
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.6.15";
|
||||
version = "0.6.16";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ=";
|
||||
sha256 = "sha256-2xPm4DahTv3+T92qMYuistfPTlZaJUushP0yrgHYqco=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE=";
|
||||
cargoHash = "sha256-oPRW1x/hXhT8LBW3Z3jMBoal5zC6jKKOTo/RrDwgeJU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
, zlib
|
||||
}:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.1.2.2";
|
||||
|
|
@ -60,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.cc.libc}/lib/libm.so" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "High quality software synthesizer based on ZynAddSubFX";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "vorta";
|
||||
version = "0.8.4";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "borgbase";
|
||||
repo = "vorta";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-eS/+7s9KgGCEhA6NgIzPlGM1daP+Ir2d1mmqse4YbIE=";
|
||||
sha256 = "sha256-J/Cl+et4AS44PPG2SmOHosKVw0XtOyNL0qJk68OHwQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
tar xfvz $src -C $out
|
||||
|
||||
# Patch binaries.
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
libCairo=$out/eclipse/libcairo-swt.so
|
||||
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
|
||||
[ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
, callPackage
|
||||
}:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
# https://download.eclipse.org/eclipse/downloads/ is the main place to
|
||||
# find the downloads needed for new versions
|
||||
#
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
|||
truncate --size=$size $fname
|
||||
}
|
||||
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
|
||||
target_size=$(get_file_size bin/fsnotifier64)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
|
||||
{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gcc10Stdenv.mkDerivation rec {
|
||||
version = "10.8";
|
||||
pname = "textadept";
|
||||
|
||||
|
|
|
|||
|
|
@ -2143,7 +2143,7 @@ final: prev:
|
|||
meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/";
|
||||
};
|
||||
|
||||
diffview-nvim = buildVimPluginFrom2Nix {
|
||||
diffview-nvim = buildNeovimPluginFrom2Nix {
|
||||
pname = "diffview.nvim";
|
||||
version = "2022-05-09";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -4666,6 +4666,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/RRethy/nvim-base16/";
|
||||
};
|
||||
|
||||
nvim-biscuits = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-biscuits";
|
||||
version = "2021-11-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "code-biscuits";
|
||||
repo = "nvim-biscuits";
|
||||
rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733";
|
||||
sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd";
|
||||
};
|
||||
meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
|
||||
};
|
||||
|
||||
nvim-bqf = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-bqf";
|
||||
version = "2022-04-30";
|
||||
|
|
|
|||
|
|
@ -230,6 +230,13 @@ self: super: {
|
|||
};
|
||||
});
|
||||
|
||||
diffview-nvim = super.diffview-nvim.overrideAttrs (oa: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nvimRequireCheck = "diffview";
|
||||
});
|
||||
|
||||
direnv-vim = super.direnv-vim.overrideAttrs (oa: {
|
||||
preFixup = oa.preFixup or "" + ''
|
||||
substituteInPlace $out/autoload/direnv.vim \
|
||||
|
|
@ -316,6 +323,10 @@ self: super: {
|
|||
configurePhase = "cd plugins/nvim";
|
||||
});
|
||||
|
||||
gitlinker-nvim = super.gitlinker-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
|
@ -526,6 +537,10 @@ self: super: {
|
|||
});
|
||||
});
|
||||
|
||||
octo-nvim = super.octo-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim plenary-nvim ];
|
||||
});
|
||||
|
||||
onehalf = super.onehalf.overrideAttrs (old: {
|
||||
configurePhase = "cd vim";
|
||||
});
|
||||
|
|
|
|||
|
|
@ -116,7 +116,13 @@ class VimEditor(pluginupdate.Editor):
|
|||
def main():
|
||||
|
||||
global luaPlugins
|
||||
luaPlugins = run_nix_expr(GET_PLUGINS_LUA)
|
||||
|
||||
# whitelist
|
||||
luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [
|
||||
"diffview-nvim",
|
||||
"marks-nvim",
|
||||
"nvim-biscuits"
|
||||
]
|
||||
|
||||
editor = VimEditor("vim", ROOT, GET_PLUGINS)
|
||||
parser = editor.create_parser()
|
||||
|
|
|
|||
|
|
@ -393,6 +393,7 @@ https://github.com/catppuccin/nvim/,,catppuccin-nvim
|
|||
https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
|
||||
https://github.com/windwp/nvim-autopairs/,,
|
||||
https://github.com/RRethy/nvim-base16/,,
|
||||
https://github.com/code-biscuits/nvim-biscuits/,HEAD,
|
||||
https://github.com/kevinhwang91/nvim-bqf/,,
|
||||
https://github.com/ojroques/nvim-bufdel/,,
|
||||
https://github.com/roxma/nvim-cm-racer/,,
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ function get_pkg_out() {
|
|||
echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}"
|
||||
}
|
||||
|
||||
interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")"
|
||||
interpreter="$(get_pkg_out "stdenv.cc.libc" "/lib/ld-linux-x86-64.so.2")"
|
||||
echo "interpreter='$interpreter'"
|
||||
|
||||
# For clangformat dep on 'libtinfo.so.5'.
|
||||
|
|
@ -49,4 +49,3 @@ function print_nix_version_mono() {
|
|||
echo "nixMonoBin='$nixMonoBin'"
|
||||
$nixMonoBin/mono --version
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,6 +84,6 @@ stdenv.mkDerivation rec {
|
|||
# x86_32 is an unsupported platform.
|
||||
# Enable generic build if you really want a JIT-less binary.
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
|
||||
${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
|
||||
${file}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
|
||||
${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
|
||||
${file}
|
||||
'';
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
|
|
|||
39
pkgs/applications/misc/binocle/default.nix
Normal file
39
pkgs/applications/misc/binocle/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, xorg
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "binocle";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b0hf2aq34kxxj0la0yar5sp44k6mqcbyailp6j6q0mksf1l74bc";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CZWAHWZYaL54Rl6Jrp8B6w6HK+2fIKQle2x4mGHv2/o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/binocle \
|
||||
--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical tool to visualize binary data";
|
||||
homepage = "https://github.com/sharkdp/binocle";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbatticon";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FGCT3gP+KL71Am4cd+f71iY8EwDPRZJ4+FDgQqjZK1M=";
|
||||
sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,20 +2,24 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.21.2";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To=";
|
||||
sha256 = "sha256-7gslntYAjH2nSyVKjofC2utjpzQo3aNVD1w5StHk288=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests yt-dlp ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# requires network access
|
||||
"--ignore=test/test_results.py"
|
||||
"--ignore=test/test_downloader.py"
|
||||
|
||||
# incompatible with pytestCheckHook
|
||||
"--ignore=test/test_ytdl.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jotta-cli";
|
||||
version = "0.13.55213";
|
||||
version = "0.14.58899";
|
||||
src = fetchzip {
|
||||
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
|
||||
sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY=";
|
||||
sha256 = "sha256-V4aShSMifXQl+qnCspm+P4q99Fn3N+us/sLzzTVV7mg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
44
pkgs/applications/misc/metamorphose2/default.nix
Normal file
44
pkgs/applications/misc/metamorphose2/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, gettext
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "metamorphose2";
|
||||
version = "0.10.0beta";
|
||||
|
||||
# exif-py vendored via submodule
|
||||
src = fetchFromGitHub {
|
||||
owner = "timinaust";
|
||||
repo = "metamorphose2";
|
||||
rev = "ba0666dd02e4f3f58c1dadc309e7ec1cc13fe851";
|
||||
sha256 = "0w9l1vyyswdhdwrmi71g23qyslvhg1xym4ksifd42vwf9dxy55qp";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -rf ./src/mutagen
|
||||
substituteInPlace messages/Makefile \
|
||||
--replace "\$(shell which msgfmt)" "${gettext}/bin/msgfmt"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/metamorphose2
|
||||
makeWrapper ${python3.interpreter} $out/bin/metamorphose2 \
|
||||
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
|
||||
--add-flags "-O $out/share/metamorphose2/metamorphose2.py -w=3"
|
||||
'';
|
||||
|
||||
buildInput = [ gettext python3 ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "a graphical mass renaming program for files and folders";
|
||||
homepage = "https://github.com/timinaust/metamorphose2";
|
||||
license = with licenses; gpl3Plus;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
, extra-cmake-modules
|
||||
, cpp-utilities
|
||||
, qtutilities
|
||||
, qtforkawesome
|
||||
, boost
|
||||
, cmake
|
||||
, kio
|
||||
, plasma-framework
|
||||
|
|
@ -19,17 +21,23 @@
|
|||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.1.3";
|
||||
version = "1.1.20";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y=";
|
||||
sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase cpp-utilities qtutilities ]
|
||||
buildInputs = [
|
||||
qtbase
|
||||
cpp-utilities
|
||||
qtutilities
|
||||
boost
|
||||
qtforkawesome
|
||||
]
|
||||
++ lib.optionals webviewSupport [ qtwebengine ]
|
||||
++ lib.optionals jsSupport [ qtdeclarative ]
|
||||
++ lib.optionals kioPluginSupport [ kio ]
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.13.5";
|
||||
version = "1.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HZGI9vWSYCDH0lW+k6hvPm3UVW6lR8Lhr3H7blNupNk=";
|
||||
sha256 = "sha256-5EIXbdVBFkmftD8xK1VJmZH3Ul99fhFSpFLOQNqSXoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "100.0-3",
|
||||
"packageVersion": "100.0.2-1",
|
||||
"source": {
|
||||
"rev": "100.0-3",
|
||||
"sha256": "1n99amk6ngxa7wipc402gffqjv4qmgbaahpz3xydfarxw8gk37pl"
|
||||
"rev": "100.0.2-1",
|
||||
"sha256": "1hss4kvy4n4wxwlbb0pk7f02qra1dk8xgc6v6xqg252i7453vg9d"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "100.0",
|
||||
"sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"
|
||||
"version": "100.0.2",
|
||||
"sha512": "6d9922e35e496fa63833ba03d1466e075287e40e50854ddc4f4a2036d9c7ca1f35c03bc6f708a3c469e0ec3b389b3346ac754bb84df0fecb86955fc21c05e00f"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,12 +14,11 @@ assert withMediaPlayback -> gst_all_1 != null;
|
|||
let
|
||||
python3Packages = python3.pkgs;
|
||||
pdfjs = let
|
||||
version = "2.8.335";
|
||||
version = "2.14.305";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "pdfjs-${version}";
|
||||
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
|
||||
sha256 = "1zschfpxnhdinn9nasl5in4s62ad0h1g369cglamjgxx36x27zly";
|
||||
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
|
||||
hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
@ -33,12 +32,12 @@ let
|
|||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1zai8ivc9cqax2idspwvyp24dkis0x6sv29fia8ja3sp62i45171";
|
||||
hash = "sha256-5ohYhqhM0WamumM3lKWKTGfYccJxiBJ+XdvFJ2127bw=";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
|
|
|||
|
|
@ -8,17 +8,18 @@
|
|||
, ncurses
|
||||
, autoreconfHook
|
||||
, buildPackages
|
||||
, memstreamHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telescope";
|
||||
version = "0.7.1";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omar-polo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-W42e1p70dMhF9C7BBPp1Yhp2PrRb8/Lu07yOGiUSmNg=";
|
||||
sha256 = "sha256-9gZeBAC7AGU5vb+692npjKbbqFEAr9iGLu1u68EJ0W8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
libevent
|
||||
libressl
|
||||
ncurses
|
||||
];
|
||||
] ++ lib.optional stdenv.isDarwin memstreamHook;
|
||||
|
||||
configureFlags = [
|
||||
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
|
||||
|
|
|
|||
|
|
@ -70,40 +70,9 @@ let
|
|||
removed = date: throw "removed from nixpkgs on ${date}";
|
||||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
arukas = archived "2022/01";
|
||||
chef = archived "2022/01";
|
||||
cherryservers = archived "2022/01";
|
||||
clc = archived "2022/01";
|
||||
cloudstack = removed "2022/01";
|
||||
cobbler = archived "2022/01";
|
||||
cohesity = archived "2022/01";
|
||||
dyn = archived "2022/01";
|
||||
genymotion = archived "2022/01";
|
||||
hedvig = archived "2022/01";
|
||||
ignition = archived "2022/01";
|
||||
incapsula = archived "2022/01";
|
||||
influxdb = archived "2022/01";
|
||||
jdcloud = archived "2022/01";
|
||||
kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
|
||||
librato = archived "2022/01";
|
||||
logentries = archived "2022/01";
|
||||
metalcloud = archived "2022/01";
|
||||
mysql = archived "2022/01";
|
||||
nixos = archived "2022/01";
|
||||
oneandone = archived "2022/01";
|
||||
packet = archived "2022/01";
|
||||
profitbricks = archived "2022/01";
|
||||
pureport = archived "2022/01";
|
||||
rancher = archived "2022/01";
|
||||
rightscale = archived "2022/01";
|
||||
runscope = archived "2022/01";
|
||||
segment = removed "2022/01";
|
||||
softlayer = archived "2022/01";
|
||||
telefonicaopencloud = archived "2022/01";
|
||||
teleport = removed "2022/01";
|
||||
terraform = archived "2022/01";
|
||||
ultradns = archived "2022/01";
|
||||
vthunder = throw "provider was renamed to thunder on 2022/01";
|
||||
opc = archived "2022/05";
|
||||
oraclepaas = archived "2022/05";
|
||||
template = archived "2022/05";
|
||||
};
|
||||
|
||||
# excluding aliases, used by terraform-full
|
||||
|
|
|
|||
|
|
@ -73,13 +73,13 @@
|
|||
"version": "2.2.0"
|
||||
},
|
||||
"auth0": {
|
||||
"owner": "alexkappa",
|
||||
"provider-source-address": "registry.terraform.io/alexkappa/auth0",
|
||||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.26.2",
|
||||
"sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw",
|
||||
"vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms",
|
||||
"version": "0.26.2"
|
||||
"rev": "v0.30.2",
|
||||
"sha256": "sha256-6+81QomUnKEbaqGHSRabLSb7O6lrrG+Fp9N8y8ZtS8A=",
|
||||
"vendorSha256": "sha256-4o+/iB853zXcEYgPKVZ8CVHdIOEZW+/OX+LDBHSNjUk=",
|
||||
"version": "0.30.2"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -860,15 +860,6 @@
|
|||
"vendorSha256": null,
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"opc": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/opc",
|
||||
"repo": "terraform-provider-opc",
|
||||
"rev": "v1.4.1",
|
||||
"sha256": "1kylnjy7s5bkx6zjksbz8sfx77pxcc9ycbi8kd8axnrcmj4q01xc",
|
||||
"vendorSha256": null,
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"opennebula": {
|
||||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
|
|
@ -905,15 +896,6 @@
|
|||
"vendorSha256": null,
|
||||
"version": "0.6.10"
|
||||
},
|
||||
"oraclepaas": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oraclepaas",
|
||||
"repo": "terraform-provider-oraclepaas",
|
||||
"rev": "v1.5.3",
|
||||
"sha256": "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15",
|
||||
"vendorSha256": null,
|
||||
"version": "1.5.3"
|
||||
},
|
||||
"ovh": {
|
||||
"owner": "ovh",
|
||||
"provider-source-address": "registry.terraform.io/ovh/ovh",
|
||||
|
|
@ -1068,13 +1050,13 @@
|
|||
"version": "0.14.5"
|
||||
},
|
||||
"snowflake": {
|
||||
"owner": "chanzuckerberg",
|
||||
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.33.1",
|
||||
"sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=",
|
||||
"vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=",
|
||||
"version": "0.33.1"
|
||||
"rev": "v0.34.0",
|
||||
"sha256": "sha256-7FQp5lDm6WKFmtk9V8Sf+e5J4tLpAOfgMKpbcQRcfIE=",
|
||||
"vendorSha256": "sha256-HGukjbPQyQpFnVkgUnreQlNAW9nhLirnQnYIpBfFe+M=",
|
||||
"version": "0.34.0"
|
||||
},
|
||||
"sops": {
|
||||
"owner": "carlpett",
|
||||
|
|
@ -1121,15 +1103,6 @@
|
|||
"vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=",
|
||||
"version": "2.16.0"
|
||||
},
|
||||
"template": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/template",
|
||||
"repo": "terraform-provider-template",
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2",
|
||||
"vendorSha256": null,
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -25,7 +26,7 @@ stdenvNoCC.mkDerivation {
|
|||
inherit version pname;
|
||||
src = appimage;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
@ -46,6 +47,9 @@ stdenvNoCC.mkDerivation {
|
|||
mkdir -p $out/
|
||||
cp -r bin $out/bin
|
||||
|
||||
wrapProgram $out/bin/session-desktop-appimage-${version} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220517";
|
||||
version = "20220526";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6jKsdilgWm6oDAuzE1aToMg9oV9BmTgQrOvvlwPA5gc=";
|
||||
sha256 = "sha256-vFq9NvQboqGVzwiH2KPhT6jsdY5i2oKIgEaZKfBsb/o=";
|
||||
};
|
||||
|
||||
# Remove when Apple SDK is >= 10.13
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
|
||||
, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
|
||||
, libnl
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -21,31 +22,34 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
qmake
|
||||
];
|
||||
|
||||
patches = [ ./drone_ini.patch ];
|
||||
prePatch = ''
|
||||
sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
name = "ostinato";
|
||||
desktopName = "Ostinato";
|
||||
genericName = "Packet/Traffic Generator and Analyzer";
|
||||
comment = "Network packet and traffic generator and analyzer with a friendly GUI";
|
||||
categories = [ "Network" ];
|
||||
startupNotify = true;
|
||||
exec = "$out/bin/ostinato";
|
||||
exec = "@out@/bin/ostinato";
|
||||
icon = ostinatoIcon;
|
||||
extraConfig = {
|
||||
"GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete";
|
||||
"Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole";
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
preFixup = ''
|
||||
substituteInPlace $out/share/applications/ostinato.desktop \
|
||||
--subst-var out
|
||||
|
||||
cat > $out/bin/ostinato.ini <<EOF
|
||||
WiresharkPath=${wireshark}/bin/wireshark
|
||||
|
|
@ -62,8 +66,8 @@ mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A packet traffic generator and analyzer";
|
||||
homepage = "https://ostinato.org";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://ostinato.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ rick68 ];
|
||||
platforms = with platforms; linux ++ darwin ++ cygwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, imagemagick
|
||||
, networkmanager
|
||||
, librsvg
|
||||
, pango
|
||||
, webkitgtk
|
||||
# Python libs
|
||||
|
|
@ -26,6 +27,7 @@ buildPythonApplication rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gdk-pixbuf
|
||||
gobject-introspection
|
||||
imagemagick
|
||||
wrapGAppsHook
|
||||
|
|
@ -39,7 +41,7 @@ buildPythonApplication rec {
|
|||
buildInputs = [
|
||||
# To avoid enabling strictDeps = false (#56943)
|
||||
gobject-introspection
|
||||
networkmanager
|
||||
librsvg
|
||||
pango
|
||||
webkitgtk
|
||||
] ++ lib.optionals withIndicator [ libappindicator-gtk3 ];
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
rm -f $out/opt/SpiderOakONE/lib/libz*
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
|
||||
"$out/opt/SpiderOakONE/lib/SpiderOakONE"
|
||||
|
||||
RPATH=$out/opt/SpiderOakONE/lib:${ldpath}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "7.40.2";
|
||||
version = "7.41.2";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_113.snap";
|
||||
sha512 = "33f8f367a9fe232cf359869dfa0aa55c9be6f6c0e1ebdf7d65ae4616afe0fe2b61c57697f6d67d5e71f5dffd163eb601d8f2d2757712b01d0d32eb027018c2d3";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_114.snap";
|
||||
sha512 = "298a72858c195fc1d7ac7388ab418876ade32204ce476685da07dee5fd6e19de5e537be45ec01f354e8029d7e5b873988712fa1d31f4d19362712151a7d10b95";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
68
pkgs/applications/networking/warp/default.nix
Normal file
68
pkgs/applications/networking/warp/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, itstool
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warp";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "warp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6KWTjfrJr0QkiYHkwy4IKrzQuVUMHc1yILM7ixHBHSQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Xy/tn5iUqwlmztmTmqUbISAk1xu9vkbMk4CvK4j2ttM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast and secure file transfer";
|
||||
homepage = "https://apps.gnome.org/app/app.drey.Warp";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
let
|
||||
libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ];
|
||||
in ''
|
||||
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||
interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2
|
||||
|
||||
for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide;
|
||||
do
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
|||
patchPhase = ''
|
||||
for binaryfile in $binaryFiles; do
|
||||
patchelf \
|
||||
--set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \
|
||||
--set-rpath ${stdenv.glibc}/lib \
|
||||
--set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 \
|
||||
--set-rpath ${stdenv.cc.libc}/lib \
|
||||
$binaryfile
|
||||
done
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ in stdenv.mkDerivation {
|
|||
${optionalString (!headless) ''
|
||||
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
|
||||
''} -i configure
|
||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
|
||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
|
||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2
|
||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2
|
||||
|
||||
grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e '
|
||||
${optionalString pulseSupport
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ i3lock-color, lib, stdenv, fetchFromGitHub }:
|
||||
{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
i3lock-color.overrideAttrs (oldAttrs : rec {
|
||||
pname = "i3lock-blur";
|
||||
|
|
@ -11,6 +11,16 @@ i3lock-color.overrideAttrs (oldAttrs : rec {
|
|||
sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull patch pending upstream inclusion for -fno-common toolchain
|
||||
# support: https://github.com/karulont/i3lock-blur/pull/22
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/karulont/i3lock-blur/commit/ec8fe0e7f7d78bf445602ed517efd5c324bb32f7.patch";
|
||||
sha256 = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An improved screenlocker based upon XCB and PAM with background blurring filter";
|
||||
homepage = "https://github.com/karulont/i3lock-blur/";
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ let
|
|||
setuptools
|
||||
python-dateutil
|
||||
dbus-python
|
||||
dbus-next
|
||||
mpd2
|
||||
psutil
|
||||
pyxdg
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@ rec {
|
|||
mkdir -p $out/lib
|
||||
|
||||
# Copy what we need from Glibc.
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/libresolv.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/ld-linux*.so.? $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libc.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libm.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* $out/lib
|
||||
|
||||
# Copy BusyBox.
|
||||
cp -pd ${pkgs.busybox}/bin/* $out/bin
|
||||
|
|
|
|||
|
|
@ -11,11 +11,22 @@ in fetchFromGitHub {
|
|||
rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
pushd $out
|
||||
|
||||
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
|
||||
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
|
||||
|
||||
# remove unrelated files
|
||||
for f in * .*; do
|
||||
case "$f" in
|
||||
share|.|..) ;;
|
||||
*) rm -rf "$f" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
popd
|
||||
'';
|
||||
sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
|
||||
sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The xkcd font";
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gedit";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "qHmR9Clh609qvNuqu3hHYMI66u765jY9PiGmHpxFhDc=";
|
||||
sha256 = "fx/UPfURDUw33mVBmT9B8PvD78eQkA6SBTR5ugaZIOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "42.1.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "kRfuQpH2/oX95/Fh4FBEA8PPquX3GxjwHjAmUZY2UtI=";
|
||||
sha256 = "TYPZiySavhW7Kz5+eurZxH+Ei8p7agkavJCLdlQavns=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ let
|
|||
lxqt-build-tools = callPackage ./lxqt-build-tools {};
|
||||
libsysstat = callPackage ./libsysstat {};
|
||||
liblxqt = callPackage ./liblxqt {};
|
||||
qtxdg-tools = callPackage ./qtxdg-tools {};
|
||||
|
||||
### CORE 1
|
||||
libfm-qt = callPackage ./libfm-qt {};
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "libqtxdg";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "llE4OxI4I/n0P8Pv5tKT3tXM7IfD3VMQSxdaLkBJ4Gk=";
|
||||
sha256 = "zrlaOiIsfbwjHFjqhYZ9lCo+oTsddICxl2UAum9Xoi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, kwindowsystem
|
||||
, liblxqt
|
||||
, libqtxdg
|
||||
, qtxdg-tools
|
||||
, procps
|
||||
, xorg
|
||||
, xdg-user-dirs
|
||||
|
|
@ -19,13 +20,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "lxqt-session";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "urm4Ehd26fmssJwu/V9Uu/lZ0J8yDOtAA0DIihTPxng=";
|
||||
sha256 = "NOwuHz5SiygE/9cLrYPz24L5v8BE6Hwqp6uKD5SnOBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +43,7 @@ mkDerivation rec {
|
|||
kwindowsystem
|
||||
liblxqt
|
||||
libqtxdg
|
||||
qtxdg-tools
|
||||
procps
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
|
|
|
|||
41
pkgs/desktops/lxqt/qtxdg-tools/default.nix
Normal file
41
pkgs/desktops/lxqt/qtxdg-tools/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, libqtxdg
|
||||
, lxqt-build-tools
|
||||
, lxqtUpdateScript
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtxdg-tools";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NUSeXEJ6zjTz6p/8R6YTVfPQEnk1ukZ2ikdDdkaPeSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lxqt-build-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libqtxdg
|
||||
];
|
||||
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lxqt/qtxdg-tools";
|
||||
description = "libqtxdg user tools";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -161,6 +161,13 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
} // lib.optionalAttrs config.allowAliases {
|
||||
#### ALIASES
|
||||
|
||||
xinitrc = xfce4-session.xinitrc; # added 2019-11-04
|
||||
|
||||
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04
|
||||
|
||||
}) // lib.optionalAttrs config.allowAliases {
|
||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
|
||||
terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24
|
||||
thunar-build = throw "xfce.thunar-build has been removed, use xfce.thunar-bare instead"; # added 2022-05-24
|
||||
thunarx-2-dev = throw "xfce.thunarx-2-dev has been removed, use xfce.thunar-bare instead"; # added 2022-05-24
|
||||
|
|
@ -209,8 +216,4 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
gtksourceview = throw "xfce.gtksourceview has been removed, use gtksourceview instead"; # added 2022-05-24
|
||||
dconf = throw "xfce.dconf has been removed, use dconf instead"; # added 2022-05-24
|
||||
vte = throw "xfce.vte has been removed, use vte instead"; # added 2022-05-24
|
||||
|
||||
xinitrc = xfce4-session.xinitrc; # added 2019-11-04
|
||||
|
||||
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{lib, stdenv, fetchurl, ant, jre, jdk}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcl";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
|
||||
sha256 = "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx";
|
||||
sha256 = "sha256-oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=";
|
||||
};
|
||||
configurePhase = ''
|
||||
mkdir nix-tools
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
sha256 = "15dsfdcxvx0wizkkn85ldz0mg0h7cjziz1lw4kky0b9v9xr48lm7";
|
||||
sha256 = "0ff7ypr76xf99h3dmy1xdnkq2xn432qnzihxs72xrd4j5nhlybwv";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.1";
|
||||
|
||||
|
|
@ -25,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
for b in cgc cgfxcat cginfo
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux*.so.? "bin/$b"
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux*.so.? "bin/$b"
|
||||
done
|
||||
# FIXME: cgfxcat and cginfo need more patchelf
|
||||
mkdir -p "$out/bin/"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ purescript_derivation_file="${script_dir}/default.nix"
|
|||
old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$purescript_derivation_file")"
|
||||
|
||||
# This is the latest release version of PureScript on GitHub.
|
||||
new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases" | jq '.[0].tag_name' --raw-output | sed -e 's/v//')
|
||||
new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases/latest" | jq '.tag_name' --raw-output | sed -e 's/v//')
|
||||
|
||||
echo "Updating purescript from old version v${old_version} to new version v${new_version}."
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpp-utilities";
|
||||
version = "5.14.0";
|
||||
version = "5.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WS/2iLwVIYZBu4/uuKgEQ5H/BdeG2aMeZBucFPvlOpI=";
|
||||
sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, perl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gecode";
|
||||
|
|
@ -9,6 +14,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(import ./fix-const-weights-clang-patch.nix fetchpatch)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
preConfigure = "patchShebangs configure";
|
||||
|
|
|
|||
|
|
@ -23,12 +23,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Gecode/gecode/pull/74
|
||||
(fetchpatch {
|
||||
name = "fix-const-weights-clang.patch";
|
||||
url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
|
||||
sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
|
||||
})
|
||||
(import ./fix-const-weights-clang-patch.nix fetchpatch)
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
fetchpatch:
|
||||
# https://github.com/Gecode/gecode/pull/74
|
||||
(fetchpatch {
|
||||
name = "fix-const-weights-clang.patch";
|
||||
url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
|
||||
sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
|
||||
})
|
||||
|
|
@ -43,11 +43,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvfs";
|
||||
version = "1.50.1";
|
||||
version = "1.50.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "dPb0EU9kJJOEroNKv6tjkjGLdCLOUyFV1rSbrh/cQFY=";
|
||||
sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
24
pkgs/development/libraries/libdwarf/0.4.nix
Normal file
24
pkgs/development/libraries/libdwarf/0.4.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdwarf";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
|
||||
sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-shared" "--disable-nonshared" ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "out" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/davea42/libdwarf-code";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ lib.maintainers.atry ];
|
||||
};
|
||||
}
|
||||
|
|
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
|
|||
sed -i \
|
||||
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
|
||||
config.linux
|
||||
'' + lib.optionalString (stdenv ? glibc) ''
|
||||
'' # condition from icu/base.nix
|
||||
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") ''
|
||||
substituteInPlace liveMedia/include/Locale.hh \
|
||||
--replace '<xlocale.h>' '<locale.h>'
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-vaapi-driver";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elFarto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY=";
|
||||
sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
, lcms2
|
||||
, re2
|
||||
, libkrb5
|
||||
, xkeyboard_config
|
||||
, enableProprietaryCodecs ? true
|
||||
}:
|
||||
|
||||
|
|
@ -127,6 +128,13 @@ qtModule rec {
|
|||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
|
||||
substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
|
||||
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
|
||||
|
||||
substituteInPlace src/core/web_engine_library_info.cpp \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
59
pkgs/development/libraries/qtforkawesome/default.nix
Normal file
59
pkgs/development/libraries/qtforkawesome/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cpp-utilities
|
||||
, qtutilities
|
||||
, qttools
|
||||
, qtbase
|
||||
, cmake
|
||||
, perl
|
||||
}:
|
||||
|
||||
let
|
||||
fork_awesome_release = fetchFromGitHub {
|
||||
owner = "ForkAwesome";
|
||||
repo = "Fork-Awesome";
|
||||
rev = "1.2.0";
|
||||
sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "qtforkawesome";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J3F+ikz6gQqV+JsOX8EpMOWoTmI6UK5KndFALUo4oiU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
cpp-utilities
|
||||
qtutilities
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
perl
|
||||
perl.pkgs.YAML
|
||||
];
|
||||
cmakeFlags = [
|
||||
# Current freetype used by NixOS users doesn't support the `.woff2` font
|
||||
# format, so we use ttf. See
|
||||
# https://github.com/NixOS/nixpkgs/pull/174875#discussion_r883423881
|
||||
"-DFORK_AWESOME_FONT_FILE=${fork_awesome_release}/fonts/forkawesome-webfont.ttf"
|
||||
"-DFORK_AWESOME_ICON_DEFINITIONS=${fork_awesome_release}/src/icons/icons.yml"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Martchus/qtforkawesome";
|
||||
description = "Library that bundles ForkAwesome for use within Qt applications";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
|
||||
, libX11, libXext, qttools, wrapQtAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm";
|
||||
sha256 = "NPMqd7j9Unvw8p/cUNMYWmgrb2ysdMvSSGJ6lJWh4/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,6 +30,12 @@ stdenv.mkDerivation rec {
|
|||
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "libsForQt5.${pname}";
|
||||
rev-prefix = "V";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
|
||||
homepage = "https://github.com/tsujan/Kvantum";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
|
||||
buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
|
||||
patchInstructions = lib.optionalString (os == "linux") ''
|
||||
autoPatchelf $packageBaseDir/bin
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -246,6 +246,7 @@
|
|||
, "pulp"
|
||||
, "purescript-language-server"
|
||||
, "purescript-psa"
|
||||
, "purs-tidy"
|
||||
, "purty"
|
||||
, "pxder"
|
||||
, "pyright"
|
||||
|
|
|
|||
5898
pkgs/development/node-packages/node-packages.nix
generated
5898
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -202,7 +202,7 @@ final: prev: {
|
|||
wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]}
|
||||
${
|
||||
if stdenv.isLinux
|
||||
then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
|
||||
then "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
|
||||
else ""
|
||||
}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "opam-file-format";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs";
|
||||
sha256 = "sha256-wnAnvLNOc9FRBdLIFR08OKVaIjSEqJrcCIn4hmtYtjY=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
|
@ -18,5 +18,6 @@ buildDunePackage rec {
|
|||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
homepage = "https://github.com/ocaml/opam-file-format/";
|
||||
changelog = "https://github.com/ocaml/opam-file-format/raw/${version}/CHANGES";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
51
pkgs/development/python-modules/aeppl/default.nix
Normal file
51
pkgs/development/python-modules/aeppl/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, aesara
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numdifftools
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aeppl";
|
||||
version = "0.0.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fbBtjU2skvfDCnRRW+9PIObsEOfKhl15qSLw3TGhl4k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aesara
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
numdifftools
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aeppl"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for an Aesara-based PPL";
|
||||
homepage = "https://github.com/aesara-devs/aeppl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, scipy
|
||||
, filelock
|
||||
, cons
|
||||
, cython
|
||||
, etuples
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, logical-unification
|
||||
, minikanren
|
||||
, cons
|
||||
, numba
|
||||
, numba-scipy
|
||||
, libgpuarray
|
||||
, sympy
|
||||
, cython
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.5.3";
|
||||
version = "2.6.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
sha256 = "sha256-20nc70gNdcGjtGxv2WxmYxmswNH8v7yGLkToP2iazjc=";
|
||||
hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -32,28 +35,41 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
filelock
|
||||
cons
|
||||
etuples
|
||||
filelock
|
||||
logical-unification
|
||||
minikanren
|
||||
cons
|
||||
numba
|
||||
numba-scipy
|
||||
libgpuarray
|
||||
sympy
|
||||
numpy
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
numba
|
||||
numba-scipy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--durations=50" ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aesara" ];
|
||||
pythonImportsCheck = [
|
||||
"aesara"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't run the most compute-intense tests
|
||||
"tests/scan/"
|
||||
"tests/tensor/"
|
||||
"tests/sandbox/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioqsw";
|
||||
version = "0.0.8";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FSH7MWtxYdJjCLpit2IhxXUFkGWml6P0SroUJ3iorRw=";
|
||||
hash = "sha256-/4d7FXz0LBKKnJemmhOXZrnRrVuFaKojLaUn0SXcFaw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
|||
jinja2
|
||||
packaging
|
||||
pyyaml
|
||||
resolvelib
|
||||
resolvelib # This library is a PITA, since ansible requires a very old version of it
|
||||
# optional dependencies
|
||||
junit-xml
|
||||
lxml
|
||||
|
|
@ -73,9 +73,10 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
|
||||
description = "Radically simple IT automation";
|
||||
homepage = "https://www.ansible.com";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,6 @@ buildPythonPackage {
|
|||
homepage = "https://www.ansible.com";
|
||||
changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "arviz";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "arviz-devs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
hash = "sha256-5P6EXXAAS1Q2eNQuj/5JrDg0lPHfA5K4WaYfKaaXm9s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asteval";
|
||||
version = "0.9.26";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.9.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newville";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b";
|
||||
hash = "sha256-FxWs4l9bqZoqdyhpVRys8Mo9Wdtn1fm5XonisPscWEs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -28,7 +30,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asteval" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=asteval --cov-report xml" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asteval"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AST evaluator of Python expression using ast module";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.24.0";
|
||||
version = "3.25.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-N/pJFZSBs3yzswtg6XMjv8KKJLLeTnA6O38d4u5SP9Y=";
|
||||
sha256 = "sha256-O0hD8PCmUH38k2a0cnt4Ihb+8/wb9RIL27xc/LONBU0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, six
|
||||
, pytest
|
||||
, mock
|
||||
, parameterized
|
||||
, pyelftools
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-lambda-builders";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "awslabs";
|
||||
repo = "aws-lambda-builders";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA=";
|
||||
hash = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -27,19 +28,36 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
mock
|
||||
parameterized
|
||||
pyelftools
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
pytest tests/functional -k 'not can_invoke_pip'
|
||||
'';
|
||||
disabledTests = [
|
||||
# CLI don't work in the sandbox
|
||||
"test_run_hello_workflow"
|
||||
# Don't tests integrations
|
||||
"TestCustomMakeWorkflow"
|
||||
"TestDotnet31"
|
||||
"TestDotnet6"
|
||||
"TestGoWorkflow"
|
||||
"TestJavaGradle"
|
||||
"TestJavaMaven"
|
||||
"TestNodejsNpmWorkflow"
|
||||
"TestNodejsNpmWorkflowWithEsbuild"
|
||||
"TestPipRunner"
|
||||
"TestPythonPipWorkflow"
|
||||
"TestRubyWorkflow"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aws_lambda_builders"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to compile, build and package AWS Lambda functions";
|
||||
homepage = "https://github.com/awslabs/aws-lambda-builders";
|
||||
description = "A tool to compile, build and package AWS Lambda functions";
|
||||
longDescription = ''
|
||||
Lambda Builders is a Python library to compile, build and package
|
||||
AWS Lambda functions for several runtimes & frameworks.
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ buildPythonPackage rec {
|
|||
--replace "--cov --cov-report term-missing " ""
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "pysnmplib==5.0.10" "pysnmplib>=5.0.10"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, xgboost
|
||||
, dask
|
||||
, distributed
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
pname = "dask-xgboost";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ xgboost dask distributed ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "dask_xdgboost" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dask/dask-xgboost";
|
||||
description = "Interactions between Dask and XGBoost";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# TypeError: __init__() got an unexpected keyword argument 'iid'
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
, pyct
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, nbsmoke
|
||||
, fastparquet
|
||||
, nbconvert
|
||||
|
|
@ -24,12 +25,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
|
||||
hash = "sha256-VKEDOJV2ITO1gxKLbFQbcem0gEd/fzTIo+QSmZVsMGI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, nose
|
||||
, nbformat
|
||||
, nbconvert
|
||||
, jupyter
|
||||
, chainer
|
||||
, parameterized
|
||||
, pytorch
|
||||
, mxnet
|
||||
, tensorflow
|
||||
, fetchFromGitHub
|
||||
, jupyter
|
||||
, keras
|
||||
#, mxnet
|
||||
, nbconvert
|
||||
, nbformat
|
||||
, nose
|
||||
, numpy
|
||||
, parameterized
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "einops";
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arogozhnikov";
|
||||
|
|
@ -26,38 +29,46 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
checkInputs = [
|
||||
chainer
|
||||
jupyter
|
||||
keras
|
||||
# mxnet (has issues with some CPUs, segfault)
|
||||
nbconvert
|
||||
nbformat
|
||||
nose
|
||||
numpy
|
||||
# For notebook tests
|
||||
nbformat
|
||||
nbconvert
|
||||
jupyter
|
||||
# For backend tests
|
||||
chainer
|
||||
parameterized
|
||||
pytorch
|
||||
mxnet
|
||||
tensorflow
|
||||
keras
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# No CUDA in sandbox
|
||||
EINOPS_SKIP_CUPY = 1;
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
|
||||
# Prevent hangs on PyTorch-related tests, see
|
||||
# https://discuss.pytorch.org/t/pytorch-cpu-hangs-on-nn-linear/17748/4
|
||||
export OMP_NUM_THREADS=1
|
||||
|
||||
nosetests -v -w tests
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"einops"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests are failing as mxnet is not pulled-in
|
||||
# https://github.com/NixOS/nixpkgs/issues/174872
|
||||
"test_all_notebooks"
|
||||
"test_dl_notebook_with_all_backends"
|
||||
"test_backends_installed"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_layers.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flexible and powerful tensor operations for readable and reliable code";
|
||||
homepage = "https://github.com/arogozhnikov/einops";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yl3dy ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yl3dy ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-access-context-manager";
|
||||
version = "0.1.10";
|
||||
version = "0.1.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o=";
|
||||
sha256 = "sha256-nvwb5q8ZzN8Uz69H4KH+XLInHlJtm84WFmEmJ3M14so=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q=";
|
||||
sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,22 +12,21 @@
|
|||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-logging";
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg=";
|
||||
hash = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "google-cloud-appengine-logging >= 0.1.0, < 1.0.0dev" "google-cloud-appengine-logging >= 0.1.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-cloud-appengine-logging
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue