Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
(cdep)illabout
commit
c870565292
@ -43,7 +43,9 @@ let
|
||||
lib.hasSuffix ".o" baseName ||
|
||||
lib.hasSuffix ".so" baseName ||
|
||||
# Filter out nix-build result symlinks
|
||||
(type == "symlink" && lib.hasPrefix "result" baseName)
|
||||
(type == "symlink" && lib.hasPrefix "result" baseName) ||
|
||||
# Filter out sockets and other types of files we can't have in the store.
|
||||
(type == "unknown")
|
||||
);
|
||||
|
||||
# Filters a source tree removing version control files and directories using cleanSourceWith
|
||||
|
||||
@ -1909,6 +1909,12 @@
|
||||
githubId = 3086255;
|
||||
name = "Barry Moore II";
|
||||
};
|
||||
chisui = {
|
||||
email = "chisui.pd@gmail.com";
|
||||
github = "chisui";
|
||||
githubId = 4526429;
|
||||
name = "Philipp Dargel";
|
||||
};
|
||||
chivay = {
|
||||
email = "hubert.jasudowicz@gmail.com";
|
||||
github = "chivay";
|
||||
@ -4811,6 +4817,12 @@
|
||||
githubId = 26877687;
|
||||
name = "Yurii Izorkin";
|
||||
};
|
||||
j0xaf = {
|
||||
email = "j0xaf@j0xaf.de";
|
||||
name = "Jörn Gersdorf";
|
||||
github = "j0xaf";
|
||||
githubId = 932697;
|
||||
};
|
||||
j0hax = {
|
||||
name = "Johannes Arnold";
|
||||
email = "johannes.arnold@stud.uni-hannover.de";
|
||||
|
||||
@ -98,6 +98,7 @@ in
|
||||
deluge = handleTest ./deluge.nix {};
|
||||
dendrite = handleTest ./dendrite.nix {};
|
||||
dhparams = handleTest ./dhparams.nix {};
|
||||
disable-installer-tools = handleTest ./disable-installer-tools.nix {};
|
||||
discourse = handleTest ./discourse.nix {};
|
||||
dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
|
||||
dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {};
|
||||
|
||||
29
nixos/tests/disable-installer-tools.nix
Normal file
29
nixos/tests/disable-installer-tools.nix
Normal file
@ -0,0 +1,29 @@
|
||||
import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
|
||||
|
||||
{
|
||||
name = "disable-installer-tools";
|
||||
|
||||
machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
system.disableInstallerTools = true;
|
||||
boot.enableContainers = false;
|
||||
environment.defaultPackages = [];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
|
||||
|
||||
with subtest("nixos installer tools should not be included"):
|
||||
machine.fail("which nixos-rebuild")
|
||||
machine.fail("which nixos-install")
|
||||
machine.fail("which nixos-generate-config")
|
||||
machine.fail("which nixos-enter")
|
||||
machine.fail("which nixos-version")
|
||||
machine.fail("which nixos-build-vms")
|
||||
|
||||
with subtest("perl should not be included"):
|
||||
machine.fail("which perl")
|
||||
'';
|
||||
})
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA==";
|
||||
sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
@ -34,7 +34,7 @@ in appimageTools.wrapType2 {
|
||||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/32";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
122
pkgs/applications/blockchains/wasabibackend/create_deps.sh
Normal file → Executable file
122
pkgs/applications/blockchains/wasabibackend/create_deps.sh
Normal file → Executable file
@ -1,13 +1,26 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p dotnet-sdk_3 nixfmt
|
||||
#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt
|
||||
set -euo pipefail
|
||||
|
||||
# Run this script to generate deps.nix
|
||||
# ./create_deps.sh /path/to/package/source/checkout > deps.nix
|
||||
|
||||
# TODO: consolidate with other dotnet deps generation scripts by which
|
||||
# this script is inspired:
|
||||
# - pkgs/servers/nosql/eventstore/create-deps.sh
|
||||
# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh
|
||||
# - pkgs/misc/emulators/ryujinx/updater.sh
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
deps_file="$(realpath "./deps.nix")"
|
||||
|
||||
exec 2>&1 6> "$deps_file"
|
||||
|
||||
store_src="$( nix-build ../../../.. -A wasabibackend.src --no-out-link )"
|
||||
src="$(mktemp -d)"
|
||||
cp -rT "$store_src" "$src"
|
||||
chmod -R +w "$src"
|
||||
pushd "$src"
|
||||
|
||||
URLBASE="https://www.nuget.org/api/v2/package"
|
||||
|
||||
@ -30,69 +43,56 @@ DEPS_TEMPLATE="
|
||||
sha256 = \"%s\";
|
||||
})"
|
||||
|
||||
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
function generate_restore_log() {
|
||||
checkout_path=$1
|
||||
>&2 echo "generating restore log for $checkout_path..."
|
||||
cd $checkout_path
|
||||
dotnet nuget locals all --clear
|
||||
dotnet restore -v normal --no-cache WalletWasabi.Backend -r linux-x64
|
||||
cd -
|
||||
}
|
||||
HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \
|
||||
--no-cache --force --runtime linux-x64 \
|
||||
WalletWasabi.Backend/WalletWasabi.Backend.csproj >&2
|
||||
|
||||
function process_restore_log() {
|
||||
restore_log=$1
|
||||
>&2 echo "processing restore log..."
|
||||
while read line; do
|
||||
if echo $line | grep -q "^[[:space:]]*Installing"; then
|
||||
l=$(echo $line | xargs)
|
||||
l=${l#Installing }
|
||||
l=${l%.}
|
||||
echo $l
|
||||
fi
|
||||
done < $restore_log
|
||||
}
|
||||
mapfile -t repos < <(
|
||||
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config |
|
||||
while IFS= read index
|
||||
do
|
||||
curl --compressed -fsL "$index" | \
|
||||
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
|
||||
done
|
||||
)
|
||||
|
||||
function prefetch_deps() {
|
||||
processed_log=$1
|
||||
>&2 echo "prefetching deps..."
|
||||
while read line; do
|
||||
name=$(echo $line | cut -d' ' -f1)
|
||||
>&2 echo "prefetching '$name' version: $version"
|
||||
version=$(echo $line | cut -d' ' -f2)
|
||||
hash=$(nix-prefetch-url "$URLBASE/$name/$version" 2>/dev/null)
|
||||
echo "$name $version $hash"
|
||||
done < $processed_log
|
||||
}
|
||||
echo $DEPS_HEADER >&6
|
||||
|
||||
function generate_deps_expression() {
|
||||
packages=$1
|
||||
>&2 echo "generating deps nix-expression..."
|
||||
echo $DEPS_HEADER
|
||||
while read line; do
|
||||
name=$(echo $line | cut -d' ' -f1)
|
||||
version=$(echo $line | cut -d' ' -f2)
|
||||
hash=$(echo $line | cut -d' ' -f3)
|
||||
printf "$DEPS_TEMPLATE" $name $version $hash
|
||||
done < $packages
|
||||
echo $DEPS_FOOTER
|
||||
}
|
||||
cd "$tmpdir/.nuget/packages"
|
||||
for package in *
|
||||
do
|
||||
cd "$package"
|
||||
for version in *
|
||||
do
|
||||
found=false
|
||||
for repo in "${repos[@]}"
|
||||
do
|
||||
url="$repo$package/$version/$package.$version.nupkg"
|
||||
if curl -fsL "$url" -o /dev/null
|
||||
then
|
||||
found=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
function main() {
|
||||
checkout_path=$1
|
||||
tmpdir=$(mktemp -d)
|
||||
generate_restore_log $checkout_path > $tmpdir/restore.log
|
||||
process_restore_log $tmpdir/restore.log > $tmpdir/processed.log
|
||||
prefetch_deps $tmpdir/processed.log > $tmpdir/prefetched.log
|
||||
generate_deps_expression $tmpdir/prefetched.log > $tmpdir/deps.nix
|
||||
nixfmt $tmpdir/deps.nix
|
||||
cat $tmpdir/deps.nix
|
||||
rm -rf $tmpdir
|
||||
}
|
||||
if ! $found
|
||||
then
|
||||
echo "couldn't find $package $version" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d "$1" ]; then
|
||||
>&2 echo "First argument must be a directory, the path to the package source checkout"
|
||||
exit 1
|
||||
fi
|
||||
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
|
||||
|
||||
main $@
|
||||
printf "$DEPS_TEMPLATE" $package $version $sha256 >&6
|
||||
done
|
||||
cd ..
|
||||
done
|
||||
|
||||
echo $DEPS_FOOTER >&6
|
||||
|
||||
exec 6>&-
|
||||
|
||||
nixfmt "$deps_file"
|
||||
|
||||
1770
pkgs/applications/blockchains/wasabibackend/deps.nix
generated
1770
pkgs/applications/blockchains/wasabibackend/deps.nix
generated
File diff suppressed because it is too large
Load Diff
@ -4,18 +4,18 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "agda-mode";
|
||||
version = pkgs.haskellPackages.Agda.version;
|
||||
version = haskellPackages.Agda.version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# already byte-compiled by Agda builder
|
||||
buildPhase = ''
|
||||
agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate`
|
||||
agda=`${haskellPackages.Agda}/bin/agda-mode locate`
|
||||
cp `dirname $agda`/*.el* .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (pkgs.haskellPackages.Agda.meta) homepage license;
|
||||
inherit (haskellPackages.Agda.meta) homepage license;
|
||||
description = "Agda2-mode for Emacs extracted from Agda package";
|
||||
longDescription = ''
|
||||
Wrapper packages that liberates init.el from `agda-mode locate` magic.
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
trivialBuild rec {
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, trivialBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, emacsPackages
|
||||
}:
|
||||
|
||||
trivialBuild rec {
|
||||
@ -20,7 +19,7 @@ trivialBuild rec {
|
||||
emacs
|
||||
] ++ propagatedUserEnvPkgs;
|
||||
|
||||
propagatedUserEnvPkgs = with emacsPackages; [
|
||||
propagatedUserEnvPkgs = with emacs.pkgs; [
|
||||
evil
|
||||
markdown-mode
|
||||
];
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, trivialBuild
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
, emacs
|
||||
}:
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, trivialBuild
|
||||
, emacs
|
||||
}:
|
||||
|
||||
|
||||
@ -87,10 +87,30 @@ rec {
|
||||
nvim_with_plug = neovim.override {
|
||||
extraName = "-with-plug";
|
||||
configure.plug.plugins = with pkgs.vimPlugins; [
|
||||
vim-go
|
||||
base16-vim
|
||||
];
|
||||
configure.customRC = ''
|
||||
color base16-tomorrow-night
|
||||
set background=dark
|
||||
'';
|
||||
};
|
||||
|
||||
run_nvim_with_plug = runTest nvim_with_plug ''
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit!
|
||||
'';
|
||||
|
||||
|
||||
# check that the vim-doc hook correctly generates the tag
|
||||
# we know for a fact packer has a doc folder
|
||||
checkForTags = vimPlugins.packer-nvim.overrideAttrs(oldAttrs: {
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
[ -f $out/doc/tags ]
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
# nixpkgs should detect that no wrapping is necessary
|
||||
nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap;
|
||||
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherrytree";
|
||||
version = "0.99.40";
|
||||
version = "0.99.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
rev = version;
|
||||
sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE=";
|
||||
sha256 = "sha256-Bhk5xpJiVDSTxP1wAFTL39MgAIOa6Is9NTF1WEh6S1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oInE8fwE+7a+F4NevKPuYQqCP9GkPhqayLu8HCmVbLs=";
|
||||
sha256 = "sha256-B/ga5MpjXoLe5H/JosmrS/Wuj1elzQHPsnz/qOm7Hrg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VvO5YnDofdEku9+RC6PPHWSZY8qZt9N3JNzlm5omNAc=";
|
||||
vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -27,10 +27,10 @@ in {
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
version = "0.0.129";
|
||||
version = "0.0.130";
|
||||
src = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256:1x49vvd363w9xyrzjgmynj2b320hzpz388fh5vpp0q0qk8q3gwkk";
|
||||
sha256 = "sha256-UamSiwjR68Pfm3uyHaI871VaGwIKJ5DShl8uE3rvX+U=";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
||||
@ -1,74 +1,54 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, xorgproto, motif, libX11, libXt, libXpm, bison
|
||||
, flex, automake, autoconf, libtool, runtimeShell
|
||||
{ lib, stdenv, fetchFromGitLab, xorgproto, motif, libX11, libXt, libXpm, bison
|
||||
, flex, automake, autoconf, libtool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alliance";
|
||||
version = "5.1.1";
|
||||
version = "unstable-2021-09-15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2";
|
||||
sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.lip6.fr";
|
||||
owner = "vlsi-eda";
|
||||
repo = "alliance";
|
||||
rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65";
|
||||
sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY=";
|
||||
};
|
||||
|
||||
prePatch = "cd alliance/src";
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf flex ];
|
||||
buildInputs = [ xorgproto motif libX11 libXt libXpm bison ];
|
||||
|
||||
sourceRoot = "alliance/src/";
|
||||
ALLIANCE_TOP = placeholder "out";
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=$(out)"
|
||||
"--prefix=${placeholder "out"}" "--enable-alc-shared"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out/etc
|
||||
|
||||
#texlive for docs seems extreme
|
||||
mkdir -p $out/share/alliance
|
||||
mv ./documentation $out/share/alliance
|
||||
postPatch = ''
|
||||
# texlive for docs seems extreme
|
||||
substituteInPlace autostuff \
|
||||
--replace "$newdirs documentation" "$newdirs" \
|
||||
--replace documentation Solaris
|
||||
--replace "$newdirs documentation" "$newdirs"
|
||||
|
||||
substituteInPlace sea/src/DEF_grammar_lex.l --replace "ifndef FLEX_BETA" \
|
||||
"if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)"
|
||||
|
||||
substituteInPlace sea/src/DEF_grammar_lex.l \
|
||||
--replace "ifndef FLEX_BETA" "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)"
|
||||
./autostuff
|
||||
'';
|
||||
|
||||
allianceInstaller = ''
|
||||
#!${runtimeShell}
|
||||
cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log
|
||||
'';
|
||||
|
||||
allianceUnInstaller = ''
|
||||
#!${runtimeShell}
|
||||
awk '{print \$3}' /etc/alliance-install.log | xargs rm
|
||||
awk '{print \$3}' /etc/alliance-install.log | xargs rmdir
|
||||
rm /etc/alliance-install.log
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -i "s|ALLIANCE_TOP|$out|" distrib/*.desktop
|
||||
mkdir -p $out/share/applications
|
||||
cp -p distrib/*.desktop $out/share/applications/
|
||||
mkdir -p $out/icons/hicolor/48x48/apps/
|
||||
cp -p distrib/*.png $out/icons/hicolor/48x48/apps/
|
||||
|
||||
echo "${allianceInstaller}" > $out/bin/alliance-install
|
||||
chmod +x $out/bin/alliance-install
|
||||
|
||||
echo "${allianceUnInstaller}" > $out/bin/alliance-uninstall
|
||||
chmod +x $out/bin/alliance-uninstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Complete set of free CAD tools and portable libraries for VLSI design";
|
||||
homepage = "http://www-asim.lip6.fr/recherche/alliance/";
|
||||
description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design";
|
||||
homepage = "http://coriolis.lip6.fr/";
|
||||
license = with licenses; gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ l-as ];
|
||||
platforms = with platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -327,7 +327,7 @@ stdenv.mkDerivation {
|
||||
###
|
||||
### Remove LC_UUID
|
||||
###
|
||||
+ optionalString (stdenv.targetPlatform.isDarwin && !(stdenv.cc.bintools.bintools.isGNU or false)) ''
|
||||
+ optionalString (stdenv.targetPlatform.isDarwin && !(bintools.isGNU or false)) ''
|
||||
echo "-no_uuid" >> $out/nix-support/libc-ldflags-before
|
||||
''
|
||||
|
||||
|
||||
@ -51,10 +51,6 @@ mkDerivation rec {
|
||||
xorg.xf86inputlibinput.dev
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt
|
||||
'';
|
||||
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -40,14 +40,8 @@ mkDerivation {
|
||||
sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp
|
||||
'';
|
||||
CXXFLAGS = [
|
||||
"-I${lib.getDev xorgserver}/include/xorg"
|
||||
"-I${lib.getDev xf86inputsynaptics}/include/xorg"
|
||||
''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
|
||||
"-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg"
|
||||
];
|
||||
postInstall = ''
|
||||
# Display ~/Desktop contents on the desktop by default.
|
||||
sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
|
||||
|
||||
@ -80,58 +80,58 @@ rec {
|
||||
# v3.1.1 (LTS)
|
||||
|
||||
aspnetcore_3_1 = buildAspNetCore {
|
||||
version = "3.1.8";
|
||||
version = "3.1.19";
|
||||
sha512 = {
|
||||
x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw";
|
||||
aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40";
|
||||
x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b";
|
||||
x86_64-linux = "c9234b5dba62c88b5f7e869c7dc7fc94d9cd7b300b0ed2461132c32762c0d3d1f23a1ee0432264704fefeb35f77ca7d1dd41910daee84df9aa325559a43cfc71";
|
||||
aarch64-linux = "4cba9b43a9beb977bb50c290c0e7cbbf42664538609079dd1bc0e925a0cc4a1f76748492d4d0d402610ae910e878449bab5d797a9f12e63399585b11f9bfbee9";
|
||||
x86_64-darwin = "a30959156c818d8d93df398742a70a050decfddbd777ddd6adb4d3c1aa5ed129545eab8f0aa3f12be991611dbc3582336ed747f3075906a2a29a1cd30ef3ad90";
|
||||
};
|
||||
};
|
||||
|
||||
netcore_3_1 = buildNetCore {
|
||||
version = "3.1.8";
|
||||
version = "3.1.19";
|
||||
sha512 = {
|
||||
x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc";
|
||||
aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf";
|
||||
x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c";
|
||||
x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe";
|
||||
aarch64-linux = "c6a97bc6e2f2644d57d3fa5a512274b7129956371b07e0f39f734875b15bc0c178a9b068e2fa3e06e8a3a6696163ad1856f5d87a689612211ee02e589138110e";
|
||||
x86_64-darwin = "41ae9bc0212247c4721f41be384dae620971360c09fa31430f062c2ab851f10506ef620bf63ee414819b5dd20ddae8a1ce581bbe0d699378b244375e0822bd34";
|
||||
};
|
||||
};
|
||||
|
||||
sdk_3_1 = buildNetCoreSdk {
|
||||
version = "3.1.402";
|
||||
version = "3.1.413";
|
||||
sha512 = {
|
||||
x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2";
|
||||
aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p";
|
||||
x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8";
|
||||
x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83";
|
||||
aarch64-linux = "39f198f07577faf81f09ca621fb749d5aac38fc05e7e6bd6226009679abc7d001454068430ddb34b320901955f42de3951e2707e01bce825b5216df2bc0c8eca";
|
||||
x86_64-darwin = "2c8e5b7e578aa36d40946d0deea93dff72a68ebb5504b1593d86d63022be8b65b284cf2adad711a926b7170fc865ac4cb38531a4f2ef087e07147e67300e86b8";
|
||||
};
|
||||
};
|
||||
|
||||
# v5.0.0
|
||||
|
||||
aspnetcore_5_0 = buildAspNetCore {
|
||||
version = "5.0.0";
|
||||
version = "5.0.10";
|
||||
sha512 = {
|
||||
x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0";
|
||||
aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc";
|
||||
x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818";
|
||||
x86_64-linux = "60fd41e42e07a96416baf2dd7ea8112a7c7d510bc6f4656274981777d2cf5e824cd519924cdf06215338d74e78cdc7801e1b24c39b3d67cd2d1b3c6fee6474a9";
|
||||
aarch64-linux = "e86dd5b26e5add2f35c3a029c78e3c447755a319c105d371da297f66db5eff260f3f55ccf23e508e9a33536876708ac2e358dc62a4a28518f88df3a9131adb01";
|
||||
x86_64-darwin = "124abacba27e26249d265d51fd7abc7ab0bed9859ce3a6a8e4f193031bff3f28dd81af639542b0cc043a3957e2a90a2f5b41c6ec6b4a50a4cb8fce12bc8654f9";
|
||||
};
|
||||
};
|
||||
|
||||
net_5_0 = buildNetCore {
|
||||
version = "5.0.0";
|
||||
version = "5.0.10";
|
||||
sha512 = {
|
||||
x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4";
|
||||
aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f";
|
||||
x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53";
|
||||
x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c";
|
||||
aarch64-linux = "30861f2bd41fcd7c1d657be1eafa09f22886af0c3e09d1854c626b675a469347ce9fb79b2ea92b5ed4e2fd3d3457766ac03fc5393a690099e1d2b9b15f3334b9";
|
||||
x86_64-darwin = "2839f4fafa1f85a90b43a74a4898cbba915324f7363f1716e58cb9163d1415fa4d360703e27d0cadfe8495a370ccddbcfcc514076a880d6343a0bff76bb5ac2a";
|
||||
};
|
||||
};
|
||||
|
||||
sdk_5_0 = buildNetCoreSdk {
|
||||
version = "5.0.202";
|
||||
version = "5.0.401";
|
||||
sha512 = {
|
||||
x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA==";
|
||||
aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q==";
|
||||
x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA==";
|
||||
x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0";
|
||||
aarch64-linux = "770dcf18c08cd285934af61bedc06ffcc16a74115d15376f72376cdfbb4ab9cc9f53537ca1fe5d906b4b3c30b960ffe1404d6f7e01254091b4b9d288e9e972fa";
|
||||
x86_64-darwin = "eca773f407314123fd5b2017f68520c0647651f53e546583c4145b596c230c42898b3e56355cd5ace76b793df4aca3cd7ff9142718c86eedeabbabb70b393d0e";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
6
pkgs/development/compilers/roslyn/deps.nix
generated
6
pkgs/development/compilers/roslyn/deps.nix
generated
@ -137,10 +137,10 @@
|
||||
}
|
||||
{
|
||||
name = "microsoft.netcore.app.host.linux-x64";
|
||||
version = "3.1.14";
|
||||
version = "3.1.19";
|
||||
src = fetchurl {
|
||||
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg";
|
||||
sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h";
|
||||
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.19/microsoft.netcore.app.host.linux-x64.3.1.19.nupkg";
|
||||
sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -48,8 +48,8 @@ in [
|
||||
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";
|
||||
version = "3.1.19";
|
||||
sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8";
|
||||
})
|
||||
|
||||
(fetchNuGet {
|
||||
@ -78,8 +78,8 @@ in [
|
||||
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NetCore.App.Runtime.linux-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";
|
||||
version = "3.1.19";
|
||||
sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h";
|
||||
})
|
||||
|
||||
(fetchNuGet {
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8
|
||||
Microsoft.NetCore.App.Runtime.linux-x64 3.1.8
|
||||
Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.19
|
||||
Microsoft.NetCore.App.Runtime.linux-x64 3.1.19
|
||||
|
||||
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ eigen glog ]
|
||||
++ lib.optional runTests gflags;
|
||||
buildInputs = lib.optional runTests gflags;
|
||||
propagatedBuildInputs = [ eigen glog ];
|
||||
|
||||
# The Basel BUILD file conflicts with the cmake build directory on
|
||||
# case-insensitive filesystems, eg. darwin.
|
||||
|
||||
@ -1,37 +1,53 @@
|
||||
{ lib, stdenv, fetchurl, fetchzip, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.8.5";
|
||||
version = "0.9.9.8";
|
||||
pname = "glm";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip";
|
||||
sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-truc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# fetch newer version of platform.h which correctly supports gcc 7.3
|
||||
gcc7PlatformPatch = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h";
|
||||
sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia";
|
||||
};
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=OFF"
|
||||
"-DBUILD_STATIC_LIBS=OFF"
|
||||
"-DGLM_TEST_ENABLE=${if doCheck then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}'
|
||||
cp ${gcc7PlatformPatch} glm/simd/platform.h
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postInstall = ''
|
||||
# Install header-only library
|
||||
mkdir -p $out/include
|
||||
cp -rv ../glm $out/include
|
||||
rm $out/include/glm/CMakeLists.txt
|
||||
rm $out/include/glm/detail/*.cpp
|
||||
|
||||
# Install CMake files
|
||||
mkdir -p $out/lib
|
||||
cp -rv ../cmake $out/lib
|
||||
substituteInPlace $out/lib/cmake/glm/glmConfig.cmake \
|
||||
--replace 'GLM_INCLUDE_DIRS ''${_IMPORT_PREFIX}' "GLM_INCLUDE_DIRS $out/include"
|
||||
|
||||
# Install pkg-config file
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc
|
||||
|
||||
# Install docs
|
||||
mkdir -p $doc/share/doc/glm
|
||||
cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm
|
||||
cp -rv ../doc/api $doc/share/doc/glm/html
|
||||
cp -v ../doc/manual.pdf $doc/share/doc/glm
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -41,10 +57,10 @@ stdenv.mkDerivation rec {
|
||||
graphics software based on the OpenGL Shading Language (GLSL)
|
||||
specification and released under the MIT license.
|
||||
'';
|
||||
homepage = "http://glm.g-truc.net/";
|
||||
homepage = "https://github.com/g-truc/glm";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with maintainers; [ smancill ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
7
pkgs/development/libraries/glm/glm.pc.in
Normal file
7
pkgs/development/libraries/glm/glm.pc.in
Normal file
@ -0,0 +1,7 @@
|
||||
prefix=@out@
|
||||
includedir=@out@/include
|
||||
|
||||
Name: GLM
|
||||
Description: OpenGL Mathematics
|
||||
Version: @version@
|
||||
Cflags: -I${includedir}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Vc";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VcDevel";
|
||||
repo = "Vc";
|
||||
rev = version;
|
||||
sha256 = "09nf6j1hyq2yv0c1cmnv4ff5243ylsajy1xj3dz8c2qqcm14y6cm";
|
||||
sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
pname = "elementpath";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "elementpath";
|
||||
rev = "v${version}";
|
||||
sha256 = "1imjilhmbw08469irlbr3am5zksbg327n7mznxfixrigq9d65qx6";
|
||||
sha256 = "01h68v077xbcnqn9v52i8d6s6i7ds3zycn3ddn11hc074m4gg3af";
|
||||
};
|
||||
|
||||
# avoid circular dependency with xmlschema which directly depends on this
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "0.46.0";
|
||||
version = "0.47.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "08a4p4q96zz6qp3cy7hs5jn9h2gf68d8zchw4w0kk83sm1r8rpxw";
|
||||
sha256 = "sha256-7I7g/jxaVQDvhoGLWVerqYZhFhGUM/FwH1XCpLpg3D0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -45,14 +45,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "7.0.2";
|
||||
version = "7.0.3";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs";
|
||||
sha256 = "sha256-j1lipshccPUpMR+o28hDyaJbrVgj6AHijFqOgVmrBkg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.5.20";
|
||||
version = "1.5.21";
|
||||
pname = "pyglet";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513";
|
||||
sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2021.8.1";
|
||||
version = "2021.9.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ULaybf2uV8lY9J9EHlszbnLWZJ0QO7y6BQxvdQX+nMU=";
|
||||
sha256 = "sha256-S25x9k6vBwnmJq15y5PVUWaTujT9UNHvgIX9uH+N8dY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-snapshot";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f99152df98587f883f37bb0315f082ab3e0c565f53413f1193bb0019b992c3ea";
|
||||
sha256 = "427b5ab088b25a1c8b63ce99725040664c840ff1f5a3891252723cce972897f9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@ -38,7 +38,6 @@ buildPythonPackage rec {
|
||||
import r2pipe
|
||||
r2 = r2pipe.open('${coreutils}/bin/ls')
|
||||
r2.cmd('a')
|
||||
r2.quit()
|
||||
EOF
|
||||
'';
|
||||
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikits.odes";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b";
|
||||
sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplekml";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5";
|
||||
sha256 = "cda687be2754395fcab664e908ebf589facd41e8436d233d2be37a69efb1c536";
|
||||
};
|
||||
|
||||
# no tests are defined in 1.3.5
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,20 +2,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fnm";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schniz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wKtgMUt7QquT6mS3AI+XrZqbJOZxj6jlJi+7uC9w7xU=";
|
||||
sha256 = "sha256-4qnisgWhdAWZda8iy9nkph7//bVKJuUeEDS1GaAx+FQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "sha256-TMhhCVVFTanKdbDp7L3ZaiNohWo5a/jFbQjdRiBlCkk=";
|
||||
cargoSha256 = "sha256-f3wzuXH2ByXHHOq3zLaMtYm2HJ4BzmZe2e6DQ3V7qVo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -21,10 +21,10 @@ rustPlatform.buildRustPackage rec {
|
||||
mkdir -p $out/share/kak/autoload/plugins
|
||||
cp rc/parinfer.kak $out/share/kak/autoload/plugins/
|
||||
|
||||
rtpPath=$out/share/vim-plugins/parinfer-rust
|
||||
mkdir -p $rtpPath/plugin
|
||||
rtpPath=$out/plugin
|
||||
mkdir -p $rtpPath
|
||||
sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \
|
||||
plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim
|
||||
plugin/parinfer.vim > $rtpPath/parinfer.vim
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
4
pkgs/games/osu-lazer/deps.nix
generated
4
pkgs/games/osu-lazer/deps.nix
generated
@ -65,7 +65,7 @@
|
||||
(fetchNuGet { name = "Markdig"; version = "0.25.0"; sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; })
|
||||
(fetchNuGet { name = "MessagePack"; version = "2.3.75"; sha256 = "0mcpxym6g47lyfalnr27mmavmgmd46k6f9g7id8cn1anbbvd4xv1"; })
|
||||
(fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.75"; sha256 = "06a1ys161gvw1sr771w909gwd1y4dizdvldknkhy8484drj90prd"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.8"; sha256 = "13k0p0k1gqk12hnxj4l5yjbyv8y51ggkybrqjjr3yf3411vyy4q2"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.8"; sha256 = "0rladdnd7g8gh7hj5gbrcp3dlspngad4xhgk0qmpzhlc3qr4snf2"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.8"; sha256 = "03d2ydy7zap5hri7k1f30d1i9jaqj0nijwgp2z6b36gwqck9rys7"; })
|
||||
@ -124,7 +124,7 @@
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
||||
16
pkgs/misc/emulators/ryujinx/deps.nix
generated
16
pkgs/misc/emulators/ryujinx/deps.nix
generated
@ -12,17 +12,17 @@
|
||||
(fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; })
|
||||
(fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; })
|
||||
(fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; })
|
||||
(fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; })
|
||||
(fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.5"; sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
rec {
|
||||
addRtp = path: attrs: derivation:
|
||||
derivation // { rtp = "${derivation}/${path}"; } // {
|
||||
derivation // { rtp = "${derivation}"; } // {
|
||||
overrideAttrs = f: buildVimPlugin (attrs // f attrs);
|
||||
};
|
||||
|
||||
@ -26,6 +26,9 @@ rec {
|
||||
addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
|
||||
name = namePrefix + name;
|
||||
|
||||
# dont move the doc folder since vim expects it
|
||||
forceShare= [ "man" "info" ];
|
||||
|
||||
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
|
||||
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
|
||||
|
||||
|
||||
@ -37,6 +37,9 @@
|
||||
, xkb-switch
|
||||
, ycmd
|
||||
|
||||
# test dependencies
|
||||
, neovim-unwrapped
|
||||
|
||||
# command-t dependencies
|
||||
, rake
|
||||
, ruby
|
||||
@ -392,6 +395,12 @@ self: super: {
|
||||
substituteInPlace $out/bin/minimap_generator.sh \
|
||||
--replace "code-minimap" "${code-minimap}/bin/code-minimap"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit!
|
||||
'';
|
||||
|
||||
});
|
||||
|
||||
ncm2 = super.ncm2.overrideAttrs (old: {
|
||||
|
||||
@ -5,7 +5,7 @@ echo "Sourcing vim-gen-doc-hook"
|
||||
vimPluginGenTags() {
|
||||
echo "Executing vimPluginGenTags"
|
||||
|
||||
target="$out/@rtpPath@/$pname"
|
||||
target="$out/@rtpPath@"
|
||||
mkdir -p $out/@rtpPath@
|
||||
|
||||
# build help tags
|
||||
@ -16,7 +16,7 @@ vimPluginGenTags() {
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "No docs available"
|
||||
echo "No docs available for $target"
|
||||
fi
|
||||
|
||||
if [ -n "$addonInfo" ]; then
|
||||
|
||||
@ -187,8 +187,9 @@ let
|
||||
|
||||
rtpPath = ".";
|
||||
|
||||
nativeImpl = packages:
|
||||
(let
|
||||
# Generates a packpath folder as expected by vim
|
||||
packDir = packages:
|
||||
let
|
||||
# dir is "start" or "opt"
|
||||
linkLuaPlugin = plugin: packageName: dir: ''
|
||||
mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}/lua
|
||||
@ -205,7 +206,7 @@ let
|
||||
then linkLuaPlugin pluginPath
|
||||
else linkVimlPlugin pluginPath;
|
||||
|
||||
packageLinks = (packageName: {start ? [], opt ? []}:
|
||||
packageLinks = packageName: {start ? [], opt ? []}:
|
||||
let
|
||||
# `nativeImpl` expects packages to be derivations, not strings (as
|
||||
# opposed to older implementations that have to maintain backwards
|
||||
@ -230,21 +231,20 @@ let
|
||||
++ [
|
||||
"mkdir -p $out/pack/${packageName}/start/__python3_dependencies"
|
||||
"ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3"
|
||||
]
|
||||
);
|
||||
packDir = (packages:
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "vim-pack-dir";
|
||||
src = ./.;
|
||||
installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages));
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
);
|
||||
in
|
||||
};
|
||||
|
||||
nativeImpl = packages:
|
||||
''
|
||||
set packpath^=${packDir packages}
|
||||
set runtimepath^=${packDir packages}
|
||||
'');
|
||||
'';
|
||||
|
||||
/* Generates a vimrc string
|
||||
|
||||
@ -295,7 +295,7 @@ let
|
||||
plugImpl =
|
||||
(''
|
||||
source ${vimPlugins.vim-plug.rtp}/plug.vim
|
||||
call plug#begin('/dev/null')
|
||||
silent! call plug#begin('/dev/null')
|
||||
|
||||
'' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
|
||||
|
||||
|
||||
@ -1390,6 +1390,18 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
tabnine.tabnine-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
publisher = "tabnine";
|
||||
version = "3.4.27";
|
||||
sha256 = "sha256-Xg/N59a38OKEWb/4anysslensUoj9ENcuobkyByFDxE=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
tamasfe.even-better-toml = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "even-better-toml";
|
||||
|
||||
@ -367,35 +367,35 @@ self: super:
|
||||
xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
|
||||
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
|
||||
installFlags = [
|
||||
"sdkdir=${placeholder "out"}/include/xorg"
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
|
||||
installFlags = [
|
||||
"sdkdir=${placeholder "out"}/include/xorg"
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "out"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
|
||||
installFlags = [
|
||||
"sdkdir=${placeholder "out"}/include/xorg"
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "out"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ];
|
||||
installFlags = [
|
||||
"sdkdir=${placeholder "dev"}/include/xorg"
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
|
||||
installFlags = [
|
||||
"sdkdir=${placeholder "out"}/include/xorg"
|
||||
"configdir=${placeholder "out"}/share/X11/xorg.conf.d"
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
"--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
|
||||
];
|
||||
});
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.41.0";
|
||||
version = "1.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0utKBCe65lCaamoF4uqvku1zTX2QPpV/6xBtpGteVYw=";
|
||||
sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
25
pkgs/tools/admin/fits-cloudctl/default.nix
Normal file
25
pkgs/tools/admin/fits-cloudctl/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1i9h96b0b69ib72b2ayp8mhgvkm21jbh8mf7wb1fp2gdzbxcgrhg";
|
||||
};
|
||||
|
||||
vendorSha256 = "1fs1jqxz36i25vyb0mznkjglz8wwq9a8884052cjpacvsgd3glkf";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
homepage = "https://github.com/fi-ts/cloudctl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ j0xaf ];
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
(fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; })
|
||||
(fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; })
|
||||
(fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.14"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; })
|
||||
(fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
|
||||
(fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; })
|
||||
(fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; })
|
||||
|
||||
23
pkgs/tools/games/steam-acf/default.nix
Normal file
23
pkgs/tools/games/steam-acf/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "steam-acf";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chisui";
|
||||
repo = "acf";
|
||||
rev = "v${version}";
|
||||
sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
|
||||
};
|
||||
|
||||
cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to convert Steam .acf files to JSON";
|
||||
homepage = "https://github.com/chisui/acf";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ chisui ];
|
||||
mainProgram = "acf";
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,35 @@
|
||||
{ lib, stdenv, fetchurl, tcl, tk }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, tcl
|
||||
, tk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uudeview";
|
||||
version = "0.5.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
|
||||
url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl tk ];
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ];
|
||||
|
||||
# https://wiki.tcl.tk/3577
|
||||
patches = [ ./matherr.patch ];
|
||||
patches = [
|
||||
# https://wiki.tcl.tk/3577
|
||||
./matherr.patch
|
||||
# format hardening
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
|
||||
sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
|
||||
'';
|
||||
@ -21,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "The Nice and Friendly Decoder";
|
||||
homepage = "http://www.fpx.de/fp/Software/UUDeview/";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ woffs ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@ -5,6 +5,8 @@
|
||||
, libnetfilter_queue
|
||||
, libnfnetlink
|
||||
, lib
|
||||
, coreutils
|
||||
, iptables
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -32,6 +34,12 @@ buildGoModule rec {
|
||||
|
||||
postBuild = ''
|
||||
mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd
|
||||
mkdir -p $out/lib/systemd/system
|
||||
substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \
|
||||
--replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \
|
||||
--replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \
|
||||
--replace "/bin/mkdir" "${coreutils}/bin/mkdir"
|
||||
sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk=";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustSec";
|
||||
repo = "rustsec";
|
||||
rev = "cargo-audit%2Fv${version}";
|
||||
sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw";
|
||||
sha256 = "1j5ijrjhzqimamhj51qhpbaxx485hcxhaj64lknkn0xrda3apkx8";
|
||||
};
|
||||
|
||||
cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p";
|
||||
cargoSha256 = "1qvrzaila3wbjmc7ri5asa3di2nzln78ys9innzd84fr36c90kkc";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
26
pkgs/tools/security/yubikey-touch-detector/default.nix
Normal file
26
pkgs/tools/security/yubikey-touch-detector/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, libnotify, buildGoModule, fetchFromGitHub, pkg-config }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yubikey-touch-detector";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximbaz";
|
||||
repo = "yubikey-touch-detector";
|
||||
rev = version;
|
||||
sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0=";
|
||||
};
|
||||
vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libnotify ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen).";
|
||||
homepage = "https://github.com/maximbaz/yubikey-touch-detector";
|
||||
maintainers = with maintainers; [ sumnerevans ];
|
||||
license = licenses.isc;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2771,6 +2771,8 @@ with pkgs;
|
||||
|
||||
firestarter = callPackage ../applications/misc/firestarter { };
|
||||
|
||||
fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { };
|
||||
|
||||
frangipanni = callPackage ../tools/text/frangipanni { };
|
||||
|
||||
fselect = callPackage ../tools/misc/fselect { };
|
||||
@ -19522,6 +19524,8 @@ with pkgs;
|
||||
|
||||
yubikey-agent = callPackage ../tools/security/yubikey-agent { };
|
||||
|
||||
yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { };
|
||||
|
||||
zchunk = callPackage ../development/libraries/zchunk { };
|
||||
|
||||
zeitgeist = callPackage ../development/libraries/zeitgeist { };
|
||||
@ -29681,6 +29685,8 @@ with pkgs;
|
||||
|
||||
steamcmd = steamPackages.steamcmd;
|
||||
|
||||
steam-acf = callPackage ../tools/games/steam-acf { };
|
||||
|
||||
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
|
||||
winetricks = winetricks.override {
|
||||
# Remove default build of wine to reduce closure size.
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ pkgs
|
||||
, linuxKernel
|
||||
, config
|
||||
, buildPackages
|
||||
, callPackage
|
||||
@ -16,14 +17,31 @@
|
||||
# - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.
|
||||
# - Update linux_latest_hardened when the patches become available
|
||||
|
||||
let
|
||||
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
|
||||
with linuxKernel;
|
||||
|
||||
let
|
||||
deblobKernel = kernel: callPackage ../os-specific/linux/kernel/linux-libre.nix {
|
||||
linux = kernel;
|
||||
};
|
||||
|
||||
kernels = lib.makeExtensible (self: with self;
|
||||
# Hardened Linux
|
||||
hardenedKernelFor = kernel': overrides:
|
||||
let kernel = kernel'.override overrides;
|
||||
in kernel.override {
|
||||
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
|
||||
inherit lib;
|
||||
inherit (kernel) version;
|
||||
};
|
||||
kernelPatches = kernel.kernelPatches ++ [
|
||||
kernelPatches.hardened.${kernel.meta.branch}
|
||||
];
|
||||
modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
|
||||
isHardened = true;
|
||||
};
|
||||
in {
|
||||
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
|
||||
|
||||
kernels = recurseIntoAttrs (lib.makeExtensible (self: with self;
|
||||
let callPackage = newScope self; in {
|
||||
|
||||
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {
|
||||
@ -204,7 +222,7 @@ let
|
||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||
linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { };
|
||||
|
||||
});
|
||||
}));
|
||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||
rather than provide specific instances of those packages for a
|
||||
specific kernel, we have a function that builds those packages
|
||||
@ -429,20 +447,6 @@ let
|
||||
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
|
||||
});
|
||||
|
||||
# Hardened Linux
|
||||
hardenedKernelFor = kernel': overrides:
|
||||
let kernel = kernel'.override overrides;
|
||||
in kernel.override {
|
||||
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
|
||||
inherit lib;
|
||||
inherit (kernel) version;
|
||||
};
|
||||
kernelPatches = kernel.kernelPatches ++ [
|
||||
kernelPatches.hardened.${kernel.meta.branch}
|
||||
];
|
||||
modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
|
||||
isHardened = true;
|
||||
};
|
||||
hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
|
||||
|
||||
vanillaPackages = {
|
||||
@ -471,7 +475,7 @@ let
|
||||
linux_rpi4 = packagesFor kernels.linux_rpi4;
|
||||
};
|
||||
|
||||
packages = vanillaPackages // rtPackages // rpiPackages // {
|
||||
packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // {
|
||||
linux_mptcp_95 = packagesFor kernels.linux_mptcp_95;
|
||||
|
||||
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
|
||||
@ -495,7 +499,7 @@ let
|
||||
linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);
|
||||
|
||||
linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);
|
||||
};
|
||||
});
|
||||
|
||||
packageAliases = {
|
||||
linux_default = packages.linux_5_10;
|
||||
@ -509,22 +513,11 @@ let
|
||||
|
||||
manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
packages = recurseIntoAttrs packages;
|
||||
kernels = recurseIntoAttrs kernels;
|
||||
inherit packageAliases;
|
||||
inherit vanillaPackages rtPackages rpiPackages;
|
||||
inherit kernelPatches packagesFor hardenedPackagesFor;
|
||||
|
||||
customPackage = { version, src, configfile, allowImportFromDerivation ? true }:
|
||||
recurseIntoAttrs (packagesFor (manualConfig {
|
||||
inherit version src configfile lib stdenv allowImportFromDerivation;
|
||||
}));
|
||||
|
||||
inherit manualConfig;
|
||||
|
||||
# Derive one of the default .config files
|
||||
linuxConfig = {
|
||||
src,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user