Merge staging-next into staging
This commit is contained in:
commit
4e717ab958
|
@ -6789,6 +6789,12 @@
|
|||
githubId = 2029444;
|
||||
name = "James Kent";
|
||||
};
|
||||
kephasp = {
|
||||
email = "pierre@nothos.net";
|
||||
github = "kephas";
|
||||
githubId = 762421;
|
||||
name = "Pierre Thierry";
|
||||
};
|
||||
ketzacoatl = {
|
||||
email = "ketzacoatl@protonmail.com";
|
||||
github = "ketzacoatl";
|
||||
|
|
|
@ -35,7 +35,7 @@ toRemove=()
|
|||
cleanup() {
|
||||
rm -rf "${toRemove[@]}"
|
||||
}
|
||||
trap cleanup EXIT SIGINT SIGQUIT ERR
|
||||
trap cleanup EXIT
|
||||
|
||||
MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'
|
||||
|
||||
|
|
|
@ -23,12 +23,10 @@ let
|
|||
on_exit()
|
||||
{
|
||||
exitStatus=$?
|
||||
# Reset the EXIT handler, or else we're called again on 'exit' below
|
||||
trap - EXIT
|
||||
${cfg.postHook}
|
||||
exit $exitStatus
|
||||
}
|
||||
trap 'on_exit' INT TERM QUIT EXIT
|
||||
trap on_exit EXIT
|
||||
|
||||
archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"
|
||||
archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
|
||||
|
|
|
@ -562,7 +562,7 @@ in
|
|||
shopt -s inherit_errexit
|
||||
|
||||
create_role="$(mktemp)"
|
||||
trap 'rm -f "$create_role"' ERR EXIT
|
||||
trap 'rm -f "$create_role"' EXIT
|
||||
|
||||
db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
|
||||
echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"
|
||||
|
|
|
@ -16,11 +16,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc=";
|
||||
sha256 = "QZmujKeKd5beVt4aQbgh3EeRLAMH6YFrVswxffNGYcA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
|
||||
|
|
|
@ -130,6 +130,7 @@ mapAliases (with prev; {
|
|||
unite = unite-vim;
|
||||
UltiSnips = ultisnips;
|
||||
vim-addon-vim2nix = vim2nix;
|
||||
vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14
|
||||
vimproc = vimproc-vim;
|
||||
vimshell = vimshell-vim;
|
||||
vinegar = vim-vinegar;
|
||||
|
|
|
@ -11540,18 +11540,6 @@ final: prev:
|
|||
meta.homepage = "https://github.com/christoomey/vim-sort-motion/";
|
||||
};
|
||||
|
||||
vim-sourcetrail = buildVimPluginFrom2Nix {
|
||||
pname = "vim-sourcetrail";
|
||||
version = "2021-02-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoatiSoftware";
|
||||
repo = "vim-sourcetrail";
|
||||
rev = "c9c621a7ab81c52a661457ccf33a64fd7c56fd9d";
|
||||
sha256 = "192f69yz1hh2k0b2kcvfvv1jirjcvnbxvjkagmlkkqcg8w32nmlg";
|
||||
};
|
||||
meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/";
|
||||
};
|
||||
|
||||
vim-speeddating = buildVimPluginFrom2Nix {
|
||||
pname = "vim-speeddating";
|
||||
version = "2021-04-29";
|
||||
|
|
|
@ -969,7 +969,6 @@ https://github.com/honza/vim-snippets/,,
|
|||
https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
|
||||
https://github.com/tomlion/vim-solidity/,,
|
||||
https://github.com/christoomey/vim-sort-motion/,,
|
||||
https://github.com/CoatiSoftware/vim-sourcetrail/,,
|
||||
https://github.com/tpope/vim-speeddating/,,
|
||||
https://github.com/kbenzie/vim-spirv/,,
|
||||
https://github.com/mhinz/vim-startify/,,
|
||||
|
|
|
@ -37,14 +37,12 @@ prefetchExtensionUnpacked() {
|
|||
1>&2 echo "zipStorePath='$zipStorePath'"
|
||||
|
||||
function rm_tmpdir() {
|
||||
1>&2 printf "rm -rf -- %q\n" "$tmpDir"
|
||||
rm -rf -- "$tmpDir"
|
||||
unset tmpDir
|
||||
trap - INT TERM HUP EXIT
|
||||
1>&2 printf "rm -rf %q\n" "$tmpDir"
|
||||
rm -rf "$tmpDir"
|
||||
}
|
||||
function make_trapped_tmpdir() {
|
||||
tmpDir=$(mktemp -d)
|
||||
trap rm_tmpdir INT TERM HUP EXIT
|
||||
trap rm_tmpdir EXIT
|
||||
}
|
||||
|
||||
1>&2 echo
|
||||
|
|
|
@ -44,14 +44,11 @@ extStoreName="${extPublisher}-${extName}"
|
|||
|
||||
|
||||
function rm_tmpdir() {
|
||||
#echo "Removing \`tmpDir='$tmpDir'\`"
|
||||
rm -rf -- "$tmpDir"
|
||||
unset tmpDir
|
||||
trap - INT TERM HUP EXIT
|
||||
rm -rf "$tmpDir"
|
||||
}
|
||||
function make_trapped_tmpdir() {
|
||||
tmpDir=$(mktemp -d)
|
||||
trap rm_tmpdir INT TERM HUP EXIT
|
||||
trap rm_tmpdir EXIT
|
||||
}
|
||||
|
||||
echo
|
||||
|
|
|
@ -1,58 +1,79 @@
|
|||
{ mkDerivation, lib, callPackage, fetchzip, fetchFromGitHub, cmake, pkg-config
|
||||
, ninja, copyDesktopItems, qtbase, qttools, opencv4, procps, eigen, libXdmcp
|
||||
, libevdev, makeDesktopItem, fetchurl }:
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
callPackage,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
ninja,
|
||||
copyDesktopItems,
|
||||
qtbase,
|
||||
qttools,
|
||||
opencv4,
|
||||
procps,
|
||||
eigen,
|
||||
libXdmcp,
|
||||
libevdev,
|
||||
makeDesktopItem,
|
||||
fetchurl,
|
||||
}: let
|
||||
version = "2022.3.0";
|
||||
|
||||
let
|
||||
version = "2.3.13";
|
||||
|
||||
aruco = callPackage ./aruco.nix { };
|
||||
aruco = callPackage ./aruco.nix {};
|
||||
|
||||
# license.txt inside the zip file is MIT
|
||||
xplaneSdk = fetchzip {
|
||||
url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip";
|
||||
sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba";
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "opentrack";
|
||||
inherit version;
|
||||
|
||||
in mkDerivation {
|
||||
pname = "opentrack";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentrack";
|
||||
repo = "opentrack";
|
||||
rev = "opentrack-${version}";
|
||||
sha256 = "sha256-8gpNORTJclYUYp57Vw/0YO3XC9Idurt0a79fhqx0+mo=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentrack";
|
||||
repo = "opentrack";
|
||||
rev = "opentrack-${version}";
|
||||
sha256 = "1s986lmm5l1pwbwvd1pfiq84n32s1q1dav7a0cbga4d1vcf0v1ay";
|
||||
};
|
||||
nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];
|
||||
buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ninja copyDesktopItems ];
|
||||
buildInputs = [ qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco ];
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
dontWrapQtApps = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=RELEASE"
|
||||
"-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
|
||||
"-DSDK_XPLANE=${xplaneSdk}"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=RELEASE"
|
||||
"-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
|
||||
"-DSDK_XPLANE=${xplaneSdk}"
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtApp $out/bin/opentrack
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "opentrack";
|
||||
exec = "opentrack";
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
|
||||
sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";
|
||||
};
|
||||
desktopName = name;
|
||||
genericName = "Head tracking software";
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "opentrack";
|
||||
exec = "opentrack";
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
|
||||
sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";
|
||||
};
|
||||
desktopName = name;
|
||||
genericName = "Head tracking software";
|
||||
categories = ["Utility"];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/opentrack/opentrack";
|
||||
description = "Head tracking software for MS Windows, Linux, and Apple OSX";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ zaninime ];
|
||||
};
|
||||
}
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/opentrack/opentrack";
|
||||
description = "Head tracking software for MS Windows, Linux, and Apple OSX";
|
||||
changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [zaninime];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SwayNotificationCenter";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayNotificationCenter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+vMlhBCLxvqfPRO2U9015srhY/2sd1DoV27kzNDjsqs=";
|
||||
hash = "sha256-79Kda2Mi2r38f0J12bRm9wbHiZCy9+ojPDxwlFG8EYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ];
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.5.2";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9Gy7G/uRFUBfXlUa6nIle1WIS5Yf9DJMM57hE0oEyLI=";
|
||||
sha256 = "sha256-qrPBQuHwfwFI4PQXDikfo8hm64Sdg4czeeKWyD5HqNk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";
|
||||
|
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = "zola";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FrCpHavlHf4/g96G7cY0Rymxqi73XUCIAYp4cm//2Ic=";
|
||||
sha256 = "sha256-VkR7fM2WeI1itGq5kl54CVLnNW+NxIodkVKeGv8HoaU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-c6SbQasgpOyqVninAo104oYo1CXpiECZvsB1gxrD7wM=";
|
||||
cargoSha256 = "sha256-74QVFjDlT3ewx4sCK4/r5In0muqboBFEpMFBv2L5YaM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinny-desktop";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
|
||||
sha256 = "sha256-4jd+N3a+u+c+XLwgr8BvvdkVLzo+xTBKFdjiQeu7NJU=";
|
||||
sha256 = "sha256-JLu6xAnUaeRTM/yj2Qsc7pXTRXCnvxx8NL2fDXyAUg0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@ flutter.mkFlutterApp rec {
|
|||
pname = "fluffychat";
|
||||
version = "1.2.0";
|
||||
|
||||
vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0=";
|
||||
vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI=";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "famedly";
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
let unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "pidgin";
|
||||
version = "2.14.8";
|
||||
version = "2.14.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
|
||||
sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z";
|
||||
sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -19,12 +19,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "/6LZNRfPxgb+Adr/xfEuQgYqHBNNO5r3hITrxUMIiNM=";
|
||||
sha256 = "6xOFj1i7Np9He/ZS2Q6baq3dDWEKy+o0VQSeXvrTbfE=";
|
||||
};
|
||||
|
||||
patches = lib.optional smimeSupport (fetchpatch {
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, intltool
|
||||
, libtorrent-rasterbar
|
||||
, pythonPackages
|
||||
, python3Packages
|
||||
, gtk3
|
||||
, glib
|
||||
, gobject-introspection
|
||||
|
@ -11,62 +10,95 @@
|
|||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "deluge";
|
||||
version = "2.0.5";
|
||||
let
|
||||
inherit (lib) optionals;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-xL0Eq/0hG2Uhi+A/PEbSb0QCSITeEOAYWfuFb91vJdg=";
|
||||
};
|
||||
pypkgs = python3Packages;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
twisted
|
||||
Mako
|
||||
chardet
|
||||
pyxdg
|
||||
pyopenssl
|
||||
service-identity
|
||||
libtorrent-rasterbar.dev
|
||||
libtorrent-rasterbar.python
|
||||
setuptools
|
||||
setproctitle
|
||||
pillow
|
||||
rencode
|
||||
six
|
||||
zope_interface
|
||||
dbus-python
|
||||
pygobject3
|
||||
pycairo
|
||||
gtk3
|
||||
gobject-introspection
|
||||
librsvg
|
||||
];
|
||||
generic = { pname, withGUI }:
|
||||
pypkgs.buildPythonPackage rec {
|
||||
inherit pname;
|
||||
version = "2.1.1";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook glib ];
|
||||
src = fetchurl {
|
||||
url = "http://download.deluge-torrent.org/source/${lib.versions.majorMinor version}/deluge-${version}.tar.xz";
|
||||
hash = "sha256-do3TGYAuQkN6s3lOvnW0lxQuCO1bD7JQO61izvRC3/c=";
|
||||
};
|
||||
|
||||
checkInputs = with pythonPackages; [
|
||||
pytestCheckHook
|
||||
pytest-twisted
|
||||
pytest-cov
|
||||
mock
|
||||
mccabe
|
||||
pylint
|
||||
];
|
||||
propagatedBuildInputs = with pypkgs; [
|
||||
twisted
|
||||
Mako
|
||||
chardet
|
||||
pyxdg
|
||||
pyopenssl
|
||||
service-identity
|
||||
libtorrent-rasterbar.dev
|
||||
libtorrent-rasterbar.python
|
||||
setuptools
|
||||
setproctitle
|
||||
pillow
|
||||
rencode
|
||||
six
|
||||
zope_interface
|
||||
dbus-python
|
||||
pycairo
|
||||
librsvg
|
||||
] ++ optionals withGUI [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
pygobject3
|
||||
];
|
||||
|
||||
doCheck = false; # until pytest-twisted is packaged
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
glib
|
||||
] ++ optionals withGUI [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -R deluge/ui/data/{icons,pixmaps} $out/share/
|
||||
install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
|
||||
'';
|
||||
checkInputs = with pypkgs; [
|
||||
pytestCheckHook
|
||||
pytest-twisted
|
||||
pytest-cov
|
||||
mock
|
||||
mccabe
|
||||
pylint
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://deluge-torrent.org";
|
||||
description = "Torrent client";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ domenkozar ebzzry ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
doCheck = false; # tests are not working at all
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/lib/systemd/system packaging/systemd/*.service
|
||||
'' + (if withGUI
|
||||
then ''
|
||||
mkdir -p $out/share
|
||||
cp -R deluge/ui/data/{icons,pixmaps} $out/share/
|
||||
install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
|
||||
'' else ''
|
||||
rm -r $out/bin/deluge-gtk
|
||||
rm -r $out/lib/${python3Packages.python.libPrefix}/site-packages/deluge/ui/gtk3
|
||||
rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps}
|
||||
'');
|
||||
|
||||
postFixup = ''
|
||||
for f in $out/lib/systemd/system/*; do
|
||||
substituteInPlace $f --replace /usr/bin $out/bin
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Torrent client";
|
||||
homepage = "https://deluge-torrent.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ domenkozar ebzzry ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
rec {
|
||||
deluge-gtk = generic { pname = "deluge-gtk"; withGUI = true; };
|
||||
deluged = generic { pname = "deluged"; withGUI = false; };
|
||||
deluge = deluge-gtk;
|
||||
}
|
||||
|
|
|
@ -58,7 +58,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|||
name = "${name}-deps.tar.gz";
|
||||
inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ fFetchAttrs.impureEnvVars or [];
|
||||
|
||||
nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ];
|
||||
|
||||
|
|
|
@ -21,13 +21,11 @@ fi
|
|||
|
||||
mkTempDir() {
|
||||
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
|
||||
trap removeTempDir EXIT SIGINT SIGQUIT
|
||||
trap removeTempDir EXIT
|
||||
}
|
||||
|
||||
removeTempDir() {
|
||||
if test -n "$tmpPath"; then
|
||||
rm -rf "$tmpPath" || true
|
||||
fi
|
||||
rm -rf "$tmpPath"
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
, freetype
|
||||
, rdkafka
|
||||
, udev
|
||||
, libevdev
|
||||
, ...
|
||||
}:
|
||||
|
||||
|
@ -65,6 +66,12 @@ in
|
|||
buildInputs = [ dbus ];
|
||||
};
|
||||
|
||||
evdev-sys = attrs: {
|
||||
LIBGIT2_SYS_USE_PKG_CONFIG = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libevdev ];
|
||||
};
|
||||
|
||||
expat-sys = attrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
};
|
||||
|
|
34
pkgs/data/fonts/fira-go/default.nix
Normal file
34
pkgs/data/fonts/fira-go/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
pname = "fira-go";
|
||||
version = "1.001";
|
||||
user = "bBoxType";
|
||||
repo = "FiraGo";
|
||||
rev = "9882ba0851f88ab904dc237f250db1d45641f45d";
|
||||
in
|
||||
fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
url = "https://github.com/${user}/${repo}/archive/${rev}.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
mv $out/Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \
|
||||
$out/share/fonts/opentype
|
||||
rm -r $out/{Fonts,'Technical Report PDF',OFL.txt,README.md,*.pdf}
|
||||
'';
|
||||
|
||||
sha256 = "sha256-MDGRba1eao/yVzSuncJ/nvCG8cpdrI4roVPI1G9qCbU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bboxtype.com/typefaces/FiraGO";
|
||||
description = ''
|
||||
Font with the same glyph set as Fira Sans 4.3 and additionally
|
||||
supports Arabic, Devenagari, Georgian, Hebrew and Thai
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.loicreynier ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -4,24 +4,25 @@ let
|
|||
getPatches = dir:
|
||||
let files = builtins.attrNames (builtins.readDir dir);
|
||||
in map (f: dir + ("/" + f)) files;
|
||||
version = "2.10.1";
|
||||
version = "3.0.4";
|
||||
channel = "stable";
|
||||
filename = "flutter_linux_${version}-${channel}.tar.xz";
|
||||
|
||||
# Decouples flutter derivation from dart derivation,
|
||||
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||
dartVersion = "2.16.2";
|
||||
dartVersion = "2.17.5";
|
||||
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||
dartForFlutter = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||
sha256 = "sha256-AFJGeiPsjUZSO+DykmOIFETg2jIohg62tp3ghZrKJFk=";
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit mkFlutter;
|
||||
stable = mkFlutter rec {
|
||||
inherit version;
|
||||
|
@ -29,7 +30,7 @@ in {
|
|||
pname = "flutter";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
|
||||
sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y=";
|
||||
sha256 = "sha256-vh3QjLGFBN321DUET9XhYqSkILjEj+ZqAALu/mxY+go=";
|
||||
};
|
||||
patches = getPatches ./patches;
|
||||
};
|
||||
|
|
|
@ -61,7 +61,7 @@ let
|
|||
# path is relative otherwise it's replaced by /build/flutter
|
||||
|
||||
pushd "$FLUTTER_TOOLS_DIR"
|
||||
${dart}/bin/pub get --offline
|
||||
${dart}/bin/dart pub get --offline
|
||||
popd
|
||||
|
||||
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
|
||||
|
|
102
pkgs/development/compilers/flutter/patches/git-dir.patch
Normal file
102
pkgs/development/compilers/flutter/patches/git-dir.patch
Normal file
|
@ -0,0 +1,102 @@
|
|||
diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
|
||||
index 468a91a954..5def6897ce 100644
|
||||
--- a/dev/bots/prepare_package.dart
|
||||
+++ b/dev/bots/prepare_package.dart
|
||||
@@ -525,7 +525,7 @@ class ArchiveCreator {
|
||||
|
||||
Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
|
||||
return _processRunner.runProcess(
|
||||
- <String>['git', ...args],
|
||||
+ <String>['git', '--git-dir', '.git', ...args],
|
||||
workingDirectory: workingDirectory ?? flutterRoot,
|
||||
);
|
||||
}
|
||||
diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||
index bb0eb428a9..4a2a48bb5e 100644
|
||||
--- a/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||
+++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
|
||||
@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
|
||||
// Detect unknown versions.
|
||||
final ProcessUtils processUtils = _processUtils!;
|
||||
final RunResult parseResult = await processUtils.run(<String>[
|
||||
- 'git', 'describe', '--tags', lastFlutterVersion,
|
||||
+ 'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion,
|
||||
], workingDirectory: workingDirectory);
|
||||
if (parseResult.exitCode != 0) {
|
||||
throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}');
|
||||
@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand {
|
||||
continue;
|
||||
}
|
||||
final RunResult parseResult = await _processUtils!.run(<String>[
|
||||
- 'git', 'describe', '--tags', sha,
|
||||
+ 'git', '--git-dir', '.git', 'describe', '--tags', sha,
|
||||
], workingDirectory: workingDirectory);
|
||||
if (parseResult.exitCode == 0) {
|
||||
buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
|
||||
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
|
||||
index f2068a6ca2..99b161689e 100644
|
||||
--- a/packages/flutter_tools/lib/src/version.dart
|
||||
+++ b/packages/flutter_tools/lib/src/version.dart
|
||||
@@ -106,7 +106,7 @@ class FlutterVersion {
|
||||
String? channel = _channel;
|
||||
if (channel == null) {
|
||||
final String gitChannel = _runGit(
|
||||
- 'git rev-parse --abbrev-ref --symbolic @{u}',
|
||||
+ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}',
|
||||
globals.processUtils,
|
||||
_workingDirectory,
|
||||
);
|
||||
@@ -114,7 +114,7 @@ class FlutterVersion {
|
||||
if (slash != -1) {
|
||||
final String remote = gitChannel.substring(0, slash);
|
||||
_repositoryUrl = _runGit(
|
||||
- 'git ls-remote --get-url $remote',
|
||||
+ 'git --git-dir .git ls-remote --get-url $remote',
|
||||
globals.processUtils,
|
||||
_workingDirectory,
|
||||
);
|
||||
@@ -326,7 +326,7 @@ class FlutterVersion {
|
||||
/// the branch name will be returned as `'[user-branch]'`.
|
||||
String getBranchName({ bool redactUnknownBranches = false }) {
|
||||
_branch ??= () {
|
||||
- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||
+ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
|
||||
return branch == 'HEAD' ? channel : branch;
|
||||
}();
|
||||
if (redactUnknownBranches || _branch!.isEmpty) {
|
||||
@@ -359,7 +359,7 @@ class FlutterVersion {
|
||||
/// wrapper that does that.
|
||||
@visibleForTesting
|
||||
static List<String> gitLog(List<String> args) {
|
||||
- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
|
||||
+ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
|
||||
}
|
||||
|
||||
/// Gets the release date of the latest available Flutter version.
|
||||
@@ -730,7 +730,7 @@ class GitTagVersion {
|
||||
|
||||
static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) {
|
||||
if (fetchTags) {
|
||||
- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||
+ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
|
||||
if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
|
||||
globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
|
||||
} else {
|
||||
@@ -739,7 +739,7 @@ class GitTagVersion {
|
||||
}
|
||||
// find all tags attached to the given [gitRef]
|
||||
final List<String> tags = _runGit(
|
||||
- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||
+ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
|
||||
|
||||
// Check first for a stable tag
|
||||
final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
|
||||
@@ -760,7 +760,7 @@ class GitTagVersion {
|
||||
// recent tag and number of commits past.
|
||||
return parse(
|
||||
_runGit(
|
||||
- 'git describe --match *.*.* --long --tags $gitRef',
|
||||
+ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
|
||||
processUtils,
|
||||
workingDirectory,
|
||||
)
|
|
@ -70,3 +70,133 @@ index defc86cc20..7fdf14d112 100644
|
|||
}
|
||||
}
|
||||
|
||||
diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
|
||||
index 2aac9686e8..32c4b98b88 100644
|
||||
--- a/packages/flutter_tools/lib/src/artifacts.dart
|
||||
+++ b/packages/flutter_tools/lib/src/artifacts.dart
|
||||
@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts {
|
||||
) {
|
||||
switch (artifact) {
|
||||
case HostArtifact.engineDartSdkPath:
|
||||
- final String path = _dartSdkPath(_cache);
|
||||
+ final String path = _dartSdkPath(_fileSystem);
|
||||
return _fileSystem.directory(path);
|
||||
case HostArtifact.engineDartBinary:
|
||||
- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
return _fileSystem.file(path);
|
||||
case HostArtifact.flutterWebSdk:
|
||||
final String path = _getFlutterWebSdkPath();
|
||||
@@ -398,7 +398,7 @@ class CachedArtifacts implements Artifacts {
|
||||
case HostArtifact.dart2jsSnapshot:
|
||||
case HostArtifact.dartdevcSnapshot:
|
||||
case HostArtifact.kernelWorkerSnapshot:
|
||||
- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
return _fileSystem.file(path);
|
||||
case HostArtifact.iosDeploy:
|
||||
final String artifactFileName = _hostArtifactToFileName(artifact, _platform.isWindows);
|
||||
@@ -461,11 +461,13 @@ class CachedArtifacts implements Artifacts {
|
||||
String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
|
||||
final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||
switch (artifact) {
|
||||
+ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
+ assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
|
||||
+ return _fileSystem.path.join(engineDir, _artifactToFileName(artifact));
|
||||
case Artifact.genSnapshot:
|
||||
assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
|
||||
final String hostPlatform = getNameForHostPlatform(getCurrentHostPlatform());
|
||||
return _fileSystem.path.join(engineDir, hostPlatform, _artifactToFileName(artifact));
|
||||
- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
case Artifact.constFinder:
|
||||
case Artifact.flutterFramework:
|
||||
case Artifact.flutterMacOSFramework:
|
||||
@@ -497,13 +499,13 @@ class CachedArtifacts implements Artifacts {
|
||||
switch (artifact) {
|
||||
case Artifact.genSnapshot:
|
||||
case Artifact.flutterXcframework:
|
||||
+ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
final String artifactFileName = _artifactToFileName(artifact)!;
|
||||
final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||
return _fileSystem.path.join(engineDir, artifactFileName);
|
||||
case Artifact.flutterFramework:
|
||||
final String engineDir = _getEngineArtifactsPath(platform, mode)!;
|
||||
return _getIosEngineArtifactPath(engineDir, environmentType, _fileSystem);
|
||||
- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
case Artifact.constFinder:
|
||||
case Artifact.flutterMacOSFramework:
|
||||
case Artifact.flutterMacOSPodspec:
|
||||
@@ -594,14 +596,10 @@ class CachedArtifacts implements Artifacts {
|
||||
// For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for
|
||||
// android_arm in profile mode because it is available on all supported host platforms.
|
||||
return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile);
|
||||
- case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
- return _fileSystem.path.join(
|
||||
- _dartSdkPath(_cache), 'bin', 'snapshots',
|
||||
- _artifactToFileName(artifact),
|
||||
- );
|
||||
case Artifact.flutterTester:
|
||||
case Artifact.vmSnapshotData:
|
||||
case Artifact.isolateSnapshotData:
|
||||
+ case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
case Artifact.icuData:
|
||||
final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path;
|
||||
final String platformDirName = _enginePlatformDirectoryName(platform);
|
||||
@@ -797,7 +795,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||
final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
return _fileSystem.file(path);
|
||||
case HostArtifact.dartdevcSnapshot:
|
||||
- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
return _fileSystem.file(path);
|
||||
case HostArtifact.kernelWorkerSnapshot:
|
||||
final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform.isWindows));
|
||||
@@ -922,9 +920,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts {
|
||||
case Artifact.windowsUwpCppClientWrapper:
|
||||
return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||
case Artifact.frontendServerSnapshotForEngineDartSdk:
|
||||
- return _fileSystem.path.join(
|
||||
- _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName,
|
||||
- );
|
||||
+ return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName);
|
||||
case Artifact.uwptool:
|
||||
return _fileSystem.path.join(_hostEngineOutPath, artifactFileName);
|
||||
}
|
||||
@@ -1034,8 +1030,8 @@ class OverrideArtifacts implements Artifacts {
|
||||
}
|
||||
|
||||
/// Locate the Dart SDK.
|
||||
-String _dartSdkPath(Cache cache) {
|
||||
- return cache.getRoot().childDirectory('dart-sdk').path;
|
||||
+String _dartSdkPath(FileSystem fileSystem) {
|
||||
+ return fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'dart-sdk');
|
||||
}
|
||||
|
||||
class _TestArtifacts implements Artifacts {
|
||||
diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||
index d906511a15..adfdd4bb42 100644
|
||||
--- a/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||
+++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart
|
||||
@@ -153,10 +153,6 @@ void main() {
|
||||
artifacts.getArtifactPath(Artifact.windowsUwpDesktopPath, platform: TargetPlatform.windows_uwp_x64, mode: BuildMode.release),
|
||||
fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'windows-uwp-x64-release'),
|
||||
);
|
||||
- expect(
|
||||
- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
|
||||
- fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot')
|
||||
- );
|
||||
});
|
||||
|
||||
testWithoutContext('precompiled web artifact paths are correct', () {
|
||||
@@ -322,11 +318,6 @@ void main() {
|
||||
artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path,
|
||||
fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'),
|
||||
);
|
||||
- expect(
|
||||
- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk),
|
||||
- fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin',
|
||||
- 'snapshots', 'frontend_server.dart.snapshot')
|
||||
- );
|
||||
});
|
||||
|
||||
testWithoutContext('getEngineType', () {
|
||||
|
|
14
pkgs/development/dhall-modules/dhall-cloudformation.nix
Normal file
14
pkgs/development/dhall-modules/dhall-cloudformation.nix
Normal file
|
@ -0,0 +1,14 @@
|
|||
{ buildDhallGitHubPackage, Prelude }:
|
||||
|
||||
let
|
||||
version = "0.9.64";
|
||||
|
||||
in buildDhallGitHubPackage {
|
||||
name = "cloudformation";
|
||||
owner = "jcouyang";
|
||||
repo = "dhall-aws-cloudformation";
|
||||
rev = version;
|
||||
sha256 = "sha256-EDbMKHORYQOKoSrbErkUnsadDiYfK1ULbFhz3D5AcXc=";
|
||||
file = "package.dhall";
|
||||
dependencies = [ Prelude ];
|
||||
}
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "lloyd";
|
||||
repo = "yajl";
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml";
|
||||
};
|
||||
|
||||
|
|
|
@ -1,19 +1,39 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, django, django-appconf }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, django-appconf
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-statici18n";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyegfryed";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2fFJJNdF0jspS7djDL8sToPTetzNR6pfNp5ohCNa30I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django django-appconf ];
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-appconf
|
||||
];
|
||||
|
||||
# pypi package does not contains test harness
|
||||
# source tarball requires setting up a config
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"statici18n"
|
||||
];
|
||||
|
||||
DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings";
|
||||
|
||||
checkInputs = [
|
||||
pytest-django
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper for generating Javascript catalog to static files";
|
||||
|
|
|
@ -21,6 +21,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-test-repr-infinite-recursion.patch";
|
||||
url = "https://github.com/Delgan/loguru/commit/4fe21f66991abeb1905e24c3bc3c634543d959a2.patch";
|
||||
hash = "sha256-NUOkgUS28TOazO0txMinFtaKwsi/J1Y7kqjjvMRCnR8=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
|
||||
aiocontextvars
|
||||
];
|
||||
|
|
|
@ -2,19 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jsonnet-bundler";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsonnet-bundler";
|
||||
repo = "jsonnet-bundler";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pk6nf8r0wy7lnsnzyjd3vgq4b2kb3zl0xxn01ahpaqgmwpzajlk";
|
||||
sha256 = "sha256-vjb5wEiJw48s7FUarpA94ZauFC7iEgRDAkRTwRIZ8pA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/jb" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
37
pkgs/development/tools/karate/default.nix
Normal file
37
pkgs/development/tools/karate/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ lib, stdenvNoCC, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "karate";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
|
||||
sha256 = "69b9ba1cd9563cbad802471e7250dd46828df7ad176706577389dfe6e604e5ec";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
makeWrapper ${jre}/bin/java $out/bin/karate --add-flags "-jar $src"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "API Test Automation Made Simple";
|
||||
longDescription = ''
|
||||
Karate is the only open-source tool to combine API
|
||||
test-automation, mocks, performance-testing and even UI
|
||||
automation into a single, unified framework. The BDD syntax
|
||||
popularized by Cucumber is language-neutral, and easy for even
|
||||
non-programmers. Assertions and HTML reports are built-in, and
|
||||
you can run tests in parallel for speed.
|
||||
'';
|
||||
homepage = "https://github.com/karatelabs/karate";
|
||||
changelog = "https://github.com/karatelabs/karate/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.kephasp ];
|
||||
platforms = jre.meta.platforms;
|
||||
};
|
||||
}
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "oq";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blacksmoke16";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iGKyP3NrAnR3ISOBq+YR/vwarlnIY4u4ZwdqSBnBC7U=";
|
||||
sha256 = "sha256-1IdOyfoGAsZ5bOEJoj9Ol3sxsiq18hfniqW1ATBEGc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgloader";
|
||||
version = "3.6.6";
|
||||
version = "3.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dimitri/pgloader/releases/download/v3.6.6/pgloader-bundle-3.6.6.tgz";
|
||||
sha256 = "sha256-GDdWXY/O2xMsaIhaQIk+w8WQt9qevO8cDlgLGfNTVE0=";
|
||||
url = "https://github.com/dimitri/pgloader/releases/download/v3.6.7/pgloader-bundle-3.6.7.tgz";
|
||||
sha256 = "sha256-JfF2el0vJjDAyB2l3H4dLgEIgnmXlrCUVYKDpj2jM1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git makeWrapper ];
|
||||
|
|
|
@ -1,275 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, fetchpatch, cmake
|
||||
, wrapQtAppsHook, qt5, boost, llvmPackages, gcc, jdk, maven, pythonPackages
|
||||
, coreutils, which, desktop-file-utils, shared-mime-info, imagemagick, libicns
|
||||
}:
|
||||
|
||||
let
|
||||
# TODO: remove when version incompatibility issue with python3Packages.jedi is
|
||||
# resolved
|
||||
parso = pythonPackages.callPackage ./parso.nix { };
|
||||
jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; };
|
||||
|
||||
pythonIndexer =
|
||||
pythonPackages.callPackage ./python.nix { inherit jedi parso; };
|
||||
javaIndexer = callPackage ./java.nix { };
|
||||
|
||||
appPrefixDir = if stdenv.isDarwin then
|
||||
"$out/Applications/Sourcetrail.app/Contents"
|
||||
else
|
||||
"$out/opt/sourcetrail";
|
||||
appBinDir =
|
||||
if stdenv.isDarwin then "${appPrefixDir}/MacOS" else "${appPrefixDir}/bin";
|
||||
appResourceDir = if stdenv.isDarwin then
|
||||
"${appPrefixDir}/Resources"
|
||||
else
|
||||
"${appPrefixDir}/share";
|
||||
|
||||
# Upstream script:
|
||||
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh
|
||||
installJavaIndexer = writeScript "update_java_indexer.sh" ''
|
||||
#!${stdenv.shell}
|
||||
|
||||
cd "$(dirname "$0")/.."
|
||||
dst="${appResourceDir}/data/java/lib"
|
||||
|
||||
mkdir -p "$dst"
|
||||
cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar"
|
||||
cp -r java_indexer/lib/*.jar "$dst"
|
||||
'';
|
||||
|
||||
# Upstream script:
|
||||
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/download_python_indexer.sh
|
||||
installPythonIndexer = writeScript "download_python_indexer.sh" ''
|
||||
#!${stdenv.shell}
|
||||
|
||||
mkdir -p ${appResourceDir}/data
|
||||
ln -s "${pythonIndexer}/bin" "${appResourceDir}/data/python"
|
||||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sourcetrail";
|
||||
# NOTE: skip 2020.4.35 https://github.com/CoatiSoftware/Sourcetrail/pull/1136
|
||||
version = "2020.2.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoatiSoftware";
|
||||
repo = "Sourcetrail";
|
||||
rev = version;
|
||||
sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw";
|
||||
};
|
||||
|
||||
patches = let
|
||||
url = commit:
|
||||
"https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
|
||||
in [
|
||||
./disable-updates.patch
|
||||
./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox
|
||||
# TODO: remove on next release
|
||||
(fetchpatch {
|
||||
name = "fix-filecopy.patch";
|
||||
url = url "d079d1787c9e5cadcf41a003666dc0746cc1cda0";
|
||||
sha256 = "0mixy2a4s16kv2q89k7y4dv21wnv2zd86i4gdwn3xz977y8hf92b";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-broken-test.patch";
|
||||
url = url "85329174bac8a301733100dc4540258f977e2c5a";
|
||||
sha256 = "17l4417sbmkrgr6v3fbazlmkzl9774zrpjv2n9zwfrz52y30f7b9";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
jdk
|
||||
wrapQtAppsHook
|
||||
desktop-file-utils
|
||||
imagemagick
|
||||
javaIndexer # the resulting jar file is copied by our install script
|
||||
] ++ lib.optional (stdenv.isDarwin) libicns
|
||||
++ lib.optionals doCheck testBinPath;
|
||||
buildInputs = [ boost pythonIndexer shared-mime-info ]
|
||||
++ (with qt5; [ qtbase qtsvg ]) ++ (with llvmPackages; [ libclang llvm ]);
|
||||
binPath = [ gcc jdk.jre maven which ];
|
||||
testBinPath = binPath ++ [ coreutils ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBoost_USE_STATIC_LIBS=OFF"
|
||||
"-DBUILD_CXX_LANGUAGE_PACKAGE=ON"
|
||||
"-DBUILD_JAVA_LANGUAGE_PACKAGE=ON"
|
||||
"-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON"
|
||||
] ++ lib.optional stdenv.isLinux
|
||||
"-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
|
||||
++ lib.optional stdenv.isDarwin
|
||||
"-DClang_DIR=${llvmPackages.clang-unwrapped}";
|
||||
|
||||
postPatch = let
|
||||
major = lib.versions.major version;
|
||||
minor = lib.versions.minor version;
|
||||
patch = lib.versions.patch version;
|
||||
in ''
|
||||
# Upstream script obtains it's version from git:
|
||||
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake
|
||||
cat > cmake/version.cmake <<EOF
|
||||
set(GIT_BRANCH "")
|
||||
set(GIT_COMMIT_HASH "")
|
||||
set(GIT_VERSION_NUMBER "")
|
||||
set(VERSION_YEAR "${major}")
|
||||
set(VERSION_MINOR "${minor}")
|
||||
set(VERSION_COMMIT "${patch}")
|
||||
set(BUILD_TYPE "Release")
|
||||
set(VERSION_STRING "${major}.${minor}.${patch}")
|
||||
EOF
|
||||
|
||||
# Sourcetrail attempts to copy clang headers from the LLVM store path
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LLVM_BINARY_DIR}" '${lib.getLib llvmPackages.clang-unwrapped}'
|
||||
|
||||
patchShebangs script
|
||||
ln -sf ${installJavaIndexer} script/update_java_indexer.sh
|
||||
ln -sf ${installPythonIndexer} script/download_python_indexer.sh
|
||||
'';
|
||||
|
||||
# Directory layout for Linux:
|
||||
#
|
||||
# Sourcetrail doesn't use the usual cmake install() commands and instead uses
|
||||
# its own bash script for packaging. Since we're not able to reuse the script,
|
||||
# we'll have to roll our own in nixpkgs.
|
||||
#
|
||||
# Sourcetrail currently assumes one of the following two layouts for the
|
||||
# placement of its files:
|
||||
#
|
||||
# AppImage Layout Traditional Layout
|
||||
# ├── bin/ ├── sourcetrail*
|
||||
# │ └── sourcetrail* └── data/
|
||||
# └── share/
|
||||
# └── data/ sourcetrail: application executable
|
||||
# data: contains assets exlusive to Sourcetrail
|
||||
#
|
||||
# The AppImage layout is the one currently used by the upstream project for
|
||||
# packaging its Linux port. We can't use this layout as-is for nixpkgs,
|
||||
# because Sourcetrail treating $out/share/data as its own might lead to
|
||||
# conflicts with other packages when linked into a Nix profile.
|
||||
#
|
||||
# On the other hand, the traditional layout isn't used by the upstream project
|
||||
# anymore so there's a risk that it might become unusable at any time in the
|
||||
# future. Since it's hard to detect these problems at build time, it's not a
|
||||
# good idea to use this layout for packaging in nixpkgs.
|
||||
#
|
||||
# Considering the problems with the above layouts, we go with the third
|
||||
# option, a slight variation of the AppImage layout:
|
||||
#
|
||||
# nixpkgs
|
||||
# ├── bin/
|
||||
# │ └── sourcetrail@ (symlink to opt/sourcetrail/bin/sourcetrail)
|
||||
# └── opt/sourcetrail/
|
||||
# ├── bin/
|
||||
# │ └── sourcetrail*
|
||||
# └── share/
|
||||
# └── data/
|
||||
#
|
||||
# Upstream install script:
|
||||
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p ${appResourceDir}
|
||||
cp -R ../bin/app/data ${appResourceDir}
|
||||
cp -R ../bin/app/user/projects ${appResourceDir}/data/fallback
|
||||
rm -r ${appResourceDir}/data/install ${appResourceDir}/data/*_template.xml
|
||||
|
||||
mkdir -p "${appBinDir}"
|
||||
cp app/Sourcetrail ${appBinDir}/sourcetrail
|
||||
cp app/sourcetrail_indexer ${appBinDir}/sourcetrail_indexer
|
||||
wrapQtApp ${appBinDir}/sourcetrail \
|
||||
--prefix PATH : ${lib.makeBinPath binPath}
|
||||
|
||||
mkdir -p $out/bin
|
||||
'' + lib.optionalString (stdenv.isLinux) ''
|
||||
ln -sf ${appBinDir}/sourcetrail $out/bin/sourcetrail
|
||||
|
||||
desktop-file-install --dir=$out/share/applications \
|
||||
--set-key Exec --set-value ${appBinDir}/sourcetrail \
|
||||
../setup/Linux/data/sourcetrail.desktop
|
||||
|
||||
mkdir -p $out/share/mime/packages
|
||||
cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/
|
||||
|
||||
for size in 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
|
||||
convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
|
||||
-resize ''${size}x''${size} \
|
||||
$out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png
|
||||
done
|
||||
'' + lib.optionalString (stdenv.isDarwin) ''
|
||||
# change case (some people *might* choose a case sensitive Nix store)
|
||||
mv ${appBinDir}/sourcetrail{,.tmp}
|
||||
mv ${appBinDir}/{sourcetrail.tmp,Sourcetrail}
|
||||
mv ${appBinDir}/sourcetrail_indexer ${appResourceDir}/Sourcetrail_indexer
|
||||
|
||||
ln -sf ${appBinDir}/Sourcetrail $out/bin/sourcetrail
|
||||
|
||||
cp app/bundle_info.plist ${appPrefixDir}/Info.plist
|
||||
|
||||
mkdir -p ${appResourceDir}/icon.iconset
|
||||
for size in 16 32 128 256 512; do
|
||||
convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
|
||||
-resize ''${size}x''${size} \
|
||||
${appResourceDir}/icon.iconset/icon_''${size}x''${size}.png
|
||||
convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
|
||||
-resize $(( 2 * size ))x$(( 2 * size )) \
|
||||
${appResourceDir}/icon.iconset/icon_''${size}x''${size}@2x.png
|
||||
done
|
||||
png2icns ${appResourceDir}/icon.icns \
|
||||
${appResourceDir}/icon.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
|
||||
|
||||
mkdir -p ${appResourceDir}/project.iconset
|
||||
for size in 16 32 64 128 256 512; do
|
||||
convert ${appResourceDir}/data/gui/icon/project_256_256.png \
|
||||
-resize ''${size}x''${size} \
|
||||
${appResourceDir}/project.iconset/icon_''${size}x''${size}.png
|
||||
convert ${appResourceDir}/data/gui/icon/project_256_256.png \
|
||||
-resize $(( 2 * size ))x$(( 2 * size )) \
|
||||
${appResourceDir}/project.iconset/icon_''${size}x''${size}@2x.png
|
||||
done
|
||||
png2icns ${appResourceDir}/project.icns \
|
||||
${appResourceDir}/project.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
rm -rf ../bin/app/data/{python,java/lib}
|
||||
ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python
|
||||
ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib
|
||||
|
||||
pushd test
|
||||
# shorten PATH to prevent build failures
|
||||
wrapQtApp ./Sourcetrail_test \
|
||||
--set PATH "" \
|
||||
--prefix PATH : ${lib.makeBinPath testBinPath} \
|
||||
--set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo"
|
||||
./Sourcetrail_test
|
||||
popd
|
||||
|
||||
rm ../bin/app/data/{python,java/lib}
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# This has to be done manually in the installPhase because the actual binary
|
||||
# lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# FIXME: Some test cases are disabled in the patch phase.
|
||||
# FIXME: Tests are disabled on some platforms because of faulty detection
|
||||
# logic for libjvm.so. Should work with manual configuration.
|
||||
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.sourcetrail.com";
|
||||
description = "A cross-platform source explorer for C/C++ and Java";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ midchildan ];
|
||||
};
|
||||
}
|
|
@ -1,48 +0,0 @@
|
|||
diff --git a/src/test/SourceGroupTestSuite.cpp b/src/test/SourceGroupTestSuite.cpp
|
||||
index b5c5562a..d56b83bb 100644
|
||||
--- a/src/test/SourceGroupTestSuite.cpp
|
||||
+++ b/src/test/SourceGroupTestSuite.cpp
|
||||
@@ -522,6 +522,7 @@ TEST_CASE("sourcegroup java gradle generates expected output")
|
||||
|
||||
TEST_CASE("sourcegroup java maven generates expected output")
|
||||
{
|
||||
+ return;
|
||||
std::vector<FilePath> mavenPaths = utility::getMavenExecutablePathDetector()->getPaths();
|
||||
|
||||
REQUIRE(!mavenPaths.empty());
|
||||
diff --git a/src/test/UtilityMavenTestSuite.cpp b/src/test/UtilityMavenTestSuite.cpp
|
||||
index f48fe2b6..363ef64a 100644
|
||||
--- a/src/test/UtilityMavenTestSuite.cpp
|
||||
+++ b/src/test/UtilityMavenTestSuite.cpp
|
||||
@@ -17,6 +17,7 @@ TEST_CASE("maven path detector is working")
|
||||
|
||||
TEST_CASE("maven wrapper detects source directories of simple projects")
|
||||
{
|
||||
+ return;
|
||||
std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
|
||||
REQUIRE(!mavenPathDetector->getPaths().empty());
|
||||
|
||||
@@ -41,6 +42,7 @@ TEST_CASE("maven wrapper detects source directories of simple projects")
|
||||
|
||||
TEST_CASE("maven wrapper detects source and test directories of simple projects")
|
||||
{
|
||||
+ return;
|
||||
std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
|
||||
REQUIRE(!mavenPathDetector->getPaths().empty());
|
||||
|
||||
@@ -65,6 +67,7 @@ TEST_CASE("maven wrapper detects source and test directories of simple projects"
|
||||
|
||||
TEST_CASE("maven wrapper detects source directories of nested modules")
|
||||
{
|
||||
+ return;
|
||||
std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
|
||||
REQUIRE(!mavenPathDetector->getPaths().empty());
|
||||
|
||||
@@ -101,6 +104,7 @@ TEST_CASE("maven wrapper detects source directories of nested modules")
|
||||
|
||||
TEST_CASE("maven wrapper detects source and test directories of nested modules")
|
||||
{
|
||||
+ return;
|
||||
std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
|
||||
REQUIRE(!mavenPathDetector->getPaths().empty());
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp
|
||||
index 1be13ccd..db6098e1 100644
|
||||
--- a/src/lib/settings/ApplicationSettings.cpp
|
||||
+++ b/src/lib/settings/ApplicationSettings.cpp
|
||||
@@ -593,7 +593,7 @@ void ApplicationSettings::setUserToken(std::string token)
|
||||
|
||||
bool ApplicationSettings::getAutomaticUpdateCheck() const
|
||||
{
|
||||
- return getValue<bool>("user/update_check/automatic", true);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
void ApplicationSettings::setAutomaticUpdateCheck(bool automaticUpdates)
|
|
@ -1,28 +0,0 @@
|
|||
{ lib, pkgs, javaPackages }:
|
||||
|
||||
let
|
||||
javaIndexer = javaPackages.mavenbuild {
|
||||
name = "sourcetrail-java-indexer-${pkgs.sourcetrail.version}";
|
||||
src = pkgs.sourcetrail.src;
|
||||
m2Path = "com/sourcetrail/java-indexer";
|
||||
|
||||
# This doesn't include all required dependencies. We still rely on binary
|
||||
# copies of maven packages included in the source repo for building.
|
||||
mavenDeps = with javaPackages; [
|
||||
mavenCompiler_3_2
|
||||
plexusCompilerApi_2_4
|
||||
plexusCompilerJavac_2_4
|
||||
plexusCompilerManager_2_4
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Java indexer for Sourcetrail";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
};
|
||||
in
|
||||
javaIndexer.overrideAttrs (drv: {
|
||||
postUnpack = ''
|
||||
export sourceRoot=''${sourceRoot}/java_indexer
|
||||
'';
|
||||
})
|
|
@ -1,36 +0,0 @@
|
|||
# Taken from a past commit of nixpkgs
|
||||
|
||||
{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi";
|
||||
|
||||
# TODO: Remove this package when version incompatibility issue with
|
||||
# python3Packages.jedi is resolved.
|
||||
#
|
||||
# Upstream requirements:
|
||||
# https://github.com/CoatiSoftware/SourcetrailPythonIndexer#requirements
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest glibcLocales tox pytest-cov ];
|
||||
|
||||
propagatedBuildInputs = [ parso ];
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL="en_US.UTF-8" py.test test
|
||||
'';
|
||||
|
||||
# tox required for tests: https://github.com/davidhalter/jedi/issues/808
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/davidhalter/jedi";
|
||||
description = "An autocompletion tool for Python that can be used for text editors";
|
||||
license = licenses.lgpl3Plus;
|
||||
};
|
||||
}
|
|
@ -1,29 +0,0 @@
|
|||
# Taken from a past commit of nixpkgs
|
||||
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parso";
|
||||
|
||||
# TODO: Remove along with ./jedi.nix when version compatiblity issue is
|
||||
# resolved.
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
meta = {
|
||||
description = "A Python Parser";
|
||||
homepage = "https://github.com/davidhalter/parso";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
}
|
|
@ -1,72 +0,0 @@
|
|||
{ stdenv, lib, fetchFromGitHub, wrapPython, python, jedi, parso, cmake, swig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SourcetrailPythonIndexer";
|
||||
version = "v1_db25_p5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoatiSoftware";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "01jaigxigq6dvfwq018gn9qw7i6p4jm0y71lqzschfv9vwf6ga45";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapPython cmake swig ];
|
||||
buildInputs = [ python ];
|
||||
pythonPath = [ jedi parso ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
cmakeFlags = [
|
||||
"-DBUILD_BINDINGS_PYTHON=1"
|
||||
"-DPYTHON_VERSION=${lib.versions.majorMinor python.version}"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
pushd SourcetrailDB
|
||||
cmake -Bbuild $cmakeFlags .
|
||||
pushd build
|
||||
make -j $NIX_BUILD_CORES
|
||||
popd
|
||||
popd
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
pushd SourcetrailDB/build/bindings_python
|
||||
cp _sourcetraildb.dylib _sourcetraildb.so
|
||||
popd
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
|
||||
# FIXME: some tests are failing
|
||||
# PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \
|
||||
# ${python}/bin/python test.py
|
||||
PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \
|
||||
${python}/bin/python test_shallow.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
shopt -s extglob
|
||||
mkdir -p $out/{bin,libexec}
|
||||
|
||||
cp !(run).py $out/libexec # copy *.py excluding run.py (needs extglob)
|
||||
cat <(echo '#!/usr/bin/env python') run.py > $out/libexec/run.py
|
||||
chmod +x $out/libexec/run.py
|
||||
ln -s $out/libexec/run.py $out/bin/SourcetrailPythonIndexer
|
||||
|
||||
pushd SourcetrailDB/build/bindings_python
|
||||
cp sourcetraildb.py $out/libexec
|
||||
cp _sourcetraildb.so $out/libexec/_sourcetraildb.so
|
||||
popd
|
||||
|
||||
wrapPythonProgramsIn "$out/libexec" "$pythonPath"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python indexer for Sourcetrail";
|
||||
homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer";
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
32
pkgs/development/tools/upbound/default.nix
Normal file
32
pkgs/development/tools/upbound/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "upbound";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "up";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tbYUxqDtMIlHJ+bIE9PDDhPTSQKaZYObuRFSyRkh8+Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EeGNH/ka9Mt0vVtZfizXdTqf1f3H1aM5GITUyp+2FxM=";
|
||||
|
||||
subPackages = [ "cmd/docker-credential-up" "cmd/up" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/upbound/up/internal/version.version=v${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
|
||||
homepage = "https://upbound.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
mainProgram = "up";
|
||||
};
|
||||
}
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-prosody";
|
||||
version = "1.0.6260";
|
||||
version = "1.0.6447";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "ZUfyEYAU4YEYXBoM+tEZ6SAhqlNcsmxnKw8WEv0gy7M=";
|
||||
sha256 = "wmZV0jynaaZPLazdYhaKl9l5zPjgn12omoMfwEMqxSA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -7,7 +7,7 @@ flutter.mkFlutterApp {
|
|||
pname = "firmware-updater";
|
||||
version = "unstable";
|
||||
|
||||
vendorHash = "sha256-L8am4vTx4KlMHUdIhrUsCxGc27vkolawS/9DyFCPOJQ=";
|
||||
vendorHash = "sha256-3wVA9BLCnMijC0gOmskz+Hv7NQIGu/jhBDbWjmoq1Tc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
|
|
|
@ -1,20 +1,23 @@
|
|||
{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused }:
|
||||
{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused, pandoc, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "restool";
|
||||
version = "20.12";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://source.codeaurora.org/external/qoriq/qoriq-components/restool";
|
||||
rev = "LSDK-${version}";
|
||||
sha256 = "137xvvms3n4wwb5v2sv70vsib52s3s314306qa0mqpgxf9fb19zl";
|
||||
rev = "abd2f5b7181db9d03db9e6ccda0194923b73e9a2";
|
||||
sha256 = "sha256-ryTDyqSy39e8Omf7l8lK4mLWr8jccDhMVPldkVGSQVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ file ];
|
||||
buildInputs = [ bash coreutils dtc gawk gnugrep gnused ];
|
||||
nativeBuildInputs = [ file pandoc ];
|
||||
buildInputs = [ bash coreutils dtc gawk gnugrep gnused which ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"prefix="
|
||||
"bindir_completion=/share/bash-completion/completions"
|
||||
"DESTDIR=$(out)"
|
||||
"VERSION=${version}"
|
||||
];
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bind";
|
||||
version = "9.18.4";
|
||||
version = "9.18.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0=";
|
||||
sha256 = "sha256-DO4HjXTwvcTsN0Q1Amsl3niS8mVAoYsioC73KKEdyuc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "jicofo";
|
||||
version = "1.0-900";
|
||||
version = "1.0-911";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "tAuWhu1DdasOuLIz9/Ox1n1XcFWm5qnTVr6FpdKpwbE=";
|
||||
sha256 = "YB66NYmonbVgKpzv2pyQv7r0hYKDeBAngxrE4yWPp0o=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.2-9-g8cded16e";
|
||||
version = "2.2-22-g42bc1b99";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "L9h+qYV/W2wPzycfDGC4AXpTl7wlulyt2KryA+Tb/YU=";
|
||||
sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
@ -6,7 +6,7 @@ set -eu -o pipefail
|
|||
version="$(curl https://download.jitsi.org/stable/ | \
|
||||
pup 'a[href] text{}' | \
|
||||
awk -F'[_-]' '/jitsi-videobridge2/ {printf $3"-"$4"-"$5"\n"}' | \
|
||||
sort -u | \
|
||||
sort -Vu | \
|
||||
tail -n 1)"
|
||||
|
||||
update-source-version jitsi-videobridge "$version"
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.6260";
|
||||
version = "1.0.6447";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "Y1ELKdFdbnq20yUt4XoXmstJm8uI8EBGIFOvFWf+5Uw=";
|
||||
sha256 = "5JEPKifti7qKx0lGk4qPJJlCX4QxMhBGJqTFYktoie8=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.12.0";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
hash = "sha256-1zwGfM17SWWIvQ19cSbIfiLRaq+Ee1r94GPJWJEPoP8=";
|
||||
hash = "sha256-M8gklc9crdVkQk9vzxO4tG809O0uHOPvvq1l1tzoPt8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-07-26";
|
||||
version = "2022-08-10";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "bb6c14cdfd0b7d543d0d9c2e5f0c0a9409a82084";
|
||||
rev = "835a0a5d17765243cabee782acb5905a9aab33c3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "jlQKnF5vZp7ARVXtV/WEnTIV0m5FwqTj83igDyMyTTQ=";
|
||||
sha256 = "dPFoa5dgU5+A3wRJQShD42AkZ0n3mm3+6j4tzc7mucQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -45,7 +45,6 @@ in buildPythonApplication rec {
|
|||
buildInputs = [
|
||||
libappindicator-gtk3
|
||||
libnotify
|
||||
gobject-introspection
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
@ -60,6 +59,8 @@ in buildPythonApplication rec {
|
|||
];
|
||||
|
||||
doCheck = false; # There are no tests.
|
||||
dontWrapGApps = true;
|
||||
strictDeps = false;
|
||||
|
||||
postInstall = ''
|
||||
cp -r share $out/
|
||||
|
@ -69,10 +70,13 @@ in buildPythonApplication rec {
|
|||
ln -s $out/${python3.sitePackages}/etc $out/etc
|
||||
|
||||
glib-compile-schemas --strict $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ procps xautolock xscreensaver xfce.xfconf xset ]}
|
||||
)
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
From fdcc2f01441ec25104456022e6f8d3120709cede Mon Sep 17 00:00:00 2001
|
||||
From: Romanos Skiadas <rom.skiad@gmail.com>
|
||||
Date: Tue, 28 Jun 2022 06:16:10 +0300
|
||||
Subject: [PATCH] don't use sys.executable
|
||||
|
||||
This is required for forking self in a nixpkgs environment,
|
||||
where arandr might be wrapped. In that case, the actual arandr command
|
||||
will be a bash script, not python.
|
||||
There is no real reason to keep this around, nixpkgs properly sets the
|
||||
interpreter in the shebang anyway.
|
||||
---
|
||||
autorandr.py | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git autorandr.py autorandr.py
|
||||
index 35c15f6..1e84a2f 100755
|
||||
--- a/autorandr.py
|
||||
+++ b/autorandr.py
|
||||
@@ -1192,10 +1192,7 @@ def dispatch_call_to_sessions(argv):
|
||||
os.chdir(pwent.pw_dir)
|
||||
os.environ.clear()
|
||||
os.environ.update(process_environ)
|
||||
- if sys.executable != "" and sys.executable != None:
|
||||
- os.execl(sys.executable, sys.executable, autorandr_binary, *argv[1:])
|
||||
- else:
|
||||
- os.execl(autorandr_binary, autorandr_binary, *argv[1:])
|
||||
+ os.execl(autorandr_binary, autorandr_binary, *argv[1:])
|
||||
sys.exit(1)
|
||||
os.waitpid(child_pid, 0)
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
|
@ -1,25 +1,26 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, python3
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, systemd
|
||||
, xrandr
|
||||
, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "autorandr";
|
||||
version = "1.12.1";
|
||||
|
||||
buildInputs = [ python3Packages.python ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
propagatedBuildInputs = [ python3Packages.packaging ];
|
||||
|
||||
# no wrapper, as autorandr --batch does os.environ.clear()
|
||||
buildPhase = ''
|
||||
substituteInPlace autorandr.py \
|
||||
--replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \
|
||||
--replace '["xrandr"]' '["${xrandr}/bin/xrandr"]'
|
||||
'';
|
||||
|
||||
patches = [ ./0001-don-t-use-sys.executable.patch ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,20 +2,25 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, scdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pipectl";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ferdi265";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+o5hIDtDAh4r+AKCUhueQ3GBYf2sZtMATGX73Qg+tbo=";
|
||||
hash = "sha256-dWRem9VHzMwVo+ahUagZB2r4Ag8PyBef5X41vVpZcAc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake scdoc ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_DOCUMENTATION=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Ferdi265/pipectl";
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
, installShellFiles
|
||||
, libiconv
|
||||
, libgit2
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
, Security
|
||||
|
@ -14,16 +16,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IujaGyAGYlBb4efaRb13rsPSD2gWAg5UgG10iMp9iQE=";
|
||||
sha256 = "sha256-mumlnY9KGKdS3x4U84J4I8m5uMJI7SZR52aT6DPi/MM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
nativeBuildInputs = [ installShellFiles cmake ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ];
|
||||
|
||||
|
@ -32,13 +35,21 @@ rustPlatform.buildRustPackage rec {
|
|||
buildFeatures = if stdenv.isDarwin then [ "battery" ] else [ "default" ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell
|
||||
installShellCompletion starship.$shell
|
||||
done
|
||||
installShellCompletion --cmd starship \
|
||||
--bash <($out/bin/starship completions bash) \
|
||||
--fish <($out/bin/starship completions fish) \
|
||||
--zsh <($out/bin/starship completions zsh)
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-HrSMNNrldwb6LMMuxdQ84iY+/o5L2qwe+Vz3ekQt1YQ=";
|
||||
cargoPatches = [
|
||||
# Bump chrono dependency to fix panic when no timezone
|
||||
(fetchpatch {
|
||||
url = "https://github.com/starship/starship/commit/e652e8643310c3b41ce19ad05b8168abc29bb683.patch";
|
||||
sha256 = "sha256-iGYLJuptPMc45E7o+GXjIx7y2PxuO1mGM7xSopDBve0=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-w7UCExSkgEY52D98SSe2EkuiwtjM6t0/uTiafrtEBaU=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
|
|
27
pkgs/tools/security/binbloom/default.nix
Normal file
27
pkgs/tools/security/binbloom/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binbloom";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quarkslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UiKiDey/pHtJDr4UYqt+T/TneKig5tT8YU2u98Ttjmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Raw binary firmware analysis software";
|
||||
homepage = "https://github.com/quarkslab/binbloom";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ erdnaxe ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
# We can handle stripping ourselves.
|
||||
INSTALLFLAGS = "-m 555";
|
||||
# Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected.
|
||||
INSTALLFLAGS = lib.optionals (!stdenv.isDarwin) "-m 555";
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
|
@ -41,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
description = "ACPICA Tools";
|
||||
license = with licenses; [ iasl gpl2Only bsd3 ];
|
||||
maintainers = with maintainers; [ tadfisher ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1329,6 +1329,8 @@ mapAliases ({
|
|||
source-han-serif-simplified-chinese = source-han-serif;
|
||||
source-han-serif-traditional-chinese = source-han-serif;
|
||||
|
||||
sourcetrail = throw "sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14
|
||||
|
||||
spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22
|
||||
spectral = neochat; # Added 2020-12-27
|
||||
speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22
|
||||
|
|
|
@ -282,6 +282,8 @@ with pkgs;
|
|||
|
||||
beyond-identity = callPackage ../tools/security/beyond-identity {};
|
||||
|
||||
binbloom = callPackage ../tools/security/binbloom {};
|
||||
|
||||
bingo = callPackage ../development/tools/bingo {};
|
||||
|
||||
binserve = callPackage ../servers/binserve {
|
||||
|
@ -5454,11 +5456,14 @@ with pkgs;
|
|||
|
||||
ddrutility = callPackage ../tools/system/ddrutility { };
|
||||
|
||||
deluge-2_x = callPackage ../applications/networking/p2p/deluge {
|
||||
pythonPackages = python3Packages;
|
||||
inherit (callPackages ../applications/networking/p2p/deluge {
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; };
|
||||
};
|
||||
deluge = deluge-2_x;
|
||||
})
|
||||
deluge-gtk
|
||||
deluged
|
||||
deluge;
|
||||
|
||||
deluge-2_x = deluge;
|
||||
|
||||
desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };
|
||||
|
||||
|
@ -11637,6 +11642,8 @@ with pkgs;
|
|||
|
||||
up = callPackage ../tools/misc/up { };
|
||||
|
||||
upbound = callPackage ../development/tools/upbound { };
|
||||
|
||||
upterm = callPackage ../tools/misc/upterm { };
|
||||
|
||||
upx = callPackage ../tools/compression/upx { };
|
||||
|
@ -16267,6 +16274,8 @@ with pkgs;
|
|||
|
||||
kamid = callPackage ../servers/ftp/kamid { };
|
||||
|
||||
karate = callPackage ../development/tools/karate { };
|
||||
|
||||
kati = callPackage ../development/tools/build-managers/kati { };
|
||||
|
||||
kcat = callPackage ../development/tools/kcat { };
|
||||
|
@ -25034,6 +25043,8 @@ with pkgs;
|
|||
fira-code = callPackage ../data/fonts/fira-code { };
|
||||
fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
|
||||
|
||||
fira-go = callPackage ../data/fonts/fira-go { };
|
||||
|
||||
fira-mono = callPackage ../data/fonts/fira-mono { };
|
||||
|
||||
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
|
||||
|
@ -30598,16 +30609,6 @@ with pkgs;
|
|||
|
||||
spotify = callPackage ../applications/audio/spotify/wrapper.nix { };
|
||||
|
||||
sourcetrail = let
|
||||
llvmPackages = llvmPackages_10;
|
||||
in libsForQt5.callPackage ../development/tools/sourcetrail {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
jdk = jdk8;
|
||||
pythonPackages = python3Packages;
|
||||
inherit llvmPackages;
|
||||
boost = boost16x; # Filesystem tests in the checkPhase fail with Boost 1.77
|
||||
};
|
||||
|
||||
spotifywm = callPackage ../applications/audio/spotifywm { };
|
||||
|
||||
psst = callPackage ../applications/audio/psst { };
|
||||
|
|
|
@ -35,6 +35,8 @@ let
|
|||
|
||||
lib = import ../development/dhall-modules/lib.nix { inherit lib; };
|
||||
|
||||
dhall-cloudformation = callPackage ../development/dhall-modules/dhall-cloudformation.nix { };
|
||||
|
||||
dhall-grafana =
|
||||
callPackage ../development/dhall-modules/dhall-grafana.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue