mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
4c2eef2b37
@ -2805,6 +2805,16 @@
|
||||
githubId = 541748;
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
felschr = {
|
||||
email = "dev@felschr.com";
|
||||
github = "felschr";
|
||||
githubId = 3314323;
|
||||
name = "Felix Tenley";
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0x910ACB9F6BD26F58";
|
||||
fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
|
||||
}];
|
||||
};
|
||||
ffinkdevs = {
|
||||
email = "fink@h0st.space";
|
||||
github = "ffinkdevs";
|
||||
@ -5542,10 +5552,14 @@
|
||||
name = "Michael Mercier";
|
||||
};
|
||||
midchildan = {
|
||||
email = "midchildan+nix@gmail.com";
|
||||
email = "git@midchildan.org";
|
||||
github = "midchildan";
|
||||
githubId = 7343721;
|
||||
name = "midchildan";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x186A1EDAC5C63F83";
|
||||
fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83";
|
||||
}];
|
||||
};
|
||||
mikefaille = {
|
||||
email = "michael@faille.io";
|
||||
|
||||
@ -26,6 +26,12 @@
|
||||
<listitem>
|
||||
<para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Cinnamon desktop environment (v4.6) has been added. <varname>services.xserver.desktopManager.cinnamon.enable = true;</varname> to try it out!
|
||||
Remember that, with any new feature it's possible you could run into issues, so please send all support requests to <link xlink:href="https://github.com/NixOS/nixpkgs/issues">github.com/NixOS/nixpkgs</link> to notify the maintainers.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Quickly configure a complete, private, self-hosted video
|
||||
|
||||
@ -9,24 +9,42 @@ let
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkChangedOptionModule [ "services" "calibre-server" "libraryDir" ] [ "services" "calibre-server" "libraries" ]
|
||||
(config:
|
||||
let libraryDir = getAttrFromPath [ "services" "calibre-server" "libraryDir" ] config;
|
||||
in [ libraryDir ]
|
||||
)
|
||||
)
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.calibre-server = {
|
||||
|
||||
enable = mkEnableOption "calibre-server";
|
||||
|
||||
libraryDir = mkOption {
|
||||
libraries = mkOption {
|
||||
description = ''
|
||||
The directory where the Calibre library to serve is.
|
||||
'';
|
||||
type = types.path;
|
||||
The directories of the libraries to serve. They must be readable for the user under which the server runs.
|
||||
'';
|
||||
type = types.listOf types.path;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
description = "The user under which calibre-server runs.";
|
||||
type = types.str;
|
||||
default = "calibre-server";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
description = "The group under which calibre-server runs.";
|
||||
type = types.str;
|
||||
default = "calibre-server";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -34,29 +52,34 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.calibre-server =
|
||||
{
|
||||
systemd.services.calibre-server = {
|
||||
description = "Calibre Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "calibre-server";
|
||||
User = cfg.user;
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}";
|
||||
ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.calibre ];
|
||||
|
||||
users.users.calibre-server = {
|
||||
users.users = optionalAttrs (cfg.user == "calibre-server") {
|
||||
calibre-server = {
|
||||
home = "/var/lib/calibre-server";
|
||||
createHome = true;
|
||||
uid = config.ids.uids.calibre-server;
|
||||
group = "calibre-server";
|
||||
group = cfg.group;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups.calibre-server = {
|
||||
users.groups = optionalAttrs (cfg.group == "calibre-server") {
|
||||
calibre-server = {
|
||||
gid = config.ids.gids.calibre-server;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -99,7 +99,6 @@ in
|
||||
[crio.runtime]
|
||||
cgroup_manager = "systemd"
|
||||
log_level = "${cfg.logLevel}"
|
||||
manage_ns_lifecycle = true
|
||||
pinns_path = "${cfg.package}/bin/pinns"
|
||||
hooks_dir = []
|
||||
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf
|
||||
, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transcribe";
|
||||
version = "8.72";
|
||||
|
||||
src = if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchzip {
|
||||
url = "https://www.seventhstring.com/xscribe/downlinux32/xscsetup.tar.gz";
|
||||
sha256 = "1h5l7ry9c9awpxfnd29b0wm973ifrhj17xl5d2fdsclw2swsickb";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip {
|
||||
url = "https://www.seventhstring.com/xscribe/downlinux64/xsc64setup.tar.gz";
|
||||
sha256 = "1rpd3ppnx5i5yrnfbjrx7h7dk48kwl99i9lnpa75ap7nxvbiznm0";
|
||||
}
|
||||
else throw "Platform not supported";
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good
|
||||
gst-plugins-bad gst-plugins-ugly ];
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
libPath = with gst_all_1; stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib
|
||||
libX11 libSM libpng12 gstreamer gst-plugins-base zlib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/libexec $out/share/doc
|
||||
cp transcribe $out/libexec
|
||||
cp xschelp.htb readme_gtk.html $out/share/doc
|
||||
cp -r gtkicons $out/share/icons
|
||||
|
||||
ln -s $out/share/doc/xschelp.htb $out/libexec
|
||||
|
||||
patchelf \
|
||||
--set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
|
||||
$out/libexec/transcribe
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
ln -s $out/libexec/transcribe $out/bin/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Software to help transcribe recorded music";
|
||||
longDescription = ''
|
||||
The Transcribe! application is an assistant for people who want
|
||||
to work out a piece of music from a recording, in order to write
|
||||
it out, or play it themselves, or both. It doesn't do the
|
||||
transcribing for you, but it is essentially a specialised player
|
||||
program which is optimised for the purpose of transcription. It
|
||||
has many transcription-specific features not found on
|
||||
conventional music players.
|
||||
'';
|
||||
homepage = "https://www.seventhstring.com/xscribe/";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ michalrus ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
66
pkgs/applications/blockchains/btcpayserver/default.nix
Normal file
66
pkgs/applications/blockchains/btcpayserver/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
|
||||
dotnetPackages, dotnetCorePackages, writeScript, bash
|
||||
}:
|
||||
|
||||
let
|
||||
deps = import ./deps.nix {
|
||||
fetchNuGet = { name, version, sha256 }: fetchurl {
|
||||
name = "nuget-${name}-${version}.nupkg";
|
||||
url = "https://www.nuget.org/api/v2/package/${name}/${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
};
|
||||
dotnetSdk = dotnetCorePackages.sdk_3_1;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ];
|
||||
|
||||
# Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary.
|
||||
# Build with `dotnet build` instead and add a custom `dotnet run` script.
|
||||
buildPhase = ''
|
||||
export HOME=$TMP/home
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
|
||||
nuget sources Add -Name tmpsrc -Source $TMP/nuget
|
||||
nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget
|
||||
|
||||
dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj
|
||||
dotnet build -c Release BTCPayServer/BTCPayServer.csproj
|
||||
'';
|
||||
|
||||
runScript = ''
|
||||
#!${bash}/bin/bash
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \
|
||||
-c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cd ..
|
||||
share=$out/share/$pname
|
||||
mkdir -p $share
|
||||
mv -T source $share
|
||||
install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Self-hosted, open-source cryptocurrency payment processor";
|
||||
homepage = "https://btcpayserver.org";
|
||||
maintainers = with maintainers; [ kcalvinalvin earvstedt ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
1937
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
Normal file
1937
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
Normal file
File diff suppressed because it is too large
Load Diff
6
pkgs/applications/blockchains/btcpayserver/update.sh
Executable file
6
pkgs/applications/blockchains/btcpayserver/update.sh
Executable file
@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||
|
||||
"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix
|
||||
54
pkgs/applications/blockchains/nbxplorer/default.nix
Normal file
54
pkgs/applications/blockchains/nbxplorer/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
|
||||
dotnetPackages, dotnetCorePackages
|
||||
}:
|
||||
|
||||
let
|
||||
deps = import ./deps.nix {
|
||||
fetchNuGet = { name, version, sha256 }: fetchurl {
|
||||
name = "nuget-${name}-${version}.nupkg";
|
||||
url = "https://www.nuget.org/api/v2/package/${name}/${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
};
|
||||
dotnetSdk = dotnetCorePackages.sdk_3_1;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.1.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$TMP/home
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
|
||||
nuget sources Add -Name tmpsrc -Source $TMP/nuget
|
||||
nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget
|
||||
|
||||
dotnet restore --source $TMP/nuget NBXplorer/NBXplorer.csproj
|
||||
dotnet publish --no-restore --output $out/share/$pname -c Release NBXplorer/NBXplorer.csproj
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper $out/share/$pname/NBXplorer $out/bin/$pname \
|
||||
--set DOTNET_ROOT "${dotnetSdk}"
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets";
|
||||
maintainers = with maintainers; [ kcalvinalvin earvstedt ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
1072
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
Normal file
1072
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
Normal file
File diff suppressed because it is too large
Load Diff
6
pkgs/applications/blockchains/nbxplorer/update.sh
Executable file
6
pkgs/applications/blockchains/nbxplorer/update.sh
Executable file
@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||
|
||||
getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix
|
||||
45
pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
Executable file
45
pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
Executable file
@ -0,0 +1,45 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p dotnet-sdk_3
|
||||
set -euo pipefail
|
||||
|
||||
# Writes deps for dotnet package in $pkgSrc to $depsFile.
|
||||
# Expects $pkgSrc to contain a single .sln file.
|
||||
|
||||
pkgSrc=$1
|
||||
depsFile=$2
|
||||
|
||||
sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1)
|
||||
[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; }
|
||||
|
||||
tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX)
|
||||
echo "Using tmp dir: $tmpdir"
|
||||
cp -rT "$pkgSrc" "$tmpdir"
|
||||
chmod -R +w "$tmpdir"
|
||||
|
||||
pushd "$tmpdir" > /dev/null
|
||||
mkdir home
|
||||
echo "Running dotnet restore for $sln"
|
||||
HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
||||
dotnet restore -v normal --no-cache "$sln" > restore_log
|
||||
|
||||
echo "{ fetchNuGet }: [" > "$depsFile"
|
||||
while read pkgSpec; do
|
||||
{ read name; read version; } < <(
|
||||
# Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2
|
||||
sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec"
|
||||
)
|
||||
sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg)
|
||||
cat >> "$depsFile" <<EOF
|
||||
(fetchNuGet {
|
||||
name = "$name";
|
||||
version = "$version";
|
||||
sha256 = "$sha256";
|
||||
})
|
||||
EOF
|
||||
done < <(find home/.nuget/packages -name '*.nuspec' | LC_ALL=C sort)
|
||||
echo "]" >> "$depsFile"
|
||||
|
||||
echo "Created $depsFile"
|
||||
|
||||
popd > /dev/null
|
||||
rm -r $tmpdir
|
||||
51
pkgs/applications/blockchains/nbxplorer/util/update-common.sh
Executable file
51
pkgs/applications/blockchains/nbxplorer/util/update-common.sh
Executable file
@ -0,0 +1,51 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3
|
||||
set -euo pipefail
|
||||
|
||||
# This script uses the following env vars:
|
||||
# getVersionFromTags
|
||||
# onlyCreateDeps
|
||||
|
||||
pkgName=$1
|
||||
depsFile=$2
|
||||
|
||||
: ${getVersionFromTags:=}
|
||||
: ${onlyCreateDeps:=}
|
||||
|
||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||
nixpkgs=$(realpath "$scriptDir"/../../../../..)
|
||||
|
||||
evalNixpkgs() {
|
||||
nix eval --raw "(with import \"$nixpkgs\" {}; $1)"
|
||||
}
|
||||
|
||||
getRepo() {
|
||||
url=$(evalNixpkgs $pkgName.src.meta.homepage)
|
||||
echo $(basename $(dirname $url))/$(basename $url)
|
||||
}
|
||||
|
||||
getLatestVersionTag() {
|
||||
"$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \
|
||||
| sort -V | tail -1 | sed 's|^v||'
|
||||
}
|
||||
|
||||
if [[ ! $onlyCreateDeps ]]; then
|
||||
oldVersion=$(evalNixpkgs "$pkgName.version")
|
||||
if [[ $getVersionFromTags ]]; then
|
||||
newVersion=$(getLatestVersionTag)
|
||||
else
|
||||
newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name')
|
||||
fi
|
||||
|
||||
if [[ $newVersion == $oldVersion ]]; then
|
||||
echo "nixpkgs already has the latest version $newVersion"
|
||||
echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile")
|
||||
exit 0
|
||||
else
|
||||
echo "Updating $pkgName: $oldVersion -> $newVersion"
|
||||
(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion")
|
||||
fi
|
||||
fi
|
||||
|
||||
storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)"
|
||||
. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile"
|
||||
@ -14,9 +14,9 @@ let
|
||||
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "4.1.0.17"; # "Android Studio 4.1 RC 2"
|
||||
build = "201.6776251";
|
||||
sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc=";
|
||||
version = "4.1.0.18"; # "Android Studio 4.1 RC 3"
|
||||
build = "201.6823847";
|
||||
sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88=";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "4.2.0.10"; # "Android Studio 4.2 Canary 10"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "micro";
|
||||
version = "2.0.5";
|
||||
version = "2.0.7";
|
||||
|
||||
goPackagePath = "github.com/zyedidia/micro";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc";
|
||||
sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
17
pkgs/applications/editors/micro/deps.nix
generated
17
pkgs/applications/editors/micro/deps.nix
generated
@ -189,6 +189,15 @@
|
||||
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/xo/terminfo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/xo/terminfo";
|
||||
rev = "454e5b68f9e8";
|
||||
sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/yuin/gopher-lua";
|
||||
fetch = {
|
||||
@ -203,8 +212,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/clipboard";
|
||||
rev = "7c45b8673834";
|
||||
sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4";
|
||||
rev = "v1.0.3";
|
||||
sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -257,8 +266,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/tcell";
|
||||
rev = "v1.4.7";
|
||||
sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa";
|
||||
rev = "v2.0.2";
|
||||
sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "12.0";
|
||||
version = "12.1";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "netbeans";
|
||||
exec = "netbeans";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
|
||||
sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4";
|
||||
sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
|
||||
, gdk-pixbuf }:
|
||||
, gdk-pixbuf, gdk-pixbuf-xlib }:
|
||||
|
||||
assert stdenv.hostPlatform.system == "i686-linux";
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
# versions.
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ];
|
||||
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
|
||||
|
||||
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
|
||||
|
||||
|
||||
@ -22,7 +22,14 @@ buildPythonApplication rec {
|
||||
watchdog
|
||||
];
|
||||
|
||||
checkInputs = [ mock freezegun coverage green pylint ];
|
||||
checkInputs = [ mock freezegun pylint ];
|
||||
|
||||
# Skip test that has been reported multiple times upstream without result:
|
||||
# bram85/topydo#271, bram85/topydo#274.
|
||||
checkPhase = ''
|
||||
substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls'
|
||||
python -m unittest discover
|
||||
'';
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchzip, python3Packages
|
||||
{ stdenv, lib, fetchurl, fetchzip, python3
|
||||
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
|
||||
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
|
||||
, libxslt, gst_all_1 ? null
|
||||
@ -10,6 +10,7 @@
|
||||
assert withMediaPlayback -> gst_all_1 != null;
|
||||
|
||||
let
|
||||
python3Packages = python3.pkgs;
|
||||
pdfjs = let
|
||||
version = "2.4.456";
|
||||
in
|
||||
|
||||
@ -132,8 +132,8 @@ in rec {
|
||||
});
|
||||
|
||||
terraform_0_13 = pluggable (generic {
|
||||
version = "0.13.2";
|
||||
sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw";
|
||||
version = "0.13.3";
|
||||
sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoPackage}:
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.2.0";
|
||||
|
||||
goPackagePath = "github.com/StackExchange/dnscontrol";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7";
|
||||
sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p";
|
||||
};
|
||||
|
||||
vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Synchronize your DNS to multiple providers from a simple DSL";
|
||||
homepage = "https://stackexchange.github.io/dnscontrol/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
maintainers = with maintainers; [ mmahut SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
|
||||
, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3
|
||||
# Runtime dependencies:
|
||||
, systemd, libnotify, libdbusmenu
|
||||
, systemd, libnotify, libdbusmenu, libpulseaudio
|
||||
# Unfortunately this also overwrites the UI language (not just the spell
|
||||
# checking language!):
|
||||
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
|
||||
@ -122,6 +122,7 @@ in stdenv.mkDerivation rec {
|
||||
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
|
||||
|
||||
autoPatchelf --no-recurse -- $out/lib/Signal/
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
|
||||
'';
|
||||
|
||||
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||
|
||||
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
"PREFIX=$(out)"
|
||||
"LUA_INCLUDE=${lua52Packages.lua}/include"
|
||||
"LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
|
||||
"OBJDIR=$TMP/wg-build"
|
||||
];
|
||||
|
||||
preBuild = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
|
||||
@ -62,8 +62,7 @@ in
|
||||
inherit name;
|
||||
} // (libSources.${name} or { })
|
||||
);
|
||||
buildInputs = [ gettext ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake gettext ];
|
||||
meta = {
|
||||
license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.040";
|
||||
version = "4.100";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
|
||||
sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf";
|
||||
sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildPythonApplication, fetchPypi
|
||||
, altair, astor, base58, blinker, boto3, botocore, click, enum-compat
|
||||
, future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog
|
||||
, future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog
|
||||
, jinja2, setuptools
|
||||
}:
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
altair astor base58 blinker boto3 botocore click enum-compat
|
||||
future pillow protobuf requests toml tornado tzlocal validators watchdog
|
||||
future pillow protobuf requests toml tornado_5 tzlocal validators watchdog
|
||||
jinja2 setuptools
|
||||
];
|
||||
|
||||
|
||||
@ -2,20 +2,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "0.12.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nwpqwr8sqqpndj7qsk935i1675f4qdbl31x60a038l9iiwc28x1";
|
||||
sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x";
|
||||
};
|
||||
|
||||
vendorSha256 = "1m5ahzh5sfla3p6hllr7wjigvrnccdvrsdjpxd2hy0rl7jsrp85m";
|
||||
vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildPhase = ''
|
||||
export GO_LDFLAGS="-s -w"
|
||||
make GH_VERSION=${version} bin/gh manpages
|
||||
'';
|
||||
|
||||
|
||||
54
pkgs/applications/video/filebot/default.nix
Normal file
54
pkgs/applications/video/filebot/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook
|
||||
, zlib, libzen, libmediainfo, curl, libmms, glib
|
||||
}:
|
||||
|
||||
let
|
||||
# FileBot requires libcurl-gnutls.so to build
|
||||
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filebot";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ];
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/opt $out/bin
|
||||
# Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is.
|
||||
cp -r filebot.sh lib/ jar/ $out/opt/
|
||||
# Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
|
||||
substituteInPlace $out/opt/filebot.sh \
|
||||
--replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
|
||||
--replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
|
||||
wrapProgram $out/opt/filebot.sh \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]}
|
||||
# Expose the binary in bin to make runnable.
|
||||
ln -s $out/opt/filebot.sh $out/bin/filebot
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The ultimate TV and Movie Renamer";
|
||||
longDescription = ''
|
||||
FileBot is the ultimate tool for organizing and renaming your Movies, TV
|
||||
Shows and Anime as well as fetching subtitles and artwork. It's smart and
|
||||
just works.
|
||||
'';
|
||||
homepage = "https://filebot.net";
|
||||
changelog = "https://www.filebot.net/forums/viewforum.php?f=7";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ gleber felschr ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake
|
||||
, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib
|
||||
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark
|
||||
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2
|
||||
, withGUI ? true
|
||||
, qtbase ? null
|
||||
, qtmultimedia ? null
|
||||
@ -13,13 +13,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "48.0.0";
|
||||
version = "50.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc";
|
||||
sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
expat file xdg_utils boost libebml zlib fmt
|
||||
libmatroska libogg libvorbis flac cmark
|
||||
libmatroska libogg libvorbis flac cmark pcre2
|
||||
] ++ optional stdenv.isDarwin libiconv
|
||||
++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.18.3";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g";
|
||||
sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -41,10 +41,6 @@ buildGoModule rec {
|
||||
|
||||
BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
|
||||
buildPhase = ''
|
||||
patchShebangs .
|
||||
|
||||
sed -i '/version.buildDate/d' Makefile
|
||||
|
||||
make binaries docs BUILDTAGS="$BUILDTAGS"
|
||||
'';
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, utillinux # nsenter
|
||||
, cni-plugins # not added to path
|
||||
, iptables
|
||||
, socat
|
||||
}:
|
||||
|
||||
let
|
||||
@ -22,7 +21,6 @@ let
|
||||
conmon
|
||||
utillinux
|
||||
iptables
|
||||
socat
|
||||
] ++ extraPackages);
|
||||
|
||||
in runCommand cri-o.name {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.0.4";
|
||||
version = "2.1.0";
|
||||
in
|
||||
fetchzip rec {
|
||||
fetchzip {
|
||||
name = "3270font-${version}";
|
||||
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip";
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip";
|
||||
|
||||
sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9";
|
||||
sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-gsconnect";
|
||||
version = "39";
|
||||
version = "41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d2wypf36p95v756arf06gfilpb48gp55i1xbqnqvcd10n3q4zc2";
|
||||
sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
--- a/data/org.gnome.Shell.Extensions.GSConnect.desktop
|
||||
+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop
|
||||
diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
|
||||
index ffb23342..b405c73b 100644
|
||||
--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
|
||||
+++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
|
||||
@@ -1,7 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
@ -9,18 +11,22 @@
|
||||
Terminal=false
|
||||
NoDisplay=true
|
||||
Icon=org.gnome.Shell.Extensions.GSConnect
|
||||
--- a/src/extension.js
|
||||
+++ b/src/extension.js
|
||||
@@ -1,5 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
|
||||
+
|
||||
const Gio = imports.gi.Gio;
|
||||
const GLib = imports.gi.GLib;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
--- a/src/prefs.js
|
||||
+++ b/src/prefs.js
|
||||
diff --git i/src/extension.js w/src/extension.js
|
||||
index 5f32aa68..872c0c61 100644
|
||||
--- i/src/extension.js
|
||||
+++ w/src/extension.js
|
||||
@@ -1,5 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
|
||||
+
|
||||
const Gio = imports.gi.Gio;
|
||||
const GObject = imports.gi.GObject;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
diff --git i/src/prefs.js w/src/prefs.js
|
||||
index 07e93099..1c166710 100644
|
||||
--- i/src/prefs.js
|
||||
+++ w/src/prefs.js
|
||||
@@ -1,5 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
|
||||
30
pkgs/development/libraries/crcpp/default.nix
Normal file
30
pkgs/development/libraries/crcpp/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crcpp";
|
||||
version = "1.0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d-bahr";
|
||||
repo = "CRCpp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include
|
||||
cp inc/CRC.h $out/include
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/d-bahr/CRCpp";
|
||||
description = "Easy to use and fast C++ CRC library";
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cutelyst";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cutelyst";
|
||||
repo = "cutelyst";
|
||||
rev = "v${version}";
|
||||
sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9";
|
||||
sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.1.8";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cwida";
|
||||
repo = "duckdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55";
|
||||
sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, python
|
||||
, libusb1
|
||||
, runtimeShell
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
python
|
||||
libxml2
|
||||
libusb1
|
||||
];
|
||||
] ++ lib.optional python.isPy3k python.pkgs.setuptools;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d"
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused
|
||||
, python27, utillinux, which, bash
|
||||
{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused
|
||||
, python3, utillinux, which
|
||||
|
||||
, enableStatic ? false
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.15";
|
||||
version = "1.16.1";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "libxsmm";
|
||||
inherit version;
|
||||
@ -11,31 +13,40 @@ in stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hfp";
|
||||
repo = "libxsmm";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj";
|
||||
rev = version;
|
||||
sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
coreutils
|
||||
gfortran7
|
||||
gfortran
|
||||
gnused
|
||||
python27
|
||||
python3
|
||||
utillinux
|
||||
which
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = let
|
||||
static = if enableStatic then "1" else "0";
|
||||
in [
|
||||
"OMP=1"
|
||||
"PREFIX=$(out)"
|
||||
"STATIC=${static}"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/hfp/libxsmm";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ chessai ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,6 +13,13 @@ buildPythonPackage rec {
|
||||
pname = "duckdb";
|
||||
inherit (duckdb) version src;
|
||||
|
||||
# build attempts to use git to figure out its own version. don't want to add
|
||||
# the dependency for something pointless.
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/package_build.py --replace \
|
||||
"'git'" "'false'"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
cd tools/pythonpkg
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a";
|
||||
sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98";
|
||||
};
|
||||
|
||||
# No tests included in archive
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = [ protobuf grpcio ];
|
||||
propagatedBuildInputs = [ protobuf grpcio setuptools ];
|
||||
|
||||
# no tests in the package
|
||||
doCheck = false;
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.3";
|
||||
version = "1.7.0";
|
||||
pname = "gsd";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838";
|
||||
sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
, wtforms
|
||||
, psycopg2 # optional, for postgresql support
|
||||
, flask_testing
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
# ihatemoney is not really a library. It will only ever be imported
|
||||
@ -113,12 +114,19 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
flask_testing
|
||||
flask_testing pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ];
|
||||
disabledTests = [
|
||||
"test_notifications" # requires running service.
|
||||
"test_invite" # requires running service.
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) ihatemoney;
|
||||
inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ihatemoney.org";
|
||||
description = "A simple shared budget manager web application";
|
||||
|
||||
@ -22,5 +22,6 @@ buildPythonPackage rec {
|
||||
description = "Python bindings to Slurm";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.35";
|
||||
version = "8.36";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0";
|
||||
sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,24 +1,17 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }:
|
||||
{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openocd";
|
||||
version = "0.10.0";
|
||||
version = "2020-09-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
|
||||
sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk";
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/openocd/code";
|
||||
rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3";
|
||||
sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix FTDI channel configuration for SheevaPlug
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch";
|
||||
sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ libftdi1 libusb1 hidapi ];
|
||||
|
||||
configureFlags = [
|
||||
@ -34,14 +27,9 @@ stdenv.mkDerivation rec {
|
||||
"--enable-remote-bitbang"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-implicit-fallthrough"
|
||||
"-Wno-format-truncation"
|
||||
"-Wno-format-overflow"
|
||||
"-Wno-error=tautological-compare"
|
||||
"-Wno-error=array-bounds"
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-error=cpp"
|
||||
]);
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
@ -64,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
"remote target" for source-level debugging of embedded systems using the
|
||||
GNU GDB program.
|
||||
'';
|
||||
homepage = "http://openocd.sourceforge.net/";
|
||||
homepage = "https://openocd.sourceforge.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
|
||||
, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
|
||||
{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
|
||||
, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
@ -10,7 +10,7 @@ let
|
||||
fontconfig
|
||||
pango
|
||||
atk
|
||||
gtk2
|
||||
gtk3
|
||||
glib
|
||||
freetype
|
||||
dbus
|
||||
@ -20,8 +20,8 @@ let
|
||||
cups
|
||||
expat
|
||||
udev
|
||||
|
||||
gnome2.GConf
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
@ -38,11 +38,10 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "react-native-debugger";
|
||||
version = "0.9.10";
|
||||
|
||||
version = "0.11.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
|
||||
sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6";
|
||||
sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
@ -52,15 +51,15 @@ in stdenv.mkDerivation rec {
|
||||
unzip $src -d $out
|
||||
|
||||
mkdir $out/{lib,bin,share}
|
||||
mv $out/lib{node,ffmpeg}.so $out/lib
|
||||
mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib
|
||||
mv $out/!(lib|share|bin) $out/share
|
||||
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath ${rpath}:$out/lib \
|
||||
$out/share/React\ Native\ Debugger
|
||||
$out/share/react-native-debugger
|
||||
|
||||
ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger
|
||||
ln -s $out/share/react-native-debugger $out/bin/react-native-debugger
|
||||
|
||||
install -Dm644 "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
@ -68,10 +67,10 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "rndebugger";
|
||||
exec = "React\\ Native\\ Debugger";
|
||||
exec = "react-native-debugger";
|
||||
desktopName = "React Native Debugger";
|
||||
genericName = "React Native Debugger";
|
||||
categories = "Development;Tools;";
|
||||
categories = "Development;Debugger;";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crawl";
|
||||
repo = "crawl";
|
||||
rev = version;
|
||||
sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm";
|
||||
sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b";
|
||||
};
|
||||
|
||||
# Patch hard-coded paths and remove force library builds
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "checksec";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slimm609";
|
||||
repo = "checksec.sh";
|
||||
rev = version;
|
||||
sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj";
|
||||
sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f";
|
||||
};
|
||||
|
||||
patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];
|
||||
|
||||
@ -5,14 +5,19 @@
|
||||
assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27
|
||||
# Assertion moved here due to some tests unintenionally triggering it,
|
||||
# e.g. nixosTests.kernel-latest; it's unclear how/why so far.
|
||||
assertion = assert lib.versionOlder kernel.version "5.8"; null;
|
||||
|
||||
name = "exfat-nofuse-${version}-${kernel.version}";
|
||||
version = "2019-09-06";
|
||||
version = "2020-04-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdrianBan";
|
||||
owner = "barrybingo";
|
||||
repo = "exfat-nofuse";
|
||||
rev = "5536f067373c196f152061f5000fe0032dc07c48";
|
||||
sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k";
|
||||
rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8";
|
||||
sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.145";
|
||||
version = "4.19.146";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p";
|
||||
sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.65";
|
||||
version = "5.4.66";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m";
|
||||
sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.8.9";
|
||||
version = "5.8.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r";
|
||||
sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // {
|
||||
version = "5.3.2020.04.04";
|
||||
modDirVersion = "5.3.0";
|
||||
version = "5.8.0-2020.09.07";
|
||||
modDirVersion = "5.8.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs.git";
|
||||
rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230";
|
||||
sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x";
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs";
|
||||
rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf";
|
||||
sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy";
|
||||
};
|
||||
|
||||
extraConfig = "BCACHEFS_FS m";
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly";
|
||||
sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.18.3";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidata-inc";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z";
|
||||
sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw";
|
||||
vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
let
|
||||
versions = {
|
||||
matomo = {
|
||||
version = "3.14.0";
|
||||
sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv";
|
||||
version = "3.14.1";
|
||||
sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3";
|
||||
};
|
||||
|
||||
matomo-beta = {
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
# `beta` examples: "b1", "rc1", null
|
||||
# TOOD when updating: use null if stable version is >= latest beta or release candidate
|
||||
beta = null;
|
||||
sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv";
|
||||
sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3";
|
||||
};
|
||||
};
|
||||
common = pname: { version, sha256, beta ? null }:
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xonsh";
|
||||
version = "0.9.21";
|
||||
version = "0.9.22";
|
||||
|
||||
# fetch from github because the pypi package ships incomplete tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "xonsh";
|
||||
repo = "xonsh";
|
||||
rev = version;
|
||||
sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0";
|
||||
sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds";
|
||||
sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v";
|
||||
};
|
||||
|
||||
vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v";
|
||||
vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -36,6 +36,6 @@ buildGoModule rec {
|
||||
description = "A CLI for Amazon EKS";
|
||||
homepage = "https://github.com/weaveworks/eksctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
maintainers = with maintainers; [ xrelkd Chili-Man ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
|
||||
, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
|
||||
, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages
|
||||
, fuseSupport ? false, fuse3 ? null }:
|
||||
|
||||
assert fuseSupport -> fuse3 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "2020-04-04";
|
||||
version = "2020-08-25";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
|
||||
rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d";
|
||||
sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g";
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "487ddeb03c574e902c5b749b4307e87e2150976a";
|
||||
sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -29,10 +30,10 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
libuuid libscrypt libsodium keyutils liburcu zlib libaio
|
||||
zstd lz4 python3Packages.pytest
|
||||
zstd lz4 python3Packages.pytest udev valgrind
|
||||
] ++ stdenv.lib.optional fuseSupport fuse3;
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false; # needs bcachefs module loaded on builder
|
||||
|
||||
checkFlags = [
|
||||
"BCACHEFS_TEST_USE_VALGRIND=no"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cloc";
|
||||
version = "1.86";
|
||||
version = "1.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlDanial";
|
||||
repo = "cloc";
|
||||
rev = version;
|
||||
sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w";
|
||||
sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, pythonPackages, fetchFromGitHub }:
|
||||
{ stdenv, python3Packages, fetchFromGitHub }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ntfy";
|
||||
version = "2.7.0";
|
||||
|
||||
@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec {
|
||||
sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
|
||||
};
|
||||
|
||||
checkInputs = with pythonPackages; [
|
||||
checkInputs = with python3Packages; [
|
||||
mock
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests ruamel_yaml appdirs
|
||||
sleekxmpp dns
|
||||
emoji
|
||||
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
|
||||
HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clevis";
|
||||
version = "13";
|
||||
version = "14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy";
|
||||
sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];
|
||||
|
||||
@ -2,27 +2,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jwt-cli";
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-engel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y";
|
||||
sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws";
|
||||
};
|
||||
|
||||
cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2";
|
||||
|
||||
patches = [
|
||||
# to fix `cargo test -- --test-threads $NIX_BUILD_CORES`
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch";
|
||||
sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k";
|
||||
})
|
||||
];
|
||||
cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = "$out/bin/jwt --version";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Super fast CLI tool to decode and encode JWTs";
|
||||
homepage = "https://github.com/mike-engel/jwt-cli";
|
||||
|
||||
@ -601,6 +601,7 @@ mapAliases ({
|
||||
torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28
|
||||
torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28
|
||||
trang = jing-trang; # added 2018-04-25
|
||||
transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16
|
||||
transmission_gtk = transmission-gtk; # added 2018-01-06
|
||||
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
|
||||
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
|
||||
|
||||
@ -970,6 +970,8 @@ in
|
||||
|
||||
crc32c = callPackage ../development/libraries/crc32c { };
|
||||
|
||||
crcpp = callPackage ../development/libraries/crcpp { };
|
||||
|
||||
cudd = callPackage ../development/libraries/cudd { };
|
||||
|
||||
cue = callPackage ../development/tools/cue { };
|
||||
@ -1945,6 +1947,8 @@ in
|
||||
|
||||
filebench = callPackage ../tools/misc/filebench { };
|
||||
|
||||
filebot = callPackage ../applications/video/filebot { };
|
||||
|
||||
fileshare = callPackage ../servers/fileshare {};
|
||||
|
||||
fileshelter = callPackage ../servers/web-apps/fileshelter { };
|
||||
@ -10156,7 +10160,13 @@ in
|
||||
python2Packages = python2.pkgs;
|
||||
python3Packages = python3.pkgs;
|
||||
|
||||
pythonInterpreters = callPackage ./../development/interpreters/python {};
|
||||
pythonInterpreters = callPackage ./../development/interpreters/python {
|
||||
# Overrides that apply to all Python interpreters
|
||||
pkgs = pkgs // {
|
||||
qt5 = pkgs.qt514;
|
||||
libsForQt5 = pkgs.libsForQt514;
|
||||
};
|
||||
};
|
||||
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
|
||||
|
||||
# Python package sets.
|
||||
@ -22827,11 +22837,19 @@ in
|
||||
|
||||
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
|
||||
|
||||
qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser {
|
||||
python3Packages = python3Packages.override {
|
||||
qt5 = qt515;
|
||||
libsForQt5 = libsForQt515;
|
||||
qutebrowser = let
|
||||
libsForQt5 = libsForQt515;
|
||||
qt5 = qt515;
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pkgs = pkgs // {
|
||||
inherit libsForQt5 qt5;
|
||||
};
|
||||
};
|
||||
self = python3;
|
||||
};
|
||||
in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
|
||||
python3 = python;
|
||||
};
|
||||
|
||||
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};
|
||||
@ -23522,8 +23540,6 @@ in
|
||||
|
||||
transcode = callPackage ../applications/audio/transcode { };
|
||||
|
||||
transcribe = callPackage ../applications/audio/transcribe { };
|
||||
|
||||
transmission = callPackage ../applications/networking/p2p/transmission { };
|
||||
transmission-gtk = transmission.override { enableGTK3 = true; };
|
||||
transmission-qt = transmission.override { enableQt = true; };
|
||||
@ -24443,6 +24459,8 @@ in
|
||||
};
|
||||
btc1d = btc1.override { withGui = false; };
|
||||
|
||||
btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
|
||||
|
||||
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
|
||||
|
||||
dashpay = callPackage ../applications/blockchains/dashpay.nix { };
|
||||
@ -24495,7 +24513,9 @@ in
|
||||
namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; };
|
||||
namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; };
|
||||
|
||||
pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; };
|
||||
nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
|
||||
|
||||
pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; };
|
||||
pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; };
|
||||
|
||||
ethabi = callPackage ../applications/blockchains/ethabi.nix { };
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
{ pkgs
|
||||
, stdenv
|
||||
, python
|
||||
, qt5
|
||||
, libsForQt5
|
||||
, overrides ? (self: super: {})
|
||||
}:
|
||||
|
||||
@ -3595,7 +3593,7 @@ in {
|
||||
|
||||
maya = callPackage ../development/python-modules/maya { };
|
||||
|
||||
mayavi = libsForQt5.callPackage ../development/python-modules/mayavi {
|
||||
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
|
||||
inherit buildPythonPackage isPy27 fetchPypi;
|
||||
inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
|
||||
};
|
||||
@ -4185,7 +4183,7 @@ in {
|
||||
|
||||
ovh = callPackage ../development/python-modules/ovh { };
|
||||
|
||||
ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; });
|
||||
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; });
|
||||
|
||||
owslib = callPackage ../development/python-modules/owslib { };
|
||||
|
||||
@ -4437,8 +4435,8 @@ in {
|
||||
pipx = callPackage ../development/python-modules/pipx { };
|
||||
|
||||
pivy = callPackage ../development/python-modules/pivy {
|
||||
inherit (qt5) qtbase qmake;
|
||||
inherit (libsForQt5) soqt;
|
||||
inherit (pkgs.qt5) qtbase qmake;
|
||||
inherit (pkgs.libsForQt5) soqt;
|
||||
};
|
||||
|
||||
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; };
|
||||
@ -4510,8 +4508,8 @@ in {
|
||||
pooch = callPackage ../development/python-modules/pooch { };
|
||||
|
||||
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
|
||||
inherit (qt5) qtbase;
|
||||
inherit (libsForQt5) poppler;
|
||||
inherit (pkgs.qt5) qtbase;
|
||||
inherit (pkgs.libsForQt5) poppler;
|
||||
inherit (pkgs) pkgconfig;
|
||||
};
|
||||
|
||||
@ -5216,7 +5214,7 @@ in {
|
||||
|
||||
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };
|
||||
|
||||
pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; };
|
||||
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; };
|
||||
|
||||
pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };
|
||||
|
||||
@ -5229,7 +5227,7 @@ in {
|
||||
|
||||
pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
|
||||
|
||||
pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; };
|
||||
pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; };
|
||||
|
||||
pyquery = callPackage ../development/python-modules/pyquery { };
|
||||
|
||||
@ -5335,9 +5333,9 @@ in {
|
||||
pyshp = callPackage ../development/python-modules/pyshp { };
|
||||
|
||||
pyside2-tools =
|
||||
toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; });
|
||||
toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; });
|
||||
|
||||
pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; });
|
||||
pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; });
|
||||
|
||||
pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; };
|
||||
|
||||
@ -5938,7 +5936,7 @@ in {
|
||||
|
||||
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
|
||||
|
||||
qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; };
|
||||
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; };
|
||||
|
||||
qscintilla = self.qscintilla-qt4;
|
||||
|
||||
@ -6119,7 +6117,7 @@ in {
|
||||
|
||||
roboschool = callPackage ../development/python-modules/roboschool {
|
||||
inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package
|
||||
inherit (qt5) qtbase;
|
||||
inherit (pkgs.qt5) qtbase;
|
||||
};
|
||||
|
||||
robot-detection = callPackage ../development/python-modules/robot-detection { };
|
||||
@ -6405,7 +6403,7 @@ in {
|
||||
shellingham = callPackage ../development/python-modules/shellingham { };
|
||||
|
||||
shiboken2 =
|
||||
toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; });
|
||||
toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; });
|
||||
|
||||
shippai = callPackage ../development/python-modules/shippai { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user