Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
1ecb97eae9
22 changed files with 108 additions and 49 deletions
|
|
@ -147,7 +147,6 @@ where they are known to differ. But there are ways to customize the argument:
|
|||
};
|
||||
}
|
||||
```
|
||||
|
||||
will result in:
|
||||
```shell
|
||||
--target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}
|
||||
|
|
|
|||
|
|
@ -29,15 +29,14 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
# We use the 'out' output, since localtime has its 'bin' output
|
||||
# first, so that is what we get if we use the derivation bare.
|
||||
# Install the polkit rules.
|
||||
environment.systemPackages = [ pkgs.localtime.out ];
|
||||
environment.systemPackages = [ pkgs.localtime ];
|
||||
# Install the systemd unit.
|
||||
systemd.packages = [ pkgs.localtime.out ];
|
||||
systemd.packages = [ pkgs.localtime ];
|
||||
|
||||
users.users.localtimed = {
|
||||
description = "Taskserver user";
|
||||
description = "localtime daemon";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
systemd.services.localtime = {
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@ let
|
|||
inherit buildFHSUserEnv;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "4.1.2.0"; # "Android Studio 4.1.2"
|
||||
build = "201.7042882";
|
||||
sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
|
||||
version = "4.1.3.0"; # "Android Studio 4.1.3"
|
||||
build = "201.7199119";
|
||||
sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "4.2.0.21"; # "Android Studio 4.2 Beta 5"
|
||||
build = "202.7141121";
|
||||
sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2";
|
||||
version = "4.2.0.22"; # "Android Studio 4.2 Beta 6"
|
||||
build = "202.7188722";
|
||||
sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7"
|
||||
sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw";
|
||||
version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10"
|
||||
sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_FLAT_MESH:BOOL=ON"
|
||||
"-DBUILD_QT5=ON"
|
||||
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
|
||||
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.0.27";
|
||||
version = "8.0.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
|
||||
hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -8,22 +8,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reddsaver";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manojkarthick";
|
||||
repo = "reddsaver";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg";
|
||||
sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4";
|
||||
};
|
||||
|
||||
cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd";
|
||||
cargoSha256 = "1cx3sqr7zb1vlfdvbcxp0yva9xh654qczpy8s09c8cviy8hac5sr";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# package does not contain tests as of v0.3.1
|
||||
# package does not contain tests as of v0.3.2
|
||||
docCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,32 @@
|
|||
, cmake, libyaml, Security
|
||||
, libjpeg, libX11, libXext, libXft, libXinerama
|
||||
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
|
||||
, extraPacks ? []
|
||||
# Packs must be installed from a local directory during the build, with dependencies
|
||||
# resolved manually, e.g. to install the 'julian' pack, which depends on the 'delay', 'list_util' and 'typedef' packs:
|
||||
# julian = pkgs.fetchzip {
|
||||
# name = "swipl-pack-julian";
|
||||
# url = "https://github.com/mndrix/julian/archive/v0.1.3.zip";
|
||||
# sha256 = "1sgql7c21p3c5m14kwa0bcmlwn9fql612krn9h36gla1j9yjdfgy";
|
||||
# };
|
||||
# delay = pkgs.fetchzip {
|
||||
# name = "swipl-pack-delay";
|
||||
# url = "https://github.com/mndrix/delay/archive/v0.3.3.zip";
|
||||
# sha256 = "0ira87afxnc2dnbbmgwmrr8qvary8lhzvhqwd52dccm6yqd3nybg";
|
||||
# };
|
||||
# list_util = pkgs.fetchzip {
|
||||
# name = "swipl-pack-list_util";
|
||||
# url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip";
|
||||
# sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q";
|
||||
# };
|
||||
# typedef = builtins.fetchTarball {
|
||||
# name = "swipl-pack-typedef";
|
||||
# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
|
||||
# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3";
|
||||
# };
|
||||
# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [
|
||||
# julian delay list_util typedef
|
||||
# ]; };
|
||||
, extraPacks ? []
|
||||
, withGui ? false
|
||||
}:
|
||||
|
||||
|
|
@ -26,6 +51,11 @@ stdenv.mkDerivation {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Add the packInstall path to the swipl pack search path
|
||||
postPatch = ''
|
||||
echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ gmp readline openssl
|
||||
|
|
@ -39,6 +69,10 @@ stdenv.mkDerivation {
|
|||
|
||||
cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/lib/swipl/pack
|
||||
'';
|
||||
|
||||
postInstall = builtins.concatStringsSep "\n"
|
||||
( builtins.map (packInstall "$out") extraPacks
|
||||
);
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg=";
|
||||
sha256 = "sha256-lE2BAwiwvewydIpVYoN+zrfpzQbMbe5Nb1r0mzdxMao=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ with skawarePackages;
|
|||
|
||||
buildPackage {
|
||||
pname = "skalibs";
|
||||
version = "2.10.0.1";
|
||||
sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
|
||||
version = "2.10.0.2";
|
||||
sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb";
|
||||
|
||||
description = "A set of general-purpose C programming libraries";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ lib, buildDunePackage, fetchurl, seq }:
|
||||
{ lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.03";
|
||||
pname = "psq";
|
||||
version = "0.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";
|
||||
sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";
|
||||
|
|
@ -12,6 +14,9 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ seq ];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.07";
|
||||
checkInputs = [ qcheck-alcotest ];
|
||||
|
||||
meta = {
|
||||
description = "Functional Priority Search Queues for OCaml";
|
||||
homepage = "https://github.com/pqwy/psq";
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-testmon";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
|
||||
sha256 = "sha256-+IpT0o+Jg2UJcy6d7mEdZsYfW4IXIBu4IqBFbywyPRk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ coverage ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "k6";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
|
||||
goPackagePath = "github.com/loadimpact/k6";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "loadimpact";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UAVbYN4uDUMqUspycEZ2VGHzxFD7IlIW6m91U8ccZXw=";
|
||||
sha256 = "sha256-wngOG0uSNoUU+88oShDpCgPpzuevzJxcwzSzWS3PzAw=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, mono5
|
||||
, mono6
|
||||
, msbuild
|
||||
, dotnet-sdk
|
||||
, makeWrapper
|
||||
, dotnetPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ];
|
||||
|
||||
preUnpack = ''
|
||||
mkdir src
|
||||
|
|
@ -26,8 +29,13 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
cd ..
|
||||
cp -r src $out/
|
||||
ls -al $out/src
|
||||
makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \
|
||||
rm -r $out/src/.msbuild
|
||||
cp -r ${msbuild}/lib/mono/msbuild $out/src/.msbuild
|
||||
|
||||
chmod -R u+w $out/src
|
||||
mv $out/src/.msbuild/Current/{bin,Bin}
|
||||
|
||||
makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
|
||||
--add-flags "$out/src/OmniSharp.exe"
|
||||
'';
|
||||
|
||||
|
|
@ -36,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tesq0 ];
|
||||
maintainers = with maintainers; [ tesq0 ericdallo ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2926,6 +2926,18 @@ let
|
|||
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
|
||||
};
|
||||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn-vim";
|
||||
version = "2021-02-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa";
|
||||
sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
|
||||
nord-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nord-vim";
|
||||
version = "2020-07-06";
|
||||
|
|
|
|||
|
|
@ -345,6 +345,7 @@ maximbaz/lightline-ale
|
|||
MaxMEllon/vim-jsx-pretty
|
||||
mbbill/undotree
|
||||
mboughaba/i3config.vim
|
||||
mcchrish/nnn.vim
|
||||
megaannum/forms
|
||||
megaannum/self
|
||||
mengelbrecht/lightline-bufferline
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
|
|||
mktplcRef = {
|
||||
name = "vsliveshare";
|
||||
publisher = "ms-vsliveshare";
|
||||
version = "1.0.3912";
|
||||
sha256 = "1k5yy04q85jjr7hzrv0s7x1m2251kglb038wcvvbs568vpscghi8";
|
||||
version = "1.0.3968";
|
||||
sha256 = "1nmhkxrlg9blxcqh7a3hl0wc5mkk2p77mn228lvmcirpbk3acsx5";
|
||||
};
|
||||
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
|
||||
nativeBuildInputs = nativeBuildInputs ++ [
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ fi
|
|||
|
||||
# Resolve the flake.
|
||||
if [[ -n $flake ]]; then
|
||||
flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
|
||||
flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
|
||||
fi
|
||||
|
||||
# Find configuration.nix and open editor instead of building.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ with skawarePackages;
|
|||
|
||||
buildPackage {
|
||||
pname = "s6-linux-init";
|
||||
version = "1.0.6.0";
|
||||
sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
|
||||
version = "1.0.6.1";
|
||||
sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn";
|
||||
|
||||
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ with skawarePackages;
|
|||
|
||||
buildPackage {
|
||||
pname = "execline";
|
||||
version = "2.7.0.0";
|
||||
sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd";
|
||||
version = "2.8.0.0";
|
||||
sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77";
|
||||
|
||||
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
|
|||
|
||||
buildPackage {
|
||||
pname = "s6-networking";
|
||||
version = "2.4.0.0";
|
||||
sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq";
|
||||
version = "2.4.1.0";
|
||||
sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc";
|
||||
|
||||
description = "A suite of small networking utilities for Unix systems";
|
||||
|
||||
|
|
|
|||
|
|
@ -213,13 +213,13 @@ in rec {
|
|||
|
||||
nixUnstable = lib.lowPrio (callPackage common rec {
|
||||
name = "nix-2.4${suffix}";
|
||||
suffix = "pre20210308_1c0e3e4";
|
||||
suffix = "pre20210317_8a5203d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
|
||||
sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
|
||||
rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
|
||||
sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
|
||||
};
|
||||
|
||||
inherit storeDir stateDir confDir boehmgc;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ with skawarePackages;
|
|||
|
||||
buildPackage {
|
||||
pname = "s6";
|
||||
version = "2.10.0.0";
|
||||
sha256 = "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0";
|
||||
version = "2.10.0.2";
|
||||
sha256 = "08bcrp7ck1l3wmjyzxi3vgk6j0n2jfymxs4rjjw4if40f3lgqfmj";
|
||||
|
||||
description = "skarnet.org's small & secure supervision software suite";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue