Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
0b82df1624
|
|
@ -82,4 +82,11 @@ This is used with repo.or.cz repositories. The arguments expected are very simil
|
|||
|
||||
## `fetchFromSourcehut` {#fetchfromsourcehut}
|
||||
|
||||
This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name!
|
||||
This is used with sourcehut repositories. Similar to `fetchFromGitHub` above,
|
||||
it expects `owner`, `repo`, `rev` and `sha256`, but don't forget the tilde (~)
|
||||
in front of the username! Expected arguments also include `vc` ("git" (default)
|
||||
or "hg"), `domain` and `fetchSubmodules`.
|
||||
|
||||
If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
|
||||
or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
|
||||
respectively. Otherwise the fetcher uses `fetchzip`.
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil
|
|||
In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:
|
||||
|
||||
- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`
|
||||
- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
|
||||
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.
|
||||
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.
|
||||
|
||||
```nix
|
||||
pet = buildGoModule rec {
|
||||
|
|
|
|||
|
|
@ -325,6 +325,15 @@
|
|||
files.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>fetchFromSourcehut</literal> now allows fetching
|
||||
repositories recursively using <literal>fetchgit</literal> or
|
||||
<literal>fetchhg</literal> if the argument
|
||||
<literal>fetchSubmodules</literal> is set to
|
||||
<literal>true</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -120,3 +120,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
|
||||
|
||||
- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
|
||||
|
||||
- `fetchFromSourcehut` now allows fetching repositories recursively
|
||||
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
|
||||
is set to `true`.
|
||||
|
|
|
|||
|
|
@ -143,6 +143,23 @@ export TMPDIR=${TMPDIR:-$tmpdir}
|
|||
|
||||
sub="auto?trusted=1"
|
||||
|
||||
# Copy the NixOS/Nixpkgs sources to the target as the initial contents
|
||||
# of the NixOS channel.
|
||||
if [[ -z $noChannelCopy ]]; then
|
||||
if [[ -z $channelPath ]]; then
|
||||
channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
|
||||
fi
|
||||
if [[ -n $channelPath ]]; then
|
||||
echo "copying channel..."
|
||||
mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root
|
||||
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
|
||||
-p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
|
||||
"${verbosity[@]}"
|
||||
install -m 0700 -d "$mountPoint"/root/.nix-defexpr
|
||||
ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels
|
||||
fi
|
||||
fi
|
||||
|
||||
# Build the system configuration in the target filesystem.
|
||||
if [[ -z $system ]]; then
|
||||
outLink="$tmpdir/system"
|
||||
|
|
@ -167,23 +184,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
|
|||
--extra-substituters "$sub" \
|
||||
-p "$mountPoint"/nix/var/nix/profiles/system --set "$system" "${verbosity[@]}"
|
||||
|
||||
# Copy the NixOS/Nixpkgs sources to the target as the initial contents
|
||||
# of the NixOS channel.
|
||||
if [[ -z $noChannelCopy ]]; then
|
||||
if [[ -z $channelPath ]]; then
|
||||
channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
|
||||
fi
|
||||
if [[ -n $channelPath ]]; then
|
||||
echo "copying channel..."
|
||||
mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root
|
||||
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
|
||||
-p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
|
||||
"${verbosity[@]}"
|
||||
install -m 0700 -d "$mountPoint"/root/.nix-defexpr
|
||||
ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels
|
||||
fi
|
||||
fi
|
||||
|
||||
# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
|
||||
mkdir -m 0755 -p "$mountPoint/etc"
|
||||
touch "$mountPoint/etc/NIXOS"
|
||||
|
|
|
|||
|
|
@ -329,9 +329,6 @@ in {
|
|||
${pkgs.php}/bin/php artisan cache:clear
|
||||
${pkgs.php}/bin/php artisan config:clear
|
||||
${pkgs.php}/bin/php artisan view:clear
|
||||
${pkgs.php}/bin/php artisan config:cache
|
||||
${pkgs.php}/bin/php artisan route:cache
|
||||
${pkgs.php}/bin/php artisan view:cache
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ in
|
|||
|
||||
DirectoryIndex index.php
|
||||
Require all granted
|
||||
Options +FollowSymLinks
|
||||
Options +FollowSymLinks -Indexes
|
||||
</Directory>
|
||||
|
||||
# https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php
|
||||
|
|
|
|||
|
|
@ -20,16 +20,20 @@ let
|
|||
optionalString fixBinary "F";
|
||||
in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";
|
||||
|
||||
activationSnippet = name: { interpreter, ... }: ''
|
||||
activationSnippet = name: { interpreter, wrapInterpreterInShell, ... }: if wrapInterpreterInShell then ''
|
||||
rm -f /run/binfmt/${name}
|
||||
cat > /run/binfmt/${name} << 'EOF'
|
||||
#!${pkgs.bash}/bin/sh
|
||||
exec -- ${interpreter} "$@"
|
||||
EOF
|
||||
chmod +x /run/binfmt/${name}
|
||||
'' else ''
|
||||
rm -f /run/binfmt/${name}
|
||||
ln -s ${interpreter} /run/binfmt/${name}
|
||||
'';
|
||||
|
||||
getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs;
|
||||
getQemuArch = system: (lib.systems.elaborate { inherit system; }).qemuArch;
|
||||
|
||||
# Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from:
|
||||
# - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix
|
||||
|
|
@ -238,6 +242,25 @@ in {
|
|||
'';
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
wrapInterpreterInShell = mkOption {
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to wrap the interpreter in a shell script.
|
||||
|
||||
This allows a shell command to be set as the interpreter.
|
||||
'';
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
interpreterSandboxPath = mkOption {
|
||||
internal = true;
|
||||
default = null;
|
||||
description = ''
|
||||
Path of the interpreter to expose in the build sandbox.
|
||||
'';
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
|
@ -258,16 +281,37 @@ in {
|
|||
config = {
|
||||
boot.binfmt.registrations = builtins.listToAttrs (map (system: {
|
||||
name = system;
|
||||
value = {
|
||||
value = let
|
||||
interpreter = getEmulator system;
|
||||
qemuArch = getQemuArch system;
|
||||
|
||||
preserveArgvZero = "qemu-${qemuArch}" == baseNameOf interpreter;
|
||||
interpreterReg = let
|
||||
wrapperName = "qemu-${qemuArch}-binfmt-P";
|
||||
wrapper = pkgs.wrapQemuBinfmtP wrapperName interpreter;
|
||||
in
|
||||
if preserveArgvZero then "${wrapper}/bin/${wrapperName}"
|
||||
else interpreter;
|
||||
in {
|
||||
inherit preserveArgvZero;
|
||||
|
||||
interpreter = interpreterReg;
|
||||
wrapInterpreterInShell = !preserveArgvZero;
|
||||
interpreterSandboxPath = dirOf (dirOf interpreterReg);
|
||||
} // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}"));
|
||||
}) cfg.emulatedSystems);
|
||||
# TODO: add a nix.extraPlatforms option to NixOS!
|
||||
nix.extraOptions = lib.mkIf (cfg.emulatedSystems != []) ''
|
||||
extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")}
|
||||
'';
|
||||
nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != [])
|
||||
([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems));
|
||||
nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) (
|
||||
let
|
||||
ruleFor = system: cfg.registrations.${system};
|
||||
hasWrappedRule = lib.any (system: (ruleFor system).wrapInterpreterInShell) cfg.emulatedSystems;
|
||||
in [ "/run/binfmt" ]
|
||||
++ lib.optional hasWrappedRule "${pkgs.bash}"
|
||||
++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems)
|
||||
);
|
||||
|
||||
environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
|
||||
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
|
||||
|
|
|
|||
|
|
@ -1,24 +1,90 @@
|
|||
# Teach the kernel how to run armv7l and aarch64-linux binaries,
|
||||
# and run GNU Hello for these architectures.
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "systemd-binfmt";
|
||||
machine = {
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
|
||||
{ system ? builtins.currentSystem,
|
||||
config ? {},
|
||||
pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
|
||||
let
|
||||
expectArgv0 = xpkgs: xpkgs.runCommandCC "expect-argv0" {
|
||||
src = pkgs.writeText "expect-argv0.c" ''
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
fprintf(stderr, "Our argv[0] is %s\n", argv[0]);
|
||||
|
||||
if (strcmp(argv[0], argv[1])) {
|
||||
fprintf(stderr, "ERROR: argv[0] is %s, should be %s\n", argv[0], argv[1]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
'';
|
||||
} ''
|
||||
$CC -o $out $src
|
||||
'';
|
||||
in {
|
||||
basic = makeTest {
|
||||
name = "systemd-binfmt";
|
||||
machine = {
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
|
||||
testScript = let
|
||||
helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello;
|
||||
helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello;
|
||||
in ''
|
||||
machine.start()
|
||||
|
||||
assert "world" in machine.succeed(
|
||||
"${helloArmv7l}/bin/hello"
|
||||
)
|
||||
|
||||
assert "world" in machine.succeed(
|
||||
"${helloAarch64}/bin/hello"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
testScript = let
|
||||
helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello;
|
||||
helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello;
|
||||
in ''
|
||||
machine.start()
|
||||
assert "world" in machine.succeed(
|
||||
"${helloArmv7l}/bin/hello"
|
||||
)
|
||||
assert "world" in machine.succeed(
|
||||
"${helloAarch64}/bin/hello"
|
||||
)
|
||||
'';
|
||||
})
|
||||
preserveArgvZero = makeTest {
|
||||
name = "systemd-binfmt-preserve-argv0";
|
||||
machine = {
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
testScript = let
|
||||
testAarch64 = expectArgv0 pkgs.pkgsCross.aarch64-multiplatform;
|
||||
in ''
|
||||
machine.start()
|
||||
machine.succeed("exec -a meow ${testAarch64} meow")
|
||||
'';
|
||||
};
|
||||
|
||||
ldPreload = makeTest {
|
||||
name = "systemd-binfmt-ld-preload";
|
||||
machine = {
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
testScript = let
|
||||
helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello;
|
||||
libredirectAarch64 = pkgs.pkgsCross.aarch64-multiplatform.libredirect;
|
||||
in ''
|
||||
machine.start()
|
||||
|
||||
assert "error" not in machine.succeed(
|
||||
"LD_PRELOAD='${libredirectAarch64}/lib/libredirect.so' ${helloAarch64}/bin/hello 2>&1"
|
||||
).lower()
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bucklespring";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zevv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "114dib4npb7r1z2zd1fwsx71xbf9r6psxqd7n7590cwz1w3r51mz";
|
||||
rev = "v${version}";
|
||||
sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -79,5 +79,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, alsa-lib
|
||||
, libsndfile
|
||||
, qt4
|
||||
, qscintilla
|
||||
, qscintilla-qt4
|
||||
, libpulseaudio
|
||||
, libjack2
|
||||
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
alsa-lib
|
||||
libsndfile
|
||||
qt4
|
||||
qscintilla
|
||||
qscintilla-qt4
|
||||
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
|
||||
++ lib.optional (audioBackend == "jack") libjack2;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "dashpay";
|
||||
repo= "dash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";
|
||||
sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ buildGoModule rec {
|
|||
sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3";
|
||||
};
|
||||
|
||||
vendorSha256 = "1hbfmq76zm50zwmlh3jblriwq2k1mp99d8lg8xzxwy56hncgfj8k";
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
|
||||
|
|
|
|||
29
pkgs/applications/editors/em/default.nix
Normal file
29
pkgs/applications/editors/em/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "em";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pgas.freeshell.org/C/em/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ijMBkl7U1f9MTXgli9kUFB8ttMG6TMQnxfDMP9AblTQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://pgas.freeshell.org/C/em/";
|
||||
description = "Editor for Mortals";
|
||||
longDescription = ''
|
||||
Em is a QMC variant of the standard Unix text editor - ed. It includes all
|
||||
of ed, so the documentation for ed is fully applicable to em. Em also has
|
||||
a number of new commands and facilities designed to improve its
|
||||
interaction and increase its usefulness to users at fast vdu terminals
|
||||
(such as the ITT's at QMC).
|
||||
'';
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -114,7 +114,7 @@ in mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
"-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5"
|
||||
"-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,33 @@
|
|||
{ mkDerivation, lib, fetchFromGitLab, cmake
|
||||
, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python
|
||||
, qtbase, qtsvg, qttools, qscintilla }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, boost
|
||||
, bzip2
|
||||
, ffmpeg
|
||||
, fftwSinglePrec
|
||||
, hdf5
|
||||
, muparser
|
||||
, netcdf
|
||||
, openssl
|
||||
, python3
|
||||
, qscintilla
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, VideoDecodeAcceleration
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ovito";
|
||||
version = "3.4.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stuko";
|
||||
repo = "ovito";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5";
|
||||
sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -19,17 +36,20 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
boost
|
||||
netcdf
|
||||
hdf5
|
||||
fftwSinglePrec
|
||||
muparser
|
||||
openssl
|
||||
bzip2
|
||||
ffmpeg
|
||||
python
|
||||
fftwSinglePrec
|
||||
hdf5
|
||||
muparser
|
||||
netcdf
|
||||
openssl
|
||||
python3
|
||||
qscintilla
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qscintilla
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
VideoDecodeAcceleration
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -37,5 +57,6 @@ mkDerivation rec {
|
|||
homepage = "https://ovito.org";
|
||||
license = with licenses; [ gpl3Only mit ];
|
||||
maintainers = with maintainers; [ twhitehead ];
|
||||
broken = stdenv.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=...
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "CopyQ";
|
||||
version = "4.1.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
|
||||
sha256 = "sha256-edrRgnjbszqJLbGLE4anCJSGApymvK0O+2ks5jWe8aw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,15 +42,6 @@ mkDerivation rec {
|
|||
wayland
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Install the bash completion script correctly
|
||||
# Remove once 4.1.1 is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
|
||||
sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace shared/com.github.hluk.copyq.desktop.in \
|
||||
--replace copyq "$out/bin/copyq"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "10.0";
|
||||
version = "10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "sha256-XACexj91TLd/i2GoFr0zZ3Yqcg+KjKoWWPfCGsEIR04=";
|
||||
sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ buildGoModule rec {
|
|||
sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g=";
|
||||
vendorSha256 = "sha256-M4pKAxNd8rqluVm+c+X+nxC/vcaVclebo9HP17yEpfo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
runVend = true;
|
||||
proxyVendor = true;
|
||||
|
||||
tags = [ "extended" ];
|
||||
|
||||
|
|
|
|||
76
pkgs/applications/misc/minigalaxy/default.nix
Normal file
76
pkgs/applications/misc/minigalaxy/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, docutils
|
||||
, gettext
|
||||
, glibcLocales
|
||||
, glib-networking
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, python3
|
||||
, python3Packages
|
||||
, steam-run-native
|
||||
, unzip
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BbtwLuG5TH/+06Ez8+mwSAjG1IWg9/3uxzjmgPHczAw=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
env HOME=$PWD LC_ALL=en_US.UTF-8 pytest
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking
|
||||
gobject-introspection
|
||||
gtk3
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
glibcLocales
|
||||
pytest
|
||||
tox
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
docutils
|
||||
python3.pkgs.pygobject3
|
||||
python3.pkgs.requests
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.simplejson
|
||||
steam-run-native
|
||||
unzip
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
# Run Linux games using the Steam Runtime by using steam-run in the wrapper
|
||||
postFixup = ''
|
||||
sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sharkwouter.github.io/minigalaxy/";
|
||||
changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md";
|
||||
downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
|
||||
description = "A simple GOG client for Linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ srapenne ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,15 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub}:
|
||||
{ lib
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
, withSpeech ? true
|
||||
, makeWrapper
|
||||
, espeak-ng
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "2.1.0";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
|
|
@ -12,11 +18,22 @@ buildGoPackage rec {
|
|||
sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
preFixup = lib.optionalString withSpeech ''
|
||||
wrapProgram $out/bin/mob \
|
||||
--set MOB_VOICE_COMMAND "${lib.getBin espeak-ng}/bin/espeak"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for swift git handover";
|
||||
description = "Tool for smooth git handover";
|
||||
homepage = "https://github.com/remotemobprogramming/mob";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
maintainers = with maintainers; [ ericdallo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqliteman";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 qscintilla ];
|
||||
buildInputs = [ qt4 qscintilla-qt4 ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp
|
||||
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = ''
|
||||
cd Sqliteman
|
||||
sed -i 's,/usr/include/Qsci,${qscintilla}/include/Qsci,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,60 @@
|
|||
{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1
|
||||
, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
|
||||
, gsm, speex, portaudio, spandsp, libuuid, libvpx
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zlib
|
||||
, openssl
|
||||
, libre
|
||||
, librem
|
||||
, pkg-config
|
||||
, gst_all_1
|
||||
, cairo
|
||||
, mpg123
|
||||
, alsa-lib
|
||||
, SDL2
|
||||
, libv4l
|
||||
, celt
|
||||
, libsndfile
|
||||
, srtp
|
||||
, ffmpeg
|
||||
, gsm
|
||||
, speex
|
||||
, portaudio
|
||||
, spandsp3
|
||||
, libuuid
|
||||
, libvpx
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.5";
|
||||
version = "1.1.0";
|
||||
pname = "baresip";
|
||||
src=fetchurl {
|
||||
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
|
||||
sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9mc1Beo7/iNhDXSDC/jiTL+lJRt8ah/1xF1heoHTE+g=";
|
||||
};
|
||||
postPatch = ''
|
||||
patchShebangs modules/ctrl_dbus/gen.sh
|
||||
'';
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [zlib openssl libre librem cairo mpg123
|
||||
alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
|
||||
buildInputs = [
|
||||
zlib
|
||||
openssl
|
||||
libre
|
||||
librem
|
||||
cairo
|
||||
mpg123
|
||||
alsa-lib
|
||||
SDL2
|
||||
libv4l
|
||||
celt
|
||||
libsndfile
|
||||
srtp
|
||||
ffmpeg
|
||||
gsm
|
||||
speex
|
||||
portaudio
|
||||
spandsp3
|
||||
libuuid
|
||||
libvpx
|
||||
] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
|
||||
makeFlags = [
|
||||
|
|
@ -23,30 +66,55 @@ stdenv.mkDerivation rec {
|
|||
"USE_VIDEO=1"
|
||||
"CCACHE_DISABLE=1"
|
||||
|
||||
"USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
|
||||
"USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1"
|
||||
"USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
|
||||
"USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
|
||||
"USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
|
||||
"USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1"
|
||||
"USE_ALSA=1"
|
||||
"USE_AMR=1"
|
||||
"USE_CAIRO=1"
|
||||
"USE_CELT=1"
|
||||
"USE_CONS=1"
|
||||
"USE_EVDEV=1"
|
||||
"USE_FFMPEG=1"
|
||||
"USE_GSM=1"
|
||||
"USE_GST1=1"
|
||||
"USE_L16=1"
|
||||
"USE_MPG123=1"
|
||||
"USE_OSS=1"
|
||||
"USE_PLC=1"
|
||||
"USE_VPX=1"
|
||||
"USE_PORTAUDIO=1"
|
||||
"USE_SDL=1"
|
||||
"USE_SNDFILE=1"
|
||||
"USE_SPEEX=1"
|
||||
"USE_SPEEX_AEC=1"
|
||||
"USE_SPEEX_PP=1"
|
||||
"USE_SPEEX_RESAMP=1"
|
||||
"USE_SRTP=1"
|
||||
"USE_STDIO=1"
|
||||
"USE_SYSLOG=1"
|
||||
"USE_UUID=1"
|
||||
"USE_V4L2=1"
|
||||
"USE_X11=1"
|
||||
|
||||
"USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1="
|
||||
"USE_ILBC=" "USE_OPUS=" "USE_SILK="
|
||||
"USE_BV32="
|
||||
"USE_COREAUDIO="
|
||||
"USE_G711=1"
|
||||
"USE_G722=1"
|
||||
"USE_G722_1="
|
||||
"USE_ILBC="
|
||||
"USE_OPUS="
|
||||
"USE_SILK="
|
||||
]
|
||||
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
|
||||
;
|
||||
|
||||
NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm
|
||||
NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm
|
||||
-DHAVE_INTTYPES_H -D__GLIBC__
|
||||
-D__need_timeval -D__need_timespec -D__need_time_t '';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.creytiv.com/baresip.html";
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
description = "A modular SIP User-Agent with audio and video support";
|
||||
homepage = "https://github.com/baresip/baresip";
|
||||
maintainers = with lib.maintainers; [ elohmeier raskin ];
|
||||
license = lib.licenses.bsd3;
|
||||
downloadPage = "http://www.creytiv.com/pub/";
|
||||
updateWalker = true;
|
||||
downloadURLRegexp = "/baresip-.*[.]tar[.].*";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.26.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.27.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-QIRt16AHILBNxKPxsOQ0n65W/bbalhXH1fM7KIaXP10=";
|
||||
sha256 = "1agxn4fcgln5lsccvw5b7g2psv6nv2y7qm5df201c9pbwjak74nm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ buildGoModule rec {
|
|||
sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8=";
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-ZFs2CXmNZpGae7bD15yTh3w6b00C7AgOwGuz72d2wHs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -714,11 +714,11 @@
|
|||
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-21.01.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz";
|
||||
sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3";
|
||||
name = "poppler-21.11.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz";
|
||||
sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584";
|
||||
md5 = "";
|
||||
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
|
||||
md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-data-0.4.10.tar.gz";
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ rec {
|
|||
|
||||
major = "7";
|
||||
minor = "2";
|
||||
patch = "4";
|
||||
tweak = "1";
|
||||
patch = "5";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "sha256-Ymi5BmpgWGzwpfXtmWDN+Gpf9Yb+Zpm/TSltWA3gjyE=";
|
||||
sha256 = "sha256-Z8G/sFnUMyhrAlKpFWJ7M69ju19LbslQnRO53UdVEqc=";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "sha256-8nzCt7/J7gqJPtHOrVu7UTonJw1pxu4fnLWJyWOUHa8=";
|
||||
sha256 = "sha256-9rnuRifsEX7RAUdsX6VVw/xQS6dZeS3RbKnoC39uMd8=";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "sha256-rZb1ej3GbgXOHOZWVKKJVuir2urLmvGmrdpB1vpcaCk=";
|
||||
sha256 = "sha256-6vERLWh0fkQcSRkC37fw2HBqxVtbr9kPEhOyWXjMrfM=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@
|
|||
, guiSupport ? fullBuild, tk
|
||||
, highlightSupport ? fullBuild
|
||||
, ApplicationServices
|
||||
# test dependencies
|
||||
, unzip
|
||||
, which
|
||||
, sqlite
|
||||
, git
|
||||
, gnupg
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,11 +19,11 @@ let
|
|||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial";
|
||||
version = "5.9.3";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4=";
|
||||
sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
@ -27,11 +33,20 @@ let
|
|||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n";
|
||||
sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs=";
|
||||
sourceRoot = "${pname}-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
for f in **/*.{py,c,t}; do
|
||||
# not only used in shebangs
|
||||
substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}'
|
||||
done
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = lib.optional re2Support fb-re2
|
||||
++ lib.optional gitSupport pygit2
|
||||
++ lib.optional highlightSupport pygments;
|
||||
|
|
@ -47,6 +62,26 @@ let
|
|||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ lib.optional rustSupport "PURE=--rust";
|
||||
|
||||
doCheck = stdenv.isLinux; # tests seem unstable on Darwin
|
||||
checkInputs = [
|
||||
unzip
|
||||
which
|
||||
sqlite
|
||||
git
|
||||
gnupg
|
||||
];
|
||||
checkPhase = ''
|
||||
cat << EOF > tests/blacklists/nix
|
||||
# tests enforcing "/usr/bin/env" shebangs, which are patched for nix
|
||||
test-run-tests.t
|
||||
test-check-shbang.t
|
||||
EOF
|
||||
|
||||
# extended timeout necessary for tests to pass on the busy CI workers
|
||||
export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
|
||||
make check
|
||||
'';
|
||||
|
||||
postInstall = (lib.optionalString guiSupport ''
|
||||
mkdir -p $out/etc/mercurial
|
||||
cp contrib/hgk $out/bin
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.5.8";
|
||||
version = "1.5.9";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XIAByE2/eVG8DAZXstKs51LQYdVPcPQuIlST3xCclrU=";
|
||||
sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -51,7 +51,7 @@ buildGoModule rec {
|
|||
homepage = "https://containerd.io/";
|
||||
description = "A daemon to control runC";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline vdemeester ];
|
||||
maintainers = with maintainers; [ offline vdemeester endocrimes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -233,19 +233,19 @@ rec {
|
|||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.9";
|
||||
version = "20.10.12";
|
||||
rev = "v${version}";
|
||||
sha256 = "1msqvzfccah6cggvf1pm7n35zy09zr4qg2aalgwpqigv0jmrbyd4";
|
||||
sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c=";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "04xx7m8s9vrkm67ba2k5i90053h5qqkjcvw5rc8w7m5a309xcp4n";
|
||||
sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4=";
|
||||
};
|
||||
runcRev = "v1.0.2"; # v1.0.2
|
||||
runcRev = "v1.0.2";
|
||||
runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp";
|
||||
containerdRev = "v1.4.11"; # v1.4.11
|
||||
containerdSha256 = "02slv4gc2blxnmv0p8pkm139vjn6ihjblmn8ps2k1afbbyps0ilr";
|
||||
containerdRev = "v1.4.12";
|
||||
containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8=";
|
||||
tiniRev = "v0.19.0"; # v0.19.0
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
};
|
||||
|
|
|
|||
79
pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c
Normal file
79
pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
// This is a tiny wrapper that converts the extra arv[0] argument
|
||||
// from binfmt-misc with the P flag enabled to QEMU parameters.
|
||||
// It also prevents LD_* environment variables from being applied
|
||||
// to QEMU itself.
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifndef TARGET_QEMU
|
||||
#error "Define TARGET_QEMU to be the path to the qemu-user binary (e.g., -DTARGET_QEMU=\"/full/path/to/qemu-riscv64\")"
|
||||
#endif
|
||||
|
||||
extern char **environ;
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
if (argc < 3) {
|
||||
fprintf(stderr, "%s: This should be run as the binfmt interpreter with the P flag\n", argv[0]);
|
||||
fprintf(stderr, "%s: My preconfigured qemu-user binary: %s\n", argv[0], TARGET_QEMU);
|
||||
return 1;
|
||||
}
|
||||
|
||||
size_t environ_count = 0;
|
||||
for (char **cur = environ; *cur != NULL; ++cur) {
|
||||
environ_count++;
|
||||
}
|
||||
|
||||
size_t new_argc = 3;
|
||||
size_t new_argv_alloc = argc + 2 * environ_count + 2; // [ "-E", env ] for each LD_* env + [ "-0", argv0 ]
|
||||
char **new_argv = (char**)malloc((new_argv_alloc + 1) * sizeof(char*));
|
||||
if (!new_argv) {
|
||||
fprintf(stderr, "FATAL: Failed to allocate new argv array\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
new_argv[0] = TARGET_QEMU;
|
||||
new_argv[1] = "-0";
|
||||
new_argv[2] = argv[2];
|
||||
|
||||
// Pass all LD_ env variables as -E and strip them in `new_environ`
|
||||
size_t new_environc = 0;
|
||||
char **new_environ = (char**)malloc((environ_count + 1) * sizeof(char*));
|
||||
if (!new_environ) {
|
||||
fprintf(stderr, "FATAL: Failed to allocate new environ array\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
for (char **cur = environ; *cur != NULL; ++cur) {
|
||||
if (strncmp("LD_", *cur, 3) == 0) {
|
||||
new_argv[new_argc++] = "-E";
|
||||
new_argv[new_argc++] = *cur;
|
||||
} else {
|
||||
new_environ[new_environc++] = *cur;
|
||||
}
|
||||
}
|
||||
new_environ[new_environc] = NULL;
|
||||
|
||||
size_t new_arg_start = new_argc;
|
||||
new_argc += argc - 3 + 2; // [ "--", full_binary_path ]
|
||||
|
||||
if (argc > 3) {
|
||||
memcpy(&new_argv[new_arg_start + 2], &argv[3], (argc - 3) * sizeof(char**));
|
||||
}
|
||||
|
||||
new_argv[new_arg_start] = "--";
|
||||
new_argv[new_arg_start + 1] = argv[1];
|
||||
new_argv[new_argc] = NULL;
|
||||
|
||||
#ifdef DEBUG
|
||||
for (size_t i = 0; i < new_argc; ++i) {
|
||||
fprintf(stderr, "argv[%zu] = %s\n", i, new_argv[i]);
|
||||
}
|
||||
#endif
|
||||
|
||||
return execve(new_argv[0], new_argv, new_environ);
|
||||
}
|
||||
|
||||
// vim: et:ts=4:sw=4
|
||||
31
pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix
Normal file
31
pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
# binfmt preserve-argv[0] wrapper
|
||||
#
|
||||
# More details in binfmt-p-wrapper.c
|
||||
#
|
||||
# The wrapper has to be static so LD_* environment variables
|
||||
# cannot affect the execution of the wrapper itself.
|
||||
|
||||
{ lib, stdenv, pkgsStatic, enableDebug ? false }:
|
||||
|
||||
name: emulator:
|
||||
|
||||
pkgsStatic.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = ./binfmt-p-wrapper.c;
|
||||
|
||||
dontUnpack = true;
|
||||
dontInstall = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
mkdir -p $out/bin
|
||||
$CC -o $out/bin/${name} -static -std=c99 -O2 \
|
||||
-DTARGET_QEMU=\"${emulator}\" \
|
||||
${lib.optionalString enableDebug "-DDEBUG"} \
|
||||
$src
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
{ fetchzip, lib }:
|
||||
{ fetchgit, fetchhg, fetchzip, lib }:
|
||||
|
||||
{ owner
|
||||
, repo, rev
|
||||
, domain ? "sr.ht"
|
||||
, vc ? "git"
|
||||
, name ? "source"
|
||||
, fetchSubmodules ? false
|
||||
, ... # For hash agility
|
||||
} @ args:
|
||||
|
||||
|
|
@ -14,12 +15,36 @@ assert (lib.assertOneOf "vc" vc [ "hg" "git" ]);
|
|||
|
||||
let
|
||||
baseUrl = "https://${vc}.${domain}/${owner}/${repo}";
|
||||
|
||||
in fetchzip (recursiveUpdate {
|
||||
inherit name;
|
||||
url = "${baseUrl}/archive/${rev}.tar.gz";
|
||||
meta.homepage = "${baseUrl}/";
|
||||
extraPostFetch = optionalString (vc == "hg") ''
|
||||
rm -f "$out/.hg_archival.txt"
|
||||
''; # impure file; see #12002
|
||||
} (removeAttrs args [ "owner" "repo" "rev" "domain" "vc" ])) // { inherit rev; }
|
||||
baseArgs = {
|
||||
inherit name;
|
||||
} // removeAttrs args [
|
||||
"owner" "repo" "rev" "domain" "vc" "name" "fetchSubmodules"
|
||||
];
|
||||
vcArgs = baseArgs // {
|
||||
inherit rev;
|
||||
url = baseUrl;
|
||||
};
|
||||
fetcher = if fetchSubmodules then vc else "zip";
|
||||
cases = {
|
||||
git = {
|
||||
fetch = fetchgit;
|
||||
arguments = vcArgs // { fetchSubmodules = true; };
|
||||
};
|
||||
hg = {
|
||||
fetch = fetchhg;
|
||||
arguments = vcArgs // { fetchSubrepos = true; };
|
||||
};
|
||||
zip = {
|
||||
fetch = fetchzip;
|
||||
arguments = baseArgs // {
|
||||
url = "${baseUrl}/archive/${rev}.tar.gz";
|
||||
extraPostFetch = optionalString (vc == "hg") ''
|
||||
rm -f "$out/.hg_archival.txt"
|
||||
''; # impure file; see #12002
|
||||
};
|
||||
};
|
||||
};
|
||||
in cases.${fetcher}.fetch cases.${fetcher}.arguments // {
|
||||
inherit rev;
|
||||
meta.homepage = "${baseUrl}";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "efl";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0k10mwpdjn57r2kflbzpybhvwl25yqqa2i2fhx0qazyjbzjbrad4";
|
||||
sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }:
|
||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terminology";
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g";
|
||||
sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -18,12 +18,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
efl
|
||||
pcre
|
||||
mesa
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-D edje-cc=${efl}/bin/edje_cc"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonnet";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
outputs = ["out" "doc"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
|
||||
sha256 = "sha256-RmuvpKv9Dg3JcxsdZDBMehJjG5SvrV0spHgxApFeuJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jekyll ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "2021.15.21";
|
||||
version = "2022.01.03";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "d04cfd5f0f6da184f5b8a03f0ce18fbd1d98eca3";
|
||||
hash = "sha256-gm/+kwIZ/m10+KuCJoK45F56nKZD3tM0myHwbFKIKAs=";
|
||||
rev = "089ca8258e6f4dc93f8d39594c1109a8578cdc98";
|
||||
hash = "sha256-N8kX/+fN8Qe+qme8RFlZyYQ/3p1WBkt0ztUwjJIQCIw=";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.12+36";
|
||||
version = "0.12+54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "60c3ea367c942459a95e610ed98f277ce46c0142";
|
||||
hash = "sha256-NcfhNUmb3IDG08XgS+NGbRLI8sn4aQkOA7RF7wucDug=";
|
||||
rev = "59a71503448401d2476cf0872808e0a99c3a4d81";
|
||||
hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
|
||||
if ! grep -q "YOSYS_VER := $version" Makefile; then
|
||||
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
|
||||
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing."
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yosys-bluespec";
|
||||
version = "2021.08.19";
|
||||
version = "2021.09.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thoughtpolice";
|
||||
repo = "yosys-bluespec";
|
||||
rev = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc";
|
||||
sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1";
|
||||
rev = "f6f4127a4e96e18080fd5362b6769fa3e24c76b1";
|
||||
sha256 = "sha256-3cNFP/k4JsgLyUQHWU10Htl2Rh0staAcA3R4piD6hDE=";
|
||||
};
|
||||
|
||||
buildInputs = [ yosys readline zlib bluespec ];
|
||||
|
|
|
|||
|
|
@ -26,12 +26,10 @@
|
|||
, vendorSha256
|
||||
# Whether to delete the vendor folder supplied with the source.
|
||||
, deleteVendor ? false
|
||||
# Whether to run the vend tool to regenerate the vendor directory.
|
||||
# This is useful if any dependency contain C files.
|
||||
, runVend ? false
|
||||
# Whether to fetch (go mod download) and proxy the vendor directory.
|
||||
# This is useful if any dependency has case-insensitive conflicts
|
||||
# which will produce platform dependant `vendorSha256` checksums.
|
||||
# This is useful if your code depends on c code and go mod tidy does not
|
||||
# include the needed sources to build or if any dependency has case-insensitive
|
||||
# conflicts which will produce platform dependant `vendorSha256` checksums.
|
||||
, proxyVendor ? false
|
||||
|
||||
# We want parallel builds by default
|
||||
|
|
@ -43,6 +41,9 @@
|
|||
|
||||
, meta ? {}
|
||||
|
||||
# disabled
|
||||
, runVend ? false
|
||||
|
||||
# Not needed with buildGoModule
|
||||
, goPackagePath ? ""
|
||||
|
||||
|
|
@ -54,7 +55,7 @@
|
|||
|
||||
with builtins;
|
||||
|
||||
assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together";
|
||||
assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";
|
||||
|
||||
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.0";
|
||||
pname = "LASzip";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
|
||||
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LASzip";
|
||||
repo = "LASzip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -199,13 +199,7 @@ stdenv.mkDerivation rec {
|
|||
"S3RegionResolutionTest.PublicBucket"
|
||||
"S3RegionResolutionTest.RestrictedBucket"
|
||||
"TestMinioServer.Connect"
|
||||
"TestS3FS.GetFileInfoRoot"
|
||||
"TestS3FS.OpenOutputStreamBackgroundWrites"
|
||||
"TestS3FS.OpenOutputStreamDestructorBackgroundWrites"
|
||||
"TestS3FS.OpenOutputStreamDestructorSyncWrite"
|
||||
"TestS3FS.OpenOutputStreamDestructorSyncWrites"
|
||||
"TestS3FS.OpenOutputStreamMetadata"
|
||||
"TestS3FS.OpenOutputStreamSyncWrites"
|
||||
"TestS3FS.*"
|
||||
"TestS3FSGeneric.*"
|
||||
] ++ lib.optionals enableGcs [
|
||||
"GcsFileSystem.FileSystemCompare"
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dyncall";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz";
|
||||
# https://www.dyncall.org/r1.2/SHA256
|
||||
sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc=";
|
||||
# https://www.dyncall.org/r1.3/SHA256
|
||||
sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A=";
|
||||
};
|
||||
|
||||
# XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }:
|
||||
|
||||
lib.fix (self: stdenv.mkDerivation rec {
|
||||
pname = "graphene-hardened-malloc";
|
||||
version = "8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz";
|
||||
sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrapheneOS";
|
||||
repo = "hardened_malloc";
|
||||
rev = version;
|
||||
sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
{ fetchurl, fetchpatch, lib, stdenv,
|
||||
cmake, netcdf, gfortran, libpng, openjpeg,
|
||||
enablePython ? false, pythonPackages ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grib-api";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
|
||||
sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/science-team/grib-api/raw/debian/1.28.0-2/debian/patches/openjpeg2.patch";
|
||||
sha256 = "05faxh51vlidiazxq1ssd3k4cjivk1adyn30k94mxqa1xnb2r2pc";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# Fix "no member named 'inmem_' in 'jas_image_t'"
|
||||
substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
buildInputs = [ netcdf
|
||||
libpng
|
||||
openjpeg
|
||||
] ++ lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enablePython [
|
||||
pythonPackages.numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
|
||||
"-DENABLE_PNG=ON"
|
||||
"-DENABLE_FORTRAN=ON"
|
||||
"-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Only do tests that don't require downloading 120MB of testdata
|
||||
# We fix the darwin checkPhase, which searches for libgrib_api.dylib
|
||||
# in /nix/store by setting DYLD_LIBRARY_PATH
|
||||
checkPhase = lib.optionalString (stdenv.isDarwin) ''
|
||||
substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
|
||||
'' + ''
|
||||
ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
description = "ECMWF Library for the GRIB file format -- DEPRECATED";
|
||||
longDescription = ''
|
||||
The ECMWF GRIB API is an application program interface accessible from C,
|
||||
FORTRAN and Python programs developed for encoding and decoding WMO FM-92
|
||||
GRIB edition 1 and edition 2 messages.
|
||||
|
||||
Please note: GRIB-API support is being discontinued at the end of 2018.
|
||||
After which there will be no further releases. Please upgrade to ecCodes
|
||||
'';
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
|
||||
, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
|
||||
}:
|
||||
|
||||
|
|
@ -8,10 +8,11 @@ in stdenv.mkDerivation rec {
|
|||
pname = "keybinder";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
|
||||
sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "engla";
|
||||
repo = "keybinder";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
|
||||
{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcangjie";
|
||||
version = "1.4_rev_${rev}";
|
||||
rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";
|
||||
sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
|
||||
src = fetchFromGitLab {
|
||||
owner = "Cangjians";
|
||||
repo = "libcangjie";
|
||||
inherit rev;
|
||||
sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
longDescription = ''
|
||||
libcangjie is a library implementing the Cangjie input method.
|
||||
'';
|
||||
homepage = "http://cangjians.github.io/projects/libcangjie/";
|
||||
homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
|
||||
maintainers = [ lib.maintainers.linquize ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcec";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
|
||||
sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pulse-Eight";
|
||||
repo = "libcec";
|
||||
rev = "libcec-${version}";
|
||||
sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcrafter";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
|
||||
sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pellegre";
|
||||
repo = "libcrafter";
|
||||
rev = "version-${version}";
|
||||
sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q=";
|
||||
};
|
||||
|
||||
preConfigure = "cd libcrafter";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,22 @@
|
|||
{lib, stdenv, fetchurl, zlib, openssl}:
|
||||
{ lib, stdenv, fetchFromGitHub, zlib, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.1";
|
||||
version = "2.0.1";
|
||||
pname = "libre";
|
||||
src = fetchurl {
|
||||
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
|
||||
sha256 = "0hzyc0hdlw795nyx6ik7h2ihs8wapbj32x8c40xq0484ciwzqnyd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "re";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/1J9cs0W96CtnHAoX/jg3FLGD9coa0eOEgf8uMQHuUk=";
|
||||
};
|
||||
buildInputs = [ zlib openssl ];
|
||||
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
|
||||
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
|
||||
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
|
||||
;
|
||||
meta = {
|
||||
description = "A library for real-time communications with async IO support and a complete SIP stack";
|
||||
homepage = "http://www.creytiv.com/re.html";
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
homepage = "https://github.com/baresip/re";
|
||||
maintainers = with lib.maintainers; [ elohmeier raskin ];
|
||||
license = lib.licenses.bsd3;
|
||||
downloadPage = "http://www.creytiv.com/pub/";
|
||||
updateWalker = true;
|
||||
downloadURLRegexp = "/re-.*[.]tar[.].*";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{lib, stdenv, fetchurl, zlib, openssl, libre}:
|
||||
{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.0";
|
||||
version = "1.0.0";
|
||||
pname = "librem";
|
||||
src=fetchurl {
|
||||
url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
|
||||
sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "rem";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6Xe9zT0qLLGe1+QCQ9NALoDTaRhHpaTLbCbA+kV7hOA=";
|
||||
};
|
||||
buildInputs = [zlib openssl libre];
|
||||
buildInputs = [ zlib openssl libre ];
|
||||
makeFlags = [
|
||||
"LIBRE_MK=${libre}/share/re/re.mk"
|
||||
"LIBRE_INC=${libre}/include/re"
|
||||
|
|
@ -16,13 +18,9 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
|
||||
;
|
||||
meta = {
|
||||
description = " A library for real-time audio and video processing";
|
||||
homepage = "http://www.creytiv.com/rem.html";
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
description = "A library for real-time audio and video processing";
|
||||
homepage = "https://github.com/baresip/rem";
|
||||
maintainers = with lib.maintainers; [ elohmeier raskin ];
|
||||
license = lib.licenses.bsd3;
|
||||
downloadPage = "http://www.creytiv.com/pub/";
|
||||
updateWalker = true;
|
||||
downloadURLRegexp = "/rem-.*[.]tar[.].*";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
67
pkgs/development/libraries/qscintilla-qt4/default.nix
Normal file
67
pkgs/development/libraries/qscintilla-qt4/default.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, qt4
|
||||
, qmake4Hook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla-qt4";
|
||||
version = "2.11.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
||||
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
||||
};
|
||||
|
||||
sourceRoot = "QScintilla-${version}/Qt4Qt5";
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
nativeBuildInputs = [ unzip qmake4Hook ];
|
||||
|
||||
patches = [
|
||||
./fix-qt4-build.patch
|
||||
];
|
||||
|
||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||
# by some packages such as sqlitebrowser
|
||||
postFixup = ''
|
||||
ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qscintilla.pro \
|
||||
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
|
||||
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
|
||||
--replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt port of the Scintilla text editing library";
|
||||
longDescription = ''
|
||||
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
|
||||
control.
|
||||
|
||||
As well as features found in standard text editing components,
|
||||
QScintilla includes features especially useful when editing and
|
||||
debugging source code. These include support for syntax styling,
|
||||
error indicators, code completion and call tips. The selection
|
||||
margin can contain markers like those used in debuggers to
|
||||
indicate breakpoints and the current line. Styling choices are
|
||||
more open than with many editors, allowing the use of
|
||||
proportional fonts, bold and italics, multiple foreground and
|
||||
background colours and multiple fonts.
|
||||
'';
|
||||
homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
|
||||
license = with licenses; [ gpl3 ]; # and commercial
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,49 +1,46 @@
|
|||
{ stdenv, lib, fetchurl, unzip
|
||||
, qt4 ? null, qmake4Hook ? null
|
||||
, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, qtbase
|
||||
, qtmacextras
|
||||
, qmake
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
|
||||
version = "2.11.6";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla-qt5";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
||||
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
|
||||
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
|
||||
};
|
||||
|
||||
sourceRoot = "QScintilla-${version}/Qt4Qt5";
|
||||
sourceRoot = "QScintilla_src-${version}/src";
|
||||
|
||||
buildInputs = [ (if withQt5 then qtbase else qt4) ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
|
||||
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
|
||||
nativeBuildInputs = [ unzip qmake ]
|
||||
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||
# by some packages such as sqlitebrowser
|
||||
postFixup = ''
|
||||
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
|
||||
ln -s $out/lib/libqscintilla2_qt5.so $out/lib/libqscintilla2.so
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
preConfigure = ''
|
||||
substituteInPlace qscintilla.pro \
|
||||
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
|
||||
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
|
||||
--replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"}
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wolfssl";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "sha256-PkuYXDL04LbUiY+O/4EilZn2+hTbwbRXPDE3B5d/4pQ=";
|
||||
sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw=";
|
||||
};
|
||||
|
||||
# Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ stdenv.mkDerivation {
|
|||
|
||||
propagatedBuildInputs = [ uchar ];
|
||||
|
||||
prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apycula";
|
||||
version = "0.0.1a12";
|
||||
version = "0.2a2";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Apycula";
|
||||
hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI=";
|
||||
hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chainer";
|
||||
version = "7.8.0";
|
||||
version = "7.8.1";
|
||||
disabled = !isPy3k; # python2.7 abandoned upstream
|
||||
|
||||
# no tests in Pypi tarball
|
||||
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
owner = "chainer";
|
||||
repo = "chainer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zfj3pk54gzxd4nid0qjx4kw1wdngwscvn4hk4cijxvwqi4a5zxj";
|
||||
sha256 = "1n07zjzc4g92m1sbgxvnansl0z00y4jnhma2mw06vnahs7s9nrf6";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -25,19 +25,13 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
|
||||
};
|
||||
|
||||
# the complete extra is for usage with conda, which we
|
||||
# don't care about
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "dask[complete]" "dask"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dask
|
||||
bokeh
|
||||
|
|
@ -56,13 +50,21 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist # not needed
|
||||
pytest-xdist
|
||||
nbsmoke
|
||||
fastparquet
|
||||
nbconvert
|
||||
netcdf4
|
||||
];
|
||||
|
||||
# The complete extra is for usage with conda, which we
|
||||
# don't care about
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "dask[complete]" "dask" \
|
||||
--replace "xarray >=0.9.6" "xarray"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
|
@ -73,10 +75,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# not compatible with current version of bokeh
|
||||
# Not compatible with current version of bokeh
|
||||
# see: https://github.com/holoviz/datashader/issues/1031
|
||||
"test_interactive_image_update"
|
||||
# latest dask broken array marshalling
|
||||
# Latest dask broken array marshalling
|
||||
# see: https://github.com/holoviz/datashader/issues/1032
|
||||
"test_raster_quadmesh_autorange_reversed"
|
||||
];
|
||||
|
|
@ -86,10 +88,14 @@ buildPythonPackage rec {
|
|||
"datashader/tests/test_datatypes.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"datashader"
|
||||
];
|
||||
|
||||
meta = with lib;{
|
||||
description = "Data visualization toolchain based on aggregating into a grid";
|
||||
homepage = "https://datashader.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,25 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, django
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.1.0";
|
||||
pname = "filebrowser_safe";
|
||||
pname = "filebrowser-safe";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4";
|
||||
pname = "filebrowser_safe";
|
||||
inherit version;
|
||||
sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94";
|
||||
};
|
||||
|
||||
buildInputs = [ django ];
|
||||
buildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
# There is no test embedded
|
||||
doCheck = false;
|
||||
|
|
@ -24,15 +31,10 @@ buildPythonPackage rec {
|
|||
filebrowser_safe was created to provide a snapshot of the
|
||||
FileBrowser asset manager for Django, to be referenced as a
|
||||
dependency for the Mezzanine CMS for Django.
|
||||
|
||||
At the time of filebrowser_safe's creation, FileBrowser was
|
||||
incorrectly packaged on PyPI, and had also dropped compatibility
|
||||
with Django 1.1 - filebrowser_safe was therefore created to
|
||||
address these specific issues.
|
||||
'';
|
||||
homepage = "https://github.com/stephenmcd/filebrowser-safe";
|
||||
downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/";
|
||||
license = licenses.free;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ prikhi ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontParts";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218";
|
||||
sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "GeoAlchemy2";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d97f85a4ff84341c12b1d7a6fee5ab5e5e942271279684310bb2f507b6ee5c53";
|
||||
sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "1.43.0";
|
||||
version = "1.44.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f3b4f4be5c8a1b5727a8f7136c94d3bacdd4b7bf11f9553f51ae4c1d876529d3";
|
||||
sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "limnoria";
|
||||
version = "2022.1.1";
|
||||
version = "2022.1.1.post1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tJqUsNRvSipuvOTfxJOFUCojrkRrrrzIgEYNShrTP8c=";
|
||||
hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "liquidctl";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fPSvxdr329SxAe4N7lTa7hddFp1WVUplkhYD1oDQXAI=";
|
||||
sha256 = "sha256-N0Ebd0zIHFmuiIozkAy4SV3o8rFA1wmrGd+dJo8jdk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.14.0";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5ad04e87bcf31eb3479fdd3cabd5082b257013e5c00f6b369539a2b584afadaf";
|
||||
sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.51";
|
||||
version = "1.2.52";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-CMoa7FQnGTWS14WmWvuryO2bKMWC05PBIDBlEWRjNRA=";
|
||||
sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "miniaudio";
|
||||
version = "1.45";
|
||||
version = "1.46";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "irmen";
|
||||
repo = "pyminiaudio";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl";
|
||||
sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb";
|
||||
};
|
||||
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
|
|
|
|||
55
pkgs/development/python-modules/optax/default.nix
Normal file
55
pkgs/development/python-modules/optax/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ absl-py
|
||||
, buildPythonPackage
|
||||
, chex
|
||||
, dm-haiku
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, lib
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optax";
|
||||
# As of 2022-01-06, the latest stable version (0.1.0) has broken tests that are fixed
|
||||
# in https://github.com/deepmind/optax/commit/d6633365d84eb6f2c0df0c52b630481a349ce562
|
||||
version = "unstable-2022-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "5ec5541b3486224b22e950480ff639ceaf5098f7";
|
||||
sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
chex
|
||||
jaxlib
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dm-haiku
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"optax"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires `flax` which depends on `optax` creating circular dependency.
|
||||
"optax/_src/equivalence_test.py"
|
||||
# Require `tensorflow_datasets` which isn't packaged in `nixpkgs`.
|
||||
"examples/datasets_test.py"
|
||||
"examples/lookahead_mnist_test.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optax is a gradient processing and optimization library for JAX.";
|
||||
homepage = "https://github.com/deepmind/optax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "parfive";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f36128e8a93f3494ce3de8af883eeba4bd651ab228682810a46ec4b7897a84b3";
|
||||
sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
pname = "pyFFTW";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0";
|
||||
sha256 = "da85102405c0bd95d57eb19e99b01a0729d8406cb204c3900894b873784253da";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -2,26 +2,34 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, tkinter
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PySimpleGUI";
|
||||
version = "4.55.1";
|
||||
pname = "pysimplegui";
|
||||
version = "4.56.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew=";
|
||||
pname = "PySimpleGUI";
|
||||
inherit version;
|
||||
sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "PySimpleGUI" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tkinter
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"PySimpleGUI"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python GUIs for Humans.";
|
||||
description = "Python GUIs for Humans";
|
||||
homepage = "https://github.com/PySimpleGUI/PySimpleGUI";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ lucasew ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "2.10.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f";
|
||||
sha256 = "89f82740b76820cf407cee9c43b75ca3ddb72f344f595902ee963837d7664986";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/qscintilla-qt4/default.nix
Normal file
42
pkgs/development/python-modules/qscintilla-qt4/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, isPyPy
|
||||
, pkgs
|
||||
, python
|
||||
, pyqt4
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "qscintilla-qt4";
|
||||
version = pkgs.qscintilla-qt4.version;
|
||||
format = "other";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = pkgs.qscintilla-qt4.src;
|
||||
|
||||
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
||||
|
||||
buildInputs = [ pyqt4.qt pyqt4 ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out
|
||||
lndir ${pyqt4} $out
|
||||
rm -rf "$out/nix-support"
|
||||
cd Python
|
||||
${python.executable} ./configure-old.py \
|
||||
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
||||
--apidir $out/api/${python.libPrefix} \
|
||||
-n ${pkgs.qscintilla-qt4}/include \
|
||||
-o ${pkgs.qscintilla-qt4}/lib \
|
||||
--sipdir $out/share/sip
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python binding to QScintilla, Qt based text editing control";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ danbst ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,51 +2,53 @@
|
|||
, pythonPackages
|
||||
, qscintilla
|
||||
, qtbase
|
||||
, qmake
|
||||
, qtmacextras
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonPackage isPy3k python sip_4 pyqt5;
|
||||
inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder;
|
||||
in buildPythonPackage rec {
|
||||
pname = "qscintilla";
|
||||
pname = "qscintilla-qt5";
|
||||
version = qscintilla.version;
|
||||
src = qscintilla.src;
|
||||
format = "other";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
nativeBuildInputs = [ sip_4 qtbase ];
|
||||
buildInputs = [ qscintilla ];
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
|
||||
buildInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Python/configure.py \
|
||||
--replace \
|
||||
"target_config.py_module_dir" \
|
||||
"'$out/${python.sitePackages}'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# configure.py will look for this folder
|
||||
mkdir -p $out/share/sip/PyQt5
|
||||
|
||||
cd Python
|
||||
substituteInPlace configure.py \
|
||||
--replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
|
||||
${python.executable} ./configure.py \
|
||||
--pyqt=PyQt5 \
|
||||
--destdir=$out/${python.sitePackages}/PyQt5 \
|
||||
--stubsdir=$out/${python.sitePackages}/PyQt5 \
|
||||
--apidir=$out/api/${python.libPrefix} \
|
||||
--qsci-incdir=${qscintilla}/include \
|
||||
--qsci-featuresdir=${qscintilla}/mkspecs/features \
|
||||
--qsci-libdir=${qscintilla}/lib \
|
||||
--pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \
|
||||
--qsci-sipdir=$out/share/sip/PyQt5 \
|
||||
--sip-incdir=${sip_4}/include
|
||||
cp pyproject-qt5.toml pyproject.toml
|
||||
echo '[tool.sip.project]' >> pyproject.toml
|
||||
echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
|
||||
>> pyproject.toml
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace project.py \
|
||||
--replace \
|
||||
"if self.project.qsci_external_lib:
|
||||
if self.qsci_features_dir is not None:" \
|
||||
"if self.project.qsci_external_lib:
|
||||
self.builder_settings.append('QT += widgets')
|
||||
|
||||
self.builder_settings.append('QT += printsupport')
|
||||
|
||||
if self.qsci_features_dir is not None:"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
build = ''
|
||||
sip-install --qsci-features-dir ${qscintilla}/mkspecs/features \
|
||||
--qsci-include-dir ${qscintilla}/include \
|
||||
--qsci-library-dir ${qscintilla}/lib --api-dir ${qscintilla}/share";
|
||||
'';
|
||||
postInstall = ''
|
||||
# Needed by pythonImportsCheck to find the module
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, disabledIf
|
||||
, isPy3k
|
||||
, isPyPy
|
||||
, pkgs
|
||||
, python
|
||||
, pyqt4
|
||||
}:
|
||||
|
||||
disabledIf (isPy3k || isPyPy)
|
||||
(buildPythonPackage {
|
||||
# TODO: Qt5 support
|
||||
pname = "qscintilla";
|
||||
version = pkgs.qscintilla.version;
|
||||
format = "other";
|
||||
|
||||
src = pkgs.qscintilla.src;
|
||||
|
||||
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
||||
|
||||
buildInputs = [ pyqt4.qt pyqt4 ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out
|
||||
lndir ${pyqt4} $out
|
||||
rm -rf "$out/nix-support"
|
||||
cd Python
|
||||
${python.executable} ./configure-old.py \
|
||||
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
||||
--apidir $out/api/${python.libPrefix} \
|
||||
-n ${pkgs.qscintilla}/include \
|
||||
-o ${pkgs.qscintilla}/lib \
|
||||
--sipdir $out/share/sip
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python binding to QScintilla, Qt based text editing control";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ danbst ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -19,12 +19,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-learn";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo=";
|
||||
sha256 = "sha256-tYcJWaVIS2FPJtMcpMF1JLGwMXUiGZ3JhcO0JW4DB2c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
, lzo
|
||||
, numpy
|
||||
, numexpr
|
||||
, setuptools
|
||||
, packaging
|
||||
# Test inputs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tables";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0j8vnxh2m5n0cyk9z3ndcj5n1zj5rdxgc1gb78bqlyn2lyw75aa9";
|
||||
sha256 = "sha256-6SqIetbyqYPlZKaZAt5KdkXDAGn8AavTU+xdolXF4f4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
@ -36,17 +36,9 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
numpy
|
||||
numexpr
|
||||
setuptools # uses pkg_resources at runtime
|
||||
packaging # uses packaging.version at runtime
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Needed for numpy >= 1.20.0
|
||||
name = "tables-pr-862-use-lowercase-numpy-dtypes.patch";
|
||||
url = "https://github.com/PyTables/PyTables/commit/93a3272b8fe754095637628b4d312400e24ae654.patch";
|
||||
sha256 = "00czgxnm1dxp9763va9xw1nc7dd7kxh9hjcg9klim52519hkbhi4";
|
||||
})
|
||||
];
|
||||
# When doing `make distclean`, ignore docs
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "src doc" "src"
|
||||
|
|
|
|||
|
|
@ -1,45 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, isPy27
|
||||
, numpy
|
||||
, scipy
|
||||
, sparse
|
||||
, pytorch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorly";
|
||||
version = "0.4.5";
|
||||
version = "0.7.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x";
|
||||
sha256 = "VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy sparse ]
|
||||
++ lib.optionals (!doCheck) [ nose ]; # upstream added nose to install_requires
|
||||
|
||||
checkInputs = [ pytest nose pytorch ];
|
||||
# also has a cupy backend, but the tests are currently broken
|
||||
# (e.g. attempts to access cupy.qr instead of cupy.linalg.qr)
|
||||
# and this backend also adds a non-optional CUDA dependence,
|
||||
# as well as tensorflow and mxnet backends, but the tests don't
|
||||
# seem to exercise these backend by default
|
||||
|
||||
# uses >= 140GB of ram to test
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nosetests -e "test_cupy"
|
||||
runHook postCheck
|
||||
# nose is not actually required for anything
|
||||
# (including testing with the minimal dependencies)
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ", 'nose'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy sparse ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "tensorly" ];
|
||||
|
||||
pythonImportsCheck = [ "tensorly" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,25 +1,38 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, simplejson, pytest, glibcLocales }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, simplejson
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uritemplate";
|
||||
version = "3.0.1";
|
||||
version = "4.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae";
|
||||
sha256 = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ simplejson ];
|
||||
propagatedBuildInputs = [
|
||||
simplejson
|
||||
];
|
||||
|
||||
checkInputs = [ pytest glibcLocales ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL=en_US.UTF-8 py.test
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"uritemplate"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of RFC 6570 URI templates";
|
||||
homepage = "https://github.com/python-hyper/uritemplate";
|
||||
description = "URI template parsing for Humans";
|
||||
license = with licenses; [ asl20 bsd3 ];
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.706";
|
||||
version = "2.0.707";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-j9exVvGY3A23sTY5y4daWlZr7awkY1tQhTDykW9tsJU=";
|
||||
sha256 = "sha256-AsKsv3fKubFZZMZHBRuVmgeGJB1zTe00J2kmqikBiD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
|
||||
sha256 = "sha256-muS3+cR75jZl/Q5ZN1srEPg8NxVquwRMpNYcHw/Ij34=";
|
||||
sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
|
||||
|
||||
let
|
||||
version = "3.17.0";
|
||||
version = "3.18.0";
|
||||
owner = "erlang";
|
||||
deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
|
||||
rebar3 = stdenv.mkDerivation rec {
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
inherit owner;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6";
|
||||
sha256 = "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang ];
|
||||
|
|
|
|||
|
|
@ -16,23 +16,23 @@ let
|
|||
};
|
||||
relx = builder {
|
||||
name = "relx";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
src = fetchHex {
|
||||
pkg = "relx";
|
||||
version = "4.5.0";
|
||||
sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI=";
|
||||
version = "4.6.0";
|
||||
sha256 = "sha256-L/gTHGMJPGIcazfcUtGyhIqTiIZYS0twHTW9vkN39Qk=";
|
||||
};
|
||||
beamDeps = [ bbmustache ];
|
||||
};
|
||||
providers = builder {
|
||||
name = "providers";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
src = fetchHex {
|
||||
pkg = "providers";
|
||||
version = "1.8.1";
|
||||
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
|
||||
version = "1.9.0";
|
||||
sha256 = "sha256-0ofodEBqFQVghkKwo9tbaNato/KrABrsh+f018efwBc=";
|
||||
};
|
||||
beamDeps = [ getopt ];
|
||||
beamDeps = [ erlware_commons getopt ];
|
||||
};
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
|
|
@ -86,21 +86,21 @@ let
|
|||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
|
||||
version = "2.8.0";
|
||||
sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
bbmustache = builder {
|
||||
name = "bbmustache";
|
||||
version = "1.10.0";
|
||||
version = "1.12.2";
|
||||
src = fetchHex {
|
||||
pkg = "bbmustache";
|
||||
version = "1.10.0";
|
||||
sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
|
||||
version = "1.12.2";
|
||||
sha256 = "sha256-aIszpNXMLVH1da3ws2g/xAo4MUovFQkG7c/Hf1tXezs=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
|
|
|||
51
pkgs/development/tools/database/indradb/default.nix
Normal file
51
pkgs/development/tools/database/indradb/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, rustfmt
|
||||
}:
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "indradb";
|
||||
repo = "indradb";
|
||||
rev = "06134dde5bb53eb1d2aaa52afdaf9ff3bf1aa674";
|
||||
sha256 = "sha256-g4Jam7yxMc+piYQzgMvVsNTF+ce1U3thzYl/M9rKG4o=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graph database written in rust ";
|
||||
homepage = "https://github.com/indradb/indradb";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
in
|
||||
{
|
||||
indradb-server = rustPlatform.buildRustPackage {
|
||||
pname = "indradb-server";
|
||||
version = "unstable-2021-01-05";
|
||||
inherit src;
|
||||
|
||||
cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
|
||||
|
||||
buildAndTestSubdir = "server";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
|
||||
# test rely on libindradb and it can't be found
|
||||
# failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
|
||||
# `let _server = Server::start(&format!("../target/debug/libindradb_plugin_*.{}", LIBRARY_EXTENSION)).unwrap();`
|
||||
doCheck = false;
|
||||
};
|
||||
indradb-client = rustPlatform.buildRustPackage {
|
||||
pname = "indradb-client";
|
||||
version = "unstable-2021-01-05";
|
||||
inherit src;
|
||||
|
||||
cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
|
||||
buildAndTestSubdir = "client";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.9.2";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nlIgX7TV3bWi8vaYQ9kXmNzGlVLgRUDNkNApwrAw3EQ=";
|
||||
sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Dmn3LJ+TBO/F3N5lgrNXXrFJ5KTp6r45ZwU11LxvQSg=";
|
||||
vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,14 @@ buildGraalvmNativeImage rec {
|
|||
};
|
||||
|
||||
# https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27
|
||||
DTLV_LIB_EXTRACT_DIR = "/tmp";
|
||||
# Needs to be inject on `nativeImageBuildArgs` inside shell environment,
|
||||
# otherwise we can't expand to the value set in `mktemp -d` call
|
||||
preBuild = ''
|
||||
export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)"
|
||||
nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR")
|
||||
'';
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
"-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}"
|
||||
"--no-fallback"
|
||||
"--native-image-info"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
|
|
@ -32,7 +33,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM=";
|
||||
};
|
||||
|
||||
patches = [ ./bincmake.patch ];
|
||||
patches = [
|
||||
./bincmake.patch
|
||||
# fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025
|
||||
(fetchpatch {
|
||||
url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch";
|
||||
sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace xdg/org.widelands.Widelands.desktop \
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "351b9693f1e0af0b0bbb05a8aef294bce1365e3c";
|
||||
sha256 = "0f7ni7y3l3w01jyhp35n023dc0213794ds79p2lmlsdqbqs3p03f";
|
||||
rev = "0f26a8d2c63c7050aea9b19982b5402595126bd7";
|
||||
sha256 = "118vv5g918r9zcbjrlm9df6q4vban8jkc9xa40bbfkghgccadbjf";
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
};
|
||||
|
|
@ -161,12 +161,12 @@ final: prev:
|
|||
|
||||
async-vim = buildVimPluginFrom2Nix {
|
||||
pname = "async.vim";
|
||||
version = "2021-03-21";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "async.vim";
|
||||
rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e";
|
||||
sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l";
|
||||
rev = "f20569020d65bec3249222606c073c0943045b5e";
|
||||
sha256 = "0lff0v2vd06amcjirnpa4wc4l4nsbngcrdqcv34kszyqgzd7phka";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/async.vim/";
|
||||
};
|
||||
|
|
@ -473,12 +473,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "cd5b7c77fb69b5ec7a2aa917234af17a4277db5e";
|
||||
sha256 = "1api1vxlwlxw5j8m2hhkpiryr24hcx9lb0z64ajig04aak3pznk0";
|
||||
rev = "09fb16e9c07c45f05951d939bb8b89e2e31dcea1";
|
||||
sha256 = "0acsac6wmyxhcgwav7gzgcjabqi37c9gcxph6x87xw8cmlbbpx81";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -581,12 +581,12 @@ final: prev:
|
|||
|
||||
cmp-buffer = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-buffer";
|
||||
version = "2021-12-24";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "cmp-buffer";
|
||||
rev = "a01cfeca70594f505b2f086501e90fb6c2f2aaaa";
|
||||
sha256 = "0qsicv28kyg3rrj1b7g7x2dhhhrs9i577bnvv4972riii544wjra";
|
||||
rev = "f83773e2f433a923997c5faad7ea689ec24d1785";
|
||||
sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/cmp-buffer/";
|
||||
};
|
||||
|
|
@ -1182,12 +1182,12 @@ final: prev:
|
|||
|
||||
crates-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "crates.nvim";
|
||||
version = "2022-01-01";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "31a4bc8ae519020edf315f8d98380e7659c1d621";
|
||||
sha256 = "1hh942nczxgljy95c6788qmkqd9gql05fk9c3ddhbrci6mmjhwcj";
|
||||
rev = "a43f8a467b091329ff59be52c06012a0c614fc9b";
|
||||
sha256 = "059h4fxx92rv78i1gpvvsnydkbr0fr1np0b7vkanhbqm37xz1b09";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
|
|
@ -2015,12 +2015,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "7ef21c9daa6f47ad0ce6907232c94bcb99f23a11";
|
||||
sha256 = "0g466ddc0jk9mrv7lq4dpxgc5cpqy89w1jx5l0x0c339sijacsgb";
|
||||
rev = "9f04462bcabfd108341a6e47ed742b09a6a5b975";
|
||||
sha256 = "0j8cb1k66x0xnqa9rf20lic9v3byw0r93kcznnjxv8arg82zpc2k";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -2039,12 +2039,12 @@ final: prev:
|
|||
|
||||
FTerm-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "FTerm.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numToStr";
|
||||
repo = "FTerm.nvim";
|
||||
rev = "0911ab93b488fdd8032e695ab56d14357e14e836";
|
||||
sha256 = "0pbfg66fd8ff1b2wshlb9c58sb8zq3ckm7yjg6vv43dk4kcnjf1i";
|
||||
rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2";
|
||||
sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6";
|
||||
};
|
||||
meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
|
||||
};
|
||||
|
|
@ -2159,12 +2159,12 @@ final: prev:
|
|||
|
||||
ghcid = buildVimPluginFrom2Nix {
|
||||
pname = "ghcid";
|
||||
version = "2021-10-10";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndmitchell";
|
||||
repo = "ghcid";
|
||||
rev = "b18ad1643f753f39e924909ecd957cb6b5a5fa89";
|
||||
sha256 = "1swwz4kzc1d41nbvvar3a2c71xy524fsyf5kjyrbbivrghcifpl8";
|
||||
rev = "dc20c97a8f9ee36cbcdcd824e3c42140059af759";
|
||||
sha256 = "0in5hryli9iiww4wvakd3q82m65zwplahnqxxfyppjps2q534dkm";
|
||||
};
|
||||
meta.homepage = "https://github.com/ndmitchell/ghcid/";
|
||||
};
|
||||
|
|
@ -2195,12 +2195,12 @@ final: prev:
|
|||
|
||||
git-blame-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "git-blame.nvim";
|
||||
version = "2021-06-14";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-person";
|
||||
repo = "git-blame.nvim";
|
||||
rev = "125f09f3e09091fa9cc6585156e199d08989dc0e";
|
||||
sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730";
|
||||
rev = "f94cd83f7fd15805c3b145ff63fdb9390b18585a";
|
||||
sha256 = "1qdb3xg7fmb5fid288h3jyaj2rl6vbcc8d7pn0gk5bshli02bp4q";
|
||||
};
|
||||
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
|
||||
};
|
||||
|
|
@ -2952,12 +2952,12 @@ final: prev:
|
|||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "1696419d2d8acc8f34ba9b81c5e91b8782369530";
|
||||
sha256 = "05a002zykm9xkqp5x6lpbwp46fyk7lz85fc2dnkq38hjyzp6h9sh";
|
||||
rev = "a99fc6963510dd481953f71683e98a4559518825";
|
||||
sha256 = "1826ixb15k9s0rqiw1ynhf6j6w9cxxciskvyiyp7wgd2i6rwf42g";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
|
|
@ -3154,6 +3154,54 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
|
||||
};
|
||||
|
||||
litee-calltree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-calltree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-calltree.nvim";
|
||||
rev = "518d9e9e82e8480a81cf3e76c46ba7880a0c0034";
|
||||
sha256 = "0ai2pj4ggjcrl3z0azwrjashqazim51crzk1f5gsbpd4j1r572iv";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";
|
||||
};
|
||||
|
||||
litee-filetree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-filetree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-filetree.nvim";
|
||||
rev = "fe7e87130ac73c60247c61d71a7479a696766c22";
|
||||
sha256 = "0scak2xdcq0vxhb21d7sm59b3hhccwwkrn5wcl7cd0akxg5xpp3s";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
|
||||
};
|
||||
|
||||
litee-symboltree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee-symboltree.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee-symboltree.nvim";
|
||||
rev = "1c857aa75a0f011fa62cfc8ccd11a3d4e14fc552";
|
||||
sha256 = "19xl6yfnyc30mgqqg15mfawj1cw78h59amb32r7zhwxsh1p4qvsg";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";
|
||||
};
|
||||
|
||||
litee-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "litee.nvim";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldelossa";
|
||||
repo = "litee.nvim";
|
||||
rev = "db4bbde5f90c3a9ca82ffe5e5dca63ecf5a8bd7c";
|
||||
sha256 = "0d5dlnxn0swrvj7i2kn6nxc8msl6z632ichabls53y1b3xps20jw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
|
||||
};
|
||||
|
||||
lsp-colors-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-colors.nvim";
|
||||
version = "2021-10-22";
|
||||
|
|
@ -3204,12 +3252,12 @@ final: prev:
|
|||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "d15c7445dc896a146b670b6ceab4bb1619384062";
|
||||
sha256 = "0bb2hmfp43khn592zxddyvllim873phqzpma2q2hvk9hdl0hz1ry";
|
||||
rev = "44a5bde409922a0019f3c25011be11fb20705f47";
|
||||
sha256 = "0g93khmivnrr02avd3nb88hh8bcyj9y7gq5l8fgjjq2cppbw03a1";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
|
|
@ -3264,12 +3312,12 @@ final: prev:
|
|||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine.nvim";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "b18b7ee8acf877a603c21b28b9a4d9c08bbd9594";
|
||||
sha256 = "0zp02m1xhqa5rbqp5wjfjaasmyd50w9782wm0k7lnyakf8akg8jn";
|
||||
rev = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455";
|
||||
sha256 = "17csrd2hbqdrim9aq948zd5vy6babjh9c8z4zw2q8xskvkkbiww8";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
||||
};
|
||||
|
|
@ -3412,8 +3460,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "minsnip.nvim";
|
||||
rev = "8edc84c4896e72a85a474930af82656773ac82b0";
|
||||
sha256 = "1m7w5xz5j0brqx7ravwqjnran9g2zr3nsckmgmpahva7287db9hz";
|
||||
rev = "190eefab6335d8d803e49c14a15c9dd0a947f972";
|
||||
sha256 = "083yskdn9jhzk1qpyhak4rdm5r0ryjr9swscxp77df6sfnbixvf5";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
|
||||
};
|
||||
|
|
@ -3804,12 +3852,12 @@ final: prev:
|
|||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "36e4ba5b49d5e01b1910db8ebc7c1963e51600a4";
|
||||
sha256 = "0wgzhxrx034m2rn2sp7gs5bi6wwdmr73qddbn3fxfn69y8h1m41n";
|
||||
rev = "ff085fbaf095ea07f5e35404747281ad3d40772e";
|
||||
sha256 = "1l0lmhm4wdc5b30vbc4715gggm9xx6y5hkvzb1xrrvkx0dp6kj0c";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
|
@ -4032,12 +4080,12 @@ final: prev:
|
|||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn.vim";
|
||||
version = "2021-12-04";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "32d106a121eb4c88a8f4d0c6d779065b731c9fcb";
|
||||
sha256 = "12n3i813019q4j1lhgkpigjbi6yjywhhdib0xhw9qsjw2s7nvpk8";
|
||||
rev = "169951733371abd152d76d1ce65e2dd867156e2d";
|
||||
sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
|
|
@ -4104,12 +4152,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "5d37e35938862f1642ef94206bec9a6f184ec798";
|
||||
sha256 = "157246yhf7za5aw7v0g0wk6kbcdpz7bwngg45l7xxh0p4c57j0y2";
|
||||
rev = "8c59fd5ec84e1c90c3982a40d699ebe62b243592";
|
||||
sha256 = "0lix5ambsmldvajb5dcwcyb8cy2g6v1iq92dbw0v11l5wcddr75f";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -4152,12 +4200,12 @@ final: prev:
|
|||
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-12-26";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "3909fc7912f4349ee8b8891056ad807abc7221d3";
|
||||
sha256 = "1awx0pzkgw1c07dghcfrspj4vl7s0rkb23jhz9sd0zi9cbrqczpc";
|
||||
rev = "96858723f1cba6a3eb004373a20c315d90584ea6";
|
||||
sha256 = "11zmf2dwd9fxgdargjbkh70d89ii7qf00mh3v8v8dm89fd6ap0xy";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||
};
|
||||
|
|
@ -4380,12 +4428,12 @@ final: prev:
|
|||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2021-11-30";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8";
|
||||
sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr";
|
||||
rev = "03f0100dd52125a968e3bda4dacc3ab2003049d9";
|
||||
sha256 = "0wqlsys0z2hq9mlqb631v84fd35fznvkkq3nbzq6xyr3d8wmp0fk";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
|
@ -4476,12 +4524,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "486d51cbf492ea769ff563f86bf84ae4a51ccb02";
|
||||
sha256 = "1zhfs2s5c63i3hvs4d558zxjd4ckr5811qhmrxwb6ry3lvp2dq4j";
|
||||
rev = "1917a52a7ccb517f76d6a6e732fb349f381fc927";
|
||||
sha256 = "0s4wcnn4d0wjr02307fbwz2f0yp77ibzadp4lcvsd7im9kxiczna";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -4560,12 +4608,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2021-12-16";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "5f35322499bc789b44d19f35ee4c23fbed5a3a89";
|
||||
sha256 = "1nc3czp7grb9db52d2cvj81pqipk0x4918560v11b9g2kmvp34g2";
|
||||
rev = "4313cbb75a966aa461ef179fbcda23ba21d64c65";
|
||||
sha256 = "15zwii6bwz488xwj9397fgbxv723vxvmqhkx3kfq412rlb5aadx5";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
|
@ -4620,12 +4668,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-12-29";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "fa2a6b68aaa6df0187b5bbebe6cbadc120d4a65a";
|
||||
sha256 = "1yfvx0nmz76cl7d8zmzgmkpxkjn12ddk7sdglcqmvy32iil3bksw";
|
||||
rev = "479fde3471ad6833d950abf645c0ebece15eaea4";
|
||||
sha256 = "072l6m04z83rb9f6sp4rvziyk3i2r20i5vhn0c9djkdhy7x2bj9h";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -4678,6 +4726,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
||||
};
|
||||
|
||||
nvim-ts-autotag = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-autotag";
|
||||
version = "2021-12-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-ts-autotag";
|
||||
rev = "0ceb4ef342bf1fdbb082ad4fa1fcfd0f864e1cba";
|
||||
sha256 = "0bbjhjngn0wv6f28z437bx9743w366665ygz6pz81059whfp93g7";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
|
||||
};
|
||||
|
||||
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-context-commentstring";
|
||||
version = "2021-12-13";
|
||||
|
|
@ -5354,12 +5414,12 @@ final: prev:
|
|||
|
||||
renamer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "renamer.nvim";
|
||||
version = "2021-12-19";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "filipdutescu";
|
||||
repo = "renamer.nvim";
|
||||
rev = "814ddbb11602e3c8b2af166b4d1e029272ab796f";
|
||||
sha256 = "067mn0wzvin7zbbzd8svshi5ga38r5d7nw8kqbyn3aakggpnylm3";
|
||||
rev = "6d4e3066bbf5725d15b082a7a188a3aca16ce217";
|
||||
sha256 = "1yfkpjjkhkhkqf543is1y2r44kz9py20rl5j34lwd2zz8ldibmca";
|
||||
};
|
||||
meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
|
||||
};
|
||||
|
|
@ -5390,12 +5450,12 @@ final: prev:
|
|||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "d91ea7e21a2e3e0c4ff58abcdee0a4804c15cdc6";
|
||||
sha256 = "1hlrny63nn9836w4g4ia4niygq8pwwv0g9hsway589xpgj0kgadz";
|
||||
rev = "b876914f4c0fef926bed50876c3da16c15adc81c";
|
||||
sha256 = "0n5y4ysm0inki1sxxa7w59b682xjy7ykflydiphwf5m1w0fhpkin";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
|
|
@ -5498,12 +5558,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2022-01-01";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "efa83a65c646ff7a1deda77aaae3703f5e0cba0d";
|
||||
sha256 = "1rla73samh16x6yvw3qd9s36vh400k3rz4gid550msvxym3inq0y";
|
||||
rev = "8cec6ac01fbeba4efd91ab9f991bbd56fb5002a7";
|
||||
sha256 = "069hn6px0a83bpj6332n9gwn82145d98pdvadhsnj89dkmf4gdcj";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
|
@ -5823,12 +5883,12 @@ final: prev:
|
|||
|
||||
splitjoin-vim = buildVimPluginFrom2Nix {
|
||||
pname = "splitjoin.vim";
|
||||
version = "2021-11-03";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "splitjoin.vim";
|
||||
rev = "0f45bfd7d6a8acb7d6ac126001a27190851bf3f5";
|
||||
sha256 = "1a5y8qj8gyrmaxh4si3k30v19yh8chws4h9k41ra1jzslrilm9ai";
|
||||
rev = "ed71635666356d9dc8950ecc177ed7eaa0d939ec";
|
||||
sha256 = "1fjg1zxl4sbibr658962iqk0lgcrggxwffmscr5v4n3x41v0xnrd";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
|
||||
|
|
@ -5942,6 +6002,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/ervandew/supertab/";
|
||||
};
|
||||
|
||||
surround-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "surround.nvim";
|
||||
version = "2021-12-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackCauldron7";
|
||||
repo = "surround.nvim";
|
||||
rev = "81f997bd71590f21f717e24bae72edf8e8b7b0f6";
|
||||
sha256 = "06mdbpka2z17hyi3p7b9ksyz79ppwybhr4h9829qba8xr2gpd465";
|
||||
};
|
||||
meta.homepage = "https://github.com/blackCauldron7/surround.nvim/";
|
||||
};
|
||||
|
||||
sved = buildVimPluginFrom2Nix {
|
||||
pname = "sved";
|
||||
version = "2021-10-22";
|
||||
|
|
@ -6149,12 +6221,12 @@ final: prev:
|
|||
|
||||
telescope-coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-coc.nvim";
|
||||
version = "2021-12-23";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "telescope-coc.nvim";
|
||||
rev = "2617983a9f0f70b578bbd290f2502d1bc91219ff";
|
||||
sha256 = "0ycvhvvy954vhi5jidwz37xkmdk3i8cnwx7aasgmpkwrcgpaqq43";
|
||||
rev = "5d806a0de91abfbdad967028627e8f300946f463";
|
||||
sha256 = "0b2497s3zdan81fslxpxpcr495wcvj1kdi5dzwl13102gd2mqn59";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
|
||||
};
|
||||
|
|
@ -7927,12 +7999,12 @@ final: prev:
|
|||
|
||||
vim-eunuch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-eunuch";
|
||||
version = "2021-10-01";
|
||||
version = "2022-01-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-eunuch";
|
||||
rev = "7a48f9ff0ef5f21447b2354ee52dc18b5567e05c";
|
||||
sha256 = "1mwalnbp8pigpvai22zhzg52m25qbl7hl7r8vr8vhs277gc0lx8m";
|
||||
rev = "7fb5aef524808d6ba67d6d986d15a2e291194edf";
|
||||
sha256 = "1yil4g5wym2a41isb6cdqcmccwrggy255frwxlb3rvffnl9b22m7";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-eunuch/";
|
||||
};
|
||||
|
|
@ -8985,12 +9057,12 @@ final: prev:
|
|||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "420143420d929d6bc9e98102b5828e0bbc5c9052";
|
||||
sha256 = "0dkvcsd3jmkmg3by4jz1a5lj17blqm6zb1w7n9bccc2gy232sx6y";
|
||||
rev = "40b155512b142f2111195d85d4c19de2c424a4f2";
|
||||
sha256 = "1pxdc0f66hgikwnwddhlwriaribbsxddyki33a5pn7z2sbhd8c9g";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
|
@ -9434,8 +9506,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "jceb";
|
||||
repo = "vim-orgmode";
|
||||
rev = "03561775e295d8546a95e04f9a2f1a246ad80354";
|
||||
sha256 = "1xn4k29s6psn0jbmbj1nymrkjky10ny9nylzpm5zz3rbad1c0k26";
|
||||
rev = "7882e202a3115a07be5300fd596194c94d622911";
|
||||
sha256 = "1idmlrgjvarsv620rkhpnknbqvrw372mjzxi3jrk3i2d6d9phsnb";
|
||||
};
|
||||
meta.homepage = "https://github.com/jceb/vim-orgmode/";
|
||||
};
|
||||
|
|
@ -11184,12 +11256,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2022-01-02";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "84bc5aeb1d6c07f892b39ae99e356d7ab7012476";
|
||||
sha256 = "17k6dcycv2n0zklb23nx9bzr4cmxgp1np3py3ci4s6fznn64yymn";
|
||||
rev = "d9fa252426343bd6f3e6cb134b41e674ad0e39d3";
|
||||
sha256 = "190kpl2ng8i1fkw6pzgx32aw6c1zw8w10aikwvdrz8f7g691kf7f";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ benizi/vim-automkdir
|
|||
bhurlow/vim-parinfer
|
||||
bitc/vim-hdevtools
|
||||
bkad/camelcasemotion
|
||||
blackCauldron7/surround.nvim
|
||||
bling/vim-bufferline
|
||||
blueballs-theme/blueballs-neovim
|
||||
blueyed/vim-diminactive
|
||||
|
|
@ -388,6 +389,10 @@ lambdalisue/vim-gista
|
|||
lambdalisue/vim-manpager
|
||||
lambdalisue/vim-pager
|
||||
latex-box-team/latex-box
|
||||
ldelossa/litee-calltree.nvim
|
||||
ldelossa/litee-filetree.nvim
|
||||
ldelossa/litee-symboltree.nvim
|
||||
ldelossa/litee.nvim
|
||||
leafgarland/typescript-vim
|
||||
leanprover/lean.vim
|
||||
ledger/vim-ledger
|
||||
|
|
@ -932,6 +937,7 @@ wincent/command-t
|
|||
wincent/ferret
|
||||
wincent/terminus
|
||||
windwp/nvim-autopairs
|
||||
windwp/nvim-ts-autotag
|
||||
winston0410/cmd-parser.nvim
|
||||
winston0410/range-highlight.nvim
|
||||
wlangstroth/vim-racket
|
||||
|
|
|
|||
|
|
@ -2,51 +2,51 @@
|
|||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.258-hardened1.patch",
|
||||
"sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.260-hardened1.patch",
|
||||
"sha256": "13r6lx3rcbaz2wvhwa950gsjharzq1n61bl9l3nm8v66j7gab3l0",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.260-hardened1/linux-hardened-4.14.260-hardened1.patch"
|
||||
},
|
||||
"sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi",
|
||||
"version": "4.14.258"
|
||||
"sha256": "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f",
|
||||
"version": "4.14.260"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.221-hardened1.patch",
|
||||
"sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.223-hardened1.patch",
|
||||
"sha256": "1jrg8fkb8kc3m1zcgyw99mnmgvyxi3yp33x9jh1s4babxcr7w4g3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.223-hardened1/linux-hardened-4.19.223-hardened1.patch"
|
||||
},
|
||||
"sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3",
|
||||
"version": "4.19.221"
|
||||
"sha256": "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz",
|
||||
"version": "4.19.223"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.87-hardened1.patch",
|
||||
"sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.89-hardened1.patch",
|
||||
"sha256": "0gpfyykm66h4hdazqw1xkg514cglin6zmd754xala924kj6x0k8b",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.89-hardened1/linux-hardened-5.10.89-hardened1.patch"
|
||||
},
|
||||
"sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3",
|
||||
"version": "5.10.87"
|
||||
"sha256": "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj",
|
||||
"version": "5.10.89"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.10-hardened1.patch",
|
||||
"sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.12-hardened1.patch",
|
||||
"sha256": "1xxyh87pbk7961zc5554f3gwr65n5msaxyxbi1kpd4q19gcw86xz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.12-hardened1/linux-hardened-5.15.12-hardened1.patch"
|
||||
},
|
||||
"sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8",
|
||||
"version": "5.15.10"
|
||||
"sha256": "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx",
|
||||
"version": "5.15.12"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.167-hardened1.patch",
|
||||
"sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.169-hardened1.patch",
|
||||
"sha256": "19mghwh66rmbjd7i0hxhysabarpz8l4wadw8schwc8q9kxy33py4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.169-hardened1/linux-hardened-5.4.169-hardened1.patch"
|
||||
},
|
||||
"sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l",
|
||||
"version": "5.4.167"
|
||||
"sha256": "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm",
|
||||
"version": "5.4.169"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-httpd";
|
||||
version = "2.4.51";
|
||||
version = "2.4.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4";
|
||||
sha256 = "sha256-ASf33El+mYPpxRR0vtdeRWB/L4cKdnWobckK9tVy9ck=";
|
||||
};
|
||||
|
||||
# FIXME: -dev depends on -doc
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3";
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY=";
|
||||
proxyVendor = true;
|
||||
|
||||
buildInputs = [ ffmpeg ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.21.4";
|
||||
version = "0.21.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spikecodes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9Qr1afzp5BwcnJ4WjACJQk4NA81JTnNBmZZNFMZ6FvU=";
|
||||
sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-HD6asNFb0ZICeXnUwF4ZZ568GJRPeSy4XwflpIuWJw8=";
|
||||
cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ buildGoModule rec {
|
|||
pname = "livepeer";
|
||||
version = "0.5.20";
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw=";
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livepeer";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, which, m4
|
||||
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
|
||||
, protobuf, boost170, zlib, curl, openssl, icu, jemalloc, libtool
|
||||
, python2Packages, makeWrapper
|
||||
}:
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "rethinkdb" ];
|
||||
|
||||
buildInputs = [ protobuf boost zlib curl openssl icu ]
|
||||
buildInputs = [ protobuf boost170 zlib curl openssl icu ]
|
||||
++ lib.optional (!stdenv.isDarwin) jemalloc
|
||||
++ lib.optional stdenv.isDarwin libtool;
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
query language that supports really useful queries like table
|
||||
joins and group by, and is easy to setup and learn.
|
||||
'';
|
||||
homepage = "http://www.rethinkdb.com";
|
||||
homepage = "https://rethinkdb.com";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "direnv";
|
||||
version = "2.30.2";
|
||||
version = "2.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "direnv";
|
||||
repo = "direnv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g=";
|
||||
sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k=";
|
||||
|
|
@ -29,6 +29,9 @@ buildGoModule rec {
|
|||
|
||||
checkInputs = [ fish zsh ];
|
||||
|
||||
# temporarily disable tests, check if they can be reenabled with the next release
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
make test-go test-bash test-fish test-zsh
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-top";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samueldr";
|
||||
repo = "nix-top";
|
||||
rev = "v${version}";
|
||||
sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";
|
||||
sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue