nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-17 18:10:38 +00:00 committed by GitHub
commit 8156636ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 819 additions and 1282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5534,6 +5534,12 @@
githubId = 4158274; githubId = 4158274;
name = "Michiel Leenaars"; name = "Michiel Leenaars";
}; };
legendofmiracles = {
email = "legendofmiracles@protonmail.com";
github = "legendofmiracles";
githubId = 30902201;
name = "legendofmiracles";
};
lejonet = { lejonet = {
email = "daniel@kuehn.se"; email = "daniel@kuehn.se";
github = "lejonet"; github = "lejonet";

3
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -446,7 +446,8 @@ in
'') rootPools)); '') 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; zfsSupport = true;
}; };

2
pkgs/applications/audio/apple-music-electron/default.nix
View File

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \ 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 cp -r ${appimageContents}/usr/share/icons $out/share
''; '';

2
pkgs/applications/audio/nuclear/default.nix
View File

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \ 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 cp -r ${appimageContents}/usr/share/icons $out/share
''; '';

2
pkgs/applications/audio/plexamp/default.nix
View File

@ -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.desktop $out/share/applications/plexamp.desktop
install -m 444 -D ${appimageContents}/plexamp.png \ install -m 444 -D ${appimageContents}/plexamp.png \
$out/share/icons/hicolor/512x512/apps/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}' --replace 'Exec=AppRun' 'Exec=${pname}'
''; '';

2
pkgs/applications/blockchains/crypto-org-wallet.nix
View File

@ -20,7 +20,7 @@ in appimageTools.wrapType2 rec {
${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png ${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 install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \ 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; { meta = with lib; {

3
pkgs/applications/blockchains/trezor-suite/default.nix
View File

@ -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}.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}/${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 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 # symlink system binaries instead bundled ones
mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} mkdir -p $out/share/${pname}/resources/bin/{bridge,tor}

74
pkgs/applications/graphics/foxotron/default.nix Normal file
View 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;
};
}

44
pkgs/applications/graphics/runwayml/default.nix
View File

@ -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
pkgs/applications/misc/shfm/default.nix Normal file
View 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;
};
}

8
pkgs/applications/misc/tdrop/default.nix
View File

@ -2,15 +2,15 @@
, xwininfo, xdotool, xprop, gawk, coreutils , xwininfo, xdotool, xprop, gawk, coreutils
, gnugrep, procps }: , gnugrep, procps }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "tdrop"; pname = "tdrop";
version = "unstable-2020-05-14"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "noctuid"; owner = "noctuid";
repo = "tdrop"; repo = "tdrop";
rev = "a9f2862515e5c190ac61d394e7fe7e1039871b89"; rev = version;
sha256 = "1zxhihgba33k8byjsracsyhby9qpdngbly6c8hpz3pbsyag5liwc"; sha256 = "sha256-1umHwzpv4J8rZ0c0q+2dPsEk4vhFB4UerwI8ctIJUZg=";
}; };
dontBuild = true; dontBuild = true;

3
pkgs/applications/misc/zettlr/default.nix
View File

@ -33,7 +33,8 @@ appimageTools.wrapType2 rec {
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop 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 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; { meta = with lib; {

196
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View File

@ -1,82 +1,160 @@
{ lib, stdenv, fetchurl { lib
, bundlerEnv, ruby , stdenv
, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection , fetchurl
, bundlerEnv
, alsaUtils
, atk
, copyDesktopItems
, gobject-introspection
, gtk2
, ruby
, libicns
, libnotify
, makeDesktopItem
, which
, wrapGAppsHook
, writeText
}: }:
# how to update: let
# find latest version at: http://mikutter.hachune.net/download#download # NOTE: $out may have different values depending on context
# run these commands: mikutterPaths = rec {
# optPrefixDir = "$out/opt/mikutter";
# wget http://mikutter.hachune.net/bin/mikutter.4.0.0.tar.gz appPrefixDir = "$out/Applications/mikutter.app/Contents";
# mkdir mikutter appBinDir = "${appPrefixDir}/MacOS";
# cd mikutter appResourceDir = "${appPrefixDir}/Resources";
# tar xvf ../mikutter.4.0.0.tar.gz iconPath = "${optPrefixDir}/core/skin/data/icon.png";
# 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";
}; };
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ]; gems = bundlerEnv {
nativeBuildInputs = [ wrapGAppsHook ]; name = "mikutter-gems"; # leave the version out to enable package reuse
gemdir = ./deps;
groups = [ "default" "plugin" ];
inherit ruby;
unpackPhase = '' # Avoid the following error:
mkdir source # > `<module:Moneta>': uninitialized constant Moneta::Builder (NameError)
cd source #
unpackFile $src # 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 rm -rf vendor
''; '';
installPhase = let installPhase = ''
env = bundlerEnv { runHook preInstall
name = "mikutter-${version}-gems";
gemdir = ./.;
inherit ruby; mkdir -p $out/bin ${optPrefixDir}
};
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
cp -rv . $out install -Dm644 README $out/share/doc/mikutter/README
mkdir $out/bin/ install -Dm644 LICENSE $out/share/doc/mikutter/LICENSE
# hack wrapGAppsHook wants a file not a symlink rm -r README LICENSE deployment
mv $out/mikutter.rb $out/bin/mikutter
gappsWrapperArgs+=( cp -r . ${optPrefixDir}
--prefix PATH : "${ruby}/bin:${alsaUtils}/bin:${libnotify}/bin"
--prefix GEM_HOME : "${env}/${env.ruby.gemPath}" gappsWrapperArgsHook # FIXME: currently runs at preFixup
wrapGApp ${optPrefixDir}/mikutter.rb \
--prefix PATH : "${scriptPath}" \
--set DISABLE_BUNDLER_SETUP 1 --set DISABLE_BUNDLER_SETUP 1
) mv ${optPrefixDir}/mikutter.rb $out/bin/mikutter
# --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules"
mkdir -p $out/share/mikutter $out/share/applications install -Dm644 ${iconPath} $out/share/icons/hicolor/256x256/apps/mikutter.png
ln -sv $out/core/skin $out/share/mikutter/skin
substituteAll ${./mikutter.desktop} $out/share/applications/mikutter.desktop runHook postInstall
''; '';
postFixup = '' postInstall =
mv $out/bin/.mikutter-wrapped $out/mikutter.rb let
substituteInPlace $out/bin/mikutter \ infoPlist = mkInfoPlist { inherit version; };
--replace "$out/bin/.mikutter-wrapped" "$out/mikutter.rb" 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; { meta = with lib; {
description = "An extensible Twitter client"; description = "An extensible Mastodon client";
homepage = "https://mikutter.hachune.net"; homepage = "https://mikutter.hachune.net";
platforms = ruby.meta.platforms; platforms = ruby.meta.platforms;
license = licenses.mit; license = licenses.mit;
broken = true;
}; };
} }

8
pkgs/applications/networking/instant-messengers/mikutter/Gemfile → pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile
View File

@ -11,12 +11,12 @@ ruby '>= 2.5.0'
group :default do group :default do
gem 'addressable','>= 2.7.0', '< 2.8' gem 'addressable','>= 2.7.0', '< 2.8'
gem 'delayer','>= 1.0.1', '< 1.1' gem 'delayer','>= 1.1.2', '< 2.0'
gem 'delayer-deferred','>= 2.1.1', '< 2.2' gem 'delayer-deferred','>= 2.2.0', '< 3.0'
gem 'diva','>= 1.0.1', '< 1.1' gem 'diva','>= 1.0.2', '< 2.0'
gem 'memoist','>= 0.16.2', '< 0.17' gem 'memoist','>= 0.16.2', '< 0.17'
gem 'oauth','>= 0.5.4' 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' gem 'typed-array','>= 0.1.2', '< 0.2'
end end

78
pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock → pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock
View File

@ -5,22 +5,23 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
atk (3.4.1) atk (3.4.1)
glib2 (= 3.4.1) glib2 (= 3.4.1)
cairo (1.16.4) cairo (1.17.5)
native-package-installer (>= 1.0.3) native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2) pkg-config (>= 1.2.2)
red-colors
cairo-gobject (3.4.1) cairo-gobject (3.4.1)
cairo (>= 1.16.2) cairo (>= 1.16.2)
glib2 (= 3.4.1) glib2 (= 3.4.1)
crack (0.4.3) crack (0.4.5)
safe_yaml (~> 1.0.0) rexml
delayer (1.0.1) delayer (1.2.0)
delayer-deferred (2.1.1) delayer-deferred (2.2.0)
delayer (>= 1.0, < 2.0) delayer (>= 1.1.2, < 2.0)
diva (1.0.1) diva (1.0.2)
addressable (>= 2.5.2, < 2.8) addressable (>= 2.5.2, < 2.8)
gdk_pixbuf2 (3.4.1) gdk_pixbuf2 (3.4.1)
gio2 (= 3.4.1) gio2 (= 3.4.1)
gettext (3.2.9) gettext (3.3.7)
locale (>= 2.0.5) locale (>= 2.0.5)
text (>= 1.3.0) text (>= 1.3.0)
gio2 (3.4.1) gio2 (3.4.1)
@ -34,40 +35,38 @@ GEM
atk (= 3.4.1) atk (= 3.4.1)
gdk_pixbuf2 (= 3.4.1) gdk_pixbuf2 (= 3.4.1)
pango (= 3.4.1) pango (= 3.4.1)
hashdiff (1.0.0) hashdiff (1.0.1)
httpclient (2.8.3) httpclient (2.8.3)
instance_storage (1.0.0) instance_storage (1.0.0)
io-console (0.5.3) locale (2.1.3)
irb (1.2.1)
reline (>= 0.0.1)
locale (2.1.2)
memoist (0.16.2) memoist (0.16.2)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
mocha (1.11.1) mocha (1.12.0)
moneta (1.2.1) moneta (1.4.1)
native-package-installer (1.0.9) native-package-installer (1.1.1)
nokogiri (1.10.7) nokogiri (1.11.3)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
oauth (0.5.4) racc (~> 1.4)
oauth (0.5.6)
pango (3.4.1) pango (3.4.1)
cairo-gobject (= 3.4.1) cairo-gobject (= 3.4.1)
gobject-introspection (= 3.4.1) gobject-introspection (= 3.4.1)
pkg-config (1.4.0) pkg-config (1.4.6)
pluggaloid (1.2.0) pluggaloid (1.5.0)
delayer (>= 1.0.0, < 2.0) delayer (>= 1.1.0, < 2.0)
instance_storage (>= 1.0.0, < 2.0.0) instance_storage (>= 1.0.0, < 2.0.0)
power_assert (1.1.5) power_assert (2.0.0)
public_suffix (4.0.1) public_suffix (4.0.6)
rake (13.0.1) racc (1.5.2)
reline (0.1.2) rake (13.0.3)
io-console (~> 0.5) red-colors (0.1.1)
ruby-prof (1.1.0) rexml (3.2.5)
safe_yaml (1.0.5) ruby-prof (1.4.3)
test-unit (3.3.4) test-unit (3.4.0)
power_assert power_assert
text (1.3.1) text (1.3.1)
typed-array (0.1.2) typed-array (0.1.2)
webmock (3.7.6) webmock (3.12.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
@ -77,19 +76,18 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
addressable (>= 2.7.0, < 2.8) addressable (>= 2.7.0, < 2.8)
delayer (>= 1.0.1, < 1.1) delayer (>= 1.1.2, < 2.0)
delayer-deferred (>= 2.1.1, < 2.2) delayer-deferred (>= 2.2.0, < 3.0)
diva (>= 1.0.1, < 1.1) diva (>= 1.0.2, < 2.0)
gettext (>= 3.2.9, < 3.3) gettext (>= 3.3.5, < 3.4)
gtk2 (= 3.4.1) gtk2 (= 3.4.1)
httpclient httpclient
irb (>= 1.2.0, < 1.3)
memoist (>= 0.16.2, < 0.17) memoist (>= 0.16.2, < 0.17)
mocha (>= 1.11.1) mocha (>= 1.11.1)
moneta moneta
nokogiri nokogiri
oauth (>= 0.5.4) oauth (>= 0.5.4)
pluggaloid (>= 1.2.0, < 1.3) pluggaloid (>= 1.5.0, < 2.0)
rake (>= 13.0.1) rake (>= 13.0.1)
ruby-prof (>= 1.1.0) ruby-prof (>= 1.1.0)
test-unit (>= 3.3.4, < 4.0) test-unit (>= 3.3.4, < 4.0)
@ -97,7 +95,7 @@ DEPENDENCIES
webmock (>= 3.7.6) webmock (>= 3.7.6)
RUBY VERSION RUBY VERSION
ruby 2.7.0p0 ruby 2.6.6p146
BUNDLED WITH BUNDLED WITH
2.1.2 2.1.4

152
pkgs/applications/networking/instant-messengers/mikutter/gemset.nix → pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix
View File

@ -22,15 +22,15 @@
version = "3.4.1"; version = "3.4.1";
}; };
cairo = { cairo = {
dependencies = ["native-package-installer" "pkg-config"]; dependencies = ["native-package-installer" "pkg-config" "red-colors"];
groups = ["default" "plugin"]; groups = ["default" "plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8"; sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s";
type = "gem"; type = "gem";
}; };
version = "1.16.4"; version = "1.17.5";
}; };
cairo-gobject = { cairo-gobject = {
dependencies = ["cairo" "glib2"]; dependencies = ["cairo" "glib2"];
@ -44,25 +44,25 @@
version = "3.4.1"; version = "3.4.1";
}; };
crack = { crack = {
dependencies = ["safe_yaml"]; dependencies = ["rexml"];
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r";
type = "gem"; type = "gem";
}; };
version = "0.4.3"; version = "0.4.5";
}; };
delayer = { delayer = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09p4rkh3dpdm1mhq721m4d6zvxqqp44kg7069s8l7kmaf7nv2nb3"; sha256 = "0iqf4i18i8rk3x7qgvkhbiqskf0xzdf733fjimrq6xkag2mq60bl";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.2.0";
}; };
delayer-deferred = { delayer-deferred = {
dependencies = ["delayer"]; dependencies = ["delayer"];
@ -70,10 +70,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mbdxn1hskjqf3zlj4waxl71ccvbj6lk81c99769paxw4fajwrgx"; sha256 = "0i2das3ncssacpqdgaf4as77vrxm7jfiizaja884fqv4rzv6s2sv";
type = "gem"; type = "gem";
}; };
version = "2.1.1"; version = "2.2.0";
}; };
diva = { diva = {
dependencies = ["addressable"]; dependencies = ["addressable"];
@ -81,10 +81,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "182gws1zihhpl7r3m8jsf29maqg9xdhj46s9lidbldar8clpl23h"; sha256 = "05wl4wg57vvng4nrp4lzjq148v908xzq092kq93phwvyxs7jnw2g";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.0.2";
}; };
gdk_pixbuf2 = { gdk_pixbuf2 = {
dependencies = ["gio2"]; dependencies = ["gio2"];
@ -103,10 +103,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; sha256 = "1fqlwq7i8ck1fjyhn19q3skvgrbz44q7gq51mlr0qym5rkj5f6rn";
type = "gem"; type = "gem";
}; };
version = "3.2.9"; version = "3.3.7";
}; };
gio2 = { gio2 = {
dependencies = ["gobject-introspection"]; dependencies = ["gobject-introspection"];
@ -157,10 +157,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18jqpbvidrlnq3xf0hkdbs00607jgz35lry6gjw4bcxgh52am2mk"; sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
httpclient = { httpclient = {
groups = ["plugin"]; groups = ["plugin"];
@ -182,36 +182,15 @@
}; };
version = "1.0.0"; 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 = { locale = {
groups = ["default" "plugin"]; groups = ["default" "plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
type = "gem"; type = "gem";
}; };
version = "2.1.2"; version = "2.1.3";
}; };
memoist = { memoist = {
groups = ["default"]; groups = ["default"];
@ -228,61 +207,61 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem"; type = "gem";
}; };
version = "2.4.0"; version = "2.5.0";
}; };
mocha = { mocha = {
groups = ["test"]; groups = ["test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";
type = "gem"; type = "gem";
}; };
version = "1.11.1"; version = "1.12.0";
}; };
moneta = { moneta = {
groups = ["plugin"]; groups = ["plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0q7fskfdc0h5dhl8aamg3ypybd6cyl4x0prh4803gj7hxr17jfm1"; sha256 = "0z25b4yysvnf2hi9jxnsiv3fvnicnzr2m70ci231av5093jfknc6";
type = "gem"; type = "gem";
}; };
version = "1.2.1"; version = "1.4.1";
}; };
native-package-installer = { native-package-installer = {
groups = ["default" "plugin"]; groups = ["default" "plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0piclgf6pw7hr10x57x0hn675djyna4sb3xc97yb9vh66wkx1fl0"; sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8";
type = "gem"; type = "gem";
}; };
version = "1.0.9"; version = "1.1.1";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2" "racc"];
groups = ["plugin"]; groups = ["plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
type = "gem"; type = "gem";
}; };
version = "1.10.7"; version = "1.11.3";
}; };
oauth = { oauth = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0";
type = "gem"; type = "gem";
}; };
version = "0.5.4"; version = "0.5.6";
}; };
pango = { pango = {
dependencies = ["cairo-gobject" "gobject-introspection"]; dependencies = ["cairo-gobject" "gobject-introspection"];
@ -300,10 +279,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1cxdpr2wlz9b587avlq04a1da5fz1vdw8jvr6lx23mcq7mqh2xcx"; sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.4.6";
}; };
pluggaloid = { pluggaloid = {
dependencies = ["delayer" "instance_storage"]; dependencies = ["delayer" "instance_storage"];
@ -311,71 +290,80 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gv0rjjdic8c41gfr3kyyphvf0fmv5rzcf6qd57zjdfcn6fvi3hh"; sha256 = "0m3f940lf1bg01jin22by7hg9hs43y995isgcyqb6vbvlv51zj11";
type = "gem"; type = "gem";
}; };
version = "1.2.0"; version = "1.5.0";
}; };
power_assert = { power_assert = {
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s"; sha256 = "172qfmzwxdf82bmwgcb13hnz9i3p6i2s2nijxnx6r63kn3drjppr";
type = "gem"; type = "gem";
}; };
version = "1.1.5"; version = "2.0.0";
}; };
public_suffix = { public_suffix = {
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem"; 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 = { rake = {
groups = ["test"]; groups = ["test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
type = "gem"; type = "gem";
}; };
version = "13.0.1"; version = "13.0.3";
}; };
reline = { red-colors = {
dependencies = ["io-console"];
groups = ["default" "plugin"]; groups = ["default" "plugin"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0908ijrngc3wkn5iny7d0kxkp74w6ixk2nwzzngplplfla1vkp8x"; sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca";
type = "gem"; 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 = { ruby-prof = {
groups = ["test"]; groups = ["test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18ga5f4h1fnwn0xh910kpnw4cg3lq3jqljd3h16bdw9pgc5ff7dn"; sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.4.3";
};
safe_yaml = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
type = "gem";
};
version = "1.0.5";
}; };
test-unit = { test-unit = {
dependencies = ["power_assert"]; dependencies = ["power_assert"];
@ -383,10 +371,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0mrkpb6wz0cs1740kaca240k4ymmkbvb2v5xaxsy6vynqw8n0g6z"; sha256 = "1h0c323zfn4hdida4g58h8wnlh4kax438gyxlw20dd78kcp01i8m";
type = "gem"; type = "gem";
}; };
version = "3.3.4"; version = "3.4.0";
}; };
text = { text = {
groups = ["default" "plugin"]; groups = ["default" "plugin"];
@ -414,9 +402,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "19xvs7gdf8r75bmyb17w9g367qxzqnlrmbdda1y36cn1vrlnf2l8"; sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0";
type = "gem"; type = "gem";
}; };
version = "3.7.6"; version = "3.12.2";
}; };
} }

0
pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile → pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile
View File

0
pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile → pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile
View File

0
pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile → pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile
View File

5
pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile Normal file
View File

@ -0,0 +1,5 @@
source 'https://rubygems.org'
group :default do
gem 'gettext', '>= 3.3.5', '< 3.4'
end

9
pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop
View File

@ -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;

6
pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile
View File

@ -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
pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb Normal file
View 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
pkgs/applications/networking/instant-messengers/mikutter/update.sh Executable file
View 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:

4
pkgs/applications/networking/mailreaders/mailspring/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mailspring"; pname = "mailspring";
version = "1.9.0"; version = "1.9.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
sha256 = "ISwNFR8M377+J7WoG9MlblF8r5yRTgCxEGszZCjqW/k="; sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/networking/pcloud/default.nix
View File

@ -84,8 +84,8 @@ in stdenv.mkDerivation {
substitute \ substitute \
app/pcloud.desktop \ app/pcloud.desktop \
share/applications/pcloud.desktop \ share/applications/pcloud.desktop \
--replace "Name=pcloud" "Name=pCloud" \ --replace 'Name=pcloud' 'Name=pCloud' \
--replace "Exec=AppRun" "Exec=$out/bin/pcloud" --replace 'Exec=AppRun' 'Exec=${pname}'
# Build the main executable # Build the main executable
cat > bin/pcloud <<EOF cat > bin/pcloud <<EOF

33
pkgs/applications/networking/tmpmail/default.nix Normal file
View 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 ];
};
}

3
pkgs/applications/office/timeular/default.nix
View File

@ -26,7 +26,8 @@ in appimageTools.wrapType2 rec {
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop 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 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; { meta = with lib; {

2
pkgs/applications/radio/rtl-sdr/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; 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; license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ]; maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -112,8 +112,8 @@ let
in { in {
subversion_1_10 = common { subversion_1_10 = common {
version = "1.10.6"; version = "1.10.7";
sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww";
extraBuildInputs = [ lz4 utf8proc ]; extraBuildInputs = [ lz4 utf8proc ];
}; };

4
pkgs/applications/video/haruna/default.nix
View File

@ -26,13 +26,13 @@
mkDerivation rec { mkDerivation rec {
pname = "haruna"; pname = "haruna";
version = "0.6.1"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "g-fb"; owner = "g-fb";
repo = "haruna"; repo = "haruna";
rev = version; rev = version;
sha256 = "sha256-8MauKmvQUwzq4Ssmm6g7/y6ADkye+eg/zyR3v/Wu848="; sha256 = "sha256-YsC0ZdLwHCO9izDIk2dTMr0U/nb60MHSxKURV8Xltss=";
}; };
buildInputs = [ buildInputs = [

8
pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
View File

@ -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 { buildKodiBinaryAddon rec {
pname = "inputstream-adaptive"; pname = "inputstream-adaptive";
namespace = "inputstream.adaptive"; namespace = "inputstream.adaptive";
version = "2.6.8"; version = "2.6.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xbmc"; owner = "xbmc";
repo = "inputstream.adaptive"; repo = "inputstream.adaptive";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "0m2d5r0f82qv4kqmq5yxzpi1awkjir2b2s2mfwkjn8p55r7gzp7c"; sha256 = "1xvinmwyx7mai84i8c394dqw86zb6ib9wnxjmv7zpky6x64lvv10";
}; };
extraNativeBuildInputs = [ gtest ];
extraBuildInputs = [ expat ]; extraBuildInputs = [ expat ];
extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];

4
pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
View File

@ -3,13 +3,13 @@
buildKodiBinaryAddon rec { buildKodiBinaryAddon rec {
pname = "inputstream-ffmpegdirect"; pname = "inputstream-ffmpegdirect";
namespace = "inputstream.ffmpegdirect"; namespace = "inputstream.ffmpegdirect";
version = "1.19.4"; version = "1.21.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xbmc"; owner = "xbmc";
repo = "inputstream.ffmpegdirect"; repo = "inputstream.ffmpegdirect";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "1ppvs6zybbi73zq1qh8klyhj99byh61c6nijmb1gd5yhg7cywf72"; sha256 = "1x5gj7iq74ysyfrzvp135m0pjz47zamcgw1v1334xd7xcx5q178p";
}; };
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];

4
pkgs/applications/video/kodi-packages/pvr-hts/default.nix
View File

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec { buildKodiBinaryAddon rec {
pname = "pvr-hts"; pname = "pvr-hts";
namespace = "pvr.hts"; namespace = "pvr.hts";
version = "8.2.4"; version = "8.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kodi-pvr"; owner = "kodi-pvr";
repo = "pvr.hts"; repo = "pvr.hts";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA="; sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y";
}; };
meta = with lib; { meta = with lib; {

7
pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
View File

@ -1,21 +1,22 @@
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub { lib, rel, buildKodiBinaryAddon, fetchFromGitHub
, pugixml, zlib , xz, pugixml, zlib
, inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp , inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp
}: }:
buildKodiBinaryAddon rec { buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple"; pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple"; namespace = "pvr.iptvsimple";
version = "7.5.1"; version = "7.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kodi-pvr"; owner = "kodi-pvr";
repo = "pvr.iptvsimple"; repo = "pvr.iptvsimple";
rev = "${version}-${rel}"; rev = "${version}-${rel}";
sha256 = "1q470v9nipnrca0rbwvqlbxw9ccbl9s1k46hwwrh94vhyp5rjlib"; sha256 = "1g1ildl2l6nl63qbfhijcbmvr6z84nqhjsy2lgx3dy25cmcqzir9";
}; };
extraBuildInputs = [ extraBuildInputs = [
xz
pugixml pugixml
zlib zlib
]; ];

29
pkgs/applications/video/kodi-packages/youtube/default.nix Normal file
View 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;
};
}

3
pkgs/applications/video/kodi/build-kodi-binary-addon.nix
View File

@ -2,6 +2,7 @@
{ name ? "${attrs.pname}-${attrs.version}" { name ? "${attrs.pname}-${attrs.version}"
, namespace , namespace
, version , version
, extraNativeBuildInputs ? []
, extraBuildInputs ? [] , extraBuildInputs ? []
, extraRuntimeDependencies ? [] , extraRuntimeDependencies ? []
, extraInstallPhase ? "", ... } @ attrs: , extraInstallPhase ? "", ... } @ attrs:
@ -10,7 +11,7 @@ toKodiAddon (stdenv.mkDerivation ({
dontStrip = true; dontStrip = true;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ] ++ extraNativeBuildInputs;
buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs; buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
inherit extraRuntimeDependencies; inherit extraRuntimeDependencies;

560
pkgs/applications/video/kodi/packages.nix
View File

@ -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

2
pkgs/applications/video/lbry/default.nix
View File

@ -29,7 +29,7 @@ in appimageTools.wrapAppImage rec {
# Now, install assets such as the desktop file and icons # Now, install assets such as the desktop file and icons
install -m 444 -D ${src}/lbry.desktop -t $out/share/applications install -m 444 -D ${src}/lbry.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lbry.desktop \ substituteInPlace $out/share/applications/lbry.desktop \
--replace 'AppRun' '$out/bin/lbry' --replace 'Exec=AppRun' 'Exec=lbry'
cp -r ${src}/usr/share/icons $out/share cp -r ${src}/usr/share/icons $out/share
''; '';

2
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
View File

@ -108,7 +108,7 @@
base binary bytestring containers ghc-prim ghci-ghcjs base binary bytestring containers ghc-prim ghci-ghcjs
template-haskell-ghcjs template-haskell-ghcjs
]; ];
homepage = "http://github.com/ghcjs"; homepage = "https://github.com/ghcjs";
license = lib.licenses.mit; license = lib.licenses.mit;
}) {}; }) {};

6
pkgs/development/compilers/llvm/12/llvm/default.nix
View File

@ -55,6 +55,12 @@ in stdenv.mkDerivation (rec {
propagatedBuildInputs = [ ncurses zlib ]; 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 '' postPatch = optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \ substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \

11
pkgs/development/compilers/llvm/exegesis-force-bdver2.patch Normal file
View 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

17
pkgs/development/libraries/igraph/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, arpack , arpack
, bison , bison
, blas , blas
@ -22,23 +21,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igraph"; pname = "igraph";
version = "0.9.1"; version = "0.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "igraph"; owner = "igraph";
repo = pname; repo = pname;
rev = version; 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 # Normally, igraph wants us to call bootstrap.sh, which will call
# tools/getversion.sh. Instead, we're going to put the version directly # tools/getversion.sh. Instead, we're going to put the version directly
# where igraph wants, and then let autoreconfHook do the rest of the # where igraph wants, and then let autoreconfHook do the rest of the
@ -55,7 +46,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ nativeBuildInputs = [
bison
cmake cmake
flex
fop fop
libxml2 libxml2
libxslt libxslt
@ -67,9 +60,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack arpack
bison
blas blas
flex
glpk glpk
gmp gmp
lapack lapack

2
pkgs/development/libraries/librtlsdr/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; 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; license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ]; maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;

12
pkgs/development/libraries/science/biology/bicpl/default.nix
View File

@ -2,16 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bicpl"; pname = "bicpl";
version = "unstable-2017-09-10"; version = "unstable-2020-10-15";
owner = "BIC-MNI";
# current master is significantly ahead of most recent release, so use Git version: # current master is significantly ahead of most recent release, so use Git version:
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner; owner = "BIC-MNI";
repo = pname; repo = pname;
rev = "612a63e740fadb162fcf27ee00da6a18dec4d5a9"; rev = "a58af912a71a4c62014975b89ef37a8e72de3c9d";
sha256 = "1vv9gi184bkvp3f99v9xmmw1ly63ip5b09y7zdjn39g7kmwzrga7"; sha256 = "0iw0pmr8xrifbx5l8a0xidfqbm1v8hwzqrw0lcmimxlzdihyri0g";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
# internal_volume_io.h: No such file or directory # internal_volume_io.h: No such file or directory
meta = with lib; { meta = with lib; {
homepage = "https://github.com/${owner}/${pname}"; homepage = "https://github.com/BIC-MNI/bicpl";
description = "Brain Imaging Centre programming library"; description = "Brain Imaging Centre programming library";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;

32
pkgs/development/libraries/science/biology/oobicpl/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "oobicpl"; pname = "oobicpl";
version = "unstable-2016-03-02"; version = "unstable-2020-08-12";
owner = "BIC-MNI";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner; owner = "BIC-MNI";
repo = pname; repo = pname;
rev = "bc062a65dead2e58461f5afb37abedfa6173f10c"; rev = "a9409da8a5bb4925438f32aff577b6333faec28b";
sha256 = "05l4ml9djw17bgdnrldhcxydrzkr2f2scqlyak52ph5azj5n4zsx"; sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libminc bicpl arguments pcre-cpp ]; buildInputs = [ libminc bicpl arguments pcre-cpp ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" cmakeFlags = [
"-DBICPL_DIR=${bicpl}/lib" "-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DARGUMENTS_DIR=${arguments}/lib" "-DBICPL_DIR=${bicpl}/lib"
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; "-DARGUMENTS_DIR=${arguments}/lib"
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE"
];
meta = with lib; { 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)"; description = "Brain Imaging Centre object-oriented programming library (and tools)";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;

10
pkgs/development/libraries/spice-protocol/default.nix
View File

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, meson, ninja }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spice-protocol"; pname = "spice-protocol";
version = "0.14.1"; version = "0.14.3";
src = fetchurl { src = fetchurl {
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz";
sha256 = "0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr"; sha256 = "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr";
}; };
nativeBuildInputs = [ meson ninja ];
postInstall = '' postInstall = ''
mkdir -p $out/lib mkdir -p $out/lib
ln -sv ../share/pkgconfig $out/lib/pkgconfig ln -sv ../share/pkgconfig $out/lib/pkgconfig

2
pkgs/development/ocaml-modules/xenstore_transport/default.nix
View File

@ -22,6 +22,6 @@ buildDunePackage rec {
meta = with lib; { meta = with lib; {
description = "Low-level libraries for connecting to a xenstore service on a xen host"; description = "Low-level libraries for connecting to a xenstore service on a xen host";
license = licenses.lgpl21Only; license = licenses.lgpl21Only;
homepage = "http://github.com/xapi-project/ocaml-xenstore-clients"; homepage = "https://github.com/xapi-project/ocaml-xenstore-clients";
}; };
} }

2
pkgs/development/python-modules/sanic/default.nix
View File

@ -45,7 +45,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "A microframework based on uvloop, httptools, and learnings of flask"; 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; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };

43
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -20,12 +20,13 @@
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem
, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , 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 , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , 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: }@args:
let let
@ -41,7 +42,8 @@ in
{ {
atk = attrs: { atk = attrs: {
dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; 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 ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ];
}; };
@ -61,12 +63,14 @@ in
}; };
cairo = attrs: { cairo = attrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
}; };
cairo-gobject = attrs: { cairo-gobject = attrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
}; };
@ -189,7 +193,8 @@ in
}; };
gdk_pixbuf2 = attrs: { gdk_pixbuf2 = attrs: {
nativeBuildInputs = [ pkg-config bundler rake ]; nativeBuildInputs = [ pkg-config bundler rake ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ];
}; };
@ -199,7 +204,8 @@ in
}; };
gio2 = attrs: { 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 ]; buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
}; };
@ -235,7 +241,8 @@ in
}; };
glib2 = attrs: { glib2 = attrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ gtk2 pcre ]; buildInputs = [ gtk2 pcre ];
}; };
@ -244,7 +251,7 @@ in
binutils pkg-config binutils pkg-config
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
util-linux libselinux libsepol util-linux libselinux libsepol
]; ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
atk atk
gdk-pixbuf gdk-pixbuf
@ -252,16 +259,18 @@ in
gobject-introspection gobject-introspection
gtk2 gtk2
harfbuzz harfbuzz
libdatrie
libthai
pcre pcre
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
]; ];
# CFLAGS must be set for this gem to detect gdkkeysyms.h correctly dontStrip = stdenv.isDarwin;
# CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
}; };
gobject-introspection = attrs: { gobject-introspection = attrs: {
nativeBuildInputs = [ pkg-config pcre ]; nativeBuildInputs = [ pkg-config pcre ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
}; };
@ -287,9 +296,7 @@ in
}; };
hitimes = attrs: { hitimes = attrs: {
buildInputs = buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.CoreServices ];
}; };
iconv = attrs: { iconv = attrs: {
@ -453,7 +460,9 @@ in
pcre pcre
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
]; ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ libdatrie libthai ]
++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ];
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ];
}; };
@ -661,7 +670,7 @@ in
}; };
zookeeper = attrs: { zookeeper = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = lib.optionals stdenv.isDarwin [ cctools ];
dontBuild = false; dontBuild = false;
postPatch = '' postPatch = ''
sed -i ext/extconf.rb -e "4a \ sed -i ext/extconf.rb -e "4a \

2
pkgs/development/tools/analysis/radare2/update.py
View File

@ -32,7 +32,7 @@ def prefetch_github(owner: str, repo: str, ref: str) -> str:
def get_radare2_rev() -> 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: with urllib.request.urlopen(feed_url) as resp:
tree = ET.fromstring(resp.read()) tree = ET.fromstring(resp.read())
releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry") releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry")

6
pkgs/development/tools/conftest/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "conftest"; pname = "conftest";
version = "0.23.0"; version = "0.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "conftest"; repo = "conftest";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU="; sha256 = "sha256-iFxRZq/8TW7Df+aAc5IN+FAXU4kvbDiHWiFOlWMmCY0=";
}; };
vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4="; vendorSha256 = "sha256-LvaSs1y1CEP+cJc0vqTh/8MezmtuFAbfMgqloAjLZl8=";
doCheck = false; doCheck = false;

2
pkgs/development/web/remarkjs/node-packages.nix generated
View File

@ -3712,7 +3712,7 @@ in
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
description = "Portable Unix shell commands for Node.js"; description = "Portable Unix shell commands for Node.js";
homepage = "http://github.com/shelljs/shelljs"; homepage = "https://github.com/shelljs/shelljs";
license = "BSD-3-Clause"; license = "BSD-3-Clause";
}; };
production = true; production = true;

291
pkgs/games/ja2-stracciatella/Cargo.lock generated
View File

@ -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"

56
pkgs/games/ja2-stracciatella/default.nix
View File

@ -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 let
version = "0.16.1"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ja2-stracciatella"; owner = "ja2-stracciatella";
repo = "ja2-stracciatella"; repo = "ja2-stracciatella";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pyn23syg70kiyfbs3pdlq0ixd2bxhncbamnic43rym3dmd52m29"; sha256 = "0m6rvgkba29jy3yq5hs1sn26mwrjl6mamqnv4plrid5fqaivhn6j";
};
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
'';
}; };
libstracciatella = rustPlatform.buildRustPackage { libstracciatella = rustPlatform.buildRustPackage {
pname = "libstracciatella"; pname = "libstracciatella";
inherit version; inherit version;
src = libstracciatellaSrc; src = "${src}/rust";
cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc"; cargoSha256 = "0blb971cv9k6c460mwq3zq8vih687bdnb39b9gph1hr90pxjviba";
doCheck = false;
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 in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "ja2-stracciatella"; pname = "ja2-stracciatella";
inherit src; inherit src version;
inherit version;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake python ];
buildInputs = [ SDL2 fltk boost ]; buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
patches = [ patches = [
./remove-rust-buildstep.patch ./remove-rust-buildstep.patch
]; ];
preConfigure = '' preConfigure = ''
sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt # Use rust library built with nix
cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") 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 = { meta = {

78
pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
View File

@ -1,21 +1,73 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index f354370e0..c9fa23c6d 100644 index e4e5547af..a3017d197 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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/game")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp") 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-smacker")
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-stracciatella")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-string_theory")
if(BUILD_LAUNCHER) if(BUILD_LAUNCHER)
@@ -235,8 +234,6 @@ copy_assets_dir_to_ja2_binary_after_build("externalized") @@ -239,14 +238,12 @@ string(LENGTH "${CMAKE_SOURCE_DIR}/src/" SOURCE_PATH_SIZE)
copy_assets_dir_to_ja2_binary_after_build("unittests") add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}")
copy_assets_dir_to_ja2_binary_after_build("mods")
add_executable(${JA2_BINARY} ${JA2_SOURCES})
-get_property(STRACCIATELLA_SHARED_LIB TARGET rust-stracciatella PROPERTY IMPORTED_LOCATION) -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) ## Uninstall
add_custom_command(TARGET ${JA2_BINARY} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy add_custom_templated_target("uninstall")

2
pkgs/os-specific/darwin/chunkwm/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "chunkwm"; pname = "chunkwm";
version = "0.4.9"; version = "0.4.9";
src = fetchzip { 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"; sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl";
}; };

4
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let let
version = "5.11.14"; version = "5.11.15";
suffix = "xanmod1-cacule"; suffix = "xanmod1-cacule";
in in
buildLinux (args // rec { buildLinux (args // rec {
@ -12,7 +12,7 @@ in
owner = "xanmod"; owner = "xanmod";
repo = "linux"; repo = "linux";
rev = modDirVersion; rev = modDirVersion;
sha256 = "sha256-kRbU1jheZi2U6mfNyhBFn3FJ7fjYkNUVwkx3w/DZNQI="; sha256 = "sha256-Qhq01SgLeNbts86DLi/t70HJfJPmM1So1C4eqVyRLK0=";
extraPostFetch = '' extraPostFetch = ''
rm $out/.config rm $out/.config
''; '';

6
pkgs/servers/consul/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "consul"; pname = "consul";
version = "1.9.4"; version = "1.9.5";
rev = "v${version}"; rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI # Note: Currently only release tags are supported, because they have the Consul UI
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
inherit rev; inherit rev;
sha256 = "1ck55i8snpm583p21y1hac0w76wiwyjpgfxkzscd4whp2jnzhhif"; sha256 = "sha256-CKezHuCbL1I79gDz7ZQiSgPbSXo0NtssQro2MqqmeXw=";
}; };
passthru.tests.consul = nixosTests.consul; passthru.tests.consul = nixosTests.consul;
@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo # has a split module structure in one repo
subPackages = ["." "connect/certgen"]; subPackages = ["." "connect/certgen"];
vendorSha256 = "0y744zpj49zvn5vqqb9wmfs1fs0lir71h2kcmhidmn9j132vg1bq"; vendorSha256 = "sha256-YqrW3PeFv1Y6lmjVmMMP0SZao57iPqfut3a1afIWkI0=";
doCheck = false; doCheck = false;

2
pkgs/servers/http/envoy/default.nix
View File

@ -38,7 +38,7 @@ buildBazelPackage rec {
patches = [ patches = [
# Quiche needs to be updated to compile under newer GCC. # 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 ./0001-quiche-update-QUICHE-tar-13949.patch
# upb needs to be updated to compile under newer GCC. # upb needs to be updated to compile under newer GCC.

4
pkgs/tools/admin/exoscale-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "exoscale-cli"; pname = "exoscale-cli";
version = "1.27.1"; version = "1.27.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exoscale"; owner = "exoscale";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YaW7rTeVz2Mbnmp6ORsnALlyVxGnf8K73LXN/fmJMLk="; sha256 = "sha256-Wq3CWKYuF4AaOVpe0sGn9BzLx/6rSPFN6rFc2jUUVEA=";
}; };
goPackagePath = "github.com/exoscale/cli"; goPackagePath = "github.com/exoscale/cli";

10
pkgs/tools/audio/yabridge/default.nix
View File

@ -45,25 +45,25 @@ let
# Derived from vst3.wrap # Derived from vst3.wrap
vst3 = rec { vst3 = rec {
version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6"; version = "3.7.2_build_28-patched";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "robbert-vdh"; owner = "robbert-vdh";
repo = "vst3sdk"; repo = "vst3sdk";
rev = version; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s="; sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w=";
}; };
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "yabridge"; pname = "yabridge";
version = "3.0.2"; version = "3.1.0";
# NOTE: Also update yabridgectl's cargoHash when this is updated # NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "robbert-vdh"; owner = "robbert-vdh";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI="; hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI=";
}; };
# Unpack subproject sources # Unpack subproject sources

2
pkgs/tools/audio/yabridgectl/default.nix
View File

@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
src = yabridge.src; src = yabridge.src;
sourceRoot = "source/tools/yabridgectl"; sourceRoot = "source/tools/yabridgectl";
cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0="; cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY=";
patches = [ patches = [
# By default, yabridgectl locates libyabridge.so by using # By default, yabridgectl locates libyabridge.so by using

10
pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch
View File

@ -1,8 +1,8 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs 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 --- a/tools/yabridgectl/src/config.rs
+++ b/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::env;
use std::fmt::Display; use std::fmt::Display;
use std::fs; use std::fs;
@ -10,7 +10,7 @@ index c1c89cf..d7bd822 100644
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use which::which; use which::which;
use xdg::BaseDirectories; use xdg::BaseDirectories;
@@ -216,34 +217,24 @@ impl Config { @@ -222,34 +223,24 @@ impl Config {
} }
} }
None => { None => {
@ -56,10 +56,10 @@ index c1c89cf..d7bd822 100644
)); ));
} }
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs 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 --- a/tools/yabridgectl/src/main.rs
+++ b/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'") .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_about( .long_about(
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \

37
pkgs/tools/compression/nx2elf/default.nix Normal file
View 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 ];
};
}

4
pkgs/tools/filesystems/mtools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtools"; pname = "mtools";
version = "4.0.26"; version = "4.0.27";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk"; sha256 = "1crqi10adwfahj8xyw60lx70hkpcc5g00b5r8277cm2f4kcwi24w";
}; };
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

30
pkgs/tools/graphics/jhead/default.nix
View File

@ -1,31 +1,20 @@
{ lib, stdenv, fetchurl, fetchpatch, libjpeg }: { lib, stdenv, fetchFromGitHub, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jhead"; pname = "jhead";
version = "3.04"; version = "3.06.0.1";
src = fetchurl { src = fetchFromGitHub {
url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; owner = "Matthias-Wandel";
sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; 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 ]; buildInputs = [ libjpeg ];
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];
patchPhase = ''
sed -i '/dpkg-buildflags/d' makefile
substituteInPlace jhead.c \
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
'';
installPhase = '' installPhase = ''
mkdir -p \ mkdir -p \
$out/bin \ $out/bin \
@ -43,10 +32,5 @@ stdenv.mkDerivation rec {
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = with maintainers; [ rycee ]; maintainers = with maintainers; [ rycee ];
platforms = platforms.all; platforms = platforms.all;
# https://github.com/NixOS/nixpkgs/issues/90828
knownVulnerabilities = [
"CVE-2020-6624"
"CVE-2020-6625"
];
}; };
} }

2
pkgs/tools/misc/betterdiscord-installer/default.nix
View File

@ -18,7 +18,7 @@ in appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications
substituteInPlace $out/share/applications/betterdiscord.desktop \ 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 cp -r ${appimageContents}/usr/share/icons $out/share
''; '';

4
pkgs/tools/misc/ostree/default.nix
View File

@ -12,6 +12,8 @@
, xz , xz
, e2fsprogs , e2fsprogs
, libsoup , libsoup
, glib-networking
, wrapGAppsHook
, gpgme , gpgme
, which , which
, makeWrapper , makeWrapper
@ -78,6 +80,7 @@ in stdenv.mkDerivation rec {
libxslt libxslt
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
@ -85,6 +88,7 @@ in stdenv.mkDerivation rec {
systemd systemd
e2fsprogs e2fsprogs
libsoup libsoup
glib-networking
gpgme gpgme
fuse fuse
libselinux libselinux

4
pkgs/tools/security/libmodsecurity/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmodsecurity"; pname = "libmodsecurity";
version = "3.0.3"; version = "3.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpiderLabs"; owner = "SpiderLabs";
repo = "ModSecurity"; repo = "ModSecurity";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; sha256 = "07vry10cdll94sp652hwapn0ppjv3mb7n2s781yhy7hssap6f2vp";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];

6
pkgs/tools/system/awstats/default.nix
View File

@ -2,11 +2,11 @@
perlPackages.buildPerlPackage rec { perlPackages.buildPerlPackage rec {
pname = "awstats"; pname = "awstats";
version = "7.7"; version = "7.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
sha256 = "0z3p77jnpjilajs9yv87r8xla2x1gjqlvrhpbgbh5ih73386v3j2"; sha256 = "1f6l0hd01jmz7hpg0py8qixxiq50n8gl37iypayskxmy05z8craa";
}; };
postPatch = '' postPatch = ''
@ -54,7 +54,7 @@ perlPackages.buildPerlPackage rec {
meta = with lib; { meta = with lib; {
description = "Real-time logfile analyzer to get advanced statistics"; description = "Real-time logfile analyzer to get advanced statistics";
homepage = "http://awstats.org"; homepage = "https://awstats.org";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.unix;
}; };

1
pkgs/top-level/aliases.nix
View File

@ -645,6 +645,7 @@ mapAliases ({
rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead";
rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
rubyMinimal = throw "rubyMinimal was removed due to being unused"; rubyMinimal = throw "rubyMinimal was removed due to being unused";
runwayml = throw "runwayml is now a webapp"; # added 2021-04-17
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31

20
pkgs/top-level/all-packages.nix
View File

@ -2847,6 +2847,8 @@ in
nwipe = callPackage ../tools/security/nwipe { }; nwipe = callPackage ../tools/security/nwipe { };
nx2elf = callPackage ../tools/compression/nx2elf { };
nx-libs = callPackage ../tools/X11/nx-libs { }; nx-libs = callPackage ../tools/X11/nx-libs { };
nyx = callPackage ../tools/networking/nyx { }; nyx = callPackage ../tools/networking/nyx { };
@ -6960,6 +6962,7 @@ in
nnn = callPackage ../applications/misc/nnn { }; nnn = callPackage ../applications/misc/nnn { };
shfm = callPackage ../applications/misc/shfm { };
noise-repellent = callPackage ../applications/audio/noise-repellent { }; noise-repellent = callPackage ../applications/audio/noise-repellent { };
@ -8785,6 +8788,8 @@ in
tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmpwatch = callPackage ../tools/misc/tmpwatch { };
tmpmail = callPackage ../applications/networking/tmpmail { };
tmux = callPackage ../tools/misc/tmux { }; tmux = callPackage ../tools/misc/tmux { };
tmux-cssh = callPackage ../tools/misc/tmux-cssh { }; tmux-cssh = callPackage ../tools/misc/tmux-cssh { };
@ -11987,7 +11992,10 @@ in
dust = callPackage ../development/interpreters/pixie/dust.nix { }; dust = callPackage ../development/interpreters/pixie/dust.nix { };
buildRubyGem = callPackage ../development/ruby-modules/gem { }; buildRubyGem = callPackage ../development/ruby-modules/gem { };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config { }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
bundix = callPackage ../development/ruby-modules/bundix { }; bundix = callPackage ../development/ruby-modules/bundix { };
bundler = callPackage ../development/ruby-modules/bundler { }; bundler = callPackage ../development/ruby-modules/bundler { };
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
@ -23077,6 +23085,10 @@ in
inherit buildPythonApplication; inherit buildPythonApplication;
}; };
foxotron = callPackage ../applications/graphics/foxotron {
inherit (darwin.apple_sdk.frameworks) AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL;
};
foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; foxtrotgps = callPackage ../applications/misc/foxtrotgps { };
fractal = callPackage ../applications/networking/instant-messengers/fractal { }; fractal = callPackage ../applications/networking/instant-messengers/fractal { };
@ -27696,7 +27708,9 @@ in
ivan = callPackage ../games/ivan { }; ivan = callPackage ../games/ivan { };
ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; ja2-stracciatella = callPackage ../games/ja2-stracciatella {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
katago = callPackage ../games/katago { }; katago = callPackage ../games/katago { };
@ -30920,8 +30934,6 @@ in
zrepl = callPackage ../tools/backup/zrepl { }; zrepl = callPackage ../tools/backup/zrepl { };
runwayml = callPackage ../applications/graphics/runwayml {};
uhubctl = callPackage ../tools/misc/uhubctl {}; uhubctl = callPackage ../tools/misc/uhubctl {};
kodelife = callPackage ../applications/graphics/kodelife {}; kodelife = callPackage ../applications/graphics/kodelife {};

2
pkgs/top-level/kodi-packages.nix
View File

@ -94,6 +94,8 @@ let self = rec {
vfs-libarchive = callPackage ../applications/video/kodi-packages/vfs-libarchive { }; vfs-libarchive = callPackage ../applications/video/kodi-packages/vfs-libarchive { };
youtube = callPackage ../applications/video/kodi-packages/youtube { };
# addon packages (dependencies) # addon packages (dependencies)
certifi = callPackage ../applications/video/kodi-packages/certifi { }; certifi = callPackage ../applications/video/kodi-packages/certifi { };

4
pkgs/top-level/ruby-packages.nix
View File

@ -1863,10 +1863,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06r2kjl4ylfgw08gjxvlwqdy1lgmgsylwnysk1d0qr6q3nd0nvg6"; sha256 = "1yl6wy2gfvjkq0457plwadk7jwx5sbpqxl9aycbphskisis9g238";
type = "gem"; type = "gem";
}; };
version = "6.1.0"; version = "6.1.3.1";
}; };
rails-dom-testing = { rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"]; dependencies = ["activesupport" "nokogiri"];