Merge remote-tracking branch 'origin/master' into haskell-updates.
This commit is contained in:
Peter Simons
commit
94d0521989
@ -5206,6 +5206,12 @@
|
||||
githubId = 35892750;
|
||||
name = "Maxine Aubrey";
|
||||
};
|
||||
maxxk = {
|
||||
email = "maxim.krivchikov@gmail.com";
|
||||
github = "maxxk";
|
||||
githubId = 1191859;
|
||||
name = "Maxim Krivchikov";
|
||||
};
|
||||
mbakke = {
|
||||
email = "mbakke@fastmail.com";
|
||||
github = "mbakke";
|
||||
@ -6359,6 +6365,12 @@
|
||||
githubId = 157610;
|
||||
name = "Piotr Bogdan";
|
||||
};
|
||||
pblkt = {
|
||||
email = "pebblekite@gmail.com";
|
||||
github = "pblkt";
|
||||
githubId = 6498458;
|
||||
name = "pebble kite";
|
||||
};
|
||||
pcarrier = {
|
||||
email = "pc@rrier.ca";
|
||||
github = "pcarrier";
|
||||
|
||||
@ -26,7 +26,7 @@ with lib;
|
||||
####### implementation
|
||||
|
||||
config = mkIf config.hardware.onlykey.enable {
|
||||
services.udev.extraRules = builtin.readFile ./onlykey.udev;
|
||||
services.udev.extraRules = builtins.readFile ./onlykey.udev;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ let
|
||||
'') gitlabConfig.production.repositories.storages))}
|
||||
'';
|
||||
|
||||
gitlabShellConfig = {
|
||||
gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig {
|
||||
user = cfg.user;
|
||||
gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
|
||||
http_settings.self_signed_cert = false;
|
||||
@ -517,6 +517,12 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
extraShellConfig = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
description = "Extra configuration to merge into shell-config.yml";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gSpeech";
|
||||
version = "0.9.2";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mothsart";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3";
|
||||
sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]}
|
||||
wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]}
|
||||
wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
|
||||
wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
|
||||
'';
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parlatype";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gkarsay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx";
|
||||
sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, libgnome-keyring
|
||||
, libnotify
|
||||
, pango
|
||||
, webkitgtk
|
||||
@ -22,6 +21,7 @@
|
||||
, pygobject3
|
||||
, pyyaml
|
||||
, requests
|
||||
, keyring
|
||||
|
||||
# commands that lutris needs
|
||||
, xrandr
|
||||
@ -71,13 +71,13 @@ let
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "lutris-original";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa";
|
||||
sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
@ -88,14 +88,13 @@ in buildPythonApplication rec {
|
||||
gnome-desktop
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libgnome-keyring
|
||||
libnotify
|
||||
pango
|
||||
webkitgtk
|
||||
] ++ gstDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
evdev distro pyyaml pygobject3 requests pillow dbus-python
|
||||
evdev distro pyyaml pygobject3 requests pillow dbus-python keyring
|
||||
];
|
||||
|
||||
# avoid double wrapping
|
||||
|
||||
@ -119,9 +119,13 @@ in stdenv.mkDerivation {
|
||||
--replace /opt $out/share \
|
||||
--replace $out/share/google/$appname/google-$appname $exe
|
||||
|
||||
for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do
|
||||
for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
|
||||
num_and_suffix="''${icon_file##*logo_}"
|
||||
icon_size="''${num_and_suffix%.*}"
|
||||
if [ $dist = "stable" ]; then
|
||||
icon_size="''${num_and_suffix%.*}"
|
||||
else
|
||||
icon_size="''${num_and_suffix%_*}"
|
||||
fi
|
||||
logo_output_prefix="$out/share/icons/hicolor"
|
||||
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
|
||||
mkdir -p "$logo_output_path"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tanka";
|
||||
@ -17,6 +17,13 @@ buildGoModule rec {
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
echo "complete -C $out/bin/tk tk" > tk.bash
|
||||
installShellCompletion tk.bash
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flexible, reusable and concise configuration for Kubernetes";
|
||||
homepage = "https://github.com/grafana/tanka/";
|
||||
|
||||
45
pkgs/applications/office/timeular/default.nix
Normal file
45
pkgs/applications/office/timeular/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
libsecret
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.4.1";
|
||||
pname = "timeular";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||
sha256 = "1s5jjdl1nzq9yd582lqs904yl10mp0s25897zmifmcbw1vz38bar";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
in appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
libsecret
|
||||
];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${pname}}
|
||||
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
|
||||
install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png
|
||||
substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Timetracking by flipping 8-sided dice";
|
||||
longDescription = ''
|
||||
The Timeular Tracker is an 8-sided dice that sits on your desk.
|
||||
Assign an activity to each side and flip to start tracking your time.
|
||||
The desktop app tell you where every minute of your day is spent.
|
||||
'';
|
||||
homepage = https://timeular.com;
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ktor ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
34
pkgs/applications/science/biology/whisper/default.nix
Normal file
34
pkgs/applications/science/biology/whisper/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv, fetchFromGitHub, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whisper";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "refresh-bio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
|
||||
# disable default static linking
|
||||
sed -i 's/ -static / /' makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin whisper whisper-index
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Short read sequence mapper";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://github.com/refresh-bio/whisper";
|
||||
maintainers = with maintainers; [ jbedo ];
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
30
pkgs/applications/version-management/p4/default.nix
Normal file
30
pkgs/applications/version-management/p4/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl, lib, autoPatchelfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4";
|
||||
version = "2020.1.1991450";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "0nhcxhwx3scx6vf7i2bc8j0b1l57lmq9bfy1cfbfbqasd3an721k";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp p4 p4broker p4d p4p $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Perforce Command-Line Client";
|
||||
homepage = "https://www.perforce.com";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ corngood ];
|
||||
};
|
||||
}
|
||||
@ -105,81 +105,81 @@ let
|
||||
"disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
|
||||
]) // {
|
||||
|
||||
name = namePrefix + name;
|
||||
name = namePrefix + name;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python
|
||||
wrapPython
|
||||
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
|
||||
pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
|
||||
pythonRemoveTestsDirHook
|
||||
] ++ lib.optionals catchConflicts [
|
||||
setuptools pythonCatchConflictsHook
|
||||
] ++ lib.optionals removeBinBytecode [
|
||||
pythonRemoveBinBytecodeHook
|
||||
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
|
||||
unzip
|
||||
] ++ lib.optionals (format == "setuptools") [
|
||||
setuptoolsBuildHook
|
||||
] ++ lib.optionals (format == "flit") [
|
||||
flitBuildHook
|
||||
] ++ lib.optionals (format == "pyproject") [
|
||||
pipBuildHook
|
||||
] ++ lib.optionals (format == "wheel") [
|
||||
wheelUnpackHook
|
||||
] ++ lib.optionals (format == "egg") [
|
||||
eggUnpackHook eggBuildHook eggInstallHook
|
||||
] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [
|
||||
pipInstallHook
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
# This is a test, however, it should be ran independent of the checkPhase and checkInputs
|
||||
pythonImportsCheckHook
|
||||
] ++ lib.optionals (python.pythonAtLeast "3.3") [
|
||||
# Optionally enforce PEP420 for python3
|
||||
pythonNamespacesHook
|
||||
] ++ nativeBuildInputs;
|
||||
nativeBuildInputs = [
|
||||
python
|
||||
wrapPython
|
||||
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
|
||||
pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
|
||||
pythonRemoveTestsDirHook
|
||||
] ++ lib.optionals catchConflicts [
|
||||
setuptools pythonCatchConflictsHook
|
||||
] ++ lib.optionals removeBinBytecode [
|
||||
pythonRemoveBinBytecodeHook
|
||||
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
|
||||
unzip
|
||||
] ++ lib.optionals (format == "setuptools") [
|
||||
setuptoolsBuildHook
|
||||
] ++ lib.optionals (format == "flit") [
|
||||
flitBuildHook
|
||||
] ++ lib.optionals (format == "pyproject") [
|
||||
pipBuildHook
|
||||
] ++ lib.optionals (format == "wheel") [
|
||||
wheelUnpackHook
|
||||
] ++ lib.optionals (format == "egg") [
|
||||
eggUnpackHook eggBuildHook eggInstallHook
|
||||
] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [
|
||||
pipInstallHook
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
# This is a test, however, it should be ran independent of the checkPhase and checkInputs
|
||||
pythonImportsCheckHook
|
||||
] ++ lib.optionals (python.pythonAtLeast "3.3") [
|
||||
# Optionally enforce PEP420 for python3
|
||||
pythonNamespacesHook
|
||||
] ++ nativeBuildInputs;
|
||||
|
||||
buildInputs = buildInputs ++ pythonPath;
|
||||
buildInputs = buildInputs ++ pythonPath;
|
||||
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ python ];
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ python ];
|
||||
|
||||
inherit strictDeps;
|
||||
inherit strictDeps;
|
||||
|
||||
LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8";
|
||||
LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8";
|
||||
|
||||
# Python packages don't have a checkPhase, only an installCheckPhase
|
||||
doCheck = false;
|
||||
doInstallCheck = attrs.doCheck or true;
|
||||
installCheckInputs = [
|
||||
] ++ lib.optionals (format == "setuptools") [
|
||||
# Longer-term we should get rid of this and require
|
||||
# users of this function to set the `installCheckPhase` or
|
||||
# pass in a hook that sets it.
|
||||
setuptoolsCheckHook
|
||||
] ++ checkInputs;
|
||||
# Python packages don't have a checkPhase, only an installCheckPhase
|
||||
doCheck = false;
|
||||
doInstallCheck = attrs.doCheck or true;
|
||||
installCheckInputs = [
|
||||
] ++ lib.optionals (format == "setuptools") [
|
||||
# Longer-term we should get rid of this and require
|
||||
# users of this function to set the `installCheckPhase` or
|
||||
# pass in a hook that sets it.
|
||||
setuptoolsCheckHook
|
||||
] ++ checkInputs;
|
||||
|
||||
postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
|
||||
wrapPythonPrograms
|
||||
'' + attrs.postFixup or '''';
|
||||
postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
|
||||
wrapPythonPrograms
|
||||
'' + attrs.postFixup or '''';
|
||||
|
||||
# Python packages built through cross-compilation are always for the host platform.
|
||||
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
|
||||
# Python packages built through cross-compilation are always for the host platform.
|
||||
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
|
||||
|
||||
# For now, revert recompilation of bytecode.
|
||||
dontUsePythonRecompileBytecode = true;
|
||||
# For now, revert recompilation of bytecode.
|
||||
dontUsePythonRecompileBytecode = true;
|
||||
|
||||
meta = {
|
||||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
isBuildPythonPackage = python.meta.platforms;
|
||||
} // meta;
|
||||
} // lib.optionalAttrs (attrs?checkPhase) {
|
||||
# If given use the specified checkPhase, otherwise use the setup hook.
|
||||
# Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
|
||||
installCheckPhase = attrs.checkPhase;
|
||||
}));
|
||||
meta = {
|
||||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
isBuildPythonPackage = python.meta.platforms;
|
||||
} // meta;
|
||||
} // lib.optionalAttrs (attrs?checkPhase) {
|
||||
# If given use the specified checkPhase, otherwise use the setup hook.
|
||||
# Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
|
||||
installCheckPhase = attrs.checkPhase;
|
||||
}));
|
||||
|
||||
passthru.updateScript = let
|
||||
filename = builtins.head (lib.splitString ":" self.meta.position);
|
||||
in attrs.passthru.updateScript or [ update-python-libraries filename ];
|
||||
passthru.updateScript = let
|
||||
filename = builtins.head (lib.splitString ":" self.meta.position);
|
||||
in attrs.passthru.updateScript or [ update-python-libraries filename ];
|
||||
in lib.extendDerivation true passthru self
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cwida";
|
||||
repo = "duckdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pz2q9c3803w8vbqiz9lag4g1kgl4ff9xca0kpcz72ap39pbp5jk";
|
||||
sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -97,8 +97,10 @@ let
|
||||
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
|
||||
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
|
||||
})
|
||||
]
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
||||
];
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
Fix a following build error:
|
||||
|
||||
In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:
|
||||
../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|."
|
||||
static_assert(
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here
|
||||
: AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... {
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here
|
||||
static_assert(internal::AssertBindArgsValidity<
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
|
||||
return base::BindRepeating(std::forward<Functor>(functor),
|
||||
^
|
||||
../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
|
||||
base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
|
||||
^
|
||||
|
||||
Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS.
|
||||
|
||||
--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
||||
+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
||||
@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(
|
||||
base::ThreadTaskRunnerHandle::Get()->PostTask(
|
||||
FROM_HERE,
|
||||
base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
|
||||
- weak_ptr_factory_.GetWeakPtr(), nil));
|
||||
+ weak_ptr_factory_.GetWeakPtr(), nullptr));
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,18 @@
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index 897bea54..6f834c20 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
|
||||
}
|
||||
|
||||
defineReplace(webEngineGetMacOSSDKVersion) {
|
||||
- value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null")
|
||||
+ value = $$system("xcrun --show-sdk-version")
|
||||
return($$value)
|
||||
}
|
||||
|
||||
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
|
||||
index 35eb6b89..7eed640a 100644
|
||||
--- a/mkspecs/features/platform.prf
|
||||
+++ b/mkspecs/features/platform.prf
|
||||
@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
|
||||
@ -19,15 +33,39 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
|
||||
}
|
||||
} else {
|
||||
skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
|
||||
@@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) {
|
||||
requested_minor = $$2
|
||||
requested_patch = $$3
|
||||
isEmpty(requested_patch): requested_patch = 0
|
||||
- WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null")
|
||||
+ WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version")
|
||||
export(WEBENGINE_OSX_SDK_PRODUCT_VERSION)
|
||||
isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
|
||||
skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
|
||||
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
|
||||
index 4426901c..3aa6057e 100644
|
||||
--- a/src/core/config/mac_osx.pri
|
||||
+++ b/src/core/config/mac_osx.pri
|
||||
@@ -5,8 +5,6 @@ load(functions)
|
||||
@@ -5,16 +5,16 @@ load(functions)
|
||||
# otherwise query for it.
|
||||
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
|
||||
isEmpty(QMAKE_MAC_SDK_VERSION) {
|
||||
- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
|
||||
- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
|
||||
+ QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version")
|
||||
isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
|
||||
}
|
||||
|
||||
|
||||
QMAKE_CLANG_DIR = "/usr"
|
||||
-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
|
||||
-!isEmpty(QMAKE_CLANG_PATH) {
|
||||
- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
|
||||
- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
|
||||
-}
|
||||
+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
|
||||
+# !isEmpty(QMAKE_CLANG_PATH) {
|
||||
+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
|
||||
+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
|
||||
+# }
|
||||
|
||||
QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
|
||||
message("Using clang++ from $${QMAKE_CLANG_PATH}")
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
, systemd
|
||||
, enableProprietaryCodecs ? true
|
||||
, gn
|
||||
, cups, darwin, openbsm, runCommand, xcbuild
|
||||
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
|
||||
, ffmpeg_3 ? null
|
||||
, lib, stdenv
|
||||
}:
|
||||
@ -51,6 +51,13 @@ qtModule {
|
||||
substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
|
||||
--replace /bin/echo ${coreutils}/bin/echo
|
||||
''
|
||||
# Prevent Chromium build script from making the path to `clang` relative to
|
||||
# the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR`
|
||||
# from `src/core/config/mac_osx.pri`.
|
||||
+ optionalString stdenv.isDarwin ''
|
||||
substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \
|
||||
--replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"'
|
||||
''
|
||||
# Patch library paths in Qt sources
|
||||
+ ''
|
||||
sed -i \
|
||||
@ -69,32 +76,15 @@ qtModule {
|
||||
''
|
||||
+ optionalString stdenv.isDarwin (''
|
||||
substituteInPlace src/core/config/mac_osx.pri \
|
||||
--replace /usr ${stdenv.cc}
|
||||
--replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
|
||||
''
|
||||
# Following is required to prevent a build error:
|
||||
# ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it
|
||||
+ (optionalString (lib.versionAtLeast qtCompatVersion "5.11") ''
|
||||
substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
|
||||
--replace '$sysroot/usr' "${darwin.xnu}"
|
||||
'')
|
||||
+ ''
|
||||
|
||||
cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py
|
||||
#!/usr/bin/env python
|
||||
print("${darwin.apple_sdk.sdk}")
|
||||
print("10.12.0")
|
||||
EOF
|
||||
|
||||
cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py
|
||||
#!/usr/bin/env python
|
||||
print('xcode_version="0910"')
|
||||
print('xcode_version_int=910')
|
||||
print('xcode_build="9B55"')
|
||||
print('machine_os_build="17E199"')
|
||||
print('sdk_path=""')
|
||||
print('sdk_version="10.10"')
|
||||
print('sdk_platform_path=""')
|
||||
print('sdk_build="17B41"')
|
||||
EOF
|
||||
|
||||
# Apple has some secret stuff they don't share with OpenBSM
|
||||
substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
|
||||
--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
|
||||
@ -111,8 +101,8 @@ EOF
|
||||
# TODO: investigate and fix properly
|
||||
"-march=westmere"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
|
||||
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
|
||||
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
|
||||
|
||||
#
|
||||
# Prevent errors like
|
||||
@ -189,6 +179,7 @@ EOF
|
||||
CoreWLAN
|
||||
Quartz
|
||||
Cocoa
|
||||
LocalAuthentication
|
||||
|
||||
openbsm
|
||||
libunwind
|
||||
@ -197,6 +188,21 @@ EOF
|
||||
buildInputs = optionals stdenv.isDarwin (with darwin; [
|
||||
cups
|
||||
|
||||
# `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
|
||||
# to get some information about the host platform.
|
||||
(writeScriptBin "sw_vers" ''
|
||||
#!${stdenv.shell}
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
-buildVersion) echo "17E199";;
|
||||
*) break ;;
|
||||
|
||||
esac
|
||||
shift
|
||||
done
|
||||
'')
|
||||
|
||||
# For sandbox.h include
|
||||
(runCommand "MacOS_SDK_sandbox.h" {} ''
|
||||
install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
|
||||
|
||||
30
pkgs/development/ocaml-modules/jwto/default.nix
Normal file
30
pkgs/development/ocaml-modules/jwto/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson
|
||||
, base64, re, ppx_deriving }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "jwto";
|
||||
version = "0.3.0";
|
||||
|
||||
minimumOCamlVersion = "4.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sporto";
|
||||
repo = "jwto";
|
||||
rev = version;
|
||||
sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ cryptokit fmt yojson base64 re ppx_deriving ];
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/sporto/jwto";
|
||||
description = "JSON Web Tokens (JWT) for OCaml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ];
|
||||
};
|
||||
}
|
||||
@ -1,20 +1,30 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }:
|
||||
{ stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "avro";
|
||||
version = "1.9.2";
|
||||
disabled = isPy3k;
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4487f0e91d0d44142bd08b3c6da57073b720c3effb02eeb4e2e822804964c56b";
|
||||
sha256 = "00rg1nn9szwm0p1lcda0w3iyqy9mx2y9zv0hdwaz6k0bsagziydv";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
# this test requires network access
|
||||
sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py
|
||||
'' + (stdenv.lib.optionalString isPy3k ''
|
||||
# these files require twisted, which is not python3 compatible
|
||||
rm avro/txipc.py
|
||||
rm avro/test/txsample*
|
||||
'');
|
||||
|
||||
nativeBuildInputs = [ pycodestyle ];
|
||||
propagatedBuildInputs = [ isort ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A serialization and RPC framework";
|
||||
homepage = "https://pypi.python.org/pypi/avro/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.zimbatm ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,30 +1,24 @@
|
||||
{ stdenv, fetchPypi, fetchpatch
|
||||
, buildPythonApplication, python, pythonOlder
|
||||
, mock, nose, pathpy, pyhamcrest, pytest_4
|
||||
, glibcLocales, parse, parse-type, six
|
||||
, traceback2
|
||||
{ stdenv, fetchFromGitHub
|
||||
, buildPythonApplication, python
|
||||
, mock, pathpy, pyhamcrest, pytest, pytest-html
|
||||
, glibcLocales
|
||||
, colorama, cucumber-tag-expressions, parse, parse-type, six
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "behave";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7.dev1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
|
||||
src = fetchFromGitHub {
|
||||
owner = "behave";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests on Python 2.7
|
||||
(fetchpatch {
|
||||
url = "https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch";
|
||||
sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ mock nose pathpy pyhamcrest pytest_4 ];
|
||||
checkInputs = [ mock pathpy pyhamcrest pytest pytest-html ];
|
||||
buildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;
|
||||
propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs bin
|
||||
@ -36,7 +30,7 @@ buildPythonApplication rec {
|
||||
export LANG="en_US.UTF-8"
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
|
||||
pytest test tests
|
||||
pytest tests
|
||||
|
||||
${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/
|
||||
${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/
|
||||
@ -47,6 +41,6 @@ buildPythonApplication rec {
|
||||
homepage = "https://github.com/behave/behave";
|
||||
description = "behaviour-driven development, Python style";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ alunduil ];
|
||||
maintainers = with maintainers; [ alunduil maxxk ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -73,6 +73,13 @@ let
|
||||
# This patch disables the test that tries to read /etc/os-release which
|
||||
# is not accessible in sandboxed builds.
|
||||
./skip_test_linux_distro.patch
|
||||
|
||||
# fix compatibility with the latest SQLAlchemy
|
||||
(fetchpatch {
|
||||
url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch";
|
||||
sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cucumber-tag-expressions";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kb8dq458sflwl2agb2v9hp04qwygslrhdps819vq27wc44jabxw";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-html ];
|
||||
checkPhase = "pytest tests/*/*.py";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cucumber/tag-expressions-python";
|
||||
description = "Provides tag-expression parser for cucumber/behave";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maxxk ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, python, stdenv, django }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-widget-tweaks";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub { # package from Pypi missing runtests.py
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg";
|
||||
};
|
||||
|
||||
checkPhase = "${python.interpreter} runtests.py";
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tweak the form field rendering in templates, not in python-level form definitions.";
|
||||
homepage = "https://github.com/jazzband/django-widget-tweaks";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
maxxk
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mocket";
|
||||
version = "3.8.7";
|
||||
version = "3.8.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zj2p20blf4p071kcs86h2c9sc964x6sahff60gg7y4d2c0iq3rs";
|
||||
sha256 = "0yqls2hqmfs6i4p2nb89j5icyrqwabalsmwfixfvbjir4fmgad2l";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, future
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, pyyaml
|
||||
, tensorflow-tensorboard
|
||||
, tqdm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-lightning";
|
||||
version = "0.8.5";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyTorchLightning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
pytorch
|
||||
pyyaml
|
||||
tensorflow-tensorboard
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
# Some packages are not in NixPkgs; other tests try to build distributed
|
||||
# models, which doesn't work in the sandbox.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pytorch_lightning" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight PyTorch wrapper for machine learning researchers";
|
||||
homepage = "https://pytorch-lightning.readthedocs.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
};
|
||||
}
|
||||
27
pkgs/development/tools/misc/mkrom/default.nix
Normal file
27
pkgs/development/tools/misc/mkrom/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkrom";
|
||||
version = "unstable-2020-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KnightOS";
|
||||
repo = "mkrom";
|
||||
rev = "7a735ecbe09409e74680a9dc1c50dd4db99a409f";
|
||||
sha256 = "18h7a0fb5zb991iy9ljpknmk9qvl9nz3yh1zh5bm399rpxn4nzx3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
cmake
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://knightos.org/";
|
||||
description = "Packages KnightOS distribution files into a ROM";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,23 @@
|
||||
{ stdenv, fetchurl, fetchzip, sconsPackages, zlib }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, sconsPackages
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nsis";
|
||||
version = "3.05";
|
||||
version = "3.06.1";
|
||||
|
||||
src =
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2";
|
||||
sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn";
|
||||
sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv";
|
||||
};
|
||||
srcWinDistributable =
|
||||
fetchzip {
|
||||
url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip";
|
||||
sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q";
|
||||
sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osslsigncode";
|
||||
version = "unstable-2019-07-25";
|
||||
version = "unstable-2020-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = pname;
|
||||
rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7";
|
||||
sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8";
|
||||
rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2";
|
||||
sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
|
||||
@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/mtrojnar/osslsigncode";
|
||||
description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.mmahut ];
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
21
pkgs/development/tools/rebazel/default.nix
Normal file
21
pkgs/development/tools/rebazel/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rebazel";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meetup";
|
||||
repo = "rebazel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2FmtbvtNfNoocj3Ly553KBLfOgBAa/eAxOrfZ3NGzzw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "tool for expediting bazel build workflows";
|
||||
homepage = "https://github.com/meetup/rebazel";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "lucky-cli";
|
||||
version = "0.21.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luckyframework";
|
||||
repo = "lucky_cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g0arf13brh6g0hynxs8bsp8jh3dd66rmf2d3qh2qjvk10101g0r";
|
||||
sha256 = "1qggbczrnrfjba6ipzjkqp6ni4rjc79pxy3vhgd7nq88ipa1sygk";
|
||||
};
|
||||
|
||||
# the integration tests will try to clone a remote repos
|
||||
|
||||
@ -1,7 +1,22 @@
|
||||
{ python3Packages, fetchurl }:
|
||||
{ python3Packages, fetchurl, fetchFromGitHub }:
|
||||
|
||||
rec {
|
||||
ansible = ansible_2_9;
|
||||
ansible = ansible_2_10;
|
||||
|
||||
# The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override
|
||||
# for now.
|
||||
ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
|
||||
pname = "ansible";
|
||||
version = "2.10.0";
|
||||
|
||||
# TODO: migrate to fetchurl, when release becomes available on releases.ansible.com
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42";
|
||||
};
|
||||
}));
|
||||
|
||||
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
|
||||
|
||||
@ -14,14 +29,4 @@ rec {
|
||||
sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294";
|
||||
};
|
||||
}));
|
||||
|
||||
ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
|
||||
pname = "ansible";
|
||||
version = "2.7.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1";
|
||||
};
|
||||
}));
|
||||
}
|
||||
|
||||
26
pkgs/tools/misc/pandoc-plantuml-filter/default.nix
Normal file
26
pkgs/tools/misc/pandoc-plantuml-filter/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ buildPythonApplication
|
||||
, fetchPypi
|
||||
, pandocfilters
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-plantuml-filter";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "08673mfwxsw6s52mgglbdz7ybb68svqyr3s9w97d7rifbwvvc9ia";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pandocfilters
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/timofurrer/pandoc-plantuml-filter";
|
||||
description = "Pandoc filter which converts PlantUML code blocks to PlantUML images.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai ];
|
||||
};
|
||||
}
|
||||
@ -2,34 +2,29 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pubs";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pubs";
|
||||
repo = "pubs";
|
||||
rev = "v${version}";
|
||||
sha256 = "16zwdqfbmlla6906g3a57a4nj8wnl11fq78r20qms717bzv211j0";
|
||||
sha256 = "0npgsyxj7kby5laznk5ilkrychs3i68y57gphwk48w8k9fvnl3zc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for bibtexparser 1.1.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch";
|
||||
sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp";
|
||||
})
|
||||
# Fix test broken by PyYAML 5.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch";
|
||||
sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4
|
||||
argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [ pyfakefs mock ddt ];
|
||||
|
||||
# Disabling git tests because they expect git to be preconfigured
|
||||
# with the user's details. See
|
||||
# https://github.com/NixOS/nixpkgs/issues/94663
|
||||
preCheck = ''
|
||||
rm tests/test_git.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command-line bibliography manager";
|
||||
homepage = "https://github.com/pubs/pubs";
|
||||
|
||||
24
pkgs/tools/misc/rargs/default.nix
Normal file
24
pkgs/tools/misc/rargs/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rargs";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lotabout";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd";
|
||||
};
|
||||
|
||||
cargoSha256 = "0qzkhx0n28f5wy4fral3adn499q3f10q71cd544s4ghqwqn4khc9";
|
||||
|
||||
doCheck=false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "xargs + awk with pattern matching support";
|
||||
homepage = "https://github.com/lolabout/rargs";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ pblkt ];
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,20 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libusb1
|
||||
, qtbase, qttools, makeWrapper, qmake
|
||||
, withEspeak ? false, espeak ? null, qt5 }:
|
||||
{ stdenv, fetchurl, pkgconfig, cryptopp
|
||||
, libusb1, qtbase, qttools, makeWrapper
|
||||
, qmake, withEspeak ? false, espeak ? null
|
||||
, qt5 }:
|
||||
|
||||
let inherit (stdenv.lib) getDev; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rockbox-utility";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2";
|
||||
sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w";
|
||||
sha256 = "0zm9f01a810y7aq0nravbsl0vs9vargwvxnfl4iz9qsqygwlj69y";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 qtbase qttools ]
|
||||
buildInputs = [ cryptopp libusb1 qtbase qttools ]
|
||||
++ stdenv.lib.optional withEspeak espeak;
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ];
|
||||
|
||||
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
cd rbutil/rbutilqt
|
||||
lrelease rbutilqt.pro
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.8.14";
|
||||
version = "1.8.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "0fcpmdshl52lg44b94h7pbikq91ppvmkdgd8993hgvzjyl0pchs5";
|
||||
sha256 = "09wncvy1cn8038xf8srz8y955xw9h59zh7avrh060wm50azrhlg5";
|
||||
};
|
||||
|
||||
cargoSha256 = "1vvcsadp2kycqjsmgy48szxzqg6s1jpdlzppfgffm8r71dcppyjj";
|
||||
cargoSha256 = "0n03dg1rrhlryap0dqqmmzhp49lxvhh3478z123x23fm04ygln44";
|
||||
|
||||
SODIUM_USE_PKG_CONFIG = 1;
|
||||
|
||||
|
||||
@ -5667,6 +5667,8 @@ in
|
||||
|
||||
pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
|
||||
|
||||
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
||||
pasystray = callPackage ../tools/audio/pasystray { };
|
||||
|
||||
phash = callPackage ../development/libraries/phash { };
|
||||
@ -10260,9 +10262,9 @@ in
|
||||
|
||||
inherit (callPackage ../tools/admin/ansible { })
|
||||
ansible
|
||||
ansible_2_7
|
||||
ansible_2_8
|
||||
ansible_2_9;
|
||||
ansible_2_9
|
||||
ansible_2_10;
|
||||
|
||||
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
|
||||
|
||||
@ -10394,6 +10396,8 @@ in
|
||||
|
||||
bazelisk = callPackage ../development/tools/bazelisk { };
|
||||
|
||||
rebazel = callPackage ../development/tools/rebazel { };
|
||||
|
||||
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
|
||||
|
||||
bear = callPackage ../development/tools/build-managers/bear { };
|
||||
@ -11045,6 +11049,10 @@ in
|
||||
|
||||
mkcert = callPackage ../development/tools/misc/mkcert { };
|
||||
|
||||
mkrom = callPackage ../development/tools/misc/mkrom {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
|
||||
mkdocs = callPackage ../development/tools/documentation/mkdocs { };
|
||||
|
||||
mockgen = callPackage ../development/tools/mockgen { };
|
||||
@ -21366,7 +21374,7 @@ in
|
||||
luppp = callPackage ../applications/audio/luppp { };
|
||||
|
||||
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
|
||||
inherit (gnome3) gnome-desktop libgnome-keyring;
|
||||
inherit (gnome3) gnome-desktop;
|
||||
wine = wineWowPackages.staging;
|
||||
};
|
||||
lutris = callPackage ../applications/misc/lutris/fhsenv.nix {
|
||||
@ -21752,6 +21760,7 @@ in
|
||||
|
||||
ostinato = callPackage ../applications/networking/ostinato { };
|
||||
|
||||
p4 = callPackage ../applications/version-management/p4 { };
|
||||
p4v = libsForQt5.callPackage ../applications/version-management/p4v { };
|
||||
|
||||
partio = callPackage ../development/libraries/partio {};
|
||||
@ -25458,6 +25467,8 @@ in
|
||||
|
||||
varscan = callPackage ../applications/science/biology/varscan { };
|
||||
|
||||
whisper = callPackage ../applications/science/biology/whisper { };
|
||||
|
||||
hmmer = callPackage ../applications/science/biology/hmmer { };
|
||||
|
||||
bwa = callPackage ../applications/science/biology/bwa { };
|
||||
@ -26812,6 +26823,8 @@ in
|
||||
|
||||
py-wmi-client = callPackage ../tools/networking/py-wmi-client { };
|
||||
|
||||
rargs = callPackage ../tools/misc/rargs { };
|
||||
|
||||
redprl = callPackage ../applications/science/logic/redprl { };
|
||||
|
||||
renderizer = pkgs.callPackage ../development/tools/renderizer {};
|
||||
@ -27002,6 +27015,8 @@ in
|
||||
|
||||
tilt = callPackage ../applications/networking/cluster/tilt {};
|
||||
|
||||
timeular = callPackage ../applications/office/timeular {};
|
||||
|
||||
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
|
||||
|
||||
tewi-font = callPackage ../data/fonts/tewi
|
||||
|
||||
@ -431,6 +431,8 @@ let
|
||||
|
||||
jsonm = callPackage ../development/ocaml-modules/jsonm { };
|
||||
|
||||
jwto = callPackage ../development/ocaml-modules/jwto { };
|
||||
|
||||
kafka = callPackage ../development/ocaml-modules/kafka { };
|
||||
|
||||
ke = callPackage ../development/ocaml-modules/ke { };
|
||||
|
||||
@ -3824,6 +3824,8 @@ in {
|
||||
|
||||
django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { };
|
||||
|
||||
django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { };
|
||||
|
||||
django_tagging = callPackage ../development/python-modules/django_tagging { };
|
||||
|
||||
django_classytags = callPackage ../development/python-modules/django_classytags { };
|
||||
@ -4083,6 +4085,8 @@ in {
|
||||
cudaSupport = false;
|
||||
};
|
||||
|
||||
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
|
||||
|
||||
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
|
||||
|
||||
pythondialog = callPackage ../development/python-modules/pythondialog { };
|
||||
@ -7637,6 +7641,8 @@ in {
|
||||
|
||||
pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };
|
||||
|
||||
cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
|
||||
|
||||
behave = callPackage ../development/python-modules/behave { };
|
||||
|
||||
bellows = callPackage ../development/python-modules/bellows { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user