Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/top-level/aliases.nix
This commit is contained in:
Jonathan Ringer
commit
39669ea2b6
121 changed files with 804 additions and 571 deletions
|
|
@ -1179,14 +1179,14 @@
|
|||
name = "Artturi N";
|
||||
};
|
||||
azahi = {
|
||||
email = "azahi@teknik.io";
|
||||
matrix = "@azahi:matrix.org";
|
||||
name = "Azat Bahawi";
|
||||
email = "azat@bahawi.net";
|
||||
matrix = "@azahi:azahi.cc";
|
||||
github = "azahi";
|
||||
githubId = 22211000;
|
||||
name = "Azat Bahawi";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0xB40FCB6608BBE3B6";
|
||||
fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6";
|
||||
longkeyid = "rsa4096/0xC8C6BDDB3847F72B";
|
||||
fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B";
|
||||
}];
|
||||
};
|
||||
ayazhafiz = {
|
||||
|
|
@ -2382,6 +2382,13 @@
|
|||
githubId = 11145016;
|
||||
name = "J.C.";
|
||||
};
|
||||
congee = {
|
||||
email = "changshengwu@pm.me";
|
||||
matrix = "@congeec:matrix.org";
|
||||
github = "congee";
|
||||
name = "Changsheng Wu";
|
||||
githubId = 2083950;
|
||||
};
|
||||
contrun = {
|
||||
email = "uuuuuu@protonmail.com";
|
||||
github = "contrun";
|
||||
|
|
@ -5462,6 +5469,12 @@
|
|||
githubId = 221929;
|
||||
name = "Jean-Baptiste Giraudeau";
|
||||
};
|
||||
jc = {
|
||||
name = "Josh Cooper";
|
||||
email = "josh@cooper.is";
|
||||
github = "joshua-cooper";
|
||||
githubId = 35612334;
|
||||
};
|
||||
jceb = {
|
||||
name = "jceb";
|
||||
email = "jceb@e-jc.de";
|
||||
|
|
@ -5590,6 +5603,16 @@
|
|||
githubId = 143075;
|
||||
name = "James Felix Black";
|
||||
};
|
||||
jfchevrette = {
|
||||
email = "jfchevrette@gmail.com";
|
||||
github = "jfchevrette";
|
||||
githubId = 3001;
|
||||
name = "Jean-Francois Chevrette";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x67A0585801290DC6";
|
||||
fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6";
|
||||
}];
|
||||
};
|
||||
jflanglois = {
|
||||
email = "yourstruly@julienlanglois.me";
|
||||
github = "jflanglois";
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ in {
|
|||
in {
|
||||
services.rsync = {
|
||||
enable = !cfg.socketActivated;
|
||||
aliases = [ "rsyncd" ];
|
||||
aliases = [ "rsyncd.service" ];
|
||||
|
||||
description = "fast remote file copy program daemon";
|
||||
after = [ "network.target" ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ in
|
|||
# E.g., if Plasma 5 is enabled, it supersedes xterm.
|
||||
imports = [
|
||||
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
|
||||
./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix
|
||||
./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix
|
||||
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
|
||||
./cinnamon.nix
|
||||
];
|
||||
|
|
|
|||
40
nixos/modules/services/x11/desktop-managers/retroarch.nix
Normal file
40
nixos/modules/services/x11/desktop-managers/retroarch.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.services.xserver.desktopManager.retroarch;
|
||||
|
||||
in {
|
||||
options.services.xserver.desktopManager.retroarch = {
|
||||
enable = mkEnableOption "RetroArch";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.retroarch;
|
||||
defaultText = literalExpression "pkgs.retroarch";
|
||||
example = literalExpression "pkgs.retroarch-full";
|
||||
description = "RetroArch package to use.";
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [ "--verbose" "--host" ];
|
||||
description = "Extra arguments to pass to RetroArch.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.desktopManager.session = [{
|
||||
name = "RetroArch";
|
||||
start = ''
|
||||
${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ j0hax ];
|
||||
}
|
||||
|
|
@ -441,6 +441,7 @@ in
|
|||
resolv = handleTest ./resolv.nix {};
|
||||
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
|
||||
restic = handleTest ./restic.nix {};
|
||||
retroarch = handleTest ./retroarch.nix {};
|
||||
riak = handleTest ./riak.nix {};
|
||||
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
|
||||
roundcube = handleTest ./roundcube.nix {};
|
||||
|
|
|
|||
49
nixos/tests/retroarch.nix
Normal file
49
nixos/tests/retroarch.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "retroarch";
|
||||
meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; };
|
||||
|
||||
machine = { ... }:
|
||||
|
||||
{
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.xserver.enable = true;
|
||||
services.xserver.desktopManager.retroarch = {
|
||||
enable = true;
|
||||
package = pkgs.retroarchFull;
|
||||
};
|
||||
services.xserver.displayManager = {
|
||||
sddm.enable = true;
|
||||
defaultSession = "RetroArch";
|
||||
autoLogin = {
|
||||
enable = true;
|
||||
user = "alice";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
user = nodes.machine.config.users.users.alice;
|
||||
xdo = "${pkgs.xdotool}/bin/xdotool";
|
||||
in ''
|
||||
with subtest("Wait for login"):
|
||||
start_all()
|
||||
machine.wait_for_file("${user.home}/.Xauthority")
|
||||
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||
|
||||
with subtest("Check RetroArch started"):
|
||||
machine.wait_until_succeeds("pgrep retroarch")
|
||||
machine.wait_for_window("^RetroArch ")
|
||||
|
||||
with subtest("Check configuration created"):
|
||||
machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg")
|
||||
|
||||
with subtest("Wait to get a screenshot"):
|
||||
machine.execute(
|
||||
"${xdo} key Alt+F1 sleep 10"
|
||||
)
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ];
|
||||
virtualisation.diskSize = "800";
|
||||
virtualisation.diskSize = 800;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-22";
|
||||
version = "7.1.0-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "sha256-Pd/b3lmFpOis8z+ITFScBUNALIKJY4ZOx2VOBwM0Bh4=";
|
||||
sha256 = "sha256-NNdtJvgExAFPgJxkSDq8N/UqCbuMRw2N5hPnWGszJtI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
|||
|
|
@ -3,33 +3,35 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "deskew";
|
||||
version = "1.25";
|
||||
version = "1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galfar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8";
|
||||
hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fpc ];
|
||||
buildInputs = [ libtiff ];
|
||||
|
||||
buildPhase = ''
|
||||
rm -r Bin # Remove pre-compiled binary
|
||||
mkdir Bin
|
||||
chmod +x compile.sh
|
||||
./compile.sh
|
||||
runHook preBuild
|
||||
patchShebangs ./Scripts
|
||||
pushd Scripts && ./compile.sh && popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin Bin/*
|
||||
runHook preInstall
|
||||
install -Dt $out/bin Bin/deskew
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line tool for deskewing scanned text documents";
|
||||
homepage = "https://bitbucket.org/galfar/app-deskew/overview";
|
||||
license = licenses.mit;
|
||||
homepage = "https://galfar.vevb.net/deskew";
|
||||
license = with licenses; [ mit mpl11 ];
|
||||
maintainers = with maintainers; [ryantm];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.3.0";
|
||||
version = "8.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw";
|
||||
sha256 = "tnZr+qjUcJ9Fhk6RP8iwu+/JsvYSE03NHhBfhedyCTQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
41
pkgs/applications/misc/leetcode-cli/default.nix
Normal file
41
pkgs/applications/misc/leetcode-cli/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, fetchCrate
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, dbus
|
||||
, sqlite
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "leetcode-cli";
|
||||
version = "0.3.10";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "May the code be with you 👻";
|
||||
longDescription = "Use leetcode.com in command line";
|
||||
homepage = "https://github.com/clearloop/leetcode-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ congee ];
|
||||
mainProgram = "leetcode";
|
||||
};
|
||||
}
|
||||
|
|
@ -31,42 +31,14 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
pname = "mupdf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
|
||||
sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";
|
||||
sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [
|
||||
(fetchpatch {
|
||||
name = "pdfocr.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
|
||||
sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pdf-layer.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
|
||||
sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pixmap.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
|
||||
sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-3407.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
|
||||
sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-37220.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f";
|
||||
sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let
|
|||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "phoc";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "Phosh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A=";
|
||||
sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
36
pkgs/applications/networking/cluster/glooctl/default.nix
Normal file
36
pkgs/applications/networking/cluster/glooctl/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t63tK0hwbVnUP9UxS8g3uzL3rBvKR10vu1E85mNV3E0=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
vendorSha256 = "sha256-IBuAUKbX1esx2p4Q/b3UxQH9S3VVNYZcn5vRKtmhO0A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/glooctl
|
||||
|
||||
export HOME=$TMP
|
||||
installShellCompletion --cmd glooctl \
|
||||
--bash <($out/bin/glooctl completion bash) \
|
||||
--zsh <($out/bin/glooctl completion zsh)
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "glooctl is the unified CLI for Gloo";
|
||||
homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nelsonjeppesen ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.60";
|
||||
version = "1.2.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EEceAIlbwfKD2K0pJxmCRn6+yc5RVBassENuMS48794=";
|
||||
sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk=";
|
||||
};
|
||||
vendorSha256 = "sha256-3hNqCIx6S1pEzLMRVmr04pmQrrc3T/Q/FsB/DCAVRCY=";
|
||||
vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ in
|
|||
rec {
|
||||
thunderbird = common rec {
|
||||
pname = "thunderbird";
|
||||
version = "91.5.1";
|
||||
version = "91.6.0";
|
||||
application = "comm/mail";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717";
|
||||
sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749";
|
||||
};
|
||||
patches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0=";
|
||||
sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "ipaexfont-003.01";
|
||||
name = "ipaexfont-004.01";
|
||||
|
||||
url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
|
||||
url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj";
|
||||
sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Japanese font package with Mincho and Gothic fonts";
|
||||
|
|
@ -21,7 +21,7 @@ fetchzip {
|
|||
|
||||
This is the successor to the IPA fonts.
|
||||
'';
|
||||
homepage = "http://ipafont.ipa.go.jp/";
|
||||
homepage = "https://moji.or.jp/ipafont/";
|
||||
license = licenses.ipa;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "unstable-2021-12-24";
|
||||
version = "2022-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495";
|
||||
sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki";
|
||||
rev = version;
|
||||
sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
dontDropIconThemeCache = true;
|
||||
|
||||
# These fixup steps are slow and unnecessary for this package.
|
||||
# Package may installs almost 400 000 small files.
|
||||
# Package may install almost 400 000 small files.
|
||||
dontPatchELF = true;
|
||||
dontRewriteSymlinks = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
, sizeVariants ? [] # default: standard
|
||||
, tweaks ? []
|
||||
, wallpapers ? false
|
||||
, withGrub ? false
|
||||
, grubScreens ? [] # default: 1080p
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -20,16 +22,17 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red"
|
|||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks
|
||||
lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname;
|
||||
version = "unstable-2022-01-07";
|
||||
version = "unstable-2022-02-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec";
|
||||
sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk";
|
||||
rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
|
||||
sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -65,6 +68,18 @@ stdenvNoCC.mkDerivation {
|
|||
''}
|
||||
''}
|
||||
|
||||
${lib.optionalString withGrub ''
|
||||
(
|
||||
cd other/grub2
|
||||
|
||||
patchShebangs install.sh
|
||||
|
||||
./install.sh --justcopy --dest $out/share/grub/themes \
|
||||
${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \
|
||||
${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens}
|
||||
)
|
||||
''}
|
||||
|
||||
jdupes -L -r $out/share
|
||||
|
||||
runHook postInstall
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphite-kde-theme";
|
||||
version = "unstable-2022-01-22";
|
||||
version = "2022-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "d60a26533b104d6d2251c5187a402f3f35ecbdf7";
|
||||
sha256 = "0cry5s3wr0frpchc0hx97r9v6r3v6rvln7l1hb3znn8npkr4mssi";
|
||||
rev = version;
|
||||
sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mate-tweak";
|
||||
version = "22.04.0";
|
||||
version = "22.04.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu-mate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "yCML+RdN7/dCCx5x1m8fUIkBrnfKztwqplpu1wXwDvY=";
|
||||
sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-cpufreq-plugin";
|
||||
version = "1.2.5";
|
||||
sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc=";
|
||||
version = "1.2.6";
|
||||
sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc=";
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ let
|
|||
category = "panel-plugins";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-cpugraph-plugin";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-wvbb1/g8ebY7g8mCMsedBQ4YZA6CRkueyNNkOpLDobA=";
|
||||
sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-sensors-plugin";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s=";
|
||||
sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "91.5.1";
|
||||
version = "91.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "sha256-NgSWlFBf9e3RoIZIDlo9Kf7dPwsNSoononGmbo/GzR8=";
|
||||
sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.4";
|
||||
version = "2.34.5";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY=";
|
||||
sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-apron-${version}";
|
||||
pname = "ocaml${ocaml.version}-apron";
|
||||
version = "0.9.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemine";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-astring-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-astring";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ then throw "BAP is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-bap-${version}";
|
||||
pname = "ocaml${ocaml.version}-bap";
|
||||
version = "2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "BinaryAnalysisPlatform";
|
||||
|
|
@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
|
|||
createFindlibDestdir = true;
|
||||
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ which makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -6,10 +6,9 @@ if !lib.versionAtLeast ocaml.version "4.02"
|
|||
then throw "batteries is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let version = "3.4.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-batteries-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-batteries";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-batteries-team";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }:
|
||||
|
||||
let version = "1.4"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-benchmark-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-benchmark";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-bos-${version}";
|
||||
pname = "ocaml${ocaml.version}-bos";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
|
||||
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5";
|
||||
name = "ocaml${ocaml.version}-camlpdf-${version}";
|
||||
pname = "ocaml${ocaml.version}-camlpdf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnwhitington";
|
||||
repo = "camlpdf";
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ if !lib.versionAtLeast ocaml.version "4.10"
|
|||
then throw "cpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let version = "2.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-cpdf-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-cpdf";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnwhitington";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-dum-${version}";
|
||||
pname = "ocaml${ocaml.version}-dum";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
name = "ocaml${ocaml.version}-elina-${version}";
|
||||
pname = "ocaml${ocaml.version}-elina";
|
||||
src = fetchurl {
|
||||
url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz";
|
||||
sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3+20200317";
|
||||
name = "ocaml${ocaml.version}-erm_xmpp-${version}";
|
||||
pname = "ocaml${ocaml.version}-erm_xmpp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hannesm";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-expat-${version}";
|
||||
pname = "ocaml${ocaml.version}-expat";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ then throw "farfadet is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-farfadet-${version}";
|
||||
pname = "ocaml${ocaml.version}-farfadet";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-FrontC-${version}";
|
||||
pname = "ocaml${ocaml.version}-FrontC";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BinaryAnalysisPlatform";
|
||||
repo = "FrontC";
|
||||
rev = "V_3_4_1";
|
||||
rev = "V_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml${ocaml.version}-functory-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-functory";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3";
|
||||
name = "ocaml${ocaml.version}-inotify-${version}";
|
||||
pname = "ocaml${ocaml.version}-inotify";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whitequark";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
|
||||
|
||||
let version = "1.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-jsonm-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-jsonm";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6";
|
||||
name = "ocaml${ocaml.version}-lablgtk-extras-${version}";
|
||||
pname = "ocaml${ocaml.version}-lablgtk-extras";
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "zoggy";
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (param) version src;
|
||||
name = "ocaml${ocaml.version}-labltk-${version}";
|
||||
pname = "ocaml${ocaml.version}-labltk";
|
||||
|
||||
buildInputs = [ ocaml findlib tcl tk makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.1";
|
||||
name = "ocaml${ocaml.version}-lwt_react-${version}";
|
||||
pname = "ocaml${ocaml.version}-lwt_react";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
|
||||
url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-${version}.tar.gz";
|
||||
sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-mlgmpidl-${version}";
|
||||
pname = "ocaml${ocaml.version}-mlgmpidl";
|
||||
version = "1.2.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nberth";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-mtime-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-mtime";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ then throw "nocrypto is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-nocrypto-${version}";
|
||||
pname = "ocaml${ocaml.version}-nocrypto";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let withLwt = lwt != null; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.2";
|
||||
name = "ocaml${ocaml.version}-notty-${version}";
|
||||
pname = "ocaml${ocaml.version}-notty";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
name = "ocaml${ocaml.version}-num-${version}";
|
||||
pname = "ocaml${ocaml.version}-num";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = "num";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ then throw "ocamlnet is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocamlnet-${version}";
|
||||
pname = "ocaml${ocaml.version}-ocamlnet";
|
||||
version = "4.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
|
||||
pname = "ocaml${ocaml.version}-ocp-ocamlres";
|
||||
version = "0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCamlPro";
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ let param =
|
|||
}; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml${ocaml.version}-pprint-${param.version}";
|
||||
inherit (param) version;
|
||||
pname = "ocaml${ocaml.version}-pprint";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-process-${version}";
|
||||
pname = "ocaml${ocaml.version}-process";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.5";
|
||||
name = "ocaml${ocaml.version}-ptime-${version}";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
name = "ocaml${ocaml.version}-rope-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-rope";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (param) url sha256;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-rresult-${version}";
|
||||
pname = "ocaml${ocaml.version}-rresult";
|
||||
version = "0.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ then throw "sosa is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-sosa-${version}";
|
||||
pname = "ocaml${ocaml.version}-sosa";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-topkg-${version}";
|
||||
pname = "ocaml${ocaml.version}-topkg";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ then throw "wasm is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-wasm-${version}";
|
||||
pname = "ocaml${ocaml.version}-wasm";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.23.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.23.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-FrH5PwNpXZpNk7mUnMBGA9MQUPBqBEOoMd9T5ond2WA=";
|
||||
sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -59,7 +61,9 @@ buildPythonPackage rec {
|
|||
"test_deferred_callback_url"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "async_upnp_client" ];
|
||||
pythonImportsCheck = [
|
||||
"async_upnp_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asyncio UPnP Client library for Python";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diagrams";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx";
|
||||
sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "6.5.0";
|
||||
version = "6.5.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0U6k/CwRjbKmr2WkNFqLmzVeeSrtrWv2TdPrl8X8X+4=";
|
||||
sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrfxtrx";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyRFXtrx";
|
||||
rev = version;
|
||||
sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm";
|
||||
hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -24,6 +24,11 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# https://github.com/Danielhiversen/pyRFXtrx/issues/130
|
||||
"tests/test_rollertrol.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to communicate with the RFXtrx family of devices";
|
||||
homepage = "https://github.com/Danielhiversen/pyRFXtrx";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "1.3.7";
|
||||
version = "1.4.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pyrogram";
|
||||
inherit version;
|
||||
hash = "sha256-OwjlZIuwbrmaCe/2lz+flr8sAyJZYXixjhtPylgExKQ=";
|
||||
hash = "sha256-5twH9ZfwtP6gi50K8nqXOmCPSFkHO5Hitd7XaDP0EQg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,30 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-celery";
|
||||
version = "0.0.0";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celery";
|
||||
repo = "pytest-celery";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w=";
|
||||
};
|
||||
|
||||
patches = [ ./no-celery.patch ];
|
||||
postPatch = ''
|
||||
# avoid infinite recursion with celery
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"celery >= 4.4.0"' ""
|
||||
'';
|
||||
|
||||
doCheck = false; # This package has nothing to test or import.
|
||||
# This package has nothing to test or import.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "pytest plugin for unittest subTest() support and subtests fixture";
|
||||
homepage = "https://github.com/pytest-dev/pytest-subtests";
|
||||
description = "Pytest plugin to enable celery.contrib.pytest";
|
||||
homepage = "https://github.com/celery/pytest-celery";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
This plugin is needed to test celery itself, so it can't depend on celery.
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -6,3 +6,3 @@ from distutils.core import setup
|
||||
install_requires = \
|
||||
-['celery >= 4.4.0']
|
||||
+[]
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-subprocess";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "aklajnert";
|
||||
repo = "pytest-subprocess";
|
||||
rev = version;
|
||||
hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY=";
|
||||
hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ let
|
|||
in buildPythonPackage rec {
|
||||
pname = "pytorch";
|
||||
# Don't forget to update pytorch-bin to the same version.
|
||||
version = "1.9.0";
|
||||
version = "1.10.2";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ in buildPythonPackage rec {
|
|||
repo = "pytorch";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM=";
|
||||
sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -304,7 +304,7 @@ in buildPythonPackage rec {
|
|||
passthru = {
|
||||
inherit cudaSupport;
|
||||
cudaArchList = final_cudaArchList;
|
||||
# At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
|
||||
# At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
|
||||
blasProvider = blas.provider;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywayland";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg=";
|
||||
sha256 = "sha256-3fVAJXiIS6sFUj8riHg7LJ4VLLpjZEK8qTJNYSaXtOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywizlight";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "sbidy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/euT77CAcfM9gMBV4SQsJWn6+JWcmqGNN8NGGX93xSg=";
|
||||
sha256 = "sha256-CbbnCNHmc2yoKX8hDUCD8gIvDX5HNL3HYKpbJjLgQwk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CRE5ghYJzo/w7d2zGh3IYUb2pl8we1XcoTo2ZKWxUZ8=";
|
||||
sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
|
||||
in buildPythonPackage rec {
|
||||
pname = "torchvision";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "vision";
|
||||
rev = "v${version}";
|
||||
sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i";
|
||||
sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libpng ninja which ]
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ufoLib2";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "xJfvyNE+30BgNirX8u1xhKcD8pM3owRAVC4WX+qFqEM=";
|
||||
sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.5.4";
|
||||
version = "5.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg=";
|
||||
sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -67,10 +67,6 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
|
||||
'';
|
||||
|
||||
WITHOUT_PULL = "1";
|
||||
makeFlags = [
|
||||
"GITTAP=${version}"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }:
|
||||
|
||||
bundlerEnv {
|
||||
pname = "chef-dk";
|
||||
version = "4.13.3";
|
||||
name = "chef-dk-4.13.3";
|
||||
# Do not change this to pname & version until underlying issues with Ruby
|
||||
# packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
|
|
|||
22
pkgs/development/tools/jless/default.nix
Normal file
22
pkgs/development/tools/jless/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jless";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaulJuliusMartinez";
|
||||
repo = "jless";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gBqyo/N/qF6HCTUrSKNVLiL1fc/JTfip1kNpNCBzRT8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PbX61RVbrI2kTuyXK+LhQdJDvNo3KjIQH5eBbL6iUBM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line pager for JSON data";
|
||||
homepage = "https://github.com/PaulJuliusMartinez/jless";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jfchevrette ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/uyha/tree-sitter-cmake",
|
||||
"rev": "f6616f1e417ee8b62daf251aa1daa5d73781c596",
|
||||
"date": "2021-10-13T08:19:43+02:00",
|
||||
"path": "/nix/store/p13qh130n5741wdfk2fbmy7ifd1z1zb2-tree-sitter-cmake",
|
||||
"sha256": "1b5cc84d0gjm8nb73gdvfjxbk9fjrfkd5aay3b0qvk6gar59pcj6",
|
||||
"rev": "5020572408a386d5d2dfac3516584f5edda7a49b",
|
||||
"date": "2022-01-26T22:53:15+01:00",
|
||||
"path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake",
|
||||
"sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/thehamsta/tree-sitter-commonlisp",
|
||||
"rev": "4fd115d3bb7046cd094f21bfe5766c302dbf64cd",
|
||||
"date": "2021-12-06T20:34:14+01:00",
|
||||
"path": "/nix/store/vmyfmgyhnx0ipi16d1w7sxsdkprybzk7-tree-sitter-commonlisp",
|
||||
"sha256": "1kmxmx93f34lba5g7kqa5fcijfak9zc9qydbid9dcqxw6kf65ncg",
|
||||
"rev": "c7e814975ab0d0d04333d1f32391c41180c58919",
|
||||
"date": "2022-01-28T21:33:11+01:00",
|
||||
"path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp",
|
||||
"sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/elm-tooling/tree-sitter-elm",
|
||||
"rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd",
|
||||
"date": "2021-12-27T23:25:02+01:00",
|
||||
"path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm",
|
||||
"sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky",
|
||||
"rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea",
|
||||
"date": "2022-02-04T13:10:25+01:00",
|
||||
"path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm",
|
||||
"sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/connorlay/tree-sitter-heex",
|
||||
"rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44",
|
||||
"date": "2022-01-23T20:01:08-08:00",
|
||||
"path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex",
|
||||
"sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k",
|
||||
"rev": "592e22292a367312c35e13de7fdb888f029981d6",
|
||||
"date": "2022-01-30T14:04:04-08:00",
|
||||
"path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex",
|
||||
"sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/latex-lsp/tree-sitter-latex",
|
||||
"rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2",
|
||||
"date": "2022-01-11T19:20:05+01:00",
|
||||
"path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex",
|
||||
"sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n",
|
||||
"rev": "323b609de40b7729073482a3c59de76cfba7744f",
|
||||
"date": "2022-02-08T21:23:53+01:00",
|
||||
"path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex",
|
||||
"sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
|
||||
"rev": "c4be6addec0a8ada234684ced6c928189fd399af",
|
||||
"date": "2022-01-22T17:12:52+01:00",
|
||||
"path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg",
|
||||
"sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc",
|
||||
"rev": "b7f879eaf9f20852f6b670439154b0128fbb6558",
|
||||
"date": "2022-02-08T12:24:02+01:00",
|
||||
"path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg",
|
||||
"sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/milisims/tree-sitter-org",
|
||||
"rev": "f110024d539e676f25b72b7c80b0fd43c34264ef",
|
||||
"date": "2021-11-28T23:04:31-05:00",
|
||||
"path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org",
|
||||
"sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc",
|
||||
"rev": "1c3eb533a9cf6800067357b59e03ac3f91fc3a54",
|
||||
"date": "2022-02-05T14:19:52-05:00",
|
||||
"path": "/nix/store/n51rx6d005iibpvb1bb2d7az1l6p6vlq-tree-sitter-org",
|
||||
"sha256": "06xkhhdlkikvxadp7wnk8riz51mjq9ks1jchdy9x3fmq6bj72y1p",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-php",
|
||||
"rev": "57f855461aeeca73bd4218754fb26b5ac143f98f",
|
||||
"date": "2021-11-19T17:22:11+01:00",
|
||||
"path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php",
|
||||
"sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc",
|
||||
"rev": "0ce134234214427b6aeb2735e93a307881c6cd6f",
|
||||
"date": "2022-01-31T19:53:17+01:00",
|
||||
"path": "/nix/store/kdddnbbsik9wvnjh1wnbyzzr1x8v64ps-tree-sitter-php",
|
||||
"sha256": "0gg3p1zpwfhf0qz0isnca0zi5zkxs5j5bmjix99dv3rkw911vk17",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-python",
|
||||
"rev": "24b530ca158d2782ea9046e756057a412e16b52f",
|
||||
"date": "2021-11-11T20:37:43-08:00",
|
||||
"path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python",
|
||||
"sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6",
|
||||
"rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad",
|
||||
"date": "2022-02-07T12:53:14-08:00",
|
||||
"path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python",
|
||||
"sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/r-lib/tree-sitter-r",
|
||||
"rev": "d9868735e401e4870a3d4422790b585fea3faec8",
|
||||
"date": "2022-01-10T10:12:40-05:00",
|
||||
"path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r",
|
||||
"sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0",
|
||||
"rev": "c19e54de252d5573cc2a762a030957074526fe99",
|
||||
"date": "2022-01-27T09:41:27-05:00",
|
||||
"path": "/nix/store/b2h3khs1x0j4j2fvs2sbkx1dp3d8fx4g-tree-sitter-r",
|
||||
"sha256": "1zan8dhjpxrn7vy7mvbc85hcdd5lls3vzpk6nchvn3j0i1ach85h",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-rust",
|
||||
"rev": "eeb0702ebdac504b97196577b1dac43c80913d7b",
|
||||
"date": "2022-01-10T13:05:56-08:00",
|
||||
"path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust",
|
||||
"sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq",
|
||||
"rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68",
|
||||
"date": "2022-02-04T13:11:35-08:00",
|
||||
"path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust",
|
||||
"sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/serenadeai/tree-sitter-scss",
|
||||
"rev": "f3174d3d131eb776f86dfa3d90fe6f7325c0ad9a",
|
||||
"date": "2021-11-08T17:21:33-08:00",
|
||||
"path": "/nix/store/qpmqd6a3rnrp451b5jjmqqwark276smj-tree-sitter-scss",
|
||||
"sha256": "0c8mx5fxcfn8wn361i7pnr3xga7vm2jjj99ilkqljir71nl6bm11",
|
||||
"rev": "c478c6868648eff49eb04a4df90d703dc45b312a",
|
||||
"date": "2022-02-03T21:48:21+00:00",
|
||||
"path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss",
|
||||
"sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
|
||||
"rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd",
|
||||
"date": "2022-01-14T01:11:12+01:00",
|
||||
"path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider",
|
||||
"sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3",
|
||||
"rev": "0f0e5b5a96dd3e048a9c3db648ed969c44068bff",
|
||||
"date": "2022-02-01T13:46:31+01:00",
|
||||
"path": "/nix/store/5rzm6vnqvpwxwakrjyy93hg0glfvcx93-tree-sitter-supercollider",
|
||||
"sha256": "0nxl43j7ddsddqcq56p921h1r5jkx8v49zxjzr6mcj6y1ljzndm2",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
|
||||
"rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7",
|
||||
"date": "2022-01-23T09:32:54-05:00",
|
||||
"path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus",
|
||||
"sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv",
|
||||
"rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f",
|
||||
"date": "2022-02-03T12:27:54-05:00",
|
||||
"path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus",
|
||||
"sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/vigoux/tree-sitter-viml",
|
||||
"rev": "274b004d226a6686546ef83231f0f836b91700ae",
|
||||
"date": "2022-01-21T14:12:20+01:00",
|
||||
"path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml",
|
||||
"sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c",
|
||||
"rev": "bc573ef552adf8bed9e36eb687a0cccf43158634",
|
||||
"date": "2022-01-24T16:13:56+01:00",
|
||||
"path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml",
|
||||
"sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ let
|
|||
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
|
||||
echo "rate limited" >&2
|
||||
fi
|
||||
release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name')
|
||||
release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')"
|
||||
# github sometimes returns an empty list even tough there are releases
|
||||
if [ "$release" = "null" ]; then
|
||||
echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.3.7";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bsPwyTucFJdKp+r8uJ2XLOzvbTM4i5EmSY+3VgyAFuE=";
|
||||
sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2wJXx8xHPrjzKupuen3XfRMSviYEwYK3nbL5/uTDIzE=";
|
||||
cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
|
||||
, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit
|
||||
, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex
|
||||
, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa
|
||||
, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp
|
||||
, OpenGL, OpenAL ? openal, Carbon, Cocoa
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -9,6 +10,21 @@ with lib;
|
|||
let
|
||||
boolToCMake = b: if b then "ON" else "OFF";
|
||||
|
||||
irrlichtMt = stdenv.mkDerivation rec {
|
||||
pname = "irrlichtMt";
|
||||
version = "1.9.0mt4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "irrlicht";
|
||||
rev = version;
|
||||
sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta = irrlicht.meta;
|
||||
};
|
||||
|
||||
generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let
|
||||
sources = {
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -30,29 +46,41 @@ let
|
|||
src = sources.src;
|
||||
|
||||
cmakeFlags = [
|
||||
"-G Ninja"
|
||||
"-DBUILD_CLIENT=${boolToCMake buildClient}"
|
||||
"-DBUILD_SERVER=${boolToCMake buildServer}"
|
||||
"-DENABLE_FREETYPE=1"
|
||||
"-DENABLE_GETTEXT=1"
|
||||
"-DENABLE_SPATIAL=1"
|
||||
"-DENABLE_SYSTEM_JSONCPP=1"
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht"
|
||||
|
||||
# Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_DATADIR=share"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_MANDIR=share/man"
|
||||
"-DCMAKE_INSTALL_LOCALEDIR=share/locale"
|
||||
|
||||
] ++ optionals buildClient [
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
] ++ optionals buildServer [
|
||||
"-DENABLE_PROMETHEUS=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen graphviz ];
|
||||
nativeBuildInputs = [ cmake doxygen graphviz ninja ];
|
||||
|
||||
buildInputs = [
|
||||
irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
|
||||
irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
|
||||
gmp libspatialindex
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv OpenGL OpenAL Carbon Cocoa
|
||||
] ++ optionals buildClient [
|
||||
libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
|
||||
] ++ optionals buildServer [
|
||||
leveldb postgresql hiredis
|
||||
leveldb postgresql hiredis prometheus-cpp
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -73,22 +101,13 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
v4 = {
|
||||
version = "0.4.17.1";
|
||||
sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg";
|
||||
dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
|
||||
};
|
||||
|
||||
v5 = {
|
||||
version = "5.4.1";
|
||||
sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8";
|
||||
dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4";
|
||||
version = "5.5.0";
|
||||
sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA=";
|
||||
dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0=";
|
||||
};
|
||||
|
||||
in {
|
||||
minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; });
|
||||
minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; });
|
||||
|
||||
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
|
||||
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -802,7 +802,6 @@
|
||||
install(CODE "
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\")
|
||||
" COMPONENT Runtime)
|
||||
endif()
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
+#include <cstdint>
|
||||
#include "irrlicht.h" // createDevice
|
||||
#include "irrlichttypes_extrabloated.h"
|
||||
#include "chat_interface.h"
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.1.45";
|
||||
version = "1.1.46";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm";
|
||||
sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk=";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/43/83/99e36ae2747bfae54a5dd32dacaf189a073278aa/epson-inkjet-printer-escpr2-1.1.46-1lsb3.2.src.rpm";
|
||||
sha256 = "sha256-7AeDULD/BB+swLBOwijilcM+yJi5slOMw2lEtquLyYw=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue