Project import generated by Copybara.
GitOrigin-RevId: b2f2d04f01b3de3abad0dd9bc48ad7a3ee32bbc6
This commit is contained in:
Default email
parent
36cc88bcef
commit
139d06eab7
106 changed files with 1201 additions and 1358 deletions
|
|
@ -5534,6 +5534,12 @@
|
|||
githubId = 4158274;
|
||||
name = "Michiel Leenaars";
|
||||
};
|
||||
legendofmiracles = {
|
||||
email = "legendofmiracles@protonmail.com";
|
||||
github = "legendofmiracles";
|
||||
githubId = 30902201;
|
||||
name = "legendofmiracles";
|
||||
};
|
||||
lejonet = {
|
||||
email = "daniel@kuehn.se";
|
||||
github = "lejonet";
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@ in {
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ lheckemann ];
|
||||
maintainers = with lib.maintainers; [ lheckemann qyliss ];
|
||||
doc = ./mailman.xml;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@ with lib;
|
|||
users.${cfg.user} = {
|
||||
description = "Nullmailer relay-only mta user";
|
||||
group = cfg.group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
groups.${cfg.group} = { };
|
||||
|
|
|
|||
|
|
@ -446,7 +446,8 @@ in
|
|||
'') rootPools));
|
||||
};
|
||||
|
||||
boot.loader.grub = mkIf inInitrd {
|
||||
# TODO FIXME See https://github.com/NixOS/nixpkgs/pull/99386#issuecomment-798813567. To not break people's bootloader and as probably not everybody would read release notes that thoroughly add inSystem.
|
||||
boot.loader.grub = mkIf (inInitrd || inSystem) {
|
||||
zfsSupport = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
|
|||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace "Exec=AppRun" "Exec=$out/bin/apple-music-electron"
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
|
|||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=$out/bin/nuclear'
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ in appimageTools.wrapType2 {
|
|||
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
|
||||
install -m 444 -D ${appimageContents}/plexamp.png \
|
||||
$out/share/icons/hicolor/512x512/apps/plexamp.png
|
||||
substituteInPlace $out/share/applications/plexamp.desktop \
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,40 @@
|
|||
{ mkDerivation
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, libvorbis
|
||||
, rtmidi
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ptcollab";
|
||||
version = "0.3.5.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxshao";
|
||||
repo = "ptcollab";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ahfxjm1chz8k65rs7rgn4s2bgippq58fjcxl8fr21pzn718wqf1";
|
||||
sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/editor.pro \
|
||||
--replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
buildInputs = [ qtbase qtmultimedia libvorbis ];
|
||||
buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Experimental pxtone editor where you can collaborate with friends";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in appimageTools.wrapType2 rec {
|
|||
${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png
|
||||
install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' "Exec=$out/bin/${pname}"
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ appimageTools.wrapType2 rec {
|
|||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
|
||||
# symlink system binaries instead bundled ones
|
||||
mkdir -p $out/share/${pname}/resources/bin/{bridge,tor}
|
||||
|
|
|
|||
74
third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
vendored
Normal file
74
third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
vendored
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, zlib
|
||||
, libX11
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXext
|
||||
, libGLU
|
||||
, alsaLib
|
||||
, fontconfig
|
||||
, AVFoundation
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, CoreAudio
|
||||
, Kernel
|
||||
, OpenGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foxotron";
|
||||
version = "2021-03-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1finvbs3pbfyvm525blwgwl5jci2zjxb1923i0cm8rmf7wasaapb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
|
||||
buildInputs = [ zlib ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsaLib fontconfig libGLU ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib/foxotron}
|
||||
cp -R ${lib.optionalString stdenv.hostPlatform.isDarwin "Foxotron.app/Contents/MacOS/"}Foxotron \
|
||||
../{config.json,Shaders,Skyboxes} $out/lib/foxotron/
|
||||
wrapProgram $out/lib/foxotron/Foxotron \
|
||||
--run "cd $out/lib/foxotron"
|
||||
ln -s $out/{lib/foxotron,bin}/Foxotron
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "General purpose model viewer";
|
||||
longDescription = ''
|
||||
ASSIMP based general purpose model viewer ("turntable") created for the
|
||||
Revision 2021 3D Graphics Competition.
|
||||
'';
|
||||
homepage = "https://github.com/Gargaj/Foxotron";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "runwayml";
|
||||
version = "0.14.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://runway-releases.s3.amazonaws.com/Runway-${version}.AppImage";
|
||||
sha256 = "1bx8j39wd2z6f32hdvmk9z77bivnizzdhn296kin2nnqgq6v6y93";
|
||||
};
|
||||
|
||||
binary = appimageTools.wrapType2 {
|
||||
name = pname;
|
||||
inherit src;
|
||||
};
|
||||
# we only use this to extract the icon and desktop file
|
||||
appimage-contents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
|
||||
in
|
||||
symlinkJoin {
|
||||
inherit name;
|
||||
paths = [ binary ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p $out/share/pixmaps/ $out/share/applications
|
||||
cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png
|
||||
sed 's:Exec=AppRun:Exec=runwayml:' ${appimage-contents}/runway.desktop > $out/share/applications/runway.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Machine learning for creators";
|
||||
homepage = "https://runwayml.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
38
third_party/nixpkgs/pkgs/applications/misc/shfm/default.nix
vendored
Normal file
38
third_party/nixpkgs/pkgs/applications/misc/shfm/default.nix
vendored
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shfm";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dylanaraps";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ilVrUFfyzOZgjbBTqlHA9hLaTHw1xHFo1Y/tjXygNEs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./shfm
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D shfm --target-directory $out/bin/
|
||||
install -D README --target-directory $out/share/doc/${pname}/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dylanaraps/shfm";
|
||||
description = "POSIX-shell based file manager";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
, xwininfo, xdotool, xprop, gawk, coreutils
|
||||
, gnugrep, procps }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdrop";
|
||||
version = "unstable-2020-05-14";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctuid";
|
||||
repo = "tdrop";
|
||||
rev = "a9f2862515e5c190ac61d394e7fe7e1039871b89";
|
||||
sha256 = "1zxhihgba33k8byjsracsyhby9qpdngbly6c8hpz3pbsyag5liwc";
|
||||
rev = version;
|
||||
sha256 = "sha256-1umHwzpv4J8rZ0c0q+2dPsEk4vhFB4UerwI8ctIJUZg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,76 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation {
|
||||
name = "with-2016-08-20";
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "with";
|
||||
version = "unstable-2018-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mchav";
|
||||
repo = "With";
|
||||
rev = "cc2828bddd92297147d4365765f4ef36385f050a";
|
||||
sha256 = "10m2xv6icrdp6lfprw3a9hsrzb3bip19ipkbmscap0niddqgcl9b";
|
||||
rev = "28eb40bbc08d171daabf0210f420477ad75e16d6";
|
||||
hash = "sha256-mKHsLHs9/I+NUdb1t9wZWkPxXcsBlVWSj8fgZckXFXk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp with $out/bin/with
|
||||
runHook preInstall
|
||||
install -D with $out/bin/with
|
||||
installShellCompletion --bash --name with.bash with.bash-completion
|
||||
runHook postInstall
|
||||
'';
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mchav/With";
|
||||
description = "Command prefixing for continuous workflow using a single tool";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
longDescription = ''
|
||||
with is a Bash script that starts an interactive shell with where every
|
||||
command is prefixed using <program>.
|
||||
|
||||
For example:
|
||||
|
||||
$ with git
|
||||
git> add .
|
||||
git> commit -a -m "Commited"
|
||||
git> push
|
||||
|
||||
Can also be used for compound commands.
|
||||
|
||||
$ with java Primes
|
||||
java Primes> 1
|
||||
2
|
||||
java Primes> 4
|
||||
7
|
||||
|
||||
And to repeat commands:
|
||||
|
||||
$ with gcc -o output input.c
|
||||
gcc -o -output input.c>
|
||||
<enter>
|
||||
Compiling...
|
||||
gcc -o -output input.c>
|
||||
|
||||
To execute a shell command proper prefix line with :.
|
||||
|
||||
git> :ls
|
||||
|
||||
You can also drop, add, and replace different commands.
|
||||
|
||||
git> +add
|
||||
git add> <some file>
|
||||
git add> !commit
|
||||
git commit> <arguments and message>
|
||||
git commit> -
|
||||
git>
|
||||
|
||||
To exit use either :q or :exit.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ appimageTools.wrapType2 rec {
|
|||
mv $out/bin/{${name},${pname}}
|
||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
|
||||
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
|
||||
substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
substituteInPlace $out/share/applications/zettlr.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.106";
|
||||
version = "3.1.110";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f0ff300a1762d701b77eb16142dcc13d9d099bbed695f1e950392c1d1bb988eb";
|
||||
sha256 = "e8642dcbbfe941e2d2def7bf2e28889082a78c1d041edb33dae180036832a96b";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,82 +1,160 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, bundlerEnv, ruby
|
||||
, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bundlerEnv
|
||||
, alsaUtils
|
||||
, atk
|
||||
, copyDesktopItems
|
||||
, gobject-introspection
|
||||
, gtk2
|
||||
, ruby
|
||||
, libicns
|
||||
, libnotify
|
||||
, makeDesktopItem
|
||||
, which
|
||||
, wrapGAppsHook
|
||||
, writeText
|
||||
}:
|
||||
|
||||
# how to update:
|
||||
# find latest version at: http://mikutter.hachune.net/download#download
|
||||
# run these commands:
|
||||
#
|
||||
# wget http://mikutter.hachune.net/bin/mikutter.4.0.0.tar.gz
|
||||
# mkdir mikutter
|
||||
# cd mikutter
|
||||
# tar xvf ../mikutter.4.0.0.tar.gz
|
||||
# find . -not -name Gemfile -exec rm {} \;
|
||||
# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
|
||||
# cd ..
|
||||
# mv mikutter/* .
|
||||
# rm mikutter.4.0.0.tar.gz
|
||||
# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mikutter";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
|
||||
sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g";
|
||||
let
|
||||
# NOTE: $out may have different values depending on context
|
||||
mikutterPaths = rec {
|
||||
optPrefixDir = "$out/opt/mikutter";
|
||||
appPrefixDir = "$out/Applications/mikutter.app/Contents";
|
||||
appBinDir = "${appPrefixDir}/MacOS";
|
||||
appResourceDir = "${appPrefixDir}/Resources";
|
||||
iconPath = "${optPrefixDir}/core/skin/data/icon.png";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
gems = bundlerEnv {
|
||||
name = "mikutter-gems"; # leave the version out to enable package reuse
|
||||
gemdir = ./deps;
|
||||
groups = [ "default" "plugin" ];
|
||||
inherit ruby;
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir source
|
||||
cd source
|
||||
unpackFile $src
|
||||
# Avoid the following error:
|
||||
# > `<module:Moneta>': uninitialized constant Moneta::Builder (NameError)
|
||||
#
|
||||
# Related:
|
||||
# https://github.com/NixOS/nixpkgs/pull/76510
|
||||
# https://github.com/NixOS/nixpkgs/pull/76765
|
||||
# https://github.com/NixOS/nixpkgs/issues/83442
|
||||
# https://github.com/NixOS/nixpkgs/issues/106545
|
||||
copyGemFiles = true;
|
||||
};
|
||||
|
||||
mkDesktopItem = { description }:
|
||||
makeDesktopItem {
|
||||
name = "mikutter";
|
||||
desktopName = "mikutter";
|
||||
exec = "mikutter";
|
||||
icon = "mikutter";
|
||||
categories = "Network;";
|
||||
comment = description;
|
||||
extraDesktopEntries.Keywords = "Mastodon;";
|
||||
};
|
||||
|
||||
mkInfoPlist = { version }:
|
||||
writeText "Info.plist" (lib.generators.toPlist { } {
|
||||
CFBundleName = "mikutter";
|
||||
CFBundleDisplayName = "mikutter";
|
||||
CFBundleExecutable = "mikutter";
|
||||
CFBundleIconFile = "mikutter";
|
||||
CFBundleIdentifier = "net.hachune.mikutter";
|
||||
CFBundleInfoDictionaryVersion = "6.0";
|
||||
CFBundlePackageType = "APPL";
|
||||
CFBundleVersion = version;
|
||||
CFBundleShortVersionString = version;
|
||||
});
|
||||
|
||||
inherit (gems) wrappedRuby;
|
||||
in
|
||||
with mikutterPaths; stdenv.mkDerivation rec {
|
||||
pname = "mikutter";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mikutter.hachune.net/bin/mikutter-${version}.tar.gz";
|
||||
sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
buildInputs = [
|
||||
atk
|
||||
gtk2
|
||||
gobject-introspection
|
||||
libnotify
|
||||
which # some plugins use it at runtime
|
||||
wrappedRuby
|
||||
] ++ lib.optionals stdenv.isLinux [ alsaUtils ];
|
||||
|
||||
scriptPath = lib.makeBinPath (
|
||||
[ wrappedRuby libnotify which ]
|
||||
++ lib.optionals stdenv.isLinux [ alsaUtils ]
|
||||
);
|
||||
|
||||
postUnpack = ''
|
||||
rm -rf vendor
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
env = bundlerEnv {
|
||||
name = "mikutter-${version}-gems";
|
||||
gemdir = ./.;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
inherit ruby;
|
||||
};
|
||||
in ''
|
||||
install -v -D -m644 README $out/share/doc/mikutter/README
|
||||
install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE
|
||||
rm -v README LICENSE
|
||||
mkdir -p $out/bin ${optPrefixDir}
|
||||
|
||||
cp -rv . $out
|
||||
mkdir $out/bin/
|
||||
# hack wrapGAppsHook wants a file not a symlink
|
||||
mv $out/mikutter.rb $out/bin/mikutter
|
||||
install -Dm644 README $out/share/doc/mikutter/README
|
||||
install -Dm644 LICENSE $out/share/doc/mikutter/LICENSE
|
||||
rm -r README LICENSE deployment
|
||||
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${ruby}/bin:${alsaUtils}/bin:${libnotify}/bin"
|
||||
--prefix GEM_HOME : "${env}/${env.ruby.gemPath}"
|
||||
cp -r . ${optPrefixDir}
|
||||
|
||||
gappsWrapperArgsHook # FIXME: currently runs at preFixup
|
||||
wrapGApp ${optPrefixDir}/mikutter.rb \
|
||||
--prefix PATH : "${scriptPath}" \
|
||||
--set DISABLE_BUNDLER_SETUP 1
|
||||
)
|
||||
# --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules"
|
||||
mv ${optPrefixDir}/mikutter.rb $out/bin/mikutter
|
||||
|
||||
mkdir -p $out/share/mikutter $out/share/applications
|
||||
ln -sv $out/core/skin $out/share/mikutter/skin
|
||||
substituteAll ${./mikutter.desktop} $out/share/applications/mikutter.desktop
|
||||
install -Dm644 ${iconPath} $out/share/icons/hicolor/256x256/apps/mikutter.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mv $out/bin/.mikutter-wrapped $out/mikutter.rb
|
||||
substituteInPlace $out/bin/mikutter \
|
||||
--replace "$out/bin/.mikutter-wrapped" "$out/mikutter.rb"
|
||||
postInstall =
|
||||
let
|
||||
infoPlist = mkInfoPlist { inherit version; };
|
||||
in
|
||||
lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p ${appBinDir} ${appResourceDir}
|
||||
install -Dm644 ${infoPlist} ${appPrefixDir}/Info.plist
|
||||
ln -s $out/bin/mikutter ${appBinDir}/mikutter
|
||||
png2icns ${appResourceDir}/mikutter.icns ${iconPath}
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
testDir="$(mktemp -d)"
|
||||
install -Dm644 ${./test_plugin.rb} "$testDir/plugin/test_plugin/test_plugin.rb"
|
||||
|
||||
$out/bin/mikutter --confroot="$testDir" --plugin=test_plugin --debug
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(mkDesktopItem { inherit (meta) description; })
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
dontWrapGApps = true; # the target is placed outside of bin/
|
||||
|
||||
passthru.updateScript = [ ./update.sh version (toString ./.) ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extensible Twitter client";
|
||||
description = "An extensible Mastodon client";
|
||||
homepage = "https://mikutter.hachune.net";
|
||||
platforms = ruby.meta.platforms;
|
||||
license = licenses.mit;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ ruby '>= 2.5.0'
|
|||
|
||||
group :default do
|
||||
gem 'addressable','>= 2.7.0', '< 2.8'
|
||||
gem 'delayer','>= 1.0.1', '< 1.1'
|
||||
gem 'delayer-deferred','>= 2.1.1', '< 2.2'
|
||||
gem 'diva','>= 1.0.1', '< 1.1'
|
||||
gem 'delayer','>= 1.1.2', '< 2.0'
|
||||
gem 'delayer-deferred','>= 2.2.0', '< 3.0'
|
||||
gem 'diva','>= 1.0.2', '< 2.0'
|
||||
gem 'memoist','>= 0.16.2', '< 0.17'
|
||||
gem 'oauth','>= 0.5.4'
|
||||
gem 'pluggaloid','>= 1.2.0', '< 1.3'
|
||||
gem 'pluggaloid','>= 1.5.0', '< 2.0'
|
||||
gem 'typed-array','>= 0.1.2', '< 0.2'
|
||||
end
|
||||
|
||||
|
|
@ -5,22 +5,23 @@ GEM
|
|||
public_suffix (>= 2.0.2, < 5.0)
|
||||
atk (3.4.1)
|
||||
glib2 (= 3.4.1)
|
||||
cairo (1.16.4)
|
||||
cairo (1.17.5)
|
||||
native-package-installer (>= 1.0.3)
|
||||
pkg-config (>= 1.2.2)
|
||||
red-colors
|
||||
cairo-gobject (3.4.1)
|
||||
cairo (>= 1.16.2)
|
||||
glib2 (= 3.4.1)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
delayer (1.0.1)
|
||||
delayer-deferred (2.1.1)
|
||||
delayer (>= 1.0, < 2.0)
|
||||
diva (1.0.1)
|
||||
crack (0.4.5)
|
||||
rexml
|
||||
delayer (1.2.0)
|
||||
delayer-deferred (2.2.0)
|
||||
delayer (>= 1.1.2, < 2.0)
|
||||
diva (1.0.2)
|
||||
addressable (>= 2.5.2, < 2.8)
|
||||
gdk_pixbuf2 (3.4.1)
|
||||
gio2 (= 3.4.1)
|
||||
gettext (3.2.9)
|
||||
gettext (3.3.7)
|
||||
locale (>= 2.0.5)
|
||||
text (>= 1.3.0)
|
||||
gio2 (3.4.1)
|
||||
|
|
@ -34,40 +35,38 @@ GEM
|
|||
atk (= 3.4.1)
|
||||
gdk_pixbuf2 (= 3.4.1)
|
||||
pango (= 3.4.1)
|
||||
hashdiff (1.0.0)
|
||||
hashdiff (1.0.1)
|
||||
httpclient (2.8.3)
|
||||
instance_storage (1.0.0)
|
||||
io-console (0.5.3)
|
||||
irb (1.2.1)
|
||||
reline (>= 0.0.1)
|
||||
locale (2.1.2)
|
||||
locale (2.1.3)
|
||||
memoist (0.16.2)
|
||||
mini_portile2 (2.4.0)
|
||||
mocha (1.11.1)
|
||||
moneta (1.2.1)
|
||||
native-package-installer (1.0.9)
|
||||
nokogiri (1.10.7)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
oauth (0.5.4)
|
||||
mini_portile2 (2.5.0)
|
||||
mocha (1.12.0)
|
||||
moneta (1.4.1)
|
||||
native-package-installer (1.1.1)
|
||||
nokogiri (1.11.3)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
oauth (0.5.6)
|
||||
pango (3.4.1)
|
||||
cairo-gobject (= 3.4.1)
|
||||
gobject-introspection (= 3.4.1)
|
||||
pkg-config (1.4.0)
|
||||
pluggaloid (1.2.0)
|
||||
delayer (>= 1.0.0, < 2.0)
|
||||
pkg-config (1.4.6)
|
||||
pluggaloid (1.5.0)
|
||||
delayer (>= 1.1.0, < 2.0)
|
||||
instance_storage (>= 1.0.0, < 2.0.0)
|
||||
power_assert (1.1.5)
|
||||
public_suffix (4.0.1)
|
||||
rake (13.0.1)
|
||||
reline (0.1.2)
|
||||
io-console (~> 0.5)
|
||||
ruby-prof (1.1.0)
|
||||
safe_yaml (1.0.5)
|
||||
test-unit (3.3.4)
|
||||
power_assert (2.0.0)
|
||||
public_suffix (4.0.6)
|
||||
racc (1.5.2)
|
||||
rake (13.0.3)
|
||||
red-colors (0.1.1)
|
||||
rexml (3.2.5)
|
||||
ruby-prof (1.4.3)
|
||||
test-unit (3.4.0)
|
||||
power_assert
|
||||
text (1.3.1)
|
||||
typed-array (0.1.2)
|
||||
webmock (3.7.6)
|
||||
webmock (3.12.2)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
|
|
@ -77,19 +76,18 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
addressable (>= 2.7.0, < 2.8)
|
||||
delayer (>= 1.0.1, < 1.1)
|
||||
delayer-deferred (>= 2.1.1, < 2.2)
|
||||
diva (>= 1.0.1, < 1.1)
|
||||
gettext (>= 3.2.9, < 3.3)
|
||||
delayer (>= 1.1.2, < 2.0)
|
||||
delayer-deferred (>= 2.2.0, < 3.0)
|
||||
diva (>= 1.0.2, < 2.0)
|
||||
gettext (>= 3.3.5, < 3.4)
|
||||
gtk2 (= 3.4.1)
|
||||
httpclient
|
||||
irb (>= 1.2.0, < 1.3)
|
||||
memoist (>= 0.16.2, < 0.17)
|
||||
mocha (>= 1.11.1)
|
||||
moneta
|
||||
nokogiri
|
||||
oauth (>= 0.5.4)
|
||||
pluggaloid (>= 1.2.0, < 1.3)
|
||||
pluggaloid (>= 1.5.0, < 2.0)
|
||||
rake (>= 13.0.1)
|
||||
ruby-prof (>= 1.1.0)
|
||||
test-unit (>= 3.3.4, < 4.0)
|
||||
|
|
@ -97,7 +95,7 @@ DEPENDENCIES
|
|||
webmock (>= 3.7.6)
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.7.0p0
|
||||
ruby 2.6.6p146
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
|
@ -22,15 +22,15 @@
|
|||
version = "3.4.1";
|
||||
};
|
||||
cairo = {
|
||||
dependencies = ["native-package-installer" "pkg-config"];
|
||||
dependencies = ["native-package-installer" "pkg-config" "red-colors"];
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
|
||||
sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.4";
|
||||
version = "1.17.5";
|
||||
};
|
||||
cairo-gobject = {
|
||||
dependencies = ["cairo" "glib2"];
|
||||
|
|
@ -44,25 +44,25 @@
|
|||
version = "3.4.1";
|
||||
};
|
||||
crack = {
|
||||
dependencies = ["safe_yaml"];
|
||||
dependencies = ["rexml"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
|
||||
sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.3";
|
||||
version = "0.4.5";
|
||||
};
|
||||
delayer = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09p4rkh3dpdm1mhq721m4d6zvxqqp44kg7069s8l7kmaf7nv2nb3";
|
||||
sha256 = "0iqf4i18i8rk3x7qgvkhbiqskf0xzdf733fjimrq6xkag2mq60bl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.2.0";
|
||||
};
|
||||
delayer-deferred = {
|
||||
dependencies = ["delayer"];
|
||||
|
|
@ -70,10 +70,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mbdxn1hskjqf3zlj4waxl71ccvbj6lk81c99769paxw4fajwrgx";
|
||||
sha256 = "0i2das3ncssacpqdgaf4as77vrxm7jfiizaja884fqv4rzv6s2sv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
};
|
||||
diva = {
|
||||
dependencies = ["addressable"];
|
||||
|
|
@ -81,10 +81,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "182gws1zihhpl7r3m8jsf29maqg9xdhj46s9lidbldar8clpl23h";
|
||||
sha256 = "05wl4wg57vvng4nrp4lzjq148v908xzq092kq93phwvyxs7jnw2g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
gdk_pixbuf2 = {
|
||||
dependencies = ["gio2"];
|
||||
|
|
@ -103,10 +103,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
|
||||
sha256 = "1fqlwq7i8ck1fjyhn19q3skvgrbz44q7gq51mlr0qym5rkj5f6rn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.9";
|
||||
version = "3.3.7";
|
||||
};
|
||||
gio2 = {
|
||||
dependencies = ["gobject-introspection"];
|
||||
|
|
@ -157,10 +157,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18jqpbvidrlnq3xf0hkdbs00607jgz35lry6gjw4bcxgh52am2mk";
|
||||
sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
};
|
||||
httpclient = {
|
||||
groups = ["plugin"];
|
||||
|
|
@ -182,36 +182,15 @@
|
|||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
io-console = {
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0srn91ly4cc5qvyj3r87sc7v8dnm52qj1hczzxmysib6ffparngd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.3";
|
||||
};
|
||||
irb = {
|
||||
dependencies = ["reline"];
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r1y8i46qd5izdszzzn5jxvwvq00m89rk0hm8cs8f21p7nlwmh5w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
};
|
||||
locale = {
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
|
||||
sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
};
|
||||
memoist = {
|
||||
groups = ["default"];
|
||||
|
|
@ -228,61 +207,61 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
mocha = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp";
|
||||
sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
};
|
||||
moneta = {
|
||||
groups = ["plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0q7fskfdc0h5dhl8aamg3ypybd6cyl4x0prh4803gj7hxr17jfm1";
|
||||
sha256 = "0z25b4yysvnf2hi9jxnsiv3fvnicnzr2m70ci231av5093jfknc6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
version = "1.4.1";
|
||||
};
|
||||
native-package-installer = {
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0piclgf6pw7hr10x57x0hn675djyna4sb3xc97yb9vh66wkx1fl0";
|
||||
sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.9";
|
||||
version = "1.1.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
|
||||
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.7";
|
||||
version = "1.11.3";
|
||||
};
|
||||
oauth = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
|
||||
sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.4";
|
||||
version = "0.5.6";
|
||||
};
|
||||
pango = {
|
||||
dependencies = ["cairo-gobject" "gobject-introspection"];
|
||||
|
|
@ -300,10 +279,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cxdpr2wlz9b587avlq04a1da5fz1vdw8jvr6lx23mcq7mqh2xcx";
|
||||
sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.4.6";
|
||||
};
|
||||
pluggaloid = {
|
||||
dependencies = ["delayer" "instance_storage"];
|
||||
|
|
@ -311,71 +290,80 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1gv0rjjdic8c41gfr3kyyphvf0fmv5rzcf6qd57zjdfcn6fvi3hh";
|
||||
sha256 = "0m3f940lf1bg01jin22by7hg9hs43y995isgcyqb6vbvlv51zj11";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
power_assert = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s";
|
||||
sha256 = "172qfmzwxdf82bmwgcb13hnz9i3p6i2s2nijxnx6r63kn3drjppr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.5";
|
||||
version = "2.0.0";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.1";
|
||||
version = "4.0.6";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
rake = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
|
||||
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.0.1";
|
||||
version = "13.0.3";
|
||||
};
|
||||
reline = {
|
||||
dependencies = ["io-console"];
|
||||
red-colors = {
|
||||
groups = ["default" "plugin"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0908ijrngc3wkn5iny7d0kxkp74w6ixk2nwzzngplplfla1vkp8x";
|
||||
sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
version = "0.1.1";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.5";
|
||||
};
|
||||
ruby-prof = {
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18ga5f4h1fnwn0xh910kpnw4cg3lq3jqljd3h16bdw9pgc5ff7dn";
|
||||
sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.5";
|
||||
version = "1.4.3";
|
||||
};
|
||||
test-unit = {
|
||||
dependencies = ["power_assert"];
|
||||
|
|
@ -383,10 +371,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mrkpb6wz0cs1740kaca240k4ymmkbvb2v5xaxsy6vynqw8n0g6z";
|
||||
sha256 = "1h0c323zfn4hdida4g58h8wnlh4kax438gyxlw20dd78kcp01i8m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.4";
|
||||
version = "3.4.0";
|
||||
};
|
||||
text = {
|
||||
groups = ["default" "plugin"];
|
||||
|
|
@ -414,9 +402,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19xvs7gdf8r75bmyb17w9g367qxzqnlrmbdda1y36cn1vrlnf2l8";
|
||||
sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.6";
|
||||
version = "3.12.2";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
group :default do
|
||||
gem 'gettext', '>= 3.3.5', '< 3.4'
|
||||
end
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=mikutter
|
||||
Comment=Twitter Client
|
||||
Type=Application
|
||||
Exec=@out@/bin/mikutter
|
||||
Icon=@out@/core/skin/data/icon.png
|
||||
Terminal=false
|
||||
Categories=Network;
|
||||
Keywords=Twitter;
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
group :default do
|
||||
gem 'gettext', '>= 3.2.9', '< 3.3'
|
||||
gem 'irb', '>= 1.2.0', '< 1.3'
|
||||
end
|
||||
10
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb
vendored
Normal file
10
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb
vendored
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# Tests mikutter's event system.
|
||||
|
||||
Plugin.create(:test_plugin) do
|
||||
require 'logger'
|
||||
Delayer.new do
|
||||
log = Logger.new(STDOUT)
|
||||
log.info("loaded test_plugin")
|
||||
exit
|
||||
end
|
||||
end
|
||||
51
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/update.sh
vendored
Executable file
51
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/update.sh
vendored
Executable file
|
|
@ -0,0 +1,51 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bundler bundix curl jq common-updater-scripts
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
main() {
|
||||
local currentVer="$1"
|
||||
local scriptDir="$2"
|
||||
local latestVer
|
||||
local srcDir
|
||||
|
||||
if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then
|
||||
echo "[ERROR] Please run the following instead:" >&2
|
||||
echo >&2
|
||||
echo " % nix-shell maintainers/scripts/update.nix --argstr path mikutter" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
latestVer="$(queryLatestVersion)"
|
||||
if [[ "$currentVer" == "$latestVer" ]]; then
|
||||
echo "[INFO] mikutter is already up to date" >&2
|
||||
exit
|
||||
fi
|
||||
|
||||
update-source-version "$UPDATE_NIX_ATTR_PATH" "$latestVer"
|
||||
|
||||
cd "$scriptDir"
|
||||
|
||||
rm -rf deps
|
||||
mkdir deps
|
||||
cd deps
|
||||
|
||||
srcDir="$(nix-build ../../../../../.. --no-out-link -A mikutter.src)"
|
||||
tar xvf "$srcDir" --strip-components=1
|
||||
find . -not -name Gemfile -exec rm {} \;
|
||||
find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; || true
|
||||
|
||||
bundle lock
|
||||
bundix
|
||||
}
|
||||
|
||||
queryLatestVersion() {
|
||||
curl -sS 'https://mikutter.hachune.net/download.json?count=1' \
|
||||
| jq -r '.[].version_string' \
|
||||
| head -n1
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
# vim:set ft=bash:
|
||||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mailspring";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
|
||||
sha256 = "ISwNFR8M377+J7WoG9MlblF8r5yRTgCxEGszZCjqW/k=";
|
||||
sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
, enableSystemd ? stdenv.isLinux
|
||||
, enableDaemon ? true
|
||||
, enableCli ? true
|
||||
, installLib ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -47,6 +48,7 @@ in stdenv.mkDerivation {
|
|||
"-DENABLE_QT=${mkFlag enableQt}"
|
||||
"-DENABLE_DAEMON=${mkFlag enableDaemon}"
|
||||
"-DENABLE_CLI=${mkFlag enableCli}"
|
||||
"-DINSTALL_LIB=${mkFlag installLib}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ in stdenv.mkDerivation {
|
|||
substitute \
|
||||
app/pcloud.desktop \
|
||||
share/applications/pcloud.desktop \
|
||||
--replace "Name=pcloud" "Name=pCloud" \
|
||||
--replace "Exec=AppRun" "Exec=$out/bin/pcloud"
|
||||
--replace 'Name=pcloud' 'Name=pCloud' \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
|
||||
# Build the main executable
|
||||
cat > bin/pcloud <<EOF
|
||||
|
|
|
|||
33
third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
vendored
Normal file
33
third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
vendored
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tmpmail";
|
||||
version = "unstable-2021-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdushantha";
|
||||
repo = "tmpmail";
|
||||
rev = "150b32083d36006cf7f496e112715ae12ee87727";
|
||||
sha256 = "sha256-yQ9/UUxBTEXK5z3f+tvVRUzIGrAnrqurQ0x56Ad7RKE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 -t $out/bin tmpmail
|
||||
installManPage tmpmail.1
|
||||
wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sdushantha/tmpmail";
|
||||
description = "A temporary email right from your terminal written in POSIX sh ";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.legendofmiracles ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,8 @@ in appimageTools.wrapType2 rec {
|
|||
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}'
|
||||
substituteInPlace $out/share/applications/timeular.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
||||
homepage = "http://github.com/librtlsdr/librtlsdr";
|
||||
homepage = "https://github.com/librtlsdr/librtlsdr";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ let
|
|||
|
||||
in {
|
||||
subversion_1_10 = common {
|
||||
version = "1.10.6";
|
||||
sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q";
|
||||
version = "1.10.7";
|
||||
sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww";
|
||||
extraBuildInputs = [ lz4 utf8proc ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-fb";
|
||||
repo = "haruna";
|
||||
rev = version;
|
||||
sha256 = "sha256-8MauKmvQUwzq4Ssmm6g7/y6ADkye+eg/zyR3v/Wu848=";
|
||||
sha256 = "sha256-YsC0ZdLwHCO9izDIk2dTMr0U/nb60MHSxKURV8Xltss=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss }:
|
||||
{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }:
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "2.6.8";
|
||||
version = "2.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "0m2d5r0f82qv4kqmq5yxzpi1awkjir2b2s2mfwkjn8p55r7gzp7c";
|
||||
sha256 = "1xvinmwyx7mai84i8c394dqw86zb6ib9wnxjmv7zpky6x64lvv10";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ gtest ];
|
||||
|
||||
extraBuildInputs = [ expat ];
|
||||
|
||||
extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-ffmpegdirect";
|
||||
namespace = "inputstream.ffmpegdirect";
|
||||
version = "1.19.4";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.ffmpegdirect";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1ppvs6zybbi73zq1qh8klyhj99byh61c6nijmb1gd5yhg7cywf72";
|
||||
sha256 = "1x5gj7iq74ysyfrzvp135m0pjz47zamcgw1v1334xd7xcx5q178p";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "8.2.4";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA=";
|
||||
sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub
|
||||
, pugixml, zlib
|
||||
, xz, pugixml, zlib
|
||||
, inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp
|
||||
}:
|
||||
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "7.5.1";
|
||||
version = "7.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1q470v9nipnrca0rbwvqlbxw9ccbl9s1k46hwwrh94vhyp5rjlib";
|
||||
sha256 = "1g1ildl2l6nl63qbfhijcbmvr6z84nqhjsy2lgx3dy25cmcqzir9";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
xz
|
||||
pugixml
|
||||
zlib
|
||||
];
|
||||
|
|
|
|||
29
third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix
vendored
Normal file
29
third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "6.8.10+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "18z9zh6yqihnmfwd6cc4kpy2frzbarvhg8qpyc3w851ad053q7v0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
requests
|
||||
inputstreamhelper
|
||||
];
|
||||
|
||||
passthru.updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.youtube";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/anxdpanic/plugin.video.youtube";
|
||||
description = "YouTube is one of the biggest video-sharing websites of the world";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
{ name ? "${attrs.pname}-${attrs.version}"
|
||||
, namespace
|
||||
, version
|
||||
, extraNativeBuildInputs ? []
|
||||
, extraBuildInputs ? []
|
||||
, extraRuntimeDependencies ? []
|
||||
, extraInstallPhase ? "", ... } @ attrs:
|
||||
|
|
@ -10,7 +11,7 @@ toKodiAddon (stdenv.mkDerivation ({
|
|||
|
||||
dontStrip = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ] ++ extraNativeBuildInputs;
|
||||
buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
|
||||
|
||||
inherit extraRuntimeDependencies;
|
||||
|
|
|
|||
|
|
@ -1,560 +0,0 @@
|
|||
{ lib, stdenv, callPackage, fetchFromGitHub
|
||||
, cmake, kodi, libcec_platform, tinyxml, pugixml
|
||||
, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
|
||||
, python3Packages, expat, glib, nspr, nss, openssl
|
||||
, libssh, libarchive, xz, bzip2, lz4, lzo }:
|
||||
|
||||
with lib;
|
||||
|
||||
let self = rec {
|
||||
|
||||
addonDir = "/share/kodi/addons";
|
||||
rel = "Matrix";
|
||||
|
||||
inherit kodi;
|
||||
|
||||
# Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
|
||||
toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {
|
||||
# Use passthru in order to prevent rebuilds when possible.
|
||||
passthru = (oldAttrs.passthru or {})// {
|
||||
kodiAddonFor = kodi;
|
||||
requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
|
||||
};
|
||||
});
|
||||
|
||||
# Check whether a derivation provides a Kodi addon.
|
||||
hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
|
||||
|
||||
# Get list of required Kodi addons given a list of derivations.
|
||||
requiredKodiAddons = drvs: let
|
||||
modules = filter hasKodiAddon drvs;
|
||||
in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
|
||||
|
||||
kodi-platform = stdenv.mkDerivation rec {
|
||||
project = "kodi-platform";
|
||||
version = "17.1";
|
||||
name = "${project}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = project;
|
||||
rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
|
||||
sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ kodi libcec_platform tinyxml ];
|
||||
};
|
||||
|
||||
buildKodiAddon =
|
||||
{ name ? "${attrs.pname}-${attrs.version}"
|
||||
, namespace
|
||||
, sourceDir ? ""
|
||||
, ... } @ attrs:
|
||||
toKodiAddon (stdenv.mkDerivation ({
|
||||
name = "kodi-" + name;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
extraRuntimeDependencies = [ ];
|
||||
|
||||
installPhase = ''
|
||||
cd $src/$sourceDir
|
||||
d=$out${addonDir}/${namespace}
|
||||
mkdir -p $d
|
||||
sauce="."
|
||||
[ -d ${namespace} ] && sauce=${namespace}
|
||||
cp -R "$sauce/"* $d
|
||||
'';
|
||||
} // attrs));
|
||||
|
||||
buildKodiBinaryAddon =
|
||||
{ name ? "${attrs.pname}-${attrs.version}"
|
||||
, namespace
|
||||
, version
|
||||
, extraBuildInputs ? []
|
||||
, extraRuntimeDependencies ? []
|
||||
, extraInstallPhase ? "", ... } @ attrs:
|
||||
toKodiAddon (stdenv.mkDerivation ({
|
||||
name = "kodi-" + name;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
|
||||
|
||||
inherit extraRuntimeDependencies;
|
||||
|
||||
# disables check ensuring install prefix is that of kodi
|
||||
cmakeFlags = [
|
||||
"-DOVERRIDE_PATHS=1"
|
||||
];
|
||||
|
||||
# kodi checks for addon .so libs existance in the addon folder (share/...)
|
||||
# and the non-wrapped kodi lib/... folder before even trying to dlopen
|
||||
# them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
|
||||
installPhase = let n = namespace; in ''
|
||||
make install
|
||||
ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
|
||||
${extraInstallPhase}
|
||||
'';
|
||||
} // attrs));
|
||||
|
||||
advanced-launcher = buildKodiAddon rec {
|
||||
|
||||
pname = "advanced-launcher";
|
||||
namespace = "plugin.program.advanced.launcher";
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edwtjo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=85724";
|
||||
description = "A program launcher for Kodi";
|
||||
longDescription = ''
|
||||
Advanced Launcher allows you to start any Linux, Windows and
|
||||
macOS external applications (with command line support or not)
|
||||
directly from the Kodi GUI. Advanced Launcher also give you
|
||||
the possibility to edit, download (from Internet resources)
|
||||
and manage all the meta-data (informations and images) related
|
||||
to these applications.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
broken = true; # requires port to python3
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
advanced-emulator-launcher = buildKodiAddon rec {
|
||||
|
||||
pname = "advanced-emulator-launcher";
|
||||
namespace = "plugin.program.advanced.emulator.launcher";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wintermute0110";
|
||||
repo = namespace;
|
||||
rev = version;
|
||||
sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=287826";
|
||||
description = "A program launcher for Kodi";
|
||||
longDescription = ''
|
||||
Advanced Emulator Launcher is a multi-emulator front-end for Kodi
|
||||
scalable to collections of thousands of ROMs. Includes offline scrapers
|
||||
for MAME and No-Intro ROM sets and also supports scrapping ROM metadata
|
||||
and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML
|
||||
DATs. Launching of games and standalone applications is also available.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
broken = true; # requires port to python3
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
controllers = let
|
||||
pname = "game-controller";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "kodi-game-controllers";
|
||||
rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
|
||||
sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Add support for different gaming controllers.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
mkController = controller: {
|
||||
${controller} = buildKodiAddon rec {
|
||||
pname = pname + "-" + controller;
|
||||
namespace = "game.controller." + controller;
|
||||
sourceDir = "addons/" + namespace;
|
||||
inherit version src meta;
|
||||
};
|
||||
};
|
||||
in (mkController "default")
|
||||
// (mkController "dreamcast")
|
||||
// (mkController "gba")
|
||||
// (mkController "genesis")
|
||||
// (mkController "mouse")
|
||||
// (mkController "n64")
|
||||
// (mkController "nes")
|
||||
// (mkController "ps")
|
||||
// (mkController "snes");
|
||||
|
||||
hyper-launcher = let
|
||||
pname = "hyper-launcher";
|
||||
version = "1.5.2";
|
||||
src = fetchFromGitHub rec {
|
||||
name = pname + "-" + version + ".tar.gz";
|
||||
owner = "teeedubb";
|
||||
repo = owner + "-xbmc-repo";
|
||||
rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
|
||||
sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
|
||||
};
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=258159";
|
||||
description = "A ROM launcher for Kodi that uses HyperSpin assets.";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
broken = true; # requires port to python3
|
||||
};
|
||||
in {
|
||||
service = buildKodiAddon {
|
||||
pname = pname + "-service";
|
||||
version = "1.2.1";
|
||||
namespace = "service.hyper.launcher";
|
||||
inherit src meta;
|
||||
};
|
||||
plugin = buildKodiAddon {
|
||||
namespace = "plugin.hyper.launcher";
|
||||
inherit pname version src meta;
|
||||
};
|
||||
};
|
||||
|
||||
joystick = buildKodiBinaryAddon rec {
|
||||
pname = namespace;
|
||||
namespace = "peripheral.joystick";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = namespace;
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Binary addon for raw joystick input.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
extraBuildInputs = [ tinyxml udev ];
|
||||
};
|
||||
|
||||
simpleplugin = buildKodiAddon rec {
|
||||
pname = "simpleplugin";
|
||||
namespace = "script.module.simpleplugin";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanvm";
|
||||
repo = namespace;
|
||||
rev = "v.${version}";
|
||||
sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = src.meta.homepage;
|
||||
description = "Simpleplugin API";
|
||||
license = licenses.gpl3;
|
||||
broken = true; # requires port to python3
|
||||
};
|
||||
};
|
||||
|
||||
svtplay = buildKodiAddon rec {
|
||||
|
||||
pname = "svtplay";
|
||||
namespace = "plugin.video.svtplay";
|
||||
version = "5.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = pname + "-" + version + ".tar.gz";
|
||||
owner = "nilzen";
|
||||
repo = "xbmc-" + pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
|
||||
description = "Watch content from SVT Play";
|
||||
longDescription = ''
|
||||
With this addon you can stream content from SVT Play
|
||||
(svtplay.se). The plugin fetches the video URL from the SVT
|
||||
Play website and feeds it to the Kodi video player. HLS (m3u8)
|
||||
is the preferred video format by the plugin.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
steam-controller = buildKodiBinaryAddon rec {
|
||||
pname = namespace;
|
||||
namespace = "peripheral.steamcontroller";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = namespace;
|
||||
rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
|
||||
sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ libusb1 ];
|
||||
|
||||
meta = {
|
||||
description = "Binary addon for steam controller.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
steam-launcher = buildKodiAddon {
|
||||
|
||||
pname = "steam-launcher";
|
||||
namespace = "script.steam.launcher";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "teeedubb";
|
||||
repo = owner + "-xbmc-repo";
|
||||
rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
|
||||
sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ steam ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
|
||||
description = "Launch Steam in Big Picture Mode from Kodi";
|
||||
longDescription = ''
|
||||
This add-on will close/minimise Kodi, launch Steam in Big
|
||||
Picture Mode and when Steam BPM is exited (either by quitting
|
||||
Steam or returning to the desktop) Kodi will
|
||||
restart/maximise. Running pre/post Steam scripts can be
|
||||
configured via the addon.
|
||||
'';
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
};
|
||||
|
||||
pdfreader = buildKodiAddon rec {
|
||||
pname = "pdfreader";
|
||||
namespace = "plugin.image.pdf";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i96751414";
|
||||
repo = "plugin.image.pdfreader";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
|
||||
description = "A comic book reader";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
};
|
||||
|
||||
pvr-hts = buildKodiBinaryAddon rec {
|
||||
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "8.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kodi-pvr/pvr.hts";
|
||||
description = "Kodi's Tvheadend HTSP client addon";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ cpages ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
pvr-hdhomerun = buildKodiBinaryAddon rec {
|
||||
|
||||
pname = "pvr-hdhomerun";
|
||||
namespace = "pvr.hdhomerun";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hdhomerun";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
|
||||
description = "Kodi's HDHomeRun PVR client addon";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ titanous ];
|
||||
};
|
||||
|
||||
extraBuildInputs = [ jsoncpp libhdhomerun ];
|
||||
|
||||
};
|
||||
|
||||
pvr-iptvsimple = buildKodiBinaryAddon rec {
|
||||
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "7.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
|
||||
description = "Kodi's IPTV Simple client addon";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
extraBuildInputs = [ zlib pugixml ];
|
||||
};
|
||||
|
||||
osmc-skin = buildKodiAddon rec {
|
||||
|
||||
pname = "osmc-skin";
|
||||
namespace = "skin.osmc";
|
||||
version = "18.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmc";
|
||||
repo = namespace;
|
||||
rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
|
||||
sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/osmc/skin.osmc";
|
||||
description = "The default skin for OSMC";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
license = licenses.cc-by-nc-sa-30;
|
||||
};
|
||||
};
|
||||
|
||||
yatp = python3Packages.toPythonModule (buildKodiAddon rec {
|
||||
pname = "yatp";
|
||||
namespace = "plugin.video.yatp";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanvm";
|
||||
repo = "kodi.yatp";
|
||||
rev = "v.${version}";
|
||||
sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
|
||||
};
|
||||
|
||||
patches = [ ./yatp/dont-monkey.patch ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
simpleplugin
|
||||
python3Packages.requests
|
||||
python3Packages.libtorrent-rasterbar
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = src.meta.homepage;
|
||||
description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
|
||||
license = licenses.gpl3;
|
||||
broken = true; # requires port to python3
|
||||
};
|
||||
});
|
||||
|
||||
inputstream-adaptive = buildKodiBinaryAddon rec {
|
||||
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "2.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peak3d";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ expat ];
|
||||
|
||||
extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
|
||||
|
||||
extraInstallPhase = let n = namespace; in ''
|
||||
ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/peak3d/inputstream.adaptive";
|
||||
description = "Kodi inputstream addon for several manifest types";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ sephalon ];
|
||||
};
|
||||
};
|
||||
|
||||
vfs-sftp = buildKodiBinaryAddon rec {
|
||||
pname = namespace;
|
||||
namespace = "vfs.sftp";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = namespace;
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "SFTP Virtual Filesystem add-on for Kodi";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ minijackson ];
|
||||
};
|
||||
|
||||
extraBuildInputs = [ openssl libssh zlib ];
|
||||
};
|
||||
|
||||
vfs-libarchive = buildKodiBinaryAddon rec {
|
||||
pname = namespace;
|
||||
namespace = "vfs.libarchive";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = namespace;
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "LibArchive Virtual Filesystem add-on for Kodi";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ minijackson ];
|
||||
};
|
||||
|
||||
extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ];
|
||||
};
|
||||
}; in self
|
||||
|
|
@ -29,7 +29,7 @@ in appimageTools.wrapAppImage rec {
|
|||
# Now, install assets such as the desktop file and icons
|
||||
install -m 444 -D ${src}/lbry.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/lbry.desktop \
|
||||
--replace 'AppRun' '$out/bin/lbry'
|
||||
--replace 'Exec=AppRun' 'Exec=lbry'
|
||||
cp -r ${src}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cql9ikk0lo/LeWNykEJSKgfGnBSUU5vOh/zUIEvMapk=";
|
||||
sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
base binary bytestring containers ghc-prim ghci-ghcjs
|
||||
template-haskell-ghcjs
|
||||
];
|
||||
homepage = "http://github.com/ghcjs";
|
||||
homepage = "https://github.com/ghcjs";
|
||||
license = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, gnat, zlib, llvm, lib
|
||||
{ stdenv, fetchFromGitHub, callPackage, gnat, zlib, llvm, lib
|
||||
, backend ? "mcode" }:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm";
|
||||
|
|
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
|||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
||||
buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
|
||||
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
# If llvm 7.0 works, 7.x releases should work too.
|
||||
|
|
@ -30,6 +31,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
# run with either of
|
||||
# nix-build -A ghdl-mcode.passthru.tests
|
||||
# nix-build -A ghdl-llvm.passthru.tests
|
||||
tests = {
|
||||
simple = callPackage ./test-simple.nix { inherit backend; };
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ghdl/ghdl";
|
||||
description = "VHDL 2008/93/87 simulator";
|
||||
|
|
|
|||
8
third_party/nixpkgs/pkgs/development/compilers/ghdl/expected-output.txt
vendored
Normal file
8
third_party/nixpkgs/pkgs/development/compilers/ghdl/expected-output.txt
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
simple-tb.vhd:71:5:@700ms:(report note): 32
|
||||
simple-tb.vhd:71:5:@900ms:(report note): 78
|
||||
simple-tb.vhd:71:5:@1100ms:(report note): 105
|
||||
simple-tb.vhd:71:5:@1300ms:(report note): 120
|
||||
simple-tb.vhd:71:5:@1500ms:(report note): 79
|
||||
simple-tb.vhd:71:5:@1700ms:(report note): 83
|
||||
simple-tb.vhd:71:5:@1900ms:(report note): 32
|
||||
simple-tb.vhd:75:1:@2100ms:(report note): All tests passed.
|
||||
78
third_party/nixpkgs/pkgs/development/compilers/ghdl/simple-tb.vhd
vendored
Normal file
78
third_party/nixpkgs/pkgs/development/compilers/ghdl/simple-tb.vhd
vendored
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
library ieee;
|
||||
use IEEE.STD_LOGIC_1164.all;
|
||||
use ieee.numeric_std.all;
|
||||
|
||||
library STD;
|
||||
use STD.textio.all;
|
||||
|
||||
entity tb is
|
||||
end tb;
|
||||
|
||||
architecture beh of tb is
|
||||
|
||||
component simple
|
||||
port (
|
||||
CLK, RESET : in std_ulogic;
|
||||
DATA_OUT : out std_ulogic_vector(7 downto 0);
|
||||
DONE_OUT : out std_ulogic
|
||||
);
|
||||
end component;
|
||||
|
||||
signal data : std_ulogic_vector(7 downto 0) := "00100000";
|
||||
signal clk : std_ulogic;
|
||||
signal RESET : std_ulogic := '0';
|
||||
signal done : std_ulogic := '0';
|
||||
signal cyclecount : integer := 0;
|
||||
|
||||
constant cycle_time_c : time := 200 ms;
|
||||
constant maxcycles : integer := 100;
|
||||
|
||||
begin
|
||||
|
||||
simple1 : simple
|
||||
port map (
|
||||
CLK => clk,
|
||||
RESET => RESET,
|
||||
DATA_OUT => data,
|
||||
DONE_OUT => done
|
||||
);
|
||||
|
||||
clk_process : process
|
||||
begin
|
||||
clk <= '0';
|
||||
wait for cycle_time_c/2;
|
||||
clk <= '1';
|
||||
wait for cycle_time_c/2;
|
||||
end process;
|
||||
|
||||
count_process : process(CLK)
|
||||
begin
|
||||
if (CLK'event and CLK ='1') then
|
||||
if (RESET = '1') then
|
||||
cyclecount <= 0;
|
||||
else
|
||||
cyclecount <= cyclecount + 1;
|
||||
end if;
|
||||
end if;
|
||||
end process;
|
||||
|
||||
test : process
|
||||
|
||||
begin
|
||||
|
||||
RESET <= '1';
|
||||
wait until (clk'event and clk='1');
|
||||
wait until (clk'event and clk='1');
|
||||
RESET <= '0';
|
||||
wait until (clk'event and clk='1');
|
||||
for cyclecnt in 1 to maxcycles loop
|
||||
exit when done = '1';
|
||||
wait until (clk'event and clk='1');
|
||||
report integer'image(to_integer(unsigned(data)));
|
||||
end loop;
|
||||
wait until (clk'event and clk='1');
|
||||
|
||||
report "All tests passed." severity NOTE;
|
||||
wait;
|
||||
end process;
|
||||
end beh;
|
||||
45
third_party/nixpkgs/pkgs/development/compilers/ghdl/simple.vhd
vendored
Normal file
45
third_party/nixpkgs/pkgs/development/compilers/ghdl/simple.vhd
vendored
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
library IEEE;
|
||||
use IEEE.STD_LOGIC_1164.all;
|
||||
use IEEE.NUMERIC_STD.ALL;
|
||||
use IEEE.STD_LOGIC_MISC.or_reduce;
|
||||
|
||||
entity simple is
|
||||
|
||||
port (
|
||||
CLK, RESET : in std_ulogic;
|
||||
DATA_OUT : out std_ulogic_vector(7 downto 0);
|
||||
DONE_OUT : out std_ulogic
|
||||
);
|
||||
end simple;
|
||||
|
||||
architecture beh of simple is
|
||||
|
||||
signal data : std_ulogic_vector(7 downto 0);
|
||||
signal done: std_ulogic;
|
||||
|
||||
begin
|
||||
|
||||
proc_ctr : process(CLK)
|
||||
begin
|
||||
if (CLK = '1' and CLK'event) then
|
||||
if (RESET = '1') then
|
||||
data <= "01011111";
|
||||
done <= '0';
|
||||
else
|
||||
case data is
|
||||
when "00100000" => data <= "01001110";
|
||||
when "01001110" => data <= "01101001";
|
||||
when "01101001" => data <= "01111000";
|
||||
when "01111000" => data <= "01001111";
|
||||
when "01001111" => data <= "01010011";
|
||||
when others => data <= "00100000";
|
||||
end case;
|
||||
done <= not or_reduce(data xor "01010011");
|
||||
end if;
|
||||
end if;
|
||||
end process;
|
||||
|
||||
DATA_OUT <= data;
|
||||
DONE_OUT <= done;
|
||||
|
||||
end beh;
|
||||
23
third_party/nixpkgs/pkgs/development/compilers/ghdl/test-simple.nix
vendored
Normal file
23
third_party/nixpkgs/pkgs/development/compilers/ghdl/test-simple.nix
vendored
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, ghdl-llvm, ghdl-mcode, backend }:
|
||||
|
||||
let
|
||||
ghdl = if backend == "llvm" then ghdl-llvm else ghdl-mcode;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "ghdl-test-simple";
|
||||
meta.timeout = 300;
|
||||
nativeBuildInputs = [ ghdl ];
|
||||
buildCommand = ''
|
||||
cp ${./simple.vhd} simple.vhd
|
||||
cp ${./simple-tb.vhd} simple-tb.vhd
|
||||
mkdir -p ghdlwork
|
||||
ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd
|
||||
ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb
|
||||
'' + (if backend == "llvm" then ''
|
||||
./sim-simple --assert-level=warning > output.txt
|
||||
'' else ''
|
||||
ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt
|
||||
'') + ''
|
||||
diff output.txt ${./expected-output.txt} && touch $out
|
||||
'';
|
||||
}
|
||||
|
|
@ -55,6 +55,12 @@ in stdenv.mkDerivation (rec {
|
|||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
patches = [
|
||||
# Force a test to evaluate the saved benchmark for a CPU for which LLVM has
|
||||
# an execution model. See NixOS/nixpkgs#119673.
|
||||
../../exegesis-force-bdver2.patch
|
||||
];
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cmake/modules/AddLLVM.cmake \
|
||||
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
|
||||
|
|
|
|||
11
third_party/nixpkgs/pkgs/development/compilers/llvm/exegesis-force-bdver2.patch
vendored
Normal file
11
third_party/nixpkgs/pkgs/development/compilers/llvm/exegesis-force-bdver2.patch
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff --git a/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s b/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s
|
||||
index 3fc1f31d54dc..a4c9bdd92131 100644
|
||||
--- a/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s
|
||||
+++ b/test/tools/llvm-exegesis/X86/uops-CMOV16rm-noreg.s
|
||||
@@ -1,5 +1,6 @@
|
||||
# RUN: llvm-exegesis -mode=uops -opcode-name=CMOV16rm -benchmarks-file=%t.CMOV16rm-uops.yaml
|
||||
# RUN: FileCheck -check-prefixes=CHECK-YAML -input-file=%t.CMOV16rm-uops.yaml %s
|
||||
+# RUN: sed -i 's,cpu_name:.*,cpu_name: bdver2,g' %t.CMOV16rm-uops.yaml
|
||||
# RUN: llvm-exegesis -mcpu=bdver2 -mode=analysis -benchmarks-file=%t.CMOV16rm-uops.yaml -analysis-clusters-output-file=- -analysis-clustering-epsilon=0.1 -analysis-inconsistency-epsilon=0.1 -analysis-numpoints=1 -analysis-clustering=naive | FileCheck -check-prefixes=CHECK-CLUSTERS %s
|
||||
|
||||
# https://bugs.llvm.org/show_bug.cgi?id=41448
|
||||
|
|
@ -1244,15 +1244,6 @@ self: super: {
|
|||
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
|
||||
reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core)));
|
||||
|
||||
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
|
||||
reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
|
||||
url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
|
||||
sha256 = "1ndqw5r85axynmx55ld6qr8ik1i1mkh6wrnkzpxbwyil2ms8mxn0";
|
||||
stripLen = 2;
|
||||
extraPrefix = "";
|
||||
includes = ["reflex-dom.cabal" ];
|
||||
});
|
||||
|
||||
# add unreleased commit fixing version constraint as a patch
|
||||
# Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved
|
||||
utc = appendPatch super.utc (pkgs.fetchpatch {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, arpack
|
||||
, bison
|
||||
, blas
|
||||
|
|
@ -22,23 +21,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igraph";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-i6Zg6bfHZ9NHwqCouX9m9YqD0VtiWW8DEkxS0hdUyIE=";
|
||||
sha256 = "sha256-Ylw02Mz9H4wIWfq59za/X7xfhgW9o0DNU55nLFqeUeo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pkg-config-paths.patch";
|
||||
url = "https://github.com/igraph/igraph/commit/980521cc948777df471893f7b6de8f3e3916a3c0.patch";
|
||||
sha256 = "0mbq8v5h90c3dhgmyjazjvva3rn57qhnv7pkc9hlbqdln9gpqg0g";
|
||||
})
|
||||
];
|
||||
|
||||
# Normally, igraph wants us to call bootstrap.sh, which will call
|
||||
# tools/getversion.sh. Instead, we're going to put the version directly
|
||||
# where igraph wants, and then let autoreconfHook do the rest of the
|
||||
|
|
@ -55,7 +46,9 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
flex
|
||||
fop
|
||||
libxml2
|
||||
libxslt
|
||||
|
|
@ -67,9 +60,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
arpack
|
||||
bison
|
||||
blas
|
||||
flex
|
||||
glpk
|
||||
gmp
|
||||
lapack
|
||||
|
|
|
|||
|
|
@ -1,40 +1,75 @@
|
|||
{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2
|
||||
, x11Support ? !stdenv.isDarwin, libX11, libXext
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, imlib2
|
||||
, libX11
|
||||
, libXext
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcaca-0.99.beta19";
|
||||
pname = "libcaca";
|
||||
version = "0.99.beta19";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://fossies.org/linux/privat/${name}.tar.gz"
|
||||
"http://caca.zoy.org/files/libcaca/${name}.tar.gz"
|
||||
"http://fossies.org/linux/privat/${pname}-${version}.tar.gz"
|
||||
"http://caca.zoy.org/files/libcaca/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj";
|
||||
hash = "sha256-EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
configureFlags = [
|
||||
(if x11Support then "--enable-x11" else "--disable-x11")
|
||||
];
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ]
|
||||
++ lib.optionals x11Support [ libX11 libXext ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
ncurses
|
||||
zlib
|
||||
(imlib2.override { inherit x11Support; })
|
||||
] ++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXext
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
mv $bin/bin/caca-config $dev/bin/caca-config
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://libcaca.zoy.org/";
|
||||
meta = with lib; {
|
||||
homepage = "http://caca.zoy.org/wiki/libcaca";
|
||||
description = "A graphics library that outputs text instead of pixels";
|
||||
license = lib.licenses.wtfpl;
|
||||
platforms = lib.platforms.unix;
|
||||
longDescription = ''
|
||||
libcaca is a graphics library that outputs text instead of pixels, so that
|
||||
it can work on older video cards or text terminals. It is not unlike the
|
||||
famous AAlib library, with the following improvements:
|
||||
|
||||
- Unicode support
|
||||
- 2048 available colours (some devices can only handle 16)
|
||||
- dithering of colour images
|
||||
- advanced text canvas operations (blitting, rotations)
|
||||
|
||||
Libcaca works in a text terminal (and should thus work on all Unix systems
|
||||
including Mac OS X) using the S-Lang or ncurses libraries. It also works
|
||||
natively on DOS and Windows.
|
||||
|
||||
Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux.
|
||||
'';
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
||||
homepage = "http://github.com/librtlsdr/librtlsdr";
|
||||
homepage = "https://github.com/librtlsdr/librtlsdr";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bicpl";
|
||||
version = "unstable-2017-09-10";
|
||||
|
||||
owner = "BIC-MNI";
|
||||
version = "unstable-2020-10-15";
|
||||
|
||||
# current master is significantly ahead of most recent release, so use Git version:
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "612a63e740fadb162fcf27ee00da6a18dec4d5a9";
|
||||
sha256 = "1vv9gi184bkvp3f99v9xmmw1ly63ip5b09y7zdjn39g7kmwzrga7";
|
||||
rev = "a58af912a71a4c62014975b89ef37a8e72de3c9d";
|
||||
sha256 = "0iw0pmr8xrifbx5l8a0xidfqbm1v8hwzqrw0lcmimxlzdihyri0g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
# internal_volume_io.h: No such file or directory
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/${owner}/${pname}";
|
||||
homepage = "https://github.com/BIC-MNI/bicpl";
|
||||
description = "Brain Imaging Centre programming library";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,28 +1,36 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libminc
|
||||
, bicpl
|
||||
, arguments
|
||||
, pcre-cpp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oobicpl";
|
||||
version = "unstable-2016-03-02";
|
||||
|
||||
owner = "BIC-MNI";
|
||||
version = "unstable-2020-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "bc062a65dead2e58461f5afb37abedfa6173f10c";
|
||||
sha256 = "05l4ml9djw17bgdnrldhcxydrzkr2f2scqlyak52ph5azj5n4zsx";
|
||||
rev = "a9409da8a5bb4925438f32aff577b6333faec28b";
|
||||
sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ libminc bicpl arguments pcre-cpp ];
|
||||
|
||||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||
"-DBICPL_DIR=${bicpl}/lib"
|
||||
"-DARGUMENTS_DIR=${arguments}/lib"
|
||||
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ];
|
||||
cmakeFlags = [
|
||||
"-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||
"-DBICPL_DIR=${bicpl}/lib"
|
||||
"-DARGUMENTS_DIR=${arguments}/lib"
|
||||
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/${owner}/${pname}";
|
||||
homepage = "https://github.com/BIC-MNI/oobicpl";
|
||||
description = "Brain Imaging Centre object-oriented programming library (and tools)";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, meson, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spice-protocol";
|
||||
version = "0.14.1";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr";
|
||||
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
ln -sv ../share/pkgconfig $out/lib/pkgconfig
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, xmlm }:
|
||||
{ lib, fetchurl, buildDunePackage, xmlm }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ezxmlm";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avsm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dgr61f0hymywikn67inq908x5adrzl3fjx3v14l9k46x7kkacl9";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ezxmlm/releases/download/v${version}/ezxmlm-v${version}.tbz";
|
||||
sha256 = "123dn4h993mlng9gzf4nc6mw75ja7ndcxkbkwfs48j5jk1z05j6d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ xmlm ];
|
||||
|
|
@ -27,7 +27,7 @@ buildDunePackage rec {
|
|||
just fine with it if you decide to switch over.
|
||||
'';
|
||||
maintainers = [ maintainers.carlosdagos ];
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/mirage/ezxmlm/";
|
||||
license = licenses.isc;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ buildDunePackage rec {
|
|||
meta = with lib; {
|
||||
description = "Low-level libraries for connecting to a xenstore service on a xen host";
|
||||
license = licenses.lgpl21Only;
|
||||
homepage = "http://github.com/xapi-project/ocaml-xenstore-clients";
|
||||
homepage = "https://github.com/xapi-project/ocaml-xenstore-clients";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Django library for Mailman UIs";
|
||||
homepage = "https://gitlab.com/mailman/django-mailman3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ globin peti ];
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ buildPythonPackage rec {
|
|||
description = "Mailman archiver plugin for HyperKitty";
|
||||
homepage = "https://gitlab.com/mailman/mailman-hyperkitty";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ globin peti ];
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
|||
description = "REST client for driving Mailman 3";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ peti globin ];
|
||||
maintainers = with maintainers; [ peti globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Library with cross-python path, ini-parsing, io, code, log facilities";
|
||||
homepage = "https://pylib.readthedocs.org/";
|
||||
homepage = "https://py.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydantic";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samuelcolvin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+HfnM/IrFlUyQJdiOYyaJUNenh8dLtd8CUJWSbn6hwQ=";
|
||||
sha256 = "1zvcmx3927fgx37gdhi8g8igvrkri1v78rn3118p4wssqhgfwa6n";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A microframework based on uvloop, httptools, and learnings of flask";
|
||||
homepage = "http://github.com/channelcat/sanic/";
|
||||
homepage = "https://github.com/channelcat/sanic/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@
|
|||
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which
|
||||
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem
|
||||
, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
|
||||
, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
|
||||
, cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl
|
||||
, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
|
||||
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
|
||||
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
|
||||
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
|
||||
, bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info
|
||||
, bundler, libsass, libselinux, libsepol, shared-mime-info, libthai, libdatrie
|
||||
, CoreServices, DarwinTools, cctools
|
||||
}@args:
|
||||
|
||||
let
|
||||
|
|
@ -41,7 +42,8 @@ in
|
|||
{
|
||||
atk = attrs: {
|
||||
dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
|
||||
nativeBuildInputs = [ rake bundler pkg-config ];
|
||||
nativeBuildInputs = [ rake bundler pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ];
|
||||
};
|
||||
|
||||
|
|
@ -61,12 +63,14 @@ in
|
|||
};
|
||||
|
||||
cairo = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
|
||||
};
|
||||
|
||||
cairo-gobject = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
|
||||
};
|
||||
|
||||
|
|
@ -189,7 +193,8 @@ in
|
|||
};
|
||||
|
||||
gdk_pixbuf2 = attrs: {
|
||||
nativeBuildInputs = [ pkg-config bundler rake ];
|
||||
nativeBuildInputs = [ pkg-config bundler rake ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ];
|
||||
};
|
||||
|
||||
|
|
@ -199,7 +204,8 @@ in
|
|||
};
|
||||
|
||||
gio2 = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
|
||||
};
|
||||
|
||||
|
|
@ -235,7 +241,8 @@ in
|
|||
};
|
||||
|
||||
glib2 = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ gtk2 pcre ];
|
||||
};
|
||||
|
||||
|
|
@ -244,7 +251,7 @@ in
|
|||
binutils pkg-config
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
util-linux libselinux libsepol
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
propagatedBuildInputs = [
|
||||
atk
|
||||
gdk-pixbuf
|
||||
|
|
@ -252,16 +259,18 @@ in
|
|||
gobject-introspection
|
||||
gtk2
|
||||
harfbuzz
|
||||
libdatrie
|
||||
libthai
|
||||
pcre
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
];
|
||||
# CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
|
||||
# CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
|
||||
dontStrip = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
gobject-introspection = attrs: {
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
nativeBuildInputs = [ pkg-config pcre ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
|
||||
};
|
||||
|
||||
|
|
@ -287,9 +296,7 @@ in
|
|||
};
|
||||
|
||||
hitimes = attrs: {
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isDarwin
|
||||
[ darwin.apple_sdk.frameworks.CoreServices ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
};
|
||||
|
||||
iconv = attrs: {
|
||||
|
|
@ -453,7 +460,9 @@ in
|
|||
pcre
|
||||
xorg.libpthreadstubs
|
||||
xorg.libXdmcp
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ libdatrie libthai ]
|
||||
++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ];
|
||||
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ];
|
||||
};
|
||||
|
||||
|
|
@ -661,7 +670,7 @@ in
|
|||
};
|
||||
|
||||
zookeeper = attrs: {
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ cctools ];
|
||||
dontBuild = false;
|
||||
postPatch = ''
|
||||
sed -i ext/extconf.rb -e "4a \
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ def prefetch_github(owner: str, repo: str, ref: str) -> str:
|
|||
|
||||
|
||||
def get_radare2_rev() -> str:
|
||||
feed_url = "http://github.com/radareorg/radare2/releases.atom"
|
||||
feed_url = "https://github.com/radareorg/radare2/releases.atom"
|
||||
with urllib.request.urlopen(feed_url) as resp:
|
||||
tree = ET.fromstring(resp.read())
|
||||
releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry")
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU=";
|
||||
sha256 = "sha256-iFxRZq/8TW7Df+aAc5IN+FAXU4kvbDiHWiFOlWMmCY0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4=";
|
||||
vendorSha256 = "sha256-LvaSs1y1CEP+cJc0vqTh/8MezmtuFAbfMgqloAjLZl8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
2
third_party/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix
generated
vendored
2
third_party/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix
generated
vendored
|
|
@ -3712,7 +3712,7 @@ in
|
|||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Portable Unix shell commands for Node.js";
|
||||
homepage = "http://github.com/shelljs/shelljs";
|
||||
homepage = "https://github.com/shelljs/shelljs";
|
||||
license = "BSD-3-Clause";
|
||||
};
|
||||
production = true;
|
||||
|
|
|
|||
291
third_party/nixpkgs/pkgs/games/ja2-stracciatella/Cargo.lock
generated
vendored
291
third_party/nixpkgs/pkgs/games/ja2-stracciatella/Cargo.lock
generated
vendored
|
|
@ -1,291 +0,0 @@
|
|||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "dtoa"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-zircon"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-zircon-sys"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "getopts"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "kernel32-sys"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "0.1.80"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.70"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.70"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shell32-sys"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stracciatella"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "0.14.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempdir"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread-id"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "user32-sys"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf8-ranges"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-build"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[metadata]
|
||||
"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
|
||||
"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
|
||||
"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
|
||||
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
|
||||
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||
"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
|
||||
"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606"
|
||||
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
|
||||
"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1"
|
||||
"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
|
||||
"checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6"
|
||||
"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035"
|
||||
"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
|
||||
"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
|
||||
"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
|
||||
"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
|
||||
"checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920"
|
||||
"checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124"
|
||||
"checksum serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "84b8035cabe9b35878adec8ac5fe03d5f6bc97ff6edd7ccb96b44c1276ba390e"
|
||||
"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c"
|
||||
"checksum syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2beff8ebc3658f07512a413866875adddd20f4fd47b2a4e6c9da65cd281baaea"
|
||||
"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
|
||||
"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
|
||||
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
|
||||
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
||||
"checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
|
||||
"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
|
||||
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
||||
"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
|
||||
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
|
||||
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
|
@ -1,45 +1,57 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }:
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, python, rustPlatform, SDL2, fltk, rapidjson, gtest, Carbon, Cocoa }:
|
||||
let
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ja2-stracciatella";
|
||||
repo = "ja2-stracciatella";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pyn23syg70kiyfbs3pdlq0ixd2bxhncbamnic43rym3dmd52m29";
|
||||
};
|
||||
lockfile = ./Cargo.lock;
|
||||
libstracciatellaSrc = stdenv.mkDerivation {
|
||||
name = "libstracciatella-${version}-src";
|
||||
src = "${src}/rust";
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R ./* $out/
|
||||
cp ${lockfile} $out/Cargo.lock
|
||||
'';
|
||||
sha256 = "0m6rvgkba29jy3yq5hs1sn26mwrjl6mamqnv4plrid5fqaivhn6j";
|
||||
};
|
||||
libstracciatella = rustPlatform.buildRustPackage {
|
||||
pname = "libstracciatella";
|
||||
inherit version;
|
||||
src = libstracciatellaSrc;
|
||||
cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc";
|
||||
doCheck = false;
|
||||
src = "${src}/rust";
|
||||
cargoSha256 = "0blb971cv9k6c460mwq3zq8vih687bdnb39b9gph1hr90pxjviba";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/include/stracciatella
|
||||
export HEADER_LOCATION=$out/include/stracciatella/stracciatella.h
|
||||
'';
|
||||
};
|
||||
stringTheoryUrl = "https://github.com/zrax/string_theory/archive/3.1.tar.gz";
|
||||
stringTheory = fetchurl {
|
||||
url = stringTheoryUrl;
|
||||
sha256 = "1flq26kkvx2m1yd38ldcq2k046yqw07jahms8a6614m924bmbv41";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ja2-stracciatella";
|
||||
inherit src;
|
||||
inherit version;
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 fltk boost ];
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
|
||||
|
||||
patches = [
|
||||
./remove-rust-buildstep.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt
|
||||
cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2")
|
||||
# Use rust library built with nix
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace lib/libstracciatella_c_api.a ${libstracciatella}/lib/libstracciatella_c_api.a \
|
||||
--replace include/stracciatella ${libstracciatella}/include/stracciatella \
|
||||
--replace bin/ja2-resource-pack ${libstracciatella}/bin/ja2-resource-pack
|
||||
|
||||
# Patch dependencies that are usually loaded by url
|
||||
substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \
|
||||
--replace ${stringTheoryUrl} file://${stringTheory}
|
||||
|
||||
cmakeFlagsArray+=("-DLOCAL_RAPIDJSON_LIB=OFF" "-DLOCAL_GTEST_LIB=OFF" "-DEXTRA_DATA_DIR=$out/share/ja2")
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
HOME=/tmp $out/bin/ja2 -unittests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,21 +1,73 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f354370e0..c9fa23c6d 100644
|
||||
index e4e5547af..a3017d197 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -159,7 +159,6 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized")
|
||||
@@ -175,13 +175,12 @@ if(BUILD_LAUNCHER)
|
||||
endif()
|
||||
message(STATUS "Fltk Libraries: ${FLTK_LIBRARIES}")
|
||||
|
||||
-set(JA2_INCLUDES "")
|
||||
+set(JA2_INCLUDES "include/stracciatella")
|
||||
set(JA2_SOURCES "")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/game")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/slog")
|
||||
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/rust")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-smacker")
|
||||
|
||||
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-stracciatella")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-string_theory")
|
||||
|
||||
if(BUILD_LAUNCHER)
|
||||
@@ -235,8 +234,6 @@ copy_assets_dir_to_ja2_binary_after_build("externalized")
|
||||
copy_assets_dir_to_ja2_binary_after_build("unittests")
|
||||
copy_assets_dir_to_ja2_binary_after_build("mods")
|
||||
|
||||
-get_property(STRACCIATELLA_SHARED_LIB TARGET rust-stracciatella PROPERTY IMPORTED_LOCATION)
|
||||
@@ -239,14 +238,12 @@ string(LENGTH "${CMAKE_SOURCE_DIR}/src/" SOURCE_PATH_SIZE)
|
||||
add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}")
|
||||
|
||||
add_executable(${JA2_BINARY} ${JA2_SOURCES})
|
||||
-target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker ${STRACCIATELLA_LIBRARIES} string_theory-internal)
|
||||
-add_dependencies(${JA2_BINARY} stracciatella)
|
||||
+target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker lib/libstracciatella_c_api.a dl pthread string_theory-internal)
|
||||
set_property(SOURCE ${CMAKE_SOURCE_DIR}/src/game/GameVersion.cc APPEND PROPERTY COMPILE_DEFINITIONS "GAME_VERSION=v${ja2-stracciatella_VERSION}")
|
||||
|
||||
if(BUILD_LAUNCHER)
|
||||
add_executable(${LAUNCHER_BINARY} ${LAUNCHER_SOURCES})
|
||||
- target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} ${STRACCIATELLA_LIBRARIES} string_theory-internal)
|
||||
- add_dependencies(${LAUNCHER_BINARY} stracciatella)
|
||||
+ target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} lib/libstracciatella_c_api.a dl pthread string_theory-internal)
|
||||
endif()
|
||||
|
||||
macro(copy_assets_dir_to_ja2_binary_after_build DIR)
|
||||
@@ -375,12 +372,12 @@ set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_
|
||||
|
||||
include(CPack)
|
||||
|
||||
-if (UNIX AND NOT MINGW AND NOT APPLE)
|
||||
+if (UNIX)
|
||||
install(TARGETS ${JA2_BINARY} RUNTIME DESTINATION bin)
|
||||
if(BUILD_LAUNCHER)
|
||||
install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION bin)
|
||||
endif()
|
||||
- install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION bin)
|
||||
+ install(PROGRAMS "bin/ja2-resource-pack" DESTINATION bin)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION share/ja2)
|
||||
if(WITH_EDITOR_SLF)
|
||||
install(FILES "${EDITORSLF_FILE}" DESTINATION share/ja2)
|
||||
@@ -400,7 +397,7 @@ else()
|
||||
if(BUILD_LAUNCHER)
|
||||
install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION .)
|
||||
endif()
|
||||
- install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION .)
|
||||
+ install(PROGRAMS "bin/ja2-resource-pack" DESTINATION .)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION .)
|
||||
if(WITH_EDITOR_SLF)
|
||||
install(FILES "${EDITORSLF_FILE}" DESTINATION .)
|
||||
@@ -428,12 +425,6 @@ if (MINGW)
|
||||
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-dlls-mingw.cmake")
|
||||
endif()
|
||||
|
||||
-if(APPLE)
|
||||
- file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt")
|
||||
- install(FILES ${APPLE_DIST_FILES} DESTINATION .)
|
||||
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.8-macos/SDL2.framework DESTINATION .)
|
||||
-endif()
|
||||
-
|
||||
if (MSVC OR APPLE)
|
||||
add_custom_command(TARGET ${JA2_BINARY} POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
## Uninstall
|
||||
|
||||
add_custom_templated_target("uninstall")
|
||||
|
|
|
|||
|
|
@ -427,8 +427,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "github-vscode-theme";
|
||||
publisher = "github";
|
||||
version = "3.0.0";
|
||||
sha256 = "1a77mbx75xfsfdlhgzghj9i7ik080bppc3jm8c00xp6781987fpa";
|
||||
version = "4.0.2";
|
||||
sha256 = "06mysdwjh7km874rrk0xc0xxaqx15b4a7x1i8dly440h8w3ng5bs";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "GitHub theme for VS Code";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "chunkwm";
|
||||
version = "0.4.9";
|
||||
src = fetchzip {
|
||||
url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz";
|
||||
url = "https://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz";
|
||||
sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.14";
|
||||
version = "5.11.15";
|
||||
suffix = "xanmod1-cacule";
|
||||
in
|
||||
buildLinux (args // rec {
|
||||
|
|
@ -12,7 +12,7 @@ in
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-kRbU1jheZi2U6mfNyhBFn3FJ7fjYkNUVwkx3w/DZNQI=";
|
||||
sha256 = "sha256-Qhq01SgLeNbts86DLi/t70HJfJPmM1So1C4eqVyRLK0=";
|
||||
extraPostFetch = ''
|
||||
rm $out/.config
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "1ck55i8snpm583p21y1hac0w76wiwyjpgfxkzscd4whp2jnzhhif";
|
||||
sha256 = "sha256-CKezHuCbL1I79gDz7ZQiSgPbSXo0NtssQro2MqqmeXw=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
vendorSha256 = "0y744zpj49zvn5vqqb9wmfs1fs0lir71h2kcmhidmn9j132vg1bq";
|
||||
vendorSha256 = "sha256-YqrW3PeFv1Y6lmjVmMMP0SZao57iPqfut3a1afIWkI0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ buildBazelPackage rec {
|
|||
|
||||
patches = [
|
||||
# Quiche needs to be updated to compile under newer GCC.
|
||||
# This is a manual backport of http://github.com/envoyproxy/envoy/pull/13949.
|
||||
# This is a manual backport of https://github.com/envoyproxy/envoy/pull/13949.
|
||||
./0001-quiche-update-QUICHE-tar-13949.patch
|
||||
|
||||
# upb needs to be updated to compile under newer GCC.
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://www.gnu.org/software/mailman/";
|
||||
description = "Free software for managing electronic mail discussion and newsletter lists";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ peti ];
|
||||
maintainers = with lib.maintainers; [ peti qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@ buildPythonPackage rec {
|
|||
description = "Archiver for GNU Mailman v3";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ peti globin ];
|
||||
maintainers = with lib.maintainers; [ peti globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://docs.mailman3.org/projects/postorius";
|
||||
description = "Web-based user interface for managing GNU Mailman";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ globin peti ];
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.27.1";
|
||||
version = "1.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YaW7rTeVz2Mbnmp6ORsnALlyVxGnf8K73LXN/fmJMLk=";
|
||||
sha256 = "sha256-Wq3CWKYuF4AaOVpe0sGn9BzLx/6rSPFN6rFc2jUUVEA=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
|||
|
|
@ -45,25 +45,25 @@ let
|
|||
|
||||
# Derived from vst3.wrap
|
||||
vst3 = rec {
|
||||
version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6";
|
||||
version = "3.7.2_build_28-patched";
|
||||
src = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = "vst3sdk";
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s=";
|
||||
sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w=";
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "yabridge";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
|
||||
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
||||
src = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI=";
|
||||
hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI=";
|
||||
};
|
||||
|
||||
# Unpack subproject sources
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
src = yabridge.src;
|
||||
sourceRoot = "source/tools/yabridgectl";
|
||||
cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0=";
|
||||
cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY=";
|
||||
|
||||
patches = [
|
||||
# By default, yabridgectl locates libyabridge.so by using
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
|
||||
index c1c89cf..d7bd822 100644
|
||||
index 6e05e34..656eef3 100644
|
||||
--- a/tools/yabridgectl/src/config.rs
|
||||
+++ b/tools/yabridgectl/src/config.rs
|
||||
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet};
|
||||
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};
|
||||
use std::env;
|
||||
use std::fmt::Display;
|
||||
use std::fs;
|
||||
|
|
@ -10,7 +10,7 @@ index c1c89cf..d7bd822 100644
|
|||
use std::path::{Path, PathBuf};
|
||||
use which::which;
|
||||
use xdg::BaseDirectories;
|
||||
@@ -216,34 +217,24 @@ impl Config {
|
||||
@@ -222,34 +223,24 @@ impl Config {
|
||||
}
|
||||
}
|
||||
None => {
|
||||
|
|
@ -56,10 +56,10 @@ index c1c89cf..d7bd822 100644
|
|||
));
|
||||
}
|
||||
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
|
||||
index 0db1bd4..221cdd0 100644
|
||||
index ce701b8..b6b9633 100644
|
||||
--- a/tools/yabridgectl/src/main.rs
|
||||
+++ b/tools/yabridgectl/src/main.rs
|
||||
@@ -102,7 +102,7 @@ fn main() -> Result<()> {
|
||||
@@ -150,7 +150,7 @@ fn main() -> Result<()> {
|
||||
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
|
||||
.long_about(
|
||||
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
|
||||
|
|
|
|||
37
third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix
vendored
Normal file
37
third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, stdenv, fetchFromGitHub, lz4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nx2elf";
|
||||
version = "unstable-2020-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuffle2";
|
||||
repo = "nx2elf";
|
||||
rev = "7212e82a77b84fcc18ef2d050970350dbf63649b";
|
||||
sha256 = "1j4k5s86c6ixa3wdqh4cfm31fxabwn6jcjc6pippx8mii98ac806";
|
||||
};
|
||||
|
||||
buildInputs = [ lz4 ];
|
||||
|
||||
postPatch = ''
|
||||
# This project does not comply with C++14 standards, and compilation on that fails.
|
||||
# This does however succesfully compile with the gnu++20 standard.
|
||||
substituteInPlace Makefile --replace "c++14" "gnu++20"
|
||||
|
||||
# pkg-config is not supported, so we'll manually use a non-ancient version of lz4
|
||||
cp ${lz4.src}/lib/lz4.{h,c} .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -D nx2elf $out/bin/nx2elf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/shuffle2/nx2elf";
|
||||
description = "Convert Nintendo Switch executable files to ELFs";
|
||||
license = licenses.unfree; # No license specified upstream
|
||||
platforms = [ "x86_64-linux" ]; # Should work on Darwin as well, but this is untested. aarch64-linux fails.
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtools";
|
||||
version = "4.0.26";
|
||||
version = "4.0.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk";
|
||||
sha256 = "1crqi10adwfahj8xyw60lx70hkpcc5g00b5r8277cm2f4kcwi24w";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grim";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib";
|
||||
sha256 = "sha256-71dmYENfPX8YHcTlR2F67EheoewicePMKm9/wPbmj9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,31 +1,20 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, libjpeg }:
|
||||
{ lib, stdenv, fetchFromGitHub, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jhead";
|
||||
version = "3.04";
|
||||
version = "3.06.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
|
||||
sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matthias-Wandel";
|
||||
repo = "jhead";
|
||||
rev = version;
|
||||
sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c";
|
||||
sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i '/dpkg-buildflags/d' makefile
|
||||
substituteInPlace jhead.c \
|
||||
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p \
|
||||
$out/bin \
|
||||
|
|
@ -43,10 +32,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
platforms = platforms.all;
|
||||
# https://github.com/NixOS/nixpkgs/issues/90828
|
||||
knownVulnerabilities = [
|
||||
"CVE-2020-6624"
|
||||
"CVE-2020-6625"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,15 +21,13 @@ let
|
|||
# This includes the complete source so the per-script derivations can run the tests.
|
||||
core = stdenv.mkDerivation rec {
|
||||
pname = "bat-extras";
|
||||
# there hasn't been a release since 2020-05-01 but there are important bugfixes
|
||||
# to the test suite so we'll pull the latest commit as of 2020-06-17.
|
||||
version = "20200515-dev"; # latest commit was dated 2020-05-15
|
||||
version = "2021.04.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-p";
|
||||
repo = pname;
|
||||
rev = "3029b6749f61f7514e9eef30e035cfab0e31eb1d";
|
||||
sha256 = "08mb94k2n182ql97c5s5j1v7np25ivynn5g0418whrx11ra41wr7";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MphI2n+oHZrw8bPohNGeGdST5LS1c6s/rKqtpcR9cLo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
|
|||
|
||||
install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/betterdiscord.desktop \
|
||||
--replace "Exec=AppRun" "Exec=$out/bin/${pname}"
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
|
|
|
|||
29
third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix
vendored
Normal file
29
third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "macchina";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macchina-CLI";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y23gpYDnYoiTJcNyWKslVenPTXcCrOvxq+0N9PjQN3g=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jfLj8kLBG6AeeYo421JCl1bMqWwOGiwQgv7AEomtFcY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion target/completions/*.{bash,fish}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast, minimal and customizable system information fetcher";
|
||||
homepage = "https://github.com/Macchina-CLI/macchina";
|
||||
changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ _414owen ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,6 +12,8 @@
|
|||
, xz
|
||||
, e2fsprogs
|
||||
, libsoup
|
||||
, glib-networking
|
||||
, wrapGAppsHook
|
||||
, gpgme
|
||||
, which
|
||||
, makeWrapper
|
||||
|
|
@ -78,6 +80,7 @@ in stdenv.mkDerivation rec {
|
|||
libxslt
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_42
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -85,6 +88,7 @@ in stdenv.mkDerivation rec {
|
|||
systemd
|
||||
e2fsprogs
|
||||
libsoup
|
||||
glib-networking
|
||||
gpgme
|
||||
fuse
|
||||
libselinux
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "watchexec";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1b0ds04q4g8xcgwkziwb5hsi7v73w9y0prvhxz880zzh930652n2";
|
||||
sha256 = "1xznhfljvsvc0ykv5h1wg31n93v96lvhbxfhavxivq3b0xh5vxrw";
|
||||
};
|
||||
|
||||
cargoSha256 = "0jpfgyz5l4fdb5cnqmadzjzrvc6dwgray4b0mx80pghpjw8a8qfb";
|
||||
cargoSha256 = "00dampnsnpzmchjcn0j5zslx17i0qgrv99gq772n0683m1l2lfq3";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rnix-hashes";
|
||||
version = "0.2.0";
|
||||
|
|
@ -10,12 +11,20 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "SzHyG5cEjaaPjTkn8puht6snjHMl8DtorOGDjxakJfA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix test failure
|
||||
(fetchpatch {
|
||||
url = "https://github.com/numtide/rnix-hashes/commit/62ab96cfd1efeade7d98efd9829eae8677bac9cc.patch";
|
||||
sha256 = "sha256-oE2fBt20FmO2cEUGivu2mKo3z6rbhVLXSF8SRvhibFs=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "vaG+0t+XAckV9F4iIgcTkbIUurxdQsTCfOnRnrOKoRc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nix Hash Converter";
|
||||
homepage = "https://github.com/numtide/rnix-hashes";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rizary ];
|
||||
maintainers = with maintainers; [ rizary SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodsecurity";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib";
|
||||
sha256 = "07vry10cdll94sp652hwapn0ppjv3mb7n2s781yhy7hssap6f2vp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tor";
|
||||
version = "0.4.5.6";
|
||||
version = "0.4.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2";
|
||||
sha256 = "0x7hhl0svfc4yh9xvq7kkzgmwjcw1ak9i0794wjg4biy2fmclzs4";
|
||||
};
|
||||
|
||||
outputs = [ "out" "geoip" ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue