Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1,5 +1,10 @@
|
||||
# File set library
|
||||
|
||||
This is the internal contributor documentation.
|
||||
The user documentation is [in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-fileset).
|
||||
|
||||
## Goals
|
||||
|
||||
The main goal of the file set library is to be able to select local files that should be added to the Nix store.
|
||||
It should have the following properties:
|
||||
- Easy:
|
||||
|
||||
@@ -258,7 +258,6 @@ If a directory does not recursively contain any file, it is omitted from the sto
|
||||
*/
|
||||
unions =
|
||||
# A list of file sets.
|
||||
# Must contain at least 1 element.
|
||||
# The elements can also be paths,
|
||||
# which get [implicitly coerced to file sets](#sec-fileset-path-coercion).
|
||||
filesets:
|
||||
|
||||
@@ -415,7 +415,7 @@ expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.u
|
||||
expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: element 0 \('"$work"'/a\) does not exist.'
|
||||
expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: element 1 \('"$work"'/b\) does not exist.'
|
||||
|
||||
# unions needs a list with at least 1 element
|
||||
# unions needs a list
|
||||
expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Expected argument to be a list, but got a null.'
|
||||
|
||||
# The tree of later arguments should not be evaluated if a former argument already includes all files
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dcrwallet";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decred";
|
||||
repo = "dcrwallet";
|
||||
rev = "release-v${version}";
|
||||
hash = "sha256-ffY5IvSGu4Q7EdJpfdsIKxxjkm6FD0DR9ItnaO90SBc=";
|
||||
hash = "sha256-Pz25jExqbvy8fgiZy9vaYuVp8kuE6deGLlBEjxTnYGQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dduHuMa5UPf73lfirTHSrYnOUbc2IyULpstZPGUJzuc=";
|
||||
vendorHash = "sha256-lvN7OcDoEzb9LyH9C5q8pd0BOnF2VKuh4O82U+tQ6fI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -46,12 +46,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.16.0";
|
||||
version = "1.16.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-aP3/IDs18Q32efFlp4XYDKpdoAm2+QwzhrMxmt3pSvE=";
|
||||
hash = "sha256-BT+LzRDoQF03aNT2Kg7YaSWhK74CvOOiHUeHDtFpe9s=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.23.0";
|
||||
version = "1.24.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-duWAOod2co62NJ5Jk+7eWTf2LcfV5ZbFw0BhrbdGdUY=";
|
||||
hash = "sha256-c00JRy1K/jYoQYNAMSm6lQkuGQXZv/2liV1F4jpg+C4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, exiv2, libxml2, gtk3
|
||||
, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gpscorrelate-2.0-exiv2-0.28.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
|
||||
hash = "sha256-/5czvSh2siPmohXWHQEg6VWCUQnZxEm2livLsEOAa6c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
docbook_xml_dtd_42
|
||||
|
||||
@@ -1,31 +1,58 @@
|
||||
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, pkg-config
|
||||
, gnome
|
||||
, libchamplain
|
||||
, gdl
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpx-viewer";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz";
|
||||
sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DaveDavenport";
|
||||
repo = "gpx-viewer";
|
||||
rev = version;
|
||||
hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio=";
|
||||
};
|
||||
|
||||
patches = fetchurl {
|
||||
url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff";
|
||||
sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7";
|
||||
};
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
configureFlags = [ "--disable-database-updates" ];
|
||||
patches = [
|
||||
# Compile with libchamplain>=0.12.21
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DaveDavenport/gpx-viewer/commit/12ed6003bdad840586351bdb4e00c18719873c0e.patch";
|
||||
hash = "sha256-2/r0M3Yxj+vWgny1Pd5G7NYMb0uC/ByZ7y3tqLVccOc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool pkg-config
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
|
||||
];
|
||||
buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ];
|
||||
|
||||
buildInputs = [
|
||||
gdl
|
||||
libchamplain
|
||||
gnome.adwaita-icon-theme
|
||||
libxml2
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://blog.sarine.nl/tag/gpxviewer/";
|
||||
description = "Simple tool to visualize tracks and waypoints stored in a gpx file";
|
||||
changelog = "https://github.com/DaveDavenport/gpx-viewer/blob/${src.rev}/NEWS";
|
||||
platforms = with platforms; linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptsd";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iVxxlblwrZ4SPbVR0kIG+ePExk4qT6gExgvHS1Ksp6A=";
|
||||
hash = "sha256-qBABt0qEePGrZH4khnikvStrSi/OVmP3yVMJZbEd36M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,33 +1,39 @@
|
||||
{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }:
|
||||
{ lib
|
||||
, buildPackages
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, fetchFromGitea
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
let
|
||||
esbuild' = buildPackages.esbuild.override {
|
||||
buildGoModule = args: buildPackages.buildGoModule (args // rec {
|
||||
version = "0.17.19";
|
||||
version = "0.18.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
|
||||
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "kaufkauflist";
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "annaaurora";
|
||||
repo = "kaufkauflist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a7C4yHTHPhL5/p1/XsrMA0PnbIzer6FShDiwUMOg69Y=";
|
||||
hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-uQ4XoaR3JjvPm8EQ2pnDM+x4zjVn4PEHq7BRqVbvFyw=";
|
||||
npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM=";
|
||||
|
||||
ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}";
|
||||
ESBUILD_BINARY_PATH = lib.getExe esbuild';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/kaufkauflist $out/share/pocketbase
|
||||
@@ -35,8 +41,7 @@ in buildNpmPackage rec {
|
||||
cp -v pb_schema.json $out/share/pocketbase/
|
||||
'';
|
||||
|
||||
# Uncomment this when nix-update-script supports Gitea.
|
||||
#passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/annaaurora/kaufkauflist";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "udiskie";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "coldfix";
|
||||
repo = "udiskie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";
|
||||
hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -63,6 +63,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/udiskie.8
|
||||
|
||||
installShellCompletion \
|
||||
--bash completions/bash/* \
|
||||
--zsh completions/zsh/*
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
+82
-9
@@ -1054,9 +1054,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gtk4"
|
||||
version = "0.6.2"
|
||||
version = "0.6.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f"
|
||||
checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
@@ -1108,6 +1108,24 @@ dependencies = [
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gvdb"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"flate2",
|
||||
"lazy_static",
|
||||
"memmap2",
|
||||
"quick-xml",
|
||||
"safe-transmute",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"walkdir",
|
||||
"zvariant",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "h2"
|
||||
version = "0.3.16"
|
||||
@@ -1473,6 +1491,15 @@ version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.5.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.7.1"
|
||||
@@ -1842,6 +1869,16 @@ dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.27.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.26"
|
||||
@@ -1920,9 +1957,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||
|
||||
[[package]]
|
||||
name = "relm4"
|
||||
version = "0.6.0-alpha.2"
|
||||
version = "0.6.0-beta.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7acc5e3ddd682eeb0ca33da36b821fc907017c6d7758b09ce280247b0b0ea8cd"
|
||||
checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"flume",
|
||||
@@ -1938,9 +1975,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "relm4-components"
|
||||
version = "0.6.0-alpha.2"
|
||||
version = "0.6.0-beta.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26bc1784d641cd5d97ac4d26c56f68699aaa4518b7c827c295c1515ddafa96e4"
|
||||
checksum = "734838f188ee58954351c75175cb5ba6e9e67f90576b7fb90b928b2cb6043e1d"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"relm4",
|
||||
@@ -1948,10 +1985,20 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "relm4-macros"
|
||||
version = "0.6.0-alpha.2"
|
||||
name = "relm4-icons"
|
||||
version = "0.6.0-beta.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8525ce12dcd7d2a9e9070d84b8b885600eccd0a143df6712ce34a87d001a8b7"
|
||||
checksum = "b7123701f31271a2e33a53270a6e73010356d99cff1b97c89276299609af3303"
|
||||
dependencies = [
|
||||
"gtk4",
|
||||
"gvdb",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "relm4-macros"
|
||||
version = "0.6.0-beta.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -2030,6 +2077,21 @@ version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
|
||||
[[package]]
|
||||
name = "safe-transmute"
|
||||
version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "schannel"
|
||||
version = "0.1.21"
|
||||
@@ -2602,6 +2664,16 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "want"
|
||||
version = "0.3.0"
|
||||
@@ -2701,6 +2773,7 @@ dependencies = [
|
||||
"log",
|
||||
"relm4",
|
||||
"relm4-components",
|
||||
"relm4-icons",
|
||||
"version-compare",
|
||||
]
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "watchmate";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azymohliad";
|
||||
repo = "watchmate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+E1tyDfFSu3J89fXd75bdYxh+Z1zTwKL6AmMTNQBEYY=";
|
||||
hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "2.1.0";
|
||||
sha256 = "08g9awlgij8privpmzmrg63aygcjqmycr981ak0lkbx5chynlnmn";
|
||||
manifestsSha256 = "06iqmc5rg9l7zwcyg66fvy6h1g4bg1mr496n17piapjiqiv3j3q4";
|
||||
version = "2.1.1";
|
||||
sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn";
|
||||
manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ=";
|
||||
vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.51.0";
|
||||
version = "0.51.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aCgJGoRJUALs94J/2zoRgCIiY9D6SquIX5FOIQiGytU=";
|
||||
hash = "sha256-CZKY4/XQsWWlp6Xgv292LstahueJ9iFhxjB//RxlQOo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HWcm8y8bySMV3ue1RpxiXfYyV33cXGFII1/d+XD2Iro=";
|
||||
vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper
|
||||
{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript
|
||||
, branch
|
||||
, withOpenASAR ? false, openasar
|
||||
, withVencord ? false, vencord }:
|
||||
@@ -31,4 +31,19 @@ stdenv.mkDerivation {
|
||||
echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
|
||||
echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "discord-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep common-updater-scripts
|
||||
set -x
|
||||
set -eou pipefail;
|
||||
url=$(curl -sI "https://discordapp.com/api/download/${
|
||||
builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname
|
||||
}?platform=osx&format=dmg" | grep -oP 'location: \K\S+')
|
||||
version=''${url##https://dl*.discordapp.net/apps/osx/}
|
||||
version=''${version%%/*.dmg}
|
||||
update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,9 +7,9 @@ let
|
||||
development = "0.0.234";
|
||||
} else {
|
||||
stable = "0.0.278";
|
||||
ptb = "0.0.77";
|
||||
canary = "0.0.312";
|
||||
development = "0.0.8795";
|
||||
ptb = "0.0.79";
|
||||
canary = "0.0.314";
|
||||
development = "0.0.8797";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
@@ -38,15 +38,15 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-Dn+k51SyHpJ1C1gJx3ZLRzD/cdzhX9qANZU2KEn9lY0=";
|
||||
hash = "sha256-HI4+ABFQtRBL7a3koCehJgn8WxJW86sCyuZE70n1AHk=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-iV131kzFcN2+eqUetqZShKqjAQfm64y6bxzAddV7wuw=";
|
||||
hash = "sha256-SbCEao9Nh3cqCRD7FsHoKMVdy8T1y5tZAAGWHE6bSz0=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-d/i7LHbJbbUUk/7iU63Xh4RWxs8ZyiCpZSS68JFW2Ps=";
|
||||
hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20231002-1";
|
||||
version = "20231003";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aZ3KuUjBsgww7CFdSuYMurLc5sDruEX4xuQWDBaCfPk=";
|
||||
hash = "sha256-fMVLmuhdccYzsOgVvViaICmbXgU0o3Fu0K85hbao4YI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -49,16 +49,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alacritty";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50=";
|
||||
hash = "sha256-SUEI7DTgs6NYT4oiqaMBNCQ8gP1XoZjPFIKhob7tfsk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ=";
|
||||
cargoHash = "sha256-iLhctiCDNpcTxoMrWwUWHBRc6X5rxSH9Jl2EDuktWmw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.154";
|
||||
version = "5.12.155";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v1XQPyI97j1uYfmCdjHEbc+RlgVCQrZ6PTXS+b6qRwM=";
|
||||
hash = "sha256-Hz/FGPnrY3EqlVuSks82UO6/7uHGEgnGgTddFKnj3AQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/VJsf7dO4niOH2kvJieLCBlPB2nxCCv7rrzIHJ1uENI=";
|
||||
cargoHash = "sha256-SiYj05OMUWn0hpJeMLEz846QQLTJuv4dtiSG/ow2yHI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "grimblast";
|
||||
version = "unstable-2023-09-06";
|
||||
version = "unstable-2023-10-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "contrib";
|
||||
rev = "5b67181fced4fb06d26afcf9614b35765c576168";
|
||||
hash = "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=";
|
||||
rev = "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542";
|
||||
hash = "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, glib
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, libbsd
|
||||
, libcamera
|
||||
, gtk3
|
||||
, libtiff
|
||||
, zbar
|
||||
, libjpeg
|
||||
, libexif
|
||||
, libraw
|
||||
, libpulseaudio
|
||||
, ffmpeg-headless
|
||||
, v4l-utils
|
||||
, makeWrapper
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "millipixels";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Librem5";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
domain = "source.puri.sm";
|
||||
hash = "sha256-pRREQRYyD9+dpRvcfsNiNthFy08Yeup9xDn+x+RWDrE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustc
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libbsd
|
||||
libcamera
|
||||
gtk3
|
||||
libtiff
|
||||
zbar
|
||||
libpulseaudio
|
||||
libraw
|
||||
libexif
|
||||
libjpeg
|
||||
python3
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/millipixels \
|
||||
--prefix PATH : ${lib.makeBinPath [ v4l-utils ffmpeg-headless ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Camera application for the Librem 5";
|
||||
homepage = "https://source.puri.sm/Librem5/millipixels";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ _999eagle ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -15,31 +15,28 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.72.0";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-DQ3TxxLxi8/W1+uBX7NEBIsVXBKnJBa6YNRBFleNrEA=";
|
||||
sha256 = "sha256-tHIIA1JE7mzDIf2v9IEZt1pjVQEA89zjTsmqhzTn3Wc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
|
||||
substituteInPlace "vendors/tezos-ligo/dune-project" \
|
||||
--replace \
|
||||
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg" \
|
||||
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg ()" \
|
||||
"(using ctypes 0.1)" \
|
||||
"(using ctypes 0.3)" \
|
||||
--replace \
|
||||
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg" \
|
||||
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg ()"
|
||||
"(lang dune 3.0)" \
|
||||
"(lang dune 3.7)"
|
||||
|
||||
substituteInPlace "vendors/tezos-ligo/src/lib_crypto/crypto_box.ml" \
|
||||
substituteInPlace "src/coq/dune" \
|
||||
--replace \
|
||||
"secretbox_open ~key ~nonce ~cmsg ~msg" \
|
||||
"secretbox_open ~key ~nonce ~cmsg ~msg ()" \
|
||||
--replace \
|
||||
"Box.box_open ~k ~nonce ~cmsg ~msg" \
|
||||
"Box.box_open ~k ~nonce ~cmsg ~msg ()"
|
||||
"(name ligo_coq)" \
|
||||
"(name ligo_coq)(mode vo)"
|
||||
'';
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
@@ -48,8 +45,6 @@ ocamlPackages.buildDunePackage rec {
|
||||
# This is a hack to work around the hack used in the dune files
|
||||
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -93,6 +88,8 @@ ocamlPackages.buildDunePackage rec {
|
||||
parse-argv
|
||||
hacl-star
|
||||
prometheus
|
||||
lwt_ppx
|
||||
msgpck
|
||||
# lsp
|
||||
linol
|
||||
linol-lwt
|
||||
|
||||
@@ -66,16 +66,16 @@ let
|
||||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg";
|
||||
platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg";
|
||||
platforms."aarch64-linux".sha256 = "0c034h0hcsff4qmibizjn2ik5pq1jb4p6f0a4k6nrkank9m0x7ap";
|
||||
platforms."x86_64-linux".sha256 = "02pj4dgfswpaglxkmbd9970znixlv82wna4xxhwjh7i5ps24a0n6";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "116.0.24";
|
||||
gitRevision = "5332865";
|
||||
chromiumVersion = "116.0.5845.190";
|
||||
version = "117.1.5";
|
||||
gitRevision = "f1b94ea";
|
||||
chromiumVersion = "117.0.5938.132";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }:
|
||||
{ lib, stdenv, fetchurl, pkgsHostTarget, libgcrypt, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libotr";
|
||||
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgsHostTarget.libgcrypt.dev # for libgcrypt-config
|
||||
];
|
||||
propagatedBuildInputs = [ libgcrypt ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildDunePackage
|
||||
, ocplib-endian
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "msgpck";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vbmithr";
|
||||
repo = "ocaml-msgpck";
|
||||
rev = "${version}";
|
||||
hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ocplib-endian ];
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Fast MessagePack (http://msgpack.org) library ";
|
||||
license = lib.licenses.isc;
|
||||
homepage = "https://github.com/vbmithr/ocaml-msgpck";
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
@@ -9,6 +9,14 @@
|
||||
, pythonOlder
|
||||
, soupsieve
|
||||
, sphinxHook
|
||||
|
||||
# for passthru.tests
|
||||
, html-sanitizer
|
||||
, markdownify
|
||||
, mechanicalsoup
|
||||
, nbconvert
|
||||
, subliminal
|
||||
, wagtail
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -52,6 +60,15 @@ buildPythonPackage rec {
|
||||
"bs4"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit html-sanitizer
|
||||
markdownify
|
||||
mechanicalsoup
|
||||
nbconvert
|
||||
subliminal
|
||||
wagtail;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=${version}";
|
||||
description = "HTML and XML parser";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch2
|
||||
, cmake
|
||||
, ninja
|
||||
, python
|
||||
@@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
|
||||
|
||||
patches = [
|
||||
# Needed to build against qt 6.5.3, until pyside 6.5.3 is released
|
||||
(fetchpatch2 {
|
||||
url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/sources/pyside6?id=63ef7628091c8827e3d0d688220d3ae165587eb2";
|
||||
hash = "sha256-TN1xdBkrzZhNontShMC1SKyJK6a8fOk/Di3zX3kv5+I=";
|
||||
stripLen = 2;
|
||||
})
|
||||
];
|
||||
|
||||
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
|
||||
# reside in the same directory as QtCore.framework, which is not true for Nix.
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmake";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
|
||||
hash = "sha256-rA0wiL2kZs+rOSCLXAaX50epK9aL+We4FYgr2/TxRKo=";
|
||||
hash = "sha256-BC6RazVbT1sr4RLQ1ZR4hHZGXDqFSvuqpt5vPyMDylA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.45.0";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e8aKjW1SCpmYcfiI1uH5tOjmQqS5kbhPEtRVR/FeWwA=";
|
||||
hash = "sha256-51OGcic3clPYjj4bmiRVmViqJUEuwzkTtNl9U3OPAdI=";
|
||||
};
|
||||
vendorHash = "sha256-kSweCT/8boHb6Go18FBpLtbYI0unUU59QWLgQCrbpfs=";
|
||||
vendorHash = "sha256-nDRg1gF6igE2FJ+s39j5EQ5/h9QkuSF2Bo9zxR3WkBE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/cache
|
||||
@@ -19,6 +19,8 @@ from codecs import iterdecode
|
||||
from datetime import datetime
|
||||
from urllib.request import urlopen
|
||||
|
||||
os.chdir(os.path.dirname(__file__))
|
||||
|
||||
depot_tools_checkout = tempfile.TemporaryDirectory()
|
||||
subprocess.check_call([
|
||||
"nix-prefetch-git",
|
||||
|
||||
+698
-520
File diff suppressed because it is too large
Load Diff
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shuttle";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuttle-hq";
|
||||
repo = "shuttle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IjalWQtO0UkLs9dsoXVAKsCblXxqtoNllAT9fms25h0=";
|
||||
hash = "sha256-iBUd42MEfDFMhHXBrgrJaihUeYTRpVt4jFQaKCKhNlc=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "chiaki4deck";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streetpea";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DXer39+j8QaI1IAIcLhVzSVNyGvwoT93knRibpFsEeY=";
|
||||
hash = "sha256-ayU2mYDpgGMgDK5AI5gwgu6h+YLKPG7P32ECWdL5wA4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_14, pkg-config
|
||||
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_18, pkg-config
|
||||
, libjpeg, pixman, cairo, pango, which, postgresql }:
|
||||
|
||||
let
|
||||
nodejs = nodejs_14;
|
||||
nodejs = nodejs_18;
|
||||
|
||||
version = "0.1.1";
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysql-connector-java";
|
||||
version = "8.0.33";
|
||||
version = "8.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
|
||||
sha256 = "sha256-k3jft7sM2xrc88mdhltxtm+SZcRAn6B4EvglMyJyX4Y=";
|
||||
sha256 = "sha256-xFYvNbb5cj6xrMHAnTzGLC8v5fxqRcmZhf4haK3wtUk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "MySQL Connector/J";
|
||||
homepage = "https://dev.mysql.com/doc/connector-j/8.0/en/";
|
||||
homepage = "https://dev.mysql.com/doc/connector-j/8.1/en/";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "8.0.29-22";
|
||||
sha256 = "sha256-dGpfU+IesAyr2s1AEjfYggOEkMGQ9JdEesu5PtJHNXA=";
|
||||
version = "8.0.34-29";
|
||||
hash = "sha256-dO5ciIIAnKj2t+fYhrtnY7MvBThoA+SymBzN8H07giM=";
|
||||
|
||||
# includes https://github.com/Percona-Lab/libkmip.git
|
||||
fetchSubmodules = true;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config
|
||||
, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4
|
||||
, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib
|
||||
, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib
|
||||
, perlPackages
|
||||
, version, sha256, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
|
||||
, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
|
||||
owner = "percona";
|
||||
repo = "percona-xtrabackup";
|
||||
rev = "${pname}-${version}";
|
||||
inherit sha256 fetchSubmodules;
|
||||
inherit hash fetchSubmodules;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
(curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4
|
||||
ncurses numactl openssl protobuf valgrind xxd zlib
|
||||
ncurses numactl openssl procps protobuf valgrind xxd zlib
|
||||
] ++ (with perlPackages; [ perl DBI DBDmysql ]);
|
||||
|
||||
patches = extraPatches;
|
||||
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.percona.com/software/percona-xtrabackup";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ izorkin ];
|
||||
maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,15 +2,33 @@
|
||||
, python3
|
||||
, fetchPypi
|
||||
}:
|
||||
let
|
||||
# bepasty 1.2 needs xstatic-font-awesome < 5, see
|
||||
# https://github.com/bepasty/bepasty-server/issues/305
|
||||
bepastyPython = python3.override {
|
||||
self = bepastyPython;
|
||||
packageOverrides = self: super: {
|
||||
xstatic-font-awesome = super.xstatic-font-awesome.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "4.7.0.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
#We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
|
||||
#This is needed for services.bepasty
|
||||
#https://github.com/NixOS/nixpkgs/pull/38300
|
||||
with python3.pkgs; buildPythonPackage rec {
|
||||
in with bepastyPython.pkgs; buildPythonPackage rec {
|
||||
pname = "bepasty";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
markupsafe
|
||||
pygments
|
||||
setuptools
|
||||
xstatic
|
||||
@@ -28,16 +46,29 @@ with python3.pkgs; buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-f5tRq48tCqjzOGq7Z2T2U1zwQN121N9ap+xPxHWZyvU=";
|
||||
sha256 = "sha256-R3bvrl/tOP0S9m6X+MwYK6fMQ51cI6W5AoxyYZ8aZ/w=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
build
|
||||
codecov
|
||||
flake8
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
selenium
|
||||
tox
|
||||
twine
|
||||
];
|
||||
|
||||
# No tests in sdist
|
||||
doCheck = false;
|
||||
disabledTestPaths = [
|
||||
# Can be enabled when werkzeug is updated to >2.2, see #245145
|
||||
# and https://github.com/bepasty/bepasty-server/pull/303
|
||||
"src/bepasty/tests/test_rest_server.py"
|
||||
|
||||
# These require a web browser
|
||||
"src/bepasty/tests/screenshots.py"
|
||||
"src/bepasty/tests/test_website.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/bepasty/bepasty-server";
|
||||
|
||||
@@ -192,8 +192,8 @@ in lib.makeExtensible (self: ({
|
||||
};
|
||||
|
||||
nix_2_18 = common {
|
||||
version = "2.18.0";
|
||||
hash = "sha256-ggISAuGpTkKp6JXt1BbcLtLDYOPECWqrVnPVgQEFHYc=";
|
||||
version = "2.18.1";
|
||||
hash = "sha256-WNmifcTsN9aG1ONkv+l2BC4sHZZxtNKy0keqBHXXQ7w=";
|
||||
};
|
||||
|
||||
# The minimum Nix version supported by Nixpkgs
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "govc";
|
||||
version = "0.30.7";
|
||||
version = "0.32.0";
|
||||
|
||||
subPackages = [ "govc" ];
|
||||
|
||||
@@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
owner = "vmware";
|
||||
repo = "govmomi";
|
||||
sha256 = "sha256-8cBS92O5AEeXQyLwOTAWbjvj1oPJiHLBooRgl5pt0Mk=";
|
||||
sha256 = "sha256-GnMWgN6ZxxGU/tRAPIk2cvpsBiut97iPcU9920wepxM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iLmQdjN0EXJuwC3NT5FKdHhJ4KvNAvnsBGAO9bypdqg=";
|
||||
vendorHash = "sha256-mf9ZYZEmqB/47JLHn8N3VDr57SXbFLubXnwfXj682FA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9879,9 +9879,13 @@ with pkgs;
|
||||
|
||||
ldc = callPackage ../development/compilers/ldc { };
|
||||
|
||||
ligo = callPackage ../development/compilers/ligo {
|
||||
coq = coq_8_14;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15;
|
||||
ligo =
|
||||
let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in
|
||||
callPackage ../development/compilers/ligo {
|
||||
coq = coq_8_13.override {
|
||||
customOCamlPackages = ocaml_p;
|
||||
};
|
||||
ocamlPackages = ocaml_p;
|
||||
};
|
||||
|
||||
lego = callPackage ../tools/admin/lego { };
|
||||
@@ -11863,7 +11867,6 @@ with pkgs;
|
||||
percona-xtrabackup = percona-xtrabackup_8_0;
|
||||
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
|
||||
boost = boost177;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
pick = callPackage ../tools/misc/pick { };
|
||||
|
||||
@@ -1162,6 +1162,8 @@ let
|
||||
|
||||
mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { };
|
||||
|
||||
msgpck = callPackage ../development/ocaml-modules/msgpck { };
|
||||
|
||||
mrmime = callPackage ../development/ocaml-modules/mrmime { };
|
||||
|
||||
mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { };
|
||||
|
||||
Reference in New Issue
Block a user