Merge staging-next into staging
This commit is contained in:
commit
ff43d848bf
@ -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";
|
||||
|
@ -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.
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
@ -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;
|
||||
};
|
||||
}
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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";
|
||||
})
|
@ -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 = [
|
||||
|
@ -39,7 +39,10 @@ in stdenv.mkDerivation rec {
|
||||
perl.pkgs.YAML
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DFORK_AWESOME_FONT_FILE=${fork_awesome_release}/fonts/forkawesome-webfont.woff2"
|
||||
# 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"
|
||||
];
|
||||
|
||||
|
@ -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 ""
|
||||
}
|
||||
'';
|
||||
|
@ -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; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -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,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;
|
||||
};
|
||||
}
|
@ -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 = [
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "http-sfv";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "mnot";
|
||||
repo = "http_sfv";
|
||||
rev = "http_sfv-${version}";
|
||||
hash = "sha256-S+cbcDx+cXwN2TpfiUpr6xK1GFRxSYgfHdUavfzeyAE=";
|
||||
hash = "sha256-VeCDgzpnaN8zkZt7Dy0njU6Dnq1SQTJ95CEYl20QxPQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apache-libcloud";
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7JLDlHj+kKJ+PP6IbEPLy5iaRZPCOf+fLB3XdSCGPPI=";
|
||||
sha256 = "sha256-SjuRQQM3mOT7B4hv8mJU5jXgIqy91wg3XqxvVuMjUGw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
|
||||
patchPhase = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace monotonic.py --replace \
|
||||
"ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
|
||||
"ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so'"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -25,6 +25,11 @@ buildPythonPackage rec {
|
||||
buildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/nipy/nitime/issues/197
|
||||
"test_FilterAnalyzer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nipy.org/nitime";
|
||||
description = "Algorithms and containers for time-series analysis in time and spectral domains";
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, pytest
|
||||
, pytest-pylint
|
||||
, pytestCheckHook
|
||||
, nbconvert
|
||||
, joblib
|
||||
, jupyter
|
||||
, jupyter-client
|
||||
, numpy
|
||||
, scipy
|
||||
@ -24,15 +24,17 @@ buildPythonPackage rec {
|
||||
disabled = !isPy3k;
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sGdOuCnSMpBDP3GNI2ASK+gEsXDMyAetnZqNHBOYVTM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaveIO";
|
||||
repo = "PhiK";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nr3804MLIBPFw/PlJ9B8xKFFGI5LDp8m2gLtJB7YcEE=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytest-pylint
|
||||
pytestCheckHook
|
||||
nbconvert
|
||||
jupyter
|
||||
jupyter-client
|
||||
];
|
||||
|
||||
@ -55,16 +57,22 @@ buildPythonPackage rec {
|
||||
scikit-build
|
||||
];
|
||||
|
||||
pythonImportCheck = [ "phik" ];
|
||||
pythonImportsCheck = [ "phik" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -r $out/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# import from $out
|
||||
rm -r phik
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Phi_K correlation analyzer library";
|
||||
longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables.";
|
||||
homepage = "https://phik.readthedocs.io/en/latest/";
|
||||
changelog = "https://github.com/KaveIO/PhiK/blob/${src.rev}/CHANGES.rst";
|
||||
maintainers = with maintainers; [ melsigl ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
, dbus-python
|
||||
, distro
|
||||
, jinja2
|
||||
, keyring
|
||||
@ -10,7 +11,10 @@
|
||||
, pygobject3
|
||||
, pyxdg
|
||||
, systemd
|
||||
, ncurses
|
||||
, networkmanager
|
||||
, pkgs-systemd
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -26,6 +30,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
distro
|
||||
jinja2
|
||||
keyring
|
||||
@ -33,6 +38,10 @@ buildPythonPackage rec {
|
||||
pygobject3
|
||||
pyxdg
|
||||
systemd
|
||||
ncurses
|
||||
networkmanager
|
||||
pkgs-systemd
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
@ -1,17 +1,28 @@
|
||||
{ lib, buildPythonPackage, snap7, fetchFromGitHub, six, setuptools }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, snap7
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-snap7";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gijzelaerr";
|
||||
repo = "python-snap7";
|
||||
rev = version;
|
||||
sha256 = "18z13wb2q5q3msp9w3wddg1byp7picczw4ng8w1ccj4npidxsqv8";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xkkJE3wTqS6spwEmQ+HBY1Szao1VFoqmQ041vnAYuqQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools six ];
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace snap7/common.py \
|
||||
@ -19,7 +30,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
# Tests require root privileges to open privilaged ports
|
||||
# We cannot run them
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -28,7 +38,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the snap7 PLC communication library ";
|
||||
description = "Python wrapper for the snap7 PLC communication library";
|
||||
homepage = "https://github.com/gijzelaerr/python-snap7";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.20.12";
|
||||
version = "0.20.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4462T2WIBdWjtd51YfslYZOcJg9f0nrSOKTi2ed6WvI=";
|
||||
hash = "sha256-5YGMBoykMtXZgdHubQJKwRqntDPnR6/qsWJc1cYk8CA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -74,7 +74,11 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test is outdated
|
||||
"tests/test_client/test_additional_properties.py"
|
||||
"tests/test_client/test_auth.py"
|
||||
"tests/test_client/test_client.py"
|
||||
"tests/test_client/test_datetime.py"
|
||||
"tests/test_imports.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -83,7 +87,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing the Rigetti QCS API";
|
||||
homepage = "https://pypi.org/project/qcs-api-client/";
|
||||
homepage = "https://qcs-api-client-python.readthedocs.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -1,63 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, asn1crypto
|
||||
, azure-storage-blob
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, cffi
|
||||
, charset-normalizer
|
||||
, fetchPypi
|
||||
, future
|
||||
, idna
|
||||
, ijson
|
||||
, oscrypto
|
||||
, pyarrow
|
||||
, pyasn1-modules
|
||||
, pycryptodomex
|
||||
, pyjwt
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, requests
|
||||
, six
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-connector-python";
|
||||
version = "2.7.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "2.7.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";
|
||||
hash = "sha256-nPsHsEi8sf5kbQP3SAzLaod+nEUGcwLpC8/3/XL2vC8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pyOpenSSL>=16.2.0,<22.0.0" "pyOpenSSL"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-storage-blob
|
||||
asn1crypto
|
||||
boto3
|
||||
certifi
|
||||
cffi
|
||||
future
|
||||
charset-normalizer
|
||||
idna
|
||||
ijson
|
||||
oscrypto
|
||||
pycryptodomex
|
||||
pyjwt
|
||||
pyopenssl
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
pyarrow
|
||||
pyasn1-modules
|
||||
urllib3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL"
|
||||
'';
|
||||
|
||||
# Tests require encrypted secrets, see
|
||||
# https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters
|
||||
doCheck = false;
|
||||
@ -69,7 +57,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Snowflake Connector for Python";
|
||||
homepage = "https://www.snowflake.com/";
|
||||
homepage = "https://github.com/snowflakedb/snowflake-connector-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
@ -19,13 +19,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.16.2";
|
||||
version = "4.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XF29JKIaOqZ/PdU+zu+wX7TAl1TKz+HcOutHDABc/PY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-9r/1vW7Rhv9+Swxdzu5PTnlQlT8ofJeZamHf5X4ql8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ packaging ];
|
||||
|
@ -103,7 +103,7 @@ buildPythonPackage rec {
|
||||
# Patch t.p._inotify to point to libc. Without this,
|
||||
# twisted.python.runtime.platform.supportsINotify() == False
|
||||
substituteInPlace src/twisted/python/_inotify.py --replace \
|
||||
"ctypes.util.find_library(\"c\")" "'${stdenv.glibc.out}/lib/libc.so.6'"
|
||||
"ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'"
|
||||
'';
|
||||
|
||||
# Generate Twisted's plug-in cache. Twisted users must do it as well. See
|
||||
|
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-urllib3";
|
||||
version = "1.26.14";
|
||||
version = "1.26.15";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KiV45LNjQczSQLAPzNqYJpiP8FiaRLpKZku9ae80jSc=";
|
||||
hash = "sha256-yJKDVB75LjRLf1n4Pqm1opWxY2bO7j8l7PxVk8efeU4=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
@ -38,7 +38,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.12.16";
|
||||
version = "0.12.17";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";
|
||||
hash = "sha256-hY01cql/j3ieL1zJoPOM/QZiF0X/ivekFRfX+TvZhyM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,30 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
, python
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webcolors";
|
||||
version = "1.11.1";
|
||||
disabled = isPy27;
|
||||
version = "1.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6";
|
||||
hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover -s tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"webcolors"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for working with color names/values defined by the HTML and CSS specifications";
|
||||
homepage = "https://bitbucket.org/ubernostrum/webcolors/overview/";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://github.com/ubernostrum/webcolors";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -1,18 +1,18 @@
|
||||
{ buildGoPackage, fetchFromGitHub, git, pandoc, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, pandoc, lib }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "checkmake";
|
||||
version = "0.1.0-2020.11.30";
|
||||
|
||||
goPackagePath = "github.com/mrtazz/checkmake";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrtazz";
|
||||
repo = pname;
|
||||
rev = "575315c9924da41534a9d0ce91c3f0d19bb53ffc";
|
||||
sha256 = "121rsl9mh3wwadgf8ggi2xnb050pak6ma68b2sw5j8clmxbrqli3";
|
||||
rev = version;
|
||||
sha256 = "sha256-Zkrr1BrP8ktRGf6EYhDpz3oTnX6msrSpfFqkqi9pmlc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [ pandoc ];
|
||||
|
||||
preBuild =
|
||||
@ -29,10 +29,11 @@ buildGoPackage rec {
|
||||
buildFlagsArray+=("-ldflags=${buildVarsFlags}")
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
pandoc -s -t man -o checkmake.1 go/src/${goPackagePath}/man/man1/checkmake.1.md
|
||||
mkdir -p $out/share/man/man1
|
||||
mv checkmake.1 $out/share/man/man1/checkmake.1
|
||||
pandoc -s -t man -o $out/share/man/man1/checkmake.1 man/man1/checkmake.1.md
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.7";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sy4z/kyHUn9OSkB1uYQsmr/T5ij/0HfTrr0sIyIUGTE=";
|
||||
sha256 = "sha256-t58+dfsf6A38RG4uT8SJPi07gkC9dGZo0WpVwN9N31k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-l2Ydj7snWQa7L1uVQxBqtj9DsrH+ayUhlsiwDJSeOWk=";
|
||||
vendorSha256 = "sha256-7YKuOApIw4SG39BLb4kh7ZuZjhCBduzKo3iS8v8KZZU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
mv mat $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/mat/MemoryAnalyzer
|
||||
[ -f $libCairo ] && patchelf --set-rpath ${
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''
|
||||
patchelf \
|
||||
--set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
|
||||
--set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
|
||||
--set-rpath $out/lib:"${libPath}" \
|
||||
$out/bin/iaca
|
||||
'';
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp iaca $out/bin
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca
|
||||
'';
|
||||
meta = {
|
||||
description = "Intel Architecture Code Analyzer";
|
||||
|
@ -1,24 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "json2hcl";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
owner = "kvz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0knil88n2w41w3nzqz6ljgfjkl5r3x0bh7ifqgiyf6sin3pl4pn0";
|
||||
sha256 = "sha256-H3jDZL/guVwJIZs7PD/rIvH3ZRYQzNTU/iUvy8aXs0o=";
|
||||
};
|
||||
|
||||
owner = "kvz";
|
||||
goPackagePath = "github.com/${owner}/${pname}";
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert JSON to HCL, and vice versa";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = [ maintainers.matthewbauer ];
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/kvz/json2hcl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
};
|
||||
}
|
||||
|
20
pkgs/development/tools/json2hcl/deps.nix
generated
20
pkgs/development/tools/json2hcl/deps.nix
generated
@ -1,20 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Acconut/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Acconut/hcl";
|
||||
rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
|
||||
sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
|
||||
sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
|
||||
};
|
||||
}
|
||||
]
|
@ -1,7 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, perl, perlPackages }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
perlPackages.buildPerlPackage {
|
||||
pname = "ninka";
|
||||
version = "2.0-pre";
|
||||
|
49
pkgs/development/tools/okteto/default.nix
Normal file
49
pkgs/development/tools/okteto/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
sha256 = "sha256-2L6Ky7Mbky6VYx4kdBuYTtaJ9AzNufuYLrgERxLYpg8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
find cmd -name "*_test.go" | xargs rm -f
|
||||
rm -f pkg/analytics/track_test.go
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-XT/ZLydN1oeuRupD3gjvY6+hOB/Lq5CQwhfr9/iT7JI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/okteto/okteto/pkg/config.VersionString=${version}"
|
||||
];
|
||||
|
||||
tags = [ "osusergo" "netgo" "static_build" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd okteto \
|
||||
--bash <($out/bin/okteto completion bash) \
|
||||
--fish <($out/bin/okteto completion fish) \
|
||||
--zsh <($out/bin/okteto completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Develop your applications directly in your Kubernetes Cluster";
|
||||
homepage = "https://okteto.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
};
|
||||
}
|
@ -1,31 +1,24 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
{ buildGoPackage
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "unconvert-unstable";
|
||||
version = "2018-07-03";
|
||||
rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
|
||||
|
||||
goPackagePath = "github.com/mdempsky/unconvert";
|
||||
buildGoModule rec {
|
||||
pname = "unconvert";
|
||||
version = "unstable-2020-02-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
owner = "mdempsky";
|
||||
repo = "unconvert";
|
||||
sha256 = "1ww5qk1cmdis4ig5mb0b0w7nzrf3734s51plmgdxqsr35y88q4p9";
|
||||
rev = "95ecdbfc0b5f3e65790c43c77874ee5357ad8a8f";
|
||||
sha256 = "sha256-jC2hbpGJeW9TBWIWdeLeGaoNdsm/gOKY4oaDsO5Fwlw=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-HmksSYA4974w+J/7PkMKEkXEfIkldj+kVywvsfLgE38=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remove unnecessary type conversions from Go source";
|
||||
homepage = "https://github.com/mdempsky/unconvert";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
29
pkgs/development/tools/unconvert/deps.nix
generated
29
pkgs/development/tools/unconvert/deps.nix
generated
@ -1,29 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/kisielk/gotool";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kisielk/gotool";
|
||||
rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
|
||||
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
|
||||
sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "96e9e165b75e735822645eff82850b08c377be36";
|
||||
sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
|
||||
};
|
||||
}
|
||||
]
|
@ -16,15 +16,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gragdn3ToOz/We+iVOrX/Fx0g7Zbb7RT5C/2K1+/spc=";
|
||||
sha256 = "sha256-fJ4FTHsgtRIgm2MYqd09okvolXBqYfLQT1yBIG0Z7rA=";
|
||||
};
|
||||
cargoSha256 = "sha256-+lNrkOCiC9WT0hbuUBCTaFCsVWJVbp/up2iov3MMt8o=";
|
||||
cargoSha256 = "sha256-8QB1kSLT2k9frPQJmwQB6mmf3Y1flTij7EQ9J5jQy24=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
@ -11,11 +11,11 @@ let
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.42.1";
|
||||
version = "0.43.1";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-rAqIkJ85l5eSojTowVZl5waK/fk00JI4fI1AY1ue/i4=";
|
||||
aarch64-linux = "sha256-uGptQ5V4u6Vz5BI9xmMShB3gnIUjvA/LKeh+kj71XK8=";
|
||||
x86_64-darwin = "sha256-Hcb4Vct9aTv4APJfNpydRY68jpEE3wZVctKhURohz4Y=";
|
||||
aarch64-darwin = "sha256-OSrbI7pX9arCJt8ymRLEARo8admPDHvpDLqf3+iYzVQ=";
|
||||
x86_64-linux = "sha256-xsKV3/MXwQExON5Bq1qRUShPV0wXEtUHB/DTVjVyWfQ=";
|
||||
aarch64-linux = "sha256-wBtpDG4GxSR4jeAZjclNqVDankWBmxf0cH0LKM4smjM=";
|
||||
x86_64-darwin = "sha256-BGrbwRoPUcSIW4Q3PF8p6vjkTKGLISBxLjOXDWcSjag=";
|
||||
aarch64-darwin = "sha256-4OyQPQPIQ94TanY1hxRTdcWZi5didvyLupLfQ516YL4=";
|
||||
};
|
||||
}
|
||||
|
@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
||||
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
|
||||
|
||||
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
|
||||
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64"
|
||||
|
||||
for f in $out/lib/*; do
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -11,23 +11,23 @@ let
|
||||
if stdenv.isAarch64 then "armv8" else
|
||||
"unknown";
|
||||
|
||||
nnueFile = "nn-13406b1dcbe0.nnue";
|
||||
nnueFile = "nn-6877cd24400e.nnue";
|
||||
nnue = fetchurl {
|
||||
name = nnueFile;
|
||||
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
|
||||
sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28=";
|
||||
sha256 = "sha256-aHfNJEAOAbGf8SrjBoriQhUoAr3TMOZve2cDhlJR1uM=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stockfish";
|
||||
version = "14.1";
|
||||
version = "15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "official-stockfish";
|
||||
repo = "Stockfish";
|
||||
rev = "sf_${version}";
|
||||
sha256 = "sha256-bb62yezHKXu0J7NKavX8xhHghaUjUFYNG5U6dh/D+Co=";
|
||||
sha256 = "sha256-sK4Jw9BPGRvlm9oIcgGcmHe8G4GR4cEuD8MtDrHZKew=";
|
||||
};
|
||||
|
||||
# This addresses a linker issue with Darwin
|
||||
|
@ -24,7 +24,7 @@ let
|
||||
cd $out
|
||||
unzip $src
|
||||
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
binary=$(find . -executable -type f)
|
||||
patchelf \
|
||||
--set-interpreter $interpreter \
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}:
|
||||
{ lib, stdenv, fetchurl, cups, perl, ghostscript, which, makeWrapper}:
|
||||
|
||||
/*
|
||||
[Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html).
|
||||
@ -30,7 +30,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}
|
||||
'';
|
||||
in
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ cups perl glibc ghostscript which ];
|
||||
buildInputs = [ cups perl stdenv.cc.libc ghostscript which ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, stdenv_32bit
|
||||
, fetchurl
|
||||
, unzip
|
||||
, autoconf
|
||||
@ -151,9 +150,9 @@ stdenv.mkDerivation rec {
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
|
||||
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${stdenv_32bit.glibc.out}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${stdenv_32bit.glibc.out}/lib" libcaepcmufr2.so.1.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${stdenv_32bit.glibc.out}/lib" libColorGearCufr2.so.2.0.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0
|
||||
)
|
||||
|
||||
(
|
||||
@ -167,17 +166,17 @@ stdenv.mkDerivation rec {
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
|
||||
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64:$out/lib" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" libcaepcmufr2.so.1.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" libColorGearCufr2.so.2.0.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0
|
||||
)
|
||||
|
||||
(
|
||||
cd $out/bin
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" cnsetuputil2
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" cnpdfdrv
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64:$out/lib" cnpkbidir
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64:$out/lib" cnrsdrvufr2
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnpdfdrv
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnrsdrvufr2
|
||||
|
||||
mv cnsetuputil2 cnsetuputil2.wrapped
|
||||
echo "#!${runtimeShell} -e" > cnsetuputil2
|
||||
|
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
|
||||
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk }:
|
||||
|
||||
let
|
||||
version = "3.0.1-1";
|
||||
@ -38,9 +38,9 @@ stdenv.mkDerivation {
|
||||
|
||||
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter
|
||||
|
||||
wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \
|
||||
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
|
||||
|
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
|
||||
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk }:
|
||||
|
||||
let
|
||||
version = "1.1.4-0";
|
||||
@ -41,8 +41,8 @@ stdenv.mkDerivation {
|
||||
|
||||
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw
|
||||
|
||||
wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \
|
||||
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
|
||||
|
||||
mkdir -p $out/lib/cups/filter/
|
||||
ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
|
||||
|
@ -1,25 +1,23 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "cshatag";
|
||||
version = "2019-12-03";
|
||||
|
||||
goPackagePath = "github.com/rfjakob/cshatag";
|
||||
goDeps = ./deps.nix;
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfjakob";
|
||||
repo = pname;
|
||||
rev = "b169f0a9dd35a7381774eb176d4badf64d403560";
|
||||
sha256 = "16kam3w75avh8khkk6jfdnxwggz2pw6ccv6v7d064j0fbb9y8x0v";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jSRMNLS+JnA3coZf9zkOL/buxZubhbftXnxDJx0nwuU=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "GITVERSION=${version}" ];
|
||||
vendorSha256 = "sha256-BX7jbYhs3+yeOUvPvz08aV2p14bXNGTag4QYkCHr5DQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
# Install man page
|
||||
cd go/src/${goPackagePath}
|
||||
make install $makeFlags
|
||||
install -D -m755 -t $out/share/man/man1/ cshatag.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -28,5 +26,4 @@ buildGoPackage rec {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
21
pkgs/os-specific/linux/cshatag/deps.nix
generated
21
pkgs/os-specific/linux/cshatag/deps.nix
generated
@ -1,21 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/pkg/xattr";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/xattr";
|
||||
rev = "d304131d5e58ca76d8b31ceefbb0c85c7b2d2a36";
|
||||
sha256 = "0bxskiai283zfra13z5f7q7f77zz2cgswaj6l6jr2nwnc3l5m80i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "201ba4db2418b54b698efb4d8082dcb504617cdb";
|
||||
sha256 = "1cqaiwp19kl38g4d6brfhi32822rhnh2q8x1j0i6yg7a8dzfvbz6";
|
||||
};
|
||||
}
|
||||
]
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user