Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
This commit is contained in:
Theodore Ni
commit
d494084017
1
.github/labeler.yml
vendored
1
.github/labeler.yml
vendored
|
|
@ -170,6 +170,7 @@
|
|||
|
||||
"6.topic: TeX":
|
||||
- doc/languages-frameworks/texlive.section.md
|
||||
- pkgs/test/texlive/**
|
||||
- pkgs/tools/typesetting/tex/**/*
|
||||
|
||||
"6.topic: vim":
|
||||
|
|
|
|||
|
|
@ -749,5 +749,3 @@ Names of files and directories should be in lowercase, with dashes between words
|
|||
|
||||
As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
|
||||
If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
|
||||
|
||||
- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
|
||||
|
|
|
|||
|
|
@ -278,9 +278,24 @@ rec {
|
|||
};
|
||||
in self;
|
||||
|
||||
/* backward compatibility with old uncurried form; deprecated */
|
||||
makeScopeWithSplicing =
|
||||
splicePackages: newScope: otherSplices: keep: extra: f:
|
||||
makeScopeWithSplicing' {
|
||||
inherit splicePackages newScope otherSplices keep extra f;
|
||||
};
|
||||
|
||||
/* Like the above, but aims to support cross compilation. It's still ugly, but
|
||||
hopefully it helps a little bit. */
|
||||
makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f:
|
||||
makeScopeWithSplicing' =
|
||||
{ splicePackages
|
||||
, newScope
|
||||
}:
|
||||
{ otherSplices
|
||||
, keep ? (_self: {})
|
||||
, extra ? (_spliced0: {})
|
||||
, f
|
||||
}:
|
||||
let
|
||||
spliced0 = splicePackages {
|
||||
pkgsBuildBuild = otherSplices.selfBuildBuild;
|
||||
|
|
@ -296,13 +311,11 @@ rec {
|
|||
callPackage = newScope spliced; # == self.newScope {};
|
||||
# N.B. the other stages of the package set spliced in are *not*
|
||||
# overridden.
|
||||
overrideScope = g: makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.fixedPoints.extends g f);
|
||||
overrideScope = g: (makeScopeWithSplicing'
|
||||
{ inherit splicePackages newScope; }
|
||||
{ inherit otherSplices keep extra;
|
||||
f = lib.fixedPoints.extends g f;
|
||||
});
|
||||
packages = f;
|
||||
};
|
||||
in self;
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ let
|
|||
noDepEntry fullDepEntry packEntry stringAfter;
|
||||
inherit (self.customisation) overrideDerivation makeOverridable
|
||||
callPackageWith callPackagesWith extendDerivation hydraJob
|
||||
makeScope makeScopeWithSplicing;
|
||||
makeScope makeScopeWithSplicing makeScopeWithSplicing';
|
||||
inherit (self.derivations) lazyDerivation;
|
||||
inherit (self.meta) addMetaAttrs dontDistribute setName updateName
|
||||
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
|
||||
|
|
|
|||
|
|
@ -10010,6 +10010,12 @@
|
|||
githubId = 8555953;
|
||||
name = "Laure Tavard";
|
||||
};
|
||||
lu15w1r7h = {
|
||||
email = "lwirth2000@gmail.com";
|
||||
github = "LU15W1R7H";
|
||||
githubId = 37505890;
|
||||
name = "Luis Wirth";
|
||||
};
|
||||
luc65r = {
|
||||
email = "lucas@ransan.tk";
|
||||
github = "luc65r";
|
||||
|
|
@ -15386,6 +15392,13 @@
|
|||
fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE";
|
||||
}];
|
||||
};
|
||||
sfr = {
|
||||
email = "sol@solfisher.com";
|
||||
matrix = "@sfr:enby.space";
|
||||
github = "solfisher";
|
||||
githubId = 57151943;
|
||||
name = "Sol Fisher Romanoff";
|
||||
};
|
||||
sfrijters = {
|
||||
email = "sfrijters@gmail.com";
|
||||
github = "SFrijters";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,23 @@
|
|||
{ lib, fetchFromGitHub, substituteAll, makeWrapper, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }:
|
||||
{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }:
|
||||
|
||||
# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
|
||||
python39.pkgs.buildPythonApplication {
|
||||
let
|
||||
# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
|
||||
python = python39.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# currently broken with 4.2.1
|
||||
# https://github.com/jwdj/EasyABC/issues/75
|
||||
wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec {
|
||||
version = "4.2.0";
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "wxPython";
|
||||
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonApplication {
|
||||
pname = "easyabc";
|
||||
version = "1.3.8.6";
|
||||
|
||||
|
|
@ -14,7 +30,7 @@ python39.pkgs.buildPythonApplication {
|
|||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python39.pkgs; [
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
cx-freeze
|
||||
wxPython_4_2
|
||||
pygame
|
||||
|
|
@ -48,7 +64,7 @@ python39.pkgs.buildPythonApplication {
|
|||
ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc
|
||||
ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps
|
||||
|
||||
makeWrapper ${python39.interpreter} $out/bin/easyabc \
|
||||
makeWrapper ${python.interpreter} $out/bin/easyabc \
|
||||
--set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \
|
||||
--add-flags "-O $out/share/easyabc/easy_abc.py"
|
||||
|
||||
|
|
|
|||
382
pkgs/applications/audio/mus/Cargo.lock
generated
Normal file
382
pkgs/applications/audio/mus/Cargo.lock
generated
Normal file
|
|
@ -0,0 +1,382 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi 0.1.19",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bufstream"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
"clap_lex",
|
||||
"is-terminal",
|
||||
"once_cell",
|
||||
"strsim",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
|
||||
dependencies = [
|
||||
"os_str_bytes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "colored"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"lazy_static",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.139"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
|
||||
|
||||
[[package]]
|
||||
name = "mpd"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/kstep/rust-mpd?rev=e8b5c3d#e8b5c3d67bb602960aa21910430380d6626b3be7"
|
||||
dependencies = [
|
||||
"bufstream",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mus"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"colored",
|
||||
"mpd",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error-attr"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.51"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.36.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.107"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.45.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
|
||||
28
pkgs/applications/audio/mus/default.nix
Normal file
28
pkgs/applications/audio/mus/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, fetchFromSourcehut, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mus";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sfr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-s7rizOieOmzK0Stkk1SWe9h/5DoaH6MMmL/5QFeezt0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"mpd-0.1.0" = "sha256-5UC6aFNJU9B5AlgJ7uPO+W7e2MHpvTu2OpktjiIXMfc=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "a pretty good mpd client";
|
||||
homepage = "https://sr.ht/~sfr/mus";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfr ];
|
||||
mainProgram = "mus";
|
||||
};
|
||||
}
|
||||
85
pkgs/applications/audio/openutau/default.nix
Normal file
85
pkgs/applications/audio/openutau/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
, dbus
|
||||
, fontconfig
|
||||
, libICE
|
||||
, libSM
|
||||
, libX11
|
||||
, portaudio
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "OpenUtau";
|
||||
version = "0.1.158";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stakira";
|
||||
repo = "OpenUtau";
|
||||
rev = "build/${version}";
|
||||
hash = "sha256-/+hlL2sj/juzWrDcb5dELp8Zdg688XK8OnjKz20rx/M=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0;
|
||||
|
||||
projectFile = "OpenUtau.sln";
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
executables = [ "OpenUtau" ];
|
||||
|
||||
runtimeDeps = [
|
||||
dbus
|
||||
fontconfig
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
portaudio
|
||||
];
|
||||
|
||||
dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
|
||||
|
||||
# socket cannot bind to localhost on darwin for tests
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# needed until upstream bumps to dotnet 7
|
||||
postPatch = ''
|
||||
substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \
|
||||
"<TargetFramework>net6.0</TargetFramework>" \
|
||||
"<TargetFramework>net7.0</TargetFramework>"
|
||||
'';
|
||||
|
||||
# need to make sure proprietary worldline resampler is copied
|
||||
postInstall = let
|
||||
runtime = if (stdenv.isLinux && stdenv.isx86_64) then "linux-x64"
|
||||
else if (stdenv.isLinux && stdenv.isAarch64) then "linux-arm64"
|
||||
else if stdenv.isDarwin then "osx"
|
||||
else null;
|
||||
in lib.optionalString (runtime != null) ''
|
||||
cp runtimes/${runtime}/native/libworldline${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/OpenUtau/
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source singing synthesis platform and UTAU successor";
|
||||
homepage = "http://www.openutau.com/";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
# deps
|
||||
binaryBytecode
|
||||
# some deps and worldline resampler
|
||||
binaryNativeCode
|
||||
];
|
||||
license = with licenses; [
|
||||
# dotnet code
|
||||
mit
|
||||
# worldline resampler
|
||||
unfree
|
||||
];
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
247
pkgs/applications/audio/openutau/deps.nix
generated
Normal file
247
pkgs/applications/audio/openutau/deps.nix
generated
Normal file
|
|
@ -0,0 +1,247 @@
|
|||
# This file was automatically generated by passthru.fetch-deps.
|
||||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.0-rc1.1"; sha256 = "15gn6qbbx6zars37fvfdsyvqg9303zr8dsx7k1v6a4mzm190xhmm"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-rc1.1"; sha256 = "0nflr62lywmgby1lc6zasn24rinkq72imkazhv77wnj28ayid3bx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-rc1.1"; sha256 = "088xz8llm8298agk4dkpzrb1bqyksgvzhj3pw1s4r1fcdfl0z64j"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-rc1.1"; sha256 = "06580q0il62f3464vq2113gbv0yng4jqm79k2wvn3brzl82pyhvq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-rc1.1"; sha256 = "1jia97djk33za7spfr9276plvx8mybm7i3ckp1wprlnmh5b6nykp"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-rc1.1"; sha256 = "1mpm34lgxcxh5hglyq2fpggdf18cadzx9030kxax5ilp69mk93df"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-rc1.1"; sha256 = "0hzk1gb4zh9n5k3wv2n8nw9qcgyj9pvwysph3shg9m8wwrdhkiy5"; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-rc1.1"; sha256 = "08116ixw118i2v11dylhwkj1ilgkpk29cp9n7zqj3zk7pxkln2f7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-rc1.1"; sha256 = "1m3r05b14vw4mn1m9ak91j00q0ppnkysb6m7w86sacqjfhpl8faa"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-rc1.1"; sha256 = "0a8xvqd0hgi8bynjipvvhg0cm9qr63p0h3ji1wbn3y9vrysliykh"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-rc1.1"; sha256 = "03lp3m40hwbpasa4q6gykj1y5772lpzzr59y5k1nbi54k2n3fl3k"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-rc1.1"; sha256 = "0bgz8djfmb17qrf44bivcyf9hwdfccl5f8hgyq158y7ag4a313sn"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-rc1.1"; sha256 = "1zslv10kcmclx5ajd74yi6j1f8p3a9iy2r0w4k8kwkc56d5jg30c"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-rc1.1"; sha256 = "0b4bmza84bv8hbh6jmy1kxxp9pnz4q4wq6bw8jc30w4jkdhp588r"; })
|
||||
(fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; })
|
||||
(fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90"; })
|
||||
(fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; })
|
||||
(fetchNuGet { pname = "Fody"; version = "6.6.3"; sha256 = "02qhz4l2qqzsjzhv0jyb0bp8dckpjfg6w6pss5cng98g92zxkma6"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
|
||||
(fetchNuGet { pname = "K4os.Hash.xxHash"; version = "1.0.8"; sha256 = "0vz1f81z4rh7a576fdzbc6wmj7p4gaca1rch3anvh1s5qd7xdd10"; })
|
||||
(fetchNuGet { pname = "Melanchall.DryWetMidi"; version = "6.1.4"; sha256 = "1m0n6in27cpasmshw261az1n9y7rq4vp7z80gv7zpg8wqichqnqv"; })
|
||||
(fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.1"; sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; })
|
||||
(fetchNuGet { pname = "Microsoft.ML.OnnxRuntime"; version = "1.15.0"; sha256 = "1wjafpn0fgxxyl5kw427ypc8c2gwha286sf96mv3fivdk3qyysxw"; })
|
||||
(fetchNuGet { pname = "Microsoft.ML.OnnxRuntime.Managed"; version = "1.15.0"; sha256 = "06hnsx0a81gbz5zr4qqij2c518wqdn3hg784zvkj0jlkwi5z2hr8"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
|
||||
(fetchNuGet { pname = "NaCl.Net"; version = "0.1.13"; sha256 = "0n92rinhbhxvdrk7dhxj6vd7c4dv76ks8djqvyrc41bbzj85qbv7"; })
|
||||
(fetchNuGet { pname = "NAudio.Core"; version = "2.1.0"; sha256 = "1pxd2qmqxsia1spdylxvv8ik5r614yvkmki438ihmhvvs2mxsmvi"; })
|
||||
(fetchNuGet { pname = "NAudio.Midi"; version = "2.1.0"; sha256 = "1llki3c83qg1lf7bsbz94m2blrq1dmpwhkffqp9vj8q8w5fbjdkj"; })
|
||||
(fetchNuGet { pname = "NAudio.Vorbis"; version = "1.5.0"; sha256 = "1b3inmmvcsbfnvcnsg6wnhbcqxyz3x2qdkggcginfwabahfl8zhm"; })
|
||||
(fetchNuGet { pname = "NetMQ"; version = "4.0.1.12"; sha256 = "0zx0m26cbpp105lnwhaynl73sg7n2gni5744vnrk198iwd114zrv"; })
|
||||
(fetchNuGet { pname = "NetSparkleUpdater.SparkleUpdater"; version = "2.2.3"; sha256 = "13vmf176f2z71xf5inp440bbxnpg40mk44f1jdh8vip6g1rg72nc"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
|
||||
(fetchNuGet { pname = "NLayer"; version = "1.14.0"; sha256 = "17srybcp3zlh31hlhpy2xd9lrka7i93842m2wf364fkgiqa4nssb"; })
|
||||
(fetchNuGet { pname = "NLayer.NAudioSupport"; version = "1.3.0"; sha256 = "0n2zk8r6sm3623j8a7rzb226i9mfr63vhf6718lyncmmsfjasmm4"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; })
|
||||
(fetchNuGet { pname = "NumSharp"; version = "0.30.0"; sha256 = "0r12i48q8gn5nxkxs3kwqcyhbd2xxzrazxg4y9l5m4gvm64zjg7d"; })
|
||||
(fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; })
|
||||
(fetchNuGet { pname = "NWaves"; version = "0.9.6"; sha256 = "16mxnc3hiaf38z3knsw54wkf9pw18yg63mzxqa4ccixf05ni3zhd"; })
|
||||
(fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; })
|
||||
(fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; })
|
||||
(fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; })
|
||||
(fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.3.1"; sha256 = "16xr69ls822azqv81wi13lbqgnff4i1lg61frx2s11mfa04jy1zz"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
|
||||
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
|
||||
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
|
||||
(fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
|
||||
(fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; })
|
||||
(fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; })
|
||||
(fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
|
||||
(fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; })
|
||||
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
|
||||
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
|
||||
(fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; })
|
||||
(fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
|
||||
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
|
||||
(fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; })
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
|
||||
(fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; sha256 = "16fgj2ab5ci217shmfsi6c0rnmkh90h6vyb60503nhpmh7y8di13"; })
|
||||
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })
|
||||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
|
||||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
|
||||
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
|
||||
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
|
||||
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
|
||||
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
|
||||
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
|
||||
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
|
||||
(fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; sha256 = "117vxa0pfgg6xfdxfpza4296ay7sqiaynyvfbsai43yrkh0lmch1"; })
|
||||
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
|
||||
(fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
|
||||
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
|
||||
(fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; sha256 = "10yh3q2i71gcw7c0dfz9qxql2vlvnqjav1hyf1q9rpbvdbgsabrs"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
|
||||
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
|
||||
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
|
||||
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
|
||||
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "5.0.0"; sha256 = "1nmzm3d1hymc992qhbzb1ngx9pd7ww00581b2ici25d9m7n99g6h"; })
|
||||
(fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; sha256 = "1xs1lagxr5blc0dfm6xv1nawcz552lq332x3j2a7sizqfarlk384"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
|
||||
(fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.9.0"; sha256 = "1lzl69ar18fn4iqya2ymm9kdv54d4mi0hcdnyvyxjq3bnhnb22qf"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; sha256 = "00yamg3b111blkjvyckxl5nxsxs2n9iccp7z1x0c2j96czgf60pz"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
|
||||
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
|
||||
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
|
||||
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
|
||||
(fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; sha256 = "0q776jpacfjmps4sc6gjvqj89w1ynj41hb0lvqmfl3j221lsfdbz"; })
|
||||
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
|
||||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
|
||||
(fetchNuGet { pname = "TinyPinyin.Net"; version = "1.0.2"; sha256 = "1f71xv8891gq5fsw89zq0n85hhxpc5pkh5ykwvigqpwb1s4zpx3w"; })
|
||||
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; })
|
||||
(fetchNuGet { pname = "ToolGood.Words.Pinyin"; version = "3.1.0"; sha256 = "19jpdbwclknc7wxpdrazq4pjgspzkzkzj0s9hxqksajx6pzgawhx"; })
|
||||
(fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; sha256 = "0giks1ww539m4r5kzdyzkq0cvfi5k50va9idjz93rclgljl96gpl"; })
|
||||
(fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; sha256 = "11yjyvyz922z1ygl8gxmdym3918df12nl7xxry4pdjpl8is33qic"; })
|
||||
(fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; sha256 = "17vsnm9ca6nqk3f1dfpfvd6i6fp8x8v41bn65rchrzwcv1zzi6pz"; })
|
||||
(fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; sha256 = "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"; })
|
||||
(fetchNuGet { pname = "WanaKana-net"; version = "1.0.0"; sha256 = "197qklph8hzrihalpi0kx4n9sf94xnhywzscisnlsxybxxdjz79z"; })
|
||||
(fetchNuGet { pname = "xunit"; version = "2.4.2"; sha256 = "0barl6x1qwx9srjxnanw9z0jik7lv1fp6cvmgqhk10aiv57dgqxm"; })
|
||||
(fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; })
|
||||
(fetchNuGet { pname = "xunit.analyzers"; version = "1.0.0"; sha256 = "0p4f24c462z49gvbh3k4z5ksa8ffa6p8abdgysqbbladl96im4c5"; })
|
||||
(fetchNuGet { pname = "xunit.assert"; version = "2.4.2"; sha256 = "0ifdry9qq3yaw2lfxdll30ljx1jkyhwwy3ydw6gd97y3kifr3k60"; })
|
||||
(fetchNuGet { pname = "xunit.core"; version = "2.4.2"; sha256 = "1ir029igwm6b571lcm6585v5yxagy66rwrg26v4a1fnjq9dnh4cd"; })
|
||||
(fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; })
|
||||
(fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; })
|
||||
(fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.5"; sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; })
|
||||
(fetchNuGet { pname = "YamlDotNet"; version = "13.1.0"; sha256 = "1mqgg0m1mr8vmcz24miagmf1s2b4mmm5mbsf1p0d7cippficiiaz"; })
|
||||
]
|
||||
43
pkgs/applications/audio/openutau/update.sh
Executable file
43
pkgs/applications/audio/openutau/update.sh
Executable file
|
|
@ -0,0 +1,43 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash curl nix jq common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
|
||||
|
||||
stripwhitespace() {
|
||||
sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
|
||||
}
|
||||
|
||||
nixeval() {
|
||||
nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
|
||||
}
|
||||
|
||||
nixbuildscript() {
|
||||
nix --extra-experimental-features nix-command build --impure -f "$nixpkgs" "$1" --no-link --print-out-paths
|
||||
}
|
||||
|
||||
findpath() {
|
||||
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
|
||||
outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
|
||||
|
||||
if [ -n "$outpath" ]; then
|
||||
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
|
||||
fi
|
||||
|
||||
echo "$path"
|
||||
}
|
||||
|
||||
attr="${UPDATE_NIX_ATTR_PATH:-openutau}"
|
||||
version="$(curl -sSL "https://api.github.com/repos/stakira/OpenUtau/releases/latest" | jq -r .tag_name | sed -e 's|^build/||')"
|
||||
|
||||
pkgpath="$(findpath "$attr")"
|
||||
|
||||
updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
|
||||
|
||||
if [ "$updated" -eq 0 ]; then
|
||||
echo 'update.sh: Package version not updated, nothing to do.'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
(cd "$(dirname "$pkgpath")" && "$(nixbuildscript "$attr.fetch-deps")" "$(dirname "$pkgpath")/deps.nix")
|
||||
|
|
@ -380,6 +380,11 @@ def main():
|
|||
|
||||
write_result(result)
|
||||
|
||||
# Commit the result
|
||||
commitMessage = "jetbrains.plugins: update"
|
||||
print("#### Committing changes... ####")
|
||||
run(['git', 'commit', f'-m{commitMessage}', '--', f'{PLUGINS_FILE}'], check=True)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ from packaging import version
|
|||
updates_url = "https://www.jetbrains.com/updates/updates.xml"
|
||||
current_path = pathlib.Path(__file__).parent
|
||||
versions_file_path = current_path.joinpath("versions.json").resolve()
|
||||
fromVersions = {}
|
||||
toVersions = {}
|
||||
|
||||
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
|
||||
|
||||
|
|
@ -74,6 +76,8 @@ def update_product(name, product):
|
|||
download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number)
|
||||
product["url"] = download_url
|
||||
if "sha256" not in product or product.get("build_number") != new_build_number:
|
||||
fromVersions[name] = product["version"]
|
||||
toVersions[name] = new_version
|
||||
logging.info("Found a newer version %s with build number %s.", new_version, new_build_number)
|
||||
product["version"] = new_version
|
||||
product["build_number"] = new_build_number
|
||||
|
|
@ -101,6 +105,26 @@ with open(versions_file_path, "w") as versions_file:
|
|||
json.dump(versions, versions_file, indent=2)
|
||||
versions_file.write("\n")
|
||||
|
||||
if len(toVersions) == 0:
|
||||
# No Updates found
|
||||
sys.exit(0)
|
||||
|
||||
if len(toVersions) == 1:
|
||||
commitMessage = ""
|
||||
else:
|
||||
lowestVersion = min(fromVersions.values())
|
||||
highestVersion = max(toVersions.values())
|
||||
commitMessage = f"jetbrains: {lowestVersion} -> {highestVersion}"
|
||||
commitMessage += "\n\n"
|
||||
|
||||
for name in toVersions.keys():
|
||||
commitMessage += f"jetbrains.{name}: {fromVersions[name]} -> {toVersions[name]}\n"
|
||||
|
||||
# Commit the result
|
||||
logging.info("#### Committing changes... ####")
|
||||
subprocess.run(['git', 'commit', f'-m{commitMessage}', '--', f'{versions_file_path}'], check=True)
|
||||
|
||||
logging.info("#### Updating plugins ####")
|
||||
plugin_script = current_path.joinpath("plugins/update_plugins.py").resolve()
|
||||
subprocess.call(plugin_script)
|
||||
|
||||
|
|
|
|||
|
|
@ -4006,6 +4006,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/junegunn/gv.vim/";
|
||||
};
|
||||
|
||||
hardtime-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hardtime.nvim";
|
||||
version = "2023-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "m4xshen";
|
||||
repo = "hardtime.nvim";
|
||||
rev = "6826c1fe8bebc63a6886833ca4ffed2fc6ec3382";
|
||||
sha256 = "0xdyh7xd58jnh97p0vps5pzpfpzd2yifrfj4crgxhq8vm3bp2w6b";
|
||||
};
|
||||
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
|
||||
};
|
||||
|
||||
hare-vim = buildVimPluginFrom2Nix {
|
||||
pname = "hare.vim";
|
||||
version = "2023-08-07";
|
||||
|
|
|
|||
|
|
@ -334,6 +334,7 @@ https://github.com/ellisonleao/gruvbox.nvim/,,
|
|||
https://github.com/nmac427/guess-indent.nvim/,HEAD,
|
||||
https://github.com/sjl/gundo.vim/,,
|
||||
https://github.com/junegunn/gv.vim/,,
|
||||
https://github.com/m4xshen/hardtime.nvim/,HEAD,
|
||||
https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
|
||||
https://github.com/ThePrimeagen/harpoon/,,
|
||||
https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
|
||||
|
|
|
|||
79
pkgs/applications/graphics/textual-paint/default.nix
Normal file
79
pkgs/applications/graphics/textual-paint/default.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = _: super: {
|
||||
pillow = super.pillow.overridePythonAttrs rec {
|
||||
version = "9.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Pillow";
|
||||
inherit version;
|
||||
hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix type handling for include and lib directories
|
||||
(fetchpatch {
|
||||
url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch";
|
||||
hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
textual = super.textual.overridePythonAttrs rec {
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textual";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw=";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "textual-paint";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1j01";
|
||||
repo = "textual-paint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ubBWK4aoa9+wyUED7CmWwjknWsWauR/mkurDgkKDiY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python.pkgs.setuptools
|
||||
python.pkgs.wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
pillow
|
||||
pyfiglet
|
||||
pyperclip
|
||||
rich
|
||||
stransi
|
||||
textual
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "textual_paint" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI image editor inspired by MS Paint";
|
||||
homepage = "https://github.com/1j01/textual-paint";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "textual-paint";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,15 @@
|
|||
{ lib, fetchFromGitHub, stdenv, shortenPerlShebang, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
|
||||
{ lib
|
||||
, perlPackages
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, shortenPerlShebang
|
||||
, perl
|
||||
, atomicparsley
|
||||
, ffmpeg
|
||||
, flvstreamer
|
||||
, rtmpdump
|
||||
}:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "get_iplayer";
|
||||
|
|
@ -11,8 +22,8 @@ perlPackages.buildPerlPackage rec {
|
|||
sha256 = "+ChCF27nmPKbqaZVxsZ6TlbzSdEz6RfMs87NE8xaSRw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
buildInputs = [ perl ];
|
||||
propagatedBuildInputs = with perlPackages; [
|
||||
HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious
|
||||
];
|
||||
|
|
@ -22,11 +33,14 @@ perlPackages.buildPerlPackage rec {
|
|||
outputs = [ "out" "man" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
cp get_iplayer $out/bin
|
||||
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
|
||||
cp get_iplayer.1 $out/share/man/man1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/.get_iplayer-wrapped
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper,
|
||||
atk, ffmpeg, gdk-pixbuf, gtk3, libXtst }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signumone-ks";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb";
|
||||
sha256 = "00wlya3kb6qac2crflm86km9r48r29bvngjq1wgzj9w2xv0q32b9";
|
||||
};
|
||||
|
||||
# Necessary to avoid using multiple ffmpeg and gtk libs
|
||||
autoPatchelfIgnoreMissingDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk gdk-pixbuf ffmpeg
|
||||
gtk3 libXtst
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
DESKTOP_PATH=$out/share/applications/signumone-ks.desktop
|
||||
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
mv opt/SignumOne-KS/SignumOne-KS.desktop $DESKTOP_PATH
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $DESKTOP_PATH --replace 'Exec=/opt/SignumOne-KS' Exec=$out/bin
|
||||
substituteInPlace $DESKTOP_PATH --replace 'Icon=' Icon=$out
|
||||
|
||||
makeWrapper $out/opt/SignumOne-KS/SignumOne-KS \
|
||||
$out/bin/SignumOne-KS \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Digital signature tool for Costa Rican electronic invoicing";
|
||||
homepage = "https://signum.one/download.html";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; ([
|
||||
pyyaml pyqtwebengine jinja2 pygments
|
||||
pyyaml pyqt6-webengine jinja2 pygments
|
||||
# scripts and userscripts libs
|
||||
tldextract beautifulsoup4
|
||||
readability-lxml pykeepass stem
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, buildGo121Module
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, callPackage
|
||||
|
|
@ -84,6 +85,7 @@ let
|
|||
heroku = automated-providers.heroku.override { spdx = "MPL-2.0"; };
|
||||
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
tailscale = automated-providers.tailscale.override { mkProviderGoModule = buildGo121Module; };
|
||||
};
|
||||
|
||||
# Put all the providers we not longer support in this list.
|
||||
|
|
|
|||
|
|
@ -1097,13 +1097,13 @@
|
|||
"vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI="
|
||||
},
|
||||
"tailscale": {
|
||||
"hash": "sha256-r8MUoPWD06DcM4Oqqyoe4MPR6/NY7vvs/90z2zjQKTU=",
|
||||
"hash": "sha256-kQARVkZM0lZtZNTftQ5JXHtVoeCiChNmq9t9yRXvK0g=",
|
||||
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
|
||||
"owner": "tailscale",
|
||||
"repo": "terraform-provider-tailscale",
|
||||
"rev": "v0.13.7",
|
||||
"rev": "v0.13.9",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-6UxBnQiogcizff5Rv4eadOeiG5JaXQphUWlfnqELvAI="
|
||||
"vendorHash": "sha256-7qDPVKcBQuJQlya6UHjo5YPLgKl0qz1NlU2TuEf8T+0="
|
||||
},
|
||||
"talos": {
|
||||
"hash": "sha256-GRwzR2L6PKx6Us1ci3cs2+DU7TQvhEPcOLyn73dS96Y=",
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.249";
|
||||
version = "1.2.252";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zDQIdWB50Ehme4JwD1mr3T48SzIH9PTCFhBJAND9FeY=";
|
||||
hash = "sha256-dKbdEkC0+HFRWsOIteNDlKc1FHB24ECWyOqrVW9MITY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V+/xwqNdX+Wa/bI/VZUUYpGPV0l17tAjEtkulZWk3cA=";
|
||||
vendorHash = "sha256-0PQDMncERGrPI5sSx76jE7MAz49CYvSORMa/Gc19agA=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ in
|
|||
homepage = "https://www.scuttlebutt.nz/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ];
|
||||
mainProgram = "ssb-patchwork";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake
|
||||
, fetchpatch
|
||||
, sqlite, wxGTK32, libusb1, soapysdr
|
||||
, mesa_glu, libX11, gnuplot, fltk
|
||||
, GLUT
|
||||
|
|
@ -16,6 +17,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull gcc-13 fix pending upstream inclusion:
|
||||
# https://github.com/myriadrf/LimeSuite/pull/384
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/myriadrf/LimeSuite/commit/4ab51835d0fde4ffe6b7be2ac3dfa915e7d4d26e.patch";
|
||||
hash = "sha256-53nLeluMtTPXxchbpftPE8Z1QMyi0UKp+0nRF4ufUgo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-gone";
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swsnr";
|
||||
repo = "git-gone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bb7xeLxo/qk2yKctaX1JXzru1+tGTt8DmDVH6ZaARkU=";
|
||||
hash = "sha256-cEMFbG7L48s1SigLD/HfQ2NplGZPpO+KIgs3oV3rgQQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tngsqAnQ2Um0UCSqBvrnpbDygF6CvL2fi0o9MVY0f4g=";
|
||||
cargoHash = "sha256-CCPVjOWM59ELd4AyT968v6kvGdVwkMxxLZGDiJlLkzA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-qw22izmh0bQ1B1kRqkMcmEdqU665/DtLod24TUH86Ww=";
|
||||
hash = "sha256-hi3ppYDzFEp4FGZHlGgwEFqyOqzX+d0JK674EyibB/c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnome-shell-extension-impatience";
|
||||
version = "unstable-2022-03-26";
|
||||
version = "unstable-2023-04-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timbertson";
|
||||
repo = "gnome-shell-impatience";
|
||||
rev = "cf7c0bb8776af9a16e4ae114df0cc65869fb669d";
|
||||
sha256 = "sha256-z/pZxSEFELtg7kueS2i6gN1+VbN0m4mxc34pOCMak5g=";
|
||||
rev = "0f961b860040ba0f7bbb51ebbaece7db29787313";
|
||||
hash = "sha256-c15zZC9xc0nq8NdnP0gjayMmnD8GyHFV8oZaD4LyR7w=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,19 +2,12 @@
|
|||
, lib
|
||||
, pkgs
|
||||
, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing
|
||||
, makeScopeWithSplicing'
|
||||
}:
|
||||
|
||||
let
|
||||
keep = _self: { };
|
||||
extra = _spliced0: { };
|
||||
|
||||
in
|
||||
makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "xfce")
|
||||
keep
|
||||
extra
|
||||
(self:
|
||||
makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "xfce";
|
||||
f = (self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in
|
||||
|
|
@ -177,4 +170,5 @@ makeScopeWithSplicing
|
|||
thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
|
||||
|
||||
xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.21rc4";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
hash = "sha256-IyTyDxERKuw+XV5CjQRoYaNOT5neCrgqjZFNJrj7Af0=";
|
||||
hash = "sha256-gY1G7ehWgt1VGtN47zek0kcAbxLsWbW3VWAdLOEUNpo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, callPackage
|
||||
, cmake
|
||||
, bash
|
||||
, coreutils
|
||||
, gnugrep
|
||||
, perl
|
||||
|
|
@ -133,7 +134,8 @@ let
|
|||
sed < '${clang}/bin/clang' > "$targetFile" \
|
||||
-e 's|^\s*exec|exec -a "$0"|g' \
|
||||
-e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \
|
||||
-e "s|${clang.cc}/bin/clang|$unwrappedClang|g"
|
||||
-e "s|${clang.cc}/bin/clang|$unwrappedClang|g" \
|
||||
-e "s|^\(\s*\)\($unwrappedClang\) \"@\\\$responseFile\"|\1argv0=\$0\n\1${bash}/bin/bash -c \"exec -a '\$argv0' \2 '@\$responseFile'\"|"
|
||||
chmod a+x "$targetFile"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -18,12 +18,23 @@
|
|||
, avrdude
|
||||
, gdb
|
||||
, openocd
|
||||
, runCommand
|
||||
, tinygoTests ? [ "smoketest" ]
|
||||
}:
|
||||
|
||||
let
|
||||
llvmMajor = lib.versions.major llvm.version;
|
||||
inherit (llvmPackages) llvm clang compiler-rt lld;
|
||||
|
||||
# only doing this because only on darwin placing clang.cc in nativeBuildInputs
|
||||
# doesn't build
|
||||
bootstrapTools = runCommand "tinygo-bootstap-tools" { } ''
|
||||
mkdir -p $out
|
||||
ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor}
|
||||
ln -s ${gdb}/bin/gdb $out/gdb-multiarch
|
||||
'';
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -100,20 +111,13 @@ buildGoModule rec {
|
|||
# Disable windows and darwin cross-compile tests
|
||||
sed -i "/GOOS=windows/d" Makefile
|
||||
sed -i "/GOOS=darwin/d" Makefile
|
||||
|
||||
# tinygo needs versioned binaries
|
||||
mkdir -p $out/libexec/tinygo
|
||||
ln -s ${lib.getBin clang.cc}/bin/clang $out/libexec/tinygo/clang-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/ld.lld $out/libexec/tinygo/ld.lld-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/wasm-ld $out/libexec/tinygo/wasm-ld-${llvmMajor}
|
||||
ln -s ${gdb}/bin/gdb $out/libexec/tinygo/gdb-multiarch
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export PATH=$out/libexec/tinygo:$PATH
|
||||
export PATH=${bootstrapTools}:$PATH
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
|
|
@ -149,7 +153,7 @@ buildGoModule rec {
|
|||
make build/release
|
||||
|
||||
wrapProgram $out/bin/tinygo \
|
||||
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo
|
||||
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:${bootstrapTools}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
81
pkgs/development/embedded/openocd-rp2040/default.nix
Normal file
81
pkgs/development/embedded/openocd-rp2040/default.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, libftdi1
|
||||
, libusb1
|
||||
, which
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
, texinfo
|
||||
, git
|
||||
, libgpiod
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "openocd-rp2040";
|
||||
version = "0.12.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/raspberrypi/openocd";
|
||||
rev = "4d87f6dcae77d3cbcd8ac3f7dc887adf46ffa504";
|
||||
sha256 = "sha256-SYC0qqNx09yO/qeKDDN8dF/9d/dofJ5B1h/PofhG8Jw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hidapi
|
||||
libftdi1
|
||||
libusb1
|
||||
which
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
texinfo
|
||||
git
|
||||
]
|
||||
++
|
||||
# tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
|
||||
lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
|
||||
version = "1.6.4";
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
|
||||
};
|
||||
}));
|
||||
|
||||
configurePhase = ''
|
||||
SKIP_SUBMODULE=1 ./bootstrap
|
||||
./configure --prefix=$out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
rules="$out/share/openocd/contrib/60-openocd.rules"
|
||||
if [ ! -f "$rules" ]; then
|
||||
echo "$rules is missing, must update the Nix file."
|
||||
exit 1
|
||||
fi
|
||||
ln -s "$rules" "$out/etc/udev/rules.d/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenOCD fork for rp2040 microcontroller";
|
||||
longDescription = ''
|
||||
This is a fork of OpenOCD by Raspberry Pi,
|
||||
which brings support to the rp2040 microcontroller.
|
||||
'';
|
||||
homepage = "https://github.com/raspberrypi/openocd";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lu15w1r7h ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
# - imports lua-packages.nix
|
||||
# - adds spliced package sets to the package set
|
||||
# - applies overrides from `packageOverrides`
|
||||
({ lua, overrides, callPackage, makeScopeWithSplicing }: let
|
||||
({ lua, overrides, callPackage, makeScopeWithSplicing' }: let
|
||||
luaPackagesFun = callPackage ../../../top-level/lua-packages.nix {
|
||||
lua = self;
|
||||
};
|
||||
|
|
@ -39,18 +39,15 @@ let
|
|||
selfHostHost = luaOnHostForHost.pkgs;
|
||||
selfTargetTarget = luaOnTargetForTarget.pkgs or {};
|
||||
};
|
||||
keep = self: { };
|
||||
extra = spliced0: {};
|
||||
extensions = lib.composeManyExtensions [
|
||||
generatedPackages
|
||||
overriddenPackages
|
||||
overrides
|
||||
];
|
||||
in makeScopeWithSplicing
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.extends extensions luaPackagesFun))
|
||||
in makeScopeWithSplicing' {
|
||||
inherit otherSplices;
|
||||
f = lib.extends extensions luaPackagesFun;
|
||||
})
|
||||
{
|
||||
overrides = packageOverrides;
|
||||
lua = self;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
# Function that when called
|
||||
# - imports perl-packages.nix
|
||||
# - adds spliced package sets to the package set
|
||||
({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing }: let
|
||||
({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing' }: let
|
||||
perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
|
||||
# allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages
|
||||
# most perl packages aren't called with callPackage so it's not possible to override their arguments individually
|
||||
|
|
@ -34,13 +34,10 @@ let
|
|||
selfHostHost = perlOnHostForHost.pkgs;
|
||||
selfTargetTarget = perlOnTargetForTarget.pkgs or {};
|
||||
};
|
||||
keep = self: { };
|
||||
extra = spliced0: {};
|
||||
in makeScopeWithSplicing
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
perlPackagesFun)
|
||||
in makeScopeWithSplicing' {
|
||||
inherit otherSplices;
|
||||
f = perlPackagesFun;
|
||||
})
|
||||
{
|
||||
perl = self;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, db
|
||||
, lib
|
||||
, libffiBoot
|
||||
, makeScopeWithSplicing
|
||||
, makeScopeWithSplicing'
|
||||
, pythonPackagesExtensions
|
||||
, stdenv
|
||||
}@args:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing, ... }:
|
||||
{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing', ... }:
|
||||
|
||||
{ implementation
|
||||
, libPrefix
|
||||
|
|
@ -48,7 +48,6 @@
|
|||
};
|
||||
hooks = import ./hooks/default.nix;
|
||||
keep = self: hooks self {};
|
||||
extra = _: {};
|
||||
optionalExtensions = cond: as: lib.optionals cond as;
|
||||
pythonExtension = import ../../../top-level/python-packages.nix;
|
||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||
|
|
@ -61,12 +60,10 @@
|
|||
overrides
|
||||
]);
|
||||
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
|
||||
in makeScopeWithSplicing
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))
|
||||
{
|
||||
in makeScopeWithSplicing' {
|
||||
inherit otherSplices keep;
|
||||
f = lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun;
|
||||
}) {
|
||||
overrides = packageOverrides;
|
||||
python = self;
|
||||
});
|
||||
|
|
|
|||
30
pkgs/development/libraries/immer/default.nix
Normal file
30
pkgs/development/libraries/immer/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immer";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arximboldi";
|
||||
repo = "immer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R0C6hN50eyFSv10L/Q0tRdnUrRvze+eRXPrlAQsddYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
dontBuild = true;
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Postmodern immutable and persistent data structures for C++ — value semantics at scale";
|
||||
homepage = "https://sinusoid.es/immer";
|
||||
changelog = "https://github.com/arximboldi/immer/releases/tag/v${version}";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ sifmelcara ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@ Check for any minor version changes.
|
|||
|
||||
*/
|
||||
|
||||
{ makeScopeWithSplicing, generateSplicesForMkScope
|
||||
{ makeScopeWithSplicing', generateSplicesForMkScope
|
||||
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl, python3
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
|
|
@ -266,6 +266,7 @@ let
|
|||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialbus = callPackage ../modules/qtserialbus.nix {};
|
||||
|
|
@ -333,7 +334,10 @@ let
|
|||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
};
|
||||
|
||||
baseScope = makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages;
|
||||
baseScope = makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "qt5";
|
||||
f = addPackages;
|
||||
};
|
||||
|
||||
bootstrapScope = baseScope.overrideScope(final: prev: {
|
||||
qtbase = prev.qtbase.override { qttranslations = null; };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
{ qtModule, qtbase, qtdeclarative }:
|
||||
|
||||
qtModule {
|
||||
pname = "qtremoteobjects";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
# cycle is detected in build when adding "dev" "bin" too
|
||||
outputs = [ "out" ];
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ let
|
|||
} ./hooks/qmake-hook.sh;
|
||||
};
|
||||
|
||||
# TODO(@Artturin): convert to makeScopeWithSplicing
|
||||
# TODO(@Artturin): convert to makeScopeWithSplicing'
|
||||
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
|
||||
baseScope = lib.makeScope newScope addPackages;
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ mapAliases {
|
|||
gtop = pkgs.gtop; # added 2023-07-31
|
||||
inherit (pkgs) htmlhint; # added 2023-08-19
|
||||
hueadm = pkgs.hueadm; # added 2023-07-31
|
||||
immich = pkgs.immich-cli; # added 2023-08-19
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
karma = pkgs.karma-runner; # added 2023-07-29
|
||||
|
|
|
|||
|
|
@ -166,7 +166,6 @@
|
|||
, "ijavascript"
|
||||
, "inliner"
|
||||
, "imapnotify"
|
||||
, "immich"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "ionic"
|
||||
|
|
|
|||
47
pkgs/development/node-packages/node-packages.nix
generated
47
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -108600,53 +108600,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
immich = nodeEnv.buildNodePackage {
|
||||
name = "immich";
|
||||
packageName = "immich";
|
||||
version = "0.41.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/immich/-/immich-0.41.0.tgz";
|
||||
sha512 = "F+DIJ41/1L4Cqs0NqubcD2qttYcxTs32DCZS2l6U7d+a4SVtbxYwtEkvljSKACka1vokmHetpveGyRau2FdZ8w==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."asynckit-0.4.0"
|
||||
sources."axios-0.26.1"
|
||||
sources."chalk-2.4.2"
|
||||
sources."cli-progress-3.12.0"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."combined-stream-1.0.8"
|
||||
sources."commander-9.5.0"
|
||||
sources."delayed-stream-1.0.0"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
sources."fdir-5.3.0"
|
||||
sources."follow-redirects-1.15.2"
|
||||
sources."form-data-4.0.0"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."p-limit-3.1.0"
|
||||
sources."picomatch-2.3.1"
|
||||
sources."string-width-4.2.3"
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."supports-color-5.5.0"
|
||||
sources."systeminformation-5.18.15"
|
||||
sources."yocto-queue-0.1.0"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Immich CLI";
|
||||
homepage = "https://github.com/alextran1502/immich-cli#readme";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
insect = nodeEnv.buildNodePackage {
|
||||
name = "insect";
|
||||
packageName = "insect";
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
setuptools
|
||||
wheel
|
||||
pybind11
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonpatch";
|
||||
version = "1.32";
|
||||
version = "1.33";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "stefankoegl";
|
||||
repo = "python-json-patch";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JMGBgYjnjHQ5JpzDwJcR2nVZfzmQ8ZZtcB0GsJ9Q4Jc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JHBB64LExzHQVoFF2xcsqGlNWX/YeEBa1M/TmfeQLWI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to apply JSON Patches according to RFC 6902";
|
||||
homepage = "https://github.com/stefankoegl/python-json-patch";
|
||||
license = licenses.bsd2; # "Modified BSD license, says pypi"
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
pkgs/development/python-modules/ochre/default.nix
Normal file
39
pkgs/development/python-modules/ochre/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, hypothesis
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ochre";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getcuia";
|
||||
repo = "ochre";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U6qycLnldwNze3XMAn6DS3XGX4RaCZgW0pH/y/FEAkk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ochre" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A down-to-earth approach to colors";
|
||||
homepage = "https://github.com/getcuia/ochre";
|
||||
changelog = "https://github.com/getcuia/ochre/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, certifi
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, pretend
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, twisted
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pem";
|
||||
version = "21.2.0";
|
||||
version = "23.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hynek";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mftLdgtgb5J4zwsb1F/4v4K7XTy4VSZBMy3zPV2f1uA=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
certifi
|
||||
cryptography
|
||||
|
|
@ -30,16 +42,16 @@ buildPythonPackage rec {
|
|||
pyopenssl
|
||||
pytestCheckHook
|
||||
twisted
|
||||
twisted.optional-dependencies.tls
|
||||
];
|
||||
] ++ twisted.optional-dependencies.tls;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pem"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy PEM file parsing in Python";
|
||||
homepage = "https://pem.readthedocs.io/";
|
||||
description = "Easy PEM file parsing in Python.";
|
||||
changelog = "https://github.com/hynek/pem/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nyanotech ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.12.7";
|
||||
version = "0.12.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-r2UQrMmgWaS1v8ZSFSvpwiSRdGw5uTAoWIlSbzrG6/g=";
|
||||
hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
72
pkgs/development/python-modules/pygitguardian/default.nix
Normal file
72
pkgs/development/python-modules/pygitguardian/default.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, marshmallow
|
||||
, marshmallow-dataclass
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, responses
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
, vcrpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygitguardian";
|
||||
version = "1.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitGuardian";
|
||||
repo = "py-gitguardian";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lDs2H5GUf3fhTSX+20dD0FNW2oirkgQQk5t7GKSnKe4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
marshmallow
|
||||
marshmallow-dataclass
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
vcrpy
|
||||
responses
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pygitguardian"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require an API key
|
||||
"test_health_check"
|
||||
"test_multi_content_scan"
|
||||
"test_content_scan_exceptions"
|
||||
"test_multi_content_exceptions"
|
||||
"test_content_scan"
|
||||
"test_extra_headers"
|
||||
"test_multiscan_parameters"
|
||||
"test_quota_overview"
|
||||
"test_versions_from_headers"
|
||||
"test_create_honeytoken"
|
||||
"test_create_jwt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to access the GitGuardian API";
|
||||
homepage = "https://github.com/GitGuardian/py-gitguardian";
|
||||
changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymetno";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyMetno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA=";
|
||||
hash = "sha256-NikfHQwVviCKWGfY1atirFVaqWQHfXg8WAgZIDnGn4Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,16 +15,17 @@
|
|||
, typing-extensions
|
||||
|
||||
# optionals
|
||||
, pycryptodome
|
||||
, cryptography
|
||||
, pillow
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
, pytest-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypdf";
|
||||
version = "3.5.2";
|
||||
version = "3.15.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -33,7 +34,7 @@ buildPythonPackage rec {
|
|||
rev = "refs/tags/${version}";
|
||||
# fetch sample files used in tests
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-f+M4sfUzDy8hxHUiWG9hyu0EYvnjNA46OtHzBSJdID0=";
|
||||
hash = "sha256-0KMZnMIeTkra2Il4HGDBtm8HLP8zpMXgUD4V5U5fYy0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -62,7 +63,7 @@ buildPythonPackage rec {
|
|||
passthru.optional-dependencies = rec {
|
||||
full = crypto ++ image;
|
||||
crypto = [
|
||||
pycryptodome
|
||||
cryptography
|
||||
];
|
||||
image = [
|
||||
pillow
|
||||
|
|
@ -75,6 +76,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-timeout
|
||||
] ++ passthru.optional-dependencies.full;
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
|
@ -82,6 +84,11 @@ buildPythonPackage rec {
|
|||
"-m" "'not enable_socket'"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires fpdf2 which we don't package yet
|
||||
"test_compression"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files";
|
||||
homepage = "https://github.com/py-pdf/pypdf";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysma";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4u564tLk91duYv1IClHddur6t+Rbla/e9P0yWAxw2sw=";
|
||||
hash = "sha256-zlCGEcG5tmgEXhSMDLKj0/imT1iHBqlp1O1QhmPrJcA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-voluptuous";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F-Secure";
|
||||
repo = "pytest-voluptuous";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xdj4qCSSJQI9Rb1WyUYrAg1I5wQ5o6IJyIjJAafP/LY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
voluptuous
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_voluptuous"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/test_plugin.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pytest plugin for asserting data against voluptuous schema";
|
||||
homepage = "https://github.com/F-Secure/pytest-voluptuous";
|
||||
changelog = "https://github.com/F-Secure/pytest-voluptuous/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +1,25 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, click-plugins
|
||||
, colorama
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
, tldextract
|
||||
, xlsxwriter
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shodan";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4q9iVOGdKo+k6Slzi+VR4l3Hqvw5RzLndufjD6RM4zk=";
|
||||
hash = "sha256-yWF8ZsR7h9SAHnCAtsdp7Jox2jmN7+CwR6Z5SSdDZFM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -26,6 +27,7 @@ buildPythonPackage rec {
|
|||
colorama
|
||||
requests
|
||||
setuptools
|
||||
tldextract
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
|
|
@ -41,6 +43,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/achillean/shodan-python";
|
||||
changelog = "https://github.com/achillean/shodan-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lihop ];
|
||||
maintainers = with maintainers; [ fab lihop ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
44
pkgs/development/python-modules/stransi/default.nix
Normal file
44
pkgs/development/python-modules/stransi/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, hypothesis
|
||||
, pytestCheckHook
|
||||
, ochre
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stransi";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getcuia";
|
||||
repo = "stransi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PDMel6emra5bzX+FwHvUVpFu2YkRKy31UwkCL4sGJ14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ochre
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "stransi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight Python parser library for ANSI escape code sequences";
|
||||
homepage = "https://github.com/getcuia/stransi";
|
||||
changelog = "https://github.com/getcuia/stransi/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -448,7 +448,10 @@ let
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11";
|
||||
# More vulnerabilities in 2.11.1 really; https://github.com/tensorflow/tensorflow/releases
|
||||
knownVulnerabilities = [ "CVE-2023-33976" ];
|
||||
broken = true || # most likely needs dealing with protobuf/abseil updates
|
||||
!(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11";
|
||||
} // lib.optionalAttrs stdenv.isDarwin {
|
||||
timeout = 86400; # 24 hours
|
||||
maxSilent = 14400; # 4h, double the default of 7200s
|
||||
|
|
|
|||
|
|
@ -28,7 +28,11 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
homepage = "https://gitlab.com/engmark/vcard";
|
||||
description = "vCard validator, class and utility functions";
|
||||
longDescription = ''
|
||||
This program can be used for strict validation and parsing of vCards. It currently supports vCard 3.0 (RFC 2426).
|
||||
'';
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "vcard";
|
||||
maintainers = [ lib.maintainers.l0b0 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "5.0.25";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-uDIjNlT93fKV0DtpJua59hUcHF90fDdvNUt1/PA1gIY=";
|
||||
sha256 = "sha256-bQbIct5+0KmD51oxotmWmC49tWuuSXkuRtybtr36bA8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
, pypugjs
|
||||
, boto3
|
||||
, moto
|
||||
, mock
|
||||
, markdown
|
||||
, lz4
|
||||
, setuptoolsTrial
|
||||
, buildbot-worker
|
||||
|
|
@ -65,14 +65,14 @@ let
|
|||
|
||||
package = buildPythonApplication rec {
|
||||
pname = "buildbot";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z4BmC6Ed+7y4rJologiLXhkIvucXz65KEBxX3LFqExY=";
|
||||
hash = "sha256-NP2nk9uVIyZOyil4KX+NyG1Z9YTSxDVA2ceMuO6JNH4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -98,7 +98,7 @@ let
|
|||
pypugjs
|
||||
boto3
|
||||
moto
|
||||
mock
|
||||
markdown
|
||||
lz4
|
||||
setuptoolsTrial
|
||||
buildbot-worker
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-duv8oKgVGfeOzjKiI8Ltmto0dcGSI1xtSy8YbqtIFTk=";
|
||||
hash = "sha256-y0BRDB2L7aWCJJ25oL2HZ80ijZ2Ebm5d5WY0UnFgbo8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6hLJADdd84LTpxVB8C+i8rea9/65QfcCPuZC/7+55Co=";
|
||||
hash = "sha256-jdeVojfC421cxjXYFjlmIeEBuraqMnukAO1QZVPE2Oc=";
|
||||
};
|
||||
|
||||
# Remove unnecessary circular dependency on buildbot
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JA+3WnZAN4224LbrluHJcnTmQ8VnuAmoEqqLtw0H10M=";
|
||||
hash = "sha256-JFzdK/DkPxwoPRaEbULNw3O3NGEIlMGrDKTVICAxdkI=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NwLb9aQQwOxo9AqvsYbl/g8mNUeufdPrCwFMJNzdfQM=";
|
||||
hash = "sha256-+PrGubM/EOw1QTUyYPy51PzuOVZ8rjCcZpeIUybm3q8=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hIBH8+RvZ53Txxl2FyrCs+ZFzRAAbK2th5Im2gZCs3c=";
|
||||
hash = "sha256-k93slBfR0rTJ0hmXG3nAMU/ar9hjX9+BPXD87DajaTU=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iK9MwE5Nzc0tHMui0LquCqTFIPbRTEYeHam+5hiOQJE=";
|
||||
hash = "sha256-oKIHLllzeyAm2BsVbZE68h53V1WQjWlYDLpd73FVOe0=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HtVleYQE+pfwso7oBNucRjHEkwjgQSZJ6Ts1x7ncLsA=";
|
||||
hash = "sha256-XPStbcijZJTmaR2mjyWSY1UCZmHpS7xF/vg/CsMR6+4=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
, twisted
|
||||
|
||||
# tests
|
||||
, mock
|
||||
, parameterized
|
||||
, psutil
|
||||
, setuptoolsTrial
|
||||
|
|
@ -28,7 +27,7 @@ buildPythonPackage (rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-et0R0pNxtL5QCgHRT1/q5t+hb6cLl6NU3AowzT/WC90=";
|
||||
hash = "sha256-L7TKo+4RDqHVVB/0ujR3jDxD+emvcEHdHTLyHe9jdk4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -48,7 +47,6 @@ buildPythonPackage (rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
parameterized
|
||||
psutil
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,20 +2,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inferno";
|
||||
version = "0.11.15";
|
||||
version = "0.11.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fyTsB+1ftol3prNLydT/coLchip1vijmfLLt3/DnBbc=";
|
||||
hash = "sha256-hCrDvlC547ee/ZYj+7tnJTKGMPxams6/WJvvBsr7CvE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XBah55xfbWjQrkupebZE2uiveFhh/R0BF1KEKkY5Hx8=";
|
||||
cargoHash = "sha256-J7P84aU/3/hvZlr06gpN98QXqRoe2Z6IQ91RbgB4Ohc=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace"
|
||||
"--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple"
|
||||
"--skip=collapse::perf::tests::test_collapse_multi_perf"
|
||||
"--skip=collapse::perf::tests::test_collapse_multi_perf_simple"
|
||||
"--skip=flamegraph_base_symbol"
|
||||
"--skip=flamegraph_multiple_base_symbol"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "initool";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbohdan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+uyBweTmtMzwTsxL1xWnomtjcwra2hWcylqFHY2AexI=";
|
||||
hash = "sha256-LV8Rv+7oUJ/4BX412WD1+Cs7N86OiXutN2ViAmo5jlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mlton ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k2tf";
|
||||
|
|
@ -11,7 +11,16 @@ buildGoModule rec {
|
|||
sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iCRiBCppqCZrCUQipoVgc4jUnLkX6QVFjxI6sv6n7tU=";
|
||||
patches = [
|
||||
# update dependencies
|
||||
# https://github.com/sl1pm4t/k2tf/pull/111
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sl1pm4t/k2tf/commit/7e7b778eeb80400cb0dadb1cdea4e617b5738147.patch";
|
||||
hash = "sha256-ZGQUuH7u3aNLml6rvOzOxVwSTlbhZLknXbHKeY4lp00=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-yGuoE1bgwVHk3ym382OC93me9HPlVoNgGo/3JROVC2E=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.19";
|
||||
version = "6.0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dFY+t6MVRdbp0z5mbnREd/t6v1D+7g/vD+K8mcJvn9E=";
|
||||
hash = "sha256-z94mKAboLs6fi+RKfwijm2RDpO729uJoSlxSzBdrkRI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mLRD5Z/ZzfT1BFFSyYmJkY98vMY/Elt3Gy0SboCpzec=";
|
||||
cargoHash = "sha256-IRWPjOUV3ElXPNYCRvQQAw74YBtEnTHtrWDYHO/eDNE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ makeScopeWithSplicing, generateSplicesForMkScope
|
||||
{ makeScopeWithSplicing', generateSplicesForMkScope
|
||||
, stdenv, buildFHSEnv, pkgsi686Linux, glxinfo
|
||||
}:
|
||||
|
||||
|
|
@ -32,6 +32,7 @@ let
|
|||
|
||||
steamcmd = callPackage ./steamcmd.nix { };
|
||||
};
|
||||
keep = self: { };
|
||||
extra = spliced0: { };
|
||||
in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun
|
||||
in makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "steamPackages";
|
||||
f = steamPackagesFun;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,64 +1,113 @@
|
|||
{ lib, stdenv, fetchurl, unzip, SDL, libGLU, libGL, openal, curl, libXxf86vm }:
|
||||
{ lib
|
||||
, fetchzip
|
||||
, stdenv
|
||||
, copyDesktopItems
|
||||
, imagemagick
|
||||
, libicns
|
||||
, makeBinaryWrapper
|
||||
, curl
|
||||
, libGL
|
||||
, libGLU
|
||||
, openal
|
||||
, libXxf86vm
|
||||
, SDL
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbanterror";
|
||||
let
|
||||
version = "4.3.4";
|
||||
|
||||
srcs =
|
||||
[ (fetchurl {
|
||||
url = "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror434_full.zip";
|
||||
sha256 = "1rx4nnndsk88nvd7k4p35cw6znclkkzm2bl5j6vn6mjjdk66jrki";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/FrozenSand/ioq3-for-UrbanTerror-4/archive/release-${version}.zip";
|
||||
sha256 = "1s9pmw7rbnzwzl1llcs0kr2krf4daf8hhnz1j89qk4bq9a9qfp71";
|
||||
})
|
||||
];
|
||||
urbanterror-maps = fetchzip {
|
||||
name = "urbanterror-maps";
|
||||
url = "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror${builtins.replaceStrings ["."] [""] version}_full.zip";
|
||||
hash = "sha256-C6Gb5PPECAOjQhmkrzkV6dpY/zHVtUj9oq3507o2PUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ];
|
||||
sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}";
|
||||
urbanterror-source = fetchzip {
|
||||
name = "urbanterror-source";
|
||||
url = "https://github.com/FrozenSand/ioq3-for-UrbanTerror-4/archive/release-${version}.zip";
|
||||
hash = "sha256-zF6Tkaj5WYkFU66VwpBFr1P18OJGrGgxnc/jvcvt8hA=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "urbanterror";
|
||||
inherit version;
|
||||
|
||||
srcs = [
|
||||
urbanterror-maps
|
||||
urbanterror-source
|
||||
];
|
||||
|
||||
sourceRoot = "urbanterror-source";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
libicns
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libGL
|
||||
libGLU
|
||||
openal
|
||||
libXxf86vm
|
||||
SDL
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
echo "USE_OPENAL = 1" > Makefile.local
|
||||
echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
|
||||
echo "USE_CURL = 1" >> Makefile.local
|
||||
echo "USE_CURL_DLOPEN = 0" >> Makefile.local
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
destDir="$out/opt/urbanterror"
|
||||
mkdir -p "$destDir"
|
||||
mkdir -p "$out/bin"
|
||||
cp -v build/release-linux-*/Quake3-UrT.* \
|
||||
"$destDir/Quake3-UrT"
|
||||
cp -v build/release-linux-*/Quake3-UrT-Ded.* \
|
||||
"$destDir/Quake3-UrT-Ded"
|
||||
cp -rv ../UrbanTerror43/q3ut4 "$destDir"
|
||||
cat << EOF > "$out/bin/urbanterror"
|
||||
#! ${stdenv.shell}
|
||||
cd "$destDir"
|
||||
exec ./Quake3-UrT "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/urbanterror"
|
||||
cat << EOF > "$out/bin/urbanterror-ded"
|
||||
#! ${stdenv.shell}
|
||||
cd "$destDir"
|
||||
exec ./Quake3-UrT-Ded "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/urbanterror-ded"
|
||||
installTargets = [ "copyfiles" ];
|
||||
installFlags = [ "COPYDIR=$(out)/share/urbanterror" ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/urbanterror
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
p=$out/opt/urbanterror/Quake3-UrT
|
||||
cur_rpath=$(patchelf --print-rpath $p)
|
||||
patchelf --set-rpath $cur_rpath:${libGL}/lib:${libGLU}/lib $p
|
||||
postInstall = ''
|
||||
icns2png --extract ${urbanterror-maps}/Quake3-UrT.app/Contents/Resources/quake3-urt.icns
|
||||
|
||||
for size in 16 24 32 48 64 128 256 512 1024; do
|
||||
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
if [ ! -e quake3-urt_"$size"x"$size"x32.png ] ; then
|
||||
convert -resize "$size"x"$size" quake3-urt_512x512x32.png quake3-urt_"$size"x"$size"x32.png
|
||||
fi
|
||||
install -Dm644 quake3-urt_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/urbanterror.png
|
||||
done;
|
||||
|
||||
makeWrapper $out/share/urbanterror/Quake3-UrT.* $out/bin/urbanterror
|
||||
makeWrapper $out/share/urbanterror/Quake3-UrT-Ded.* $out/bin/urbanterror-ded
|
||||
|
||||
ln -s ${urbanterror-maps}/q3ut4 $out/share/urbanterror/
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "urbanterror";
|
||||
exec = "urbanterror";
|
||||
icon = "urbanterror";
|
||||
comment = "A multiplayer tactical FPS on top of Quake 3 engine";
|
||||
desktopName = "Urban Terror";
|
||||
categories = [ "Game" "ActionGame" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A multiplayer tactical FPS on top of Quake 3 engine";
|
||||
homepage = "https://www.urbanterror.info";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
longDescription = ''
|
||||
Urban Terror is a free multiplayer first person shooter developed by
|
||||
FrozenSand, that (thanks to the ioquake3-code) does not require
|
||||
|
|
@ -66,10 +115,8 @@ stdenv.mkDerivation rec {
|
|||
tactical shooter; somewhat realism based, but the motto is "fun over
|
||||
realism". This results in a very unique, enjoyable and addictive game.
|
||||
'';
|
||||
homepage = "http://www.urbanterror.info";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ astsmtl ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
mainProgram = "urbanterror";
|
||||
maintainers = with lib.maintainers; [ astsmtl drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, stdenvNoCC
|
||||
, makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing', generateSplicesForMkScope
|
||||
, buildPackages
|
||||
, bsdSetupHook, makeSetupHook
|
||||
, fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell
|
||||
|
|
@ -66,11 +66,9 @@ let
|
|||
done
|
||||
'';
|
||||
|
||||
in makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "freebsd")
|
||||
(_: {})
|
||||
(_: {})
|
||||
(self: let
|
||||
in makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "freebsd";
|
||||
f = (self: let
|
||||
inherit (self) mkDerivation;
|
||||
in {
|
||||
inherit freebsdSrc;
|
||||
|
|
@ -898,4 +896,5 @@ in makeScopeWithSplicing
|
|||
'';
|
||||
});
|
||||
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, stdenvNoCC
|
||||
, makeScopeWithSplicing, generateSplicesForMkScope
|
||||
, makeScopeWithSplicing', generateSplicesForMkScope
|
||||
, buildPackages
|
||||
, bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex
|
||||
, zlib
|
||||
|
|
@ -26,17 +26,15 @@ let
|
|||
else "no"}"
|
||||
];
|
||||
|
||||
in makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "netbsd")
|
||||
(_: {})
|
||||
(_: {})
|
||||
(self: let
|
||||
in makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "netbsd";
|
||||
f = (self: let
|
||||
inherit (self) mkDerivation;
|
||||
in {
|
||||
|
||||
# Why do we have splicing and yet do `nativeBuildInputs = with self; ...`?
|
||||
#
|
||||
# We use `makeScopeWithSplicing` because this should be used for all
|
||||
# We use `makeScopeWithSplicing'` because this should be used for all
|
||||
# nested package sets which support cross, so the inner `callPackage` works
|
||||
# correctly. But for the inline packages we don't bother to use
|
||||
# `callPackage`.
|
||||
|
|
@ -1011,4 +1009,5 @@ in makeScopeWithSplicing
|
|||
# END MISCELLANEOUS
|
||||
#
|
||||
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,24 @@
|
|||
{ config, stdenv, lib, fetchurl, fetchpatch
|
||||
, perl, pkg-config
|
||||
, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc
|
||||
, enablePython ? false, python3
|
||||
, enableGSSAPI ? true, libkrb5
|
||||
, buildPackages, nixosTests
|
||||
, cmocka, tzdata
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, perl
|
||||
, pkg-config
|
||||
, libcap
|
||||
, libidn2
|
||||
, libtool
|
||||
, libxml2
|
||||
, openssl
|
||||
, libuv
|
||||
, nghttp2
|
||||
, jemalloc
|
||||
, enablePython ? false
|
||||
, python3
|
||||
, enableGSSAPI ? true
|
||||
, libkrb5
|
||||
, buildPackages
|
||||
, nixosTests
|
||||
, cmocka
|
||||
, tzdata
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
|
|
@ -24,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config ];
|
||||
buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ]
|
||||
buildInputs = [ libidn2 libtool libxml2 openssl libuv nghttp2 jemalloc ]
|
||||
++ lib.optional stdenv.isLinux libcap
|
||||
++ lib.optional enableGSSAPI libkrb5
|
||||
++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
|
||||
|
|
@ -34,8 +48,9 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--without-lmdb"
|
||||
"--with-libidn2"
|
||||
] ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput bin/bind9-config $dev
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.35.3";
|
||||
version = "0.35.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3JfJISoziIcB2Mx2gSYjegjQwqGipUtvT927QSezuq4=";
|
||||
hash = "sha256-3pUKqmqnRm3/e/fhAV5cq16wcK/f7KWb3aoFbPXCC3o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vzrp20Mg6AA0h3+5+qbKRa7nhx/hgiIHG6RNXLATpHE=";
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxysql";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysown";
|
||||
repo = "proxysql";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-HFhfAWyDB20t+c4s9NlVwdANrFobVyr+vnmZqx+X20Q=";
|
||||
hash = "sha256-+3cOEM5b5HBQhuI+92meupvQnrUj8jgbedzPJqMoXc8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index c053ab64..03f38a21 100644
|
||||
index f8902b4f..57844bd7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -59,11 +59,7 @@ endif
|
||||
|
|
@ -15,7 +15,7 @@ index c053ab64..03f38a21 100644
|
|||
USERCHECK := $(shell getent passwd proxysql)
|
||||
GROUPCHECK := $(shell getent group proxysql)
|
||||
|
||||
@@ -868,16 +864,10 @@ cleanbuild:
|
||||
@@ -303,16 +299,10 @@ cleanbuild:
|
||||
|
||||
.PHONY: install
|
||||
install: src/proxysql
|
||||
|
|
@ -36,7 +36,7 @@ index c053ab64..03f38a21 100644
|
|||
install -m 0755 etc/init.d/proxysql /etc/init.d
|
||||
ifeq ($(DISTRO),"CentOS Linux")
|
||||
diff --git a/deps/Makefile b/deps/Makefile
|
||||
index dbe495c0..9c50bab8 100644
|
||||
index 710e070b..fd1352f6 100644
|
||||
--- a/deps/Makefile
|
||||
+++ b/deps/Makefile
|
||||
@@ -69,10 +69,7 @@ default: $(tmpdefault)
|
||||
|
|
@ -50,16 +50,19 @@ index dbe495c0..9c50bab8 100644
|
|||
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
|
||||
endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -91,8 +88,6 @@ $(error Incompatible OpenSSL version: struct bio_st mismatch!)
|
||||
endif
|
||||
@@ -86,11 +83,7 @@ libinjection: libinjection/libinjection/src/libinjection.a
|
||||
|
||||
|
||||
libssl/openssl/libssl.a:
|
||||
- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true
|
||||
- cd libssl && tar -zxf openssl-*.tar.gz
|
||||
# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch
|
||||
# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
|
||||
cd libssl && ./verify-bio_st-match.sh
|
||||
-# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch
|
||||
-# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
|
||||
cd libssl/openssl && ./config no-ssl3 no-tests
|
||||
@@ -112,8 +107,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
|
||||
cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
cd libssl/openssl && ln -s . lib # curl wants this path
|
||||
@@ -108,8 +101,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
|
||||
endif
|
||||
|
||||
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
|
||||
|
|
@ -68,7 +71,7 @@ index dbe495c0..9c50bab8 100644
|
|||
#ifeq ($(REQUIRE_PATCH), true)
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
|
||||
@@ -131,8 +124,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
@@ -127,8 +118,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
|
||||
|
||||
libev/libev/.libs/libev.a:
|
||||
|
|
@ -77,7 +80,7 @@ index dbe495c0..9c50bab8 100644
|
|||
cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
|
||||
cd libev/libev && ./configure
|
||||
cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
@@ -148,8 +139,6 @@ coredumper/coredumper/src/libcoredumper.a:
|
||||
@@ -144,8 +133,6 @@ coredumper/coredumper/src/libcoredumper.a:
|
||||
coredumper: coredumper/coredumper/src/libcoredumper.a
|
||||
|
||||
curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
|
||||
|
|
@ -86,7 +89,7 @@ index dbe495c0..9c50bab8 100644
|
|||
# cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
cd curl/curl && autoreconf -fi
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -161,16 +150,6 @@ curl: curl/curl/lib/.libs/libcurl.a
|
||||
@@ -157,16 +144,6 @@ curl: curl/curl/lib/.libs/libcurl.a
|
||||
|
||||
|
||||
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
|
||||
|
|
@ -103,7 +106,7 @@ index dbe495c0..9c50bab8 100644
|
|||
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
|
||||
@@ -186,8 +165,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
@@ -182,8 +159,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
|
||||
|
||||
lz4/lz4/lib/liblz4.a:
|
||||
|
|
@ -112,16 +115,16 @@ index dbe495c0..9c50bab8 100644
|
|||
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
lz4: lz4/lz4/lib/liblz4.a
|
||||
@@ -213,8 +190,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
@@ -209,8 +184,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
|
||||
|
||||
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
|
||||
- cd libdaemon && rm -rf libdaemon-*/ || true
|
||||
- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
|
||||
cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
|
||||
cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
|
||||
cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
@@ -302,8 +277,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
@@ -299,8 +272,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
|
||||
|
||||
libconfig/libconfig/lib/.libs/libconfig++.a:
|
||||
|
|
@ -130,7 +133,7 @@ index dbe495c0..9c50bab8 100644
|
|||
cd libconfig/libconfig && ./configure --disable-examples
|
||||
cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
@@ -311,9 +284,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
|
||||
@@ -308,9 +279,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
|
||||
|
||||
|
||||
prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
|
||||
|
|
@ -140,7 +143,7 @@ index dbe495c0..9c50bab8 100644
|
|||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
|
||||
@@ -324,10 +294,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
|
||||
@@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
|
||||
|
||||
|
||||
re2/re2/obj/libre2.a:
|
||||
|
|
@ -151,7 +154,7 @@ index dbe495c0..9c50bab8 100644
|
|||
cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile
|
||||
@@ -342,8 +308,6 @@ re2: re2/re2/obj/libre2.a
|
||||
@@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a
|
||||
|
||||
|
||||
pcre/pcre/.libs/libpcre.a:
|
||||
|
|
|
|||
|
|
@ -5,24 +5,26 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.44.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qxtYYFhABrkJlwWBx4ak7xnaqg7x+D1fUF1gcJFK0e4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zSrXfSG9GXReJ+XRx7FTBZovSvNq725zzWMje3maTx4=";
|
||||
};
|
||||
|
||||
# hash missmatch on across linux and darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-mE+GpD9vMhjVQsH+mckU6GhNiLMDV5H31Jj1/HLBSEs=";
|
||||
|
||||
vendorHash = "sha256-CEr8UvQtKZo5jahLeLx3RYT592i6SwwNLRA4IRD0mYU=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${version}"
|
||||
"-X=main.version=v${version}"
|
||||
];
|
||||
|
||||
# Tests require network access
|
||||
|
|
@ -49,6 +51,6 @@ buildGoModule rec {
|
|||
application dependencies (Bundler, Composer, npm, yarn, etc.).
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
maintainers = with maintainers; [ fab jk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Linux tool for controlling PS5 DualSense controller";
|
||||
homepage = "https://github.com/nowrep/dualsensectl";
|
||||
license = licenses.gpl2Only;
|
||||
mainProgram = "dualsensectl";
|
||||
maintainers = with maintainers; [ azuwis ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
||||
, python3
|
||||
, ghostscript
|
||||
, coreutils
|
||||
, pdftk
|
||||
, poppler_utils
|
||||
, makeBinaryWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
python-env = python3.withPackages (ps: with ps; [ tkinter ]);
|
||||
binPath = lib.makeBinPath [ ghostscript pdftk poppler_utils ];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "pdf-sign";
|
||||
|
|
@ -24,24 +24,20 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-5GRk0T1iLqmvWI8zvZE3OWEHPS0/zN/Ie9brjZiFpqc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./use-nix-paths.patch;
|
||||
gs = "${ghostscript}/bin/gs";
|
||||
mv = "${coreutils}/bin/mv";
|
||||
pdftk = "${pdftk}/bin/pdftk";
|
||||
pdfinfo = "${poppler_utils}/bin/pdfinfo";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ python-env ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp pdf-sign pdf-create-empty $out/bin
|
||||
patchShebangs $out/bin
|
||||
mkdir -p $out
|
||||
cp pdf-sign pdf-create-empty $out
|
||||
|
||||
makeWrapper ${python-env}/bin/python $out/bin/pdf-sign \
|
||||
--add-flags $out/pdf-sign \
|
||||
--prefix PATH : ${binPath}
|
||||
makeWrapper ${python-env}/bin/python $out/bin/pdf-create-empty \
|
||||
--add-flags $out/pdf-create-empty \
|
||||
--prefix PATH : ${binPath}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -50,6 +46,7 @@ stdenv.mkDerivation {
|
|||
description = "A tool to visually sign PDF files";
|
||||
homepage = "https://github.com/svenssonaxel/pdf-sign";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "pdf-sign";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
diff --git a/pdf-create-empty b/pdf-create-empty
|
||||
index e4768af..5caf34c 100755
|
||||
--- a/pdf-create-empty
|
||||
+++ b/pdf-create-empty
|
||||
@@ -20,7 +20,7 @@ def main(args):
|
||||
except:
|
||||
die('Invalid dimensions')
|
||||
subprocess.run([
|
||||
- 'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
+ '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
f'-sOutputFile={o}',
|
||||
'-sDEVICE=pdfwrite',
|
||||
f'-dDEVICEWIDTHPOINTS={w}', f'-dDEVICEHEIGHTPOINTS={h}',
|
||||
diff --git a/pdf-sign b/pdf-sign
|
||||
index 64be231..37d508d 100755
|
||||
--- a/pdf-sign
|
||||
+++ b/pdf-sign
|
||||
@@ -17,7 +17,7 @@ def main(args):
|
||||
if args.flatten:
|
||||
outFile=intmp('input.pdf')
|
||||
subprocess.run([
|
||||
- 'pdftk', filePath,
|
||||
+ '@pdftk@', filePath,
|
||||
'output', outFile,
|
||||
'flatten'
|
||||
], check=True)
|
||||
@@ -28,7 +28,7 @@ def main(args):
|
||||
if args.page < -pageCount or args.page==0 or pageCount < args.page:
|
||||
die('Page number out of range')
|
||||
pageNumber=Cell(args.page if 0 < args.page else pageCount+args.page+1)
|
||||
- pagePDF=Cell(lambda: subprocess.run(['pdftk', inputPDF(), 'cat', str(pageNumber()), 'output', intmp('page.pdf')], check=True) and intmp('page.pdf'))
|
||||
+ pagePDF=Cell(lambda: subprocess.run(['@pdftk@', inputPDF(), 'cat', str(pageNumber()), 'output', intmp('page.pdf')], check=True) and intmp('page.pdf'))
|
||||
pageSize=Cell(lambda: pdfGetSize(pagePDF()))
|
||||
# The chosen signature
|
||||
if not args.signature and args.batch:
|
||||
@@ -52,7 +52,7 @@ def main(args):
|
||||
dy=h*(1-signaturePositionY())/resize - sh/2
|
||||
outFile=intmp('signature-positioned.pdf')
|
||||
subprocess.run([
|
||||
- 'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
+ '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
f'-sOutputFile={outFile}',
|
||||
'-sDEVICE=pdfwrite',
|
||||
f'-dDEVICEWIDTHPOINTS={w}', f'-dDEVICEHEIGHTPOINTS={h}', '-dFIXEDMEDIA',
|
||||
@@ -62,7 +62,7 @@ def main(args):
|
||||
return outFile
|
||||
# The signed page
|
||||
signedPagePDF=Cell(lambda: subprocess.run([
|
||||
- 'pdftk',
|
||||
+ '@pdftk@',
|
||||
pagePDF(),
|
||||
'stamp', signaturePositionedPDF(),
|
||||
'output', intmp('signed-page.pdf'),
|
||||
@@ -80,7 +80,7 @@ def main(args):
|
||||
(w, h)=displaySize()
|
||||
outFile=intmp('display.png')
|
||||
subprocess.run([
|
||||
- 'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
+ '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET',
|
||||
f'-sOutputFile={outFile}',
|
||||
'-sDEVICE=pngalpha',
|
||||
'-dMaxBitmap=2147483647',
|
||||
@@ -258,7 +258,7 @@ def main(args):
|
||||
if args.existing=='backup':
|
||||
backupFilePath=f'{signedFilePath}.backup{time.strftime("%Y%m%d_%H%M%S")}'
|
||||
subprocess.run([
|
||||
- 'mv',
|
||||
+ '@mv@',
|
||||
signedFilePath,
|
||||
backupFilePath,
|
||||
], check=True)
|
||||
@@ -269,7 +269,7 @@ def main(args):
|
||||
assert args.existing=='overwrite'
|
||||
pnr=pageNumber()
|
||||
subprocess.run([
|
||||
- 'pdftk',
|
||||
+ '@pdftk@',
|
||||
f'A={inputPDF()}',
|
||||
f'B={signedPagePDF()}',
|
||||
'cat',
|
||||
@@ -352,10 +352,10 @@ def tkthrottle(frequency, root):
|
||||
return decorator
|
||||
|
||||
def pdfCountPages(filePath):
|
||||
- return int(fromCmdOutput(["pdfinfo", filePath], "^.*\nPages: +([0-9]+)\n.*$")[1])
|
||||
+ return int(fromCmdOutput(["@pdfinfo@", filePath], "^.*\nPages: +([0-9]+)\n.*$")[1])
|
||||
|
||||
def pdfGetSize(filePath):
|
||||
- [ignored, w, h, *ignored2]=fromCmdOutput(['pdfinfo', filePath], '^.*\nPage size: +([0-9.]+) x ([0-9.]+) pts( \([A-Za-z0-9]+\))?\n.*$')
|
||||
+ [ignored, w, h, *ignored2]=fromCmdOutput(['@pdfinfo@', filePath], '^.*\nPage size: +([0-9.]+) x ([0-9.]+) pts( \([A-Za-z0-9]+\))?\n.*$')
|
||||
return (float(w), float(h))
|
||||
|
||||
def m(pattern, string):
|
||||
29
pkgs/tools/misc/astronomer/default.nix
Normal file
29
pkgs/tools/misc/astronomer/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "astronomer";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ullaakut";
|
||||
repo = "astronomer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4hUfJI2BRZl3Trk8F2qLZAyA57kq0oW9/e13atj/BVg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EOtpZPIrAVMPIZGnkZoNs7ovaR7Ts3dJsFLXClIoNVI=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to detect illegitimate stars from bot accounts on GitHub projects";
|
||||
homepage = "https://github.com/Ullaakut/astronomer";
|
||||
changelog = "https://github.com/Ullaakut/astronomer/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "astronomer";
|
||||
};
|
||||
}
|
||||
27
pkgs/tools/misc/immich-cli/default.nix
Normal file
27
pkgs/tools/misc/immich-cli/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "immich-cli";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "CLI";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BpJNssNTJZASH5VTgTNJ0ILj0XucWvyn3Y7hQdfCEGQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-GOYWPRAzV59iaX32I42dOOEv1niLiDIPagzQ/QBBbKc=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/immich-app/CLI/releases/tag/${src.rev}";
|
||||
description = "CLI utilities for Immich to help upload images and videos";
|
||||
homepage = "https://github.com/immich-app/CLI";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "immich";
|
||||
maintainers = with lib.maintainers; [ felschr ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.82.0";
|
||||
version = "0.83.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EYkHfqwCxNIrE+wRMo/kwOVfuQfgrgcpmSL1gVwDebo=";
|
||||
hash = "sha256-e2wcRawTEyK/NwSwd2WUgOnQnAj8Z7DQrrx32ksfHeU=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "${src.name}/cmd/otelcorecol";
|
||||
vendorHash = "sha256-lebysPwGTOj2W0OKmj/2sIH5wMKfhZYwHWYjqa2dfKw=";
|
||||
vendorHash = "sha256-HZ7aKLVjDMdMuq8IQ/6EgqCXWeYHmrJtf1fJyrLbPuU=";
|
||||
|
||||
# upstream strongly recommends disabling CGO
|
||||
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tgpt";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "tgpt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WJYSipaq3lL5NscfQQCxuX5maprn9Z3LSQ0Dkn9edKo=";
|
||||
hash = "sha256-e1OPDhZuRbm6DqvmB1ZiXVRSnjaZEFi2gSIMnfIIHKE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wo6Dfcdax8EjZRP5JBKrnxpFTVx0GV+7uaDgBY/zg6I=";
|
||||
hash = "sha256-r3rN1HSNz8aFjMjg/s1YNSgv9/YZZAgjowQXO81eT84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-uaYeFzG74VTUrtql6mSi+LNh6IjDomixrWwGQMgmONc=";
|
||||
vendorHash = "sha256-yzxhK7Gpgcdh+j8EJvHIduZgsF1rK652QWvswFkgO7s=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-08-12";
|
||||
version = "2023-08-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-614RJCI3/7xV5CaeiJqH0G3Kxk3orSN+xePHgHZY4GM=";
|
||||
hash = "sha256-Od8iMbHxmQKyP02piWDkeUfIhkwZLFsm6lpSTztCjmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
78
pkgs/tools/security/ggshield/default.nix
Normal file
78
pkgs/tools/security/ggshield/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ggshield";
|
||||
version = "1.18.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitGuardian";
|
||||
repo = "ggshield";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CWWgt2Ec8ChhH+nL6DkGqI3GsR52HforUYaaxSpKgCs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
charset-normalizer
|
||||
click
|
||||
cryptography
|
||||
marshmallow
|
||||
marshmallow-dataclass
|
||||
oauthlib
|
||||
pygitguardian
|
||||
pyjwt
|
||||
python-dotenv
|
||||
pyyaml
|
||||
requests
|
||||
rich
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
] ++ (with python3.pkgs; [
|
||||
pyfakefs
|
||||
pytest-mock
|
||||
pytest-voluptuous
|
||||
pytestCheckHook
|
||||
snapshottest
|
||||
vcrpy
|
||||
]);
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ggshield"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't run functional tests
|
||||
"tests/functional/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# No TLS certificate, no .git folder, etc.
|
||||
"test_cache_catches"
|
||||
"test_is_git_dir"
|
||||
"test_is_valid_git_commit_ref"
|
||||
"test_check_git_dir"
|
||||
"test_does_not_fail_if_cache"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to find and fix various types of hardcoded secrets and infrastructure-as-code misconfigurations";
|
||||
homepage = "https://github.com/GitGuardian/ggshield";
|
||||
changelog = "https://github.com/GitGuardian/ggshield/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,22 +5,27 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gobuster";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OJ";
|
||||
repo = "gobuster";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ohv/FgMbniItbrcrncAe9QKVjrhxoZ80BGYJmJtJpPk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LZL9Zje2u0v6iAQinfjflvusV57ys5J5Il6Q7br3Suc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZbY5PyXKcTB9spVGfW2Qhj8SV9alOSH0DyXx1dh/NgQ=";
|
||||
vendorHash = "sha256-w+G5PsWXhKipjYIHtz633sia+Wg9FSFVpcugEl8fp0E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
|
||||
homepage = "https://github.com/OJ/gobuster";
|
||||
changelog = "https://github.com/OJ/gobuster/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pamplemousse ];
|
||||
maintainers = with maintainers; [ fab pamplemousse ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
let
|
||||
pname = "iaito";
|
||||
version = "5.8.6";
|
||||
version = "5.8.8";
|
||||
|
||||
main_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rl8bOIR0oS6YvZA5pr8oSj7HcKK4YeCjAEi7saVdvk8=";
|
||||
hash = "sha256-/sXdp6QpDxltesg5i2CD0K2r18CrbGZmmI7HqULvFfA=";
|
||||
name = repo;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "naabu";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "naabu";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-STykmBsKLcuPhNrk/RHwvlkz9L+IwiALY7Iuvuu3dPM=";
|
||||
hash = "sha256-x6TmV8c5p9Uuc9uJG3+FNNpdmzdzgQpsyO29dly7PuU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yY5zVlZolc8NLiySBOwKIIa+UN/hsqe9/Pf6iLG1H38=";
|
||||
vendorHash = "sha256-9LIPRiLKszfz9Gj26G03TPHOqCXi1s3CYiaadInlD84=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -5,20 +5,26 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scilla";
|
||||
version = "1.2.4";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8ZRYgQ4xME71vlO0nKnxiCqeju0G4SwgEXnUol1jQxk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gZuNXQaxHJYLsEaOpNYo7ybg3f0GhkpiaLrex5lkDu4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y4Zi0Hy6ydGxLTohgJGF3L9O+79z+3t+4ZA64otCJpE=";
|
||||
vendorHash = "sha256-bVGmleuOJzi/Sz7MJlnQuJsDgRWuwieLUx8hcyKkWXI=";
|
||||
|
||||
checkFlags = [
|
||||
# requires network access
|
||||
"-skip=TestIPToHostname"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Information gathering tool for DNS, ports and more";
|
||||
homepage = "https://github.com/edoardottt/scilla";
|
||||
changelog = "https://github.com/edoardottt/scilla/releases/tag/v${version}";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,13 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "theharvester";
|
||||
version = "4.4.1";
|
||||
version = "4.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laramies";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jPwyciS4aIXJSCOolgzHbiadPzHO2MsQPGfavHqC2sg=";
|
||||
hash = "sha256-hAR5z1NwBmcmWRAg2F4QVicxKfzgTOOptlwKdx+G0+o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -63,7 +64,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
'';
|
||||
homepage = "https://github.com/laramies/theHarvester";
|
||||
changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ c0bw3b treemo ];
|
||||
maintainers = with maintainers; [ c0bw3b fab treemo ];
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
31
pkgs/tools/security/xsubfind3r/default.nix
Normal file
31
pkgs/tools/security/xsubfind3r/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xsubfind3r";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hueristiq";
|
||||
repo = "xsubfind3r";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DY9/qcE8Ryue6NEWglM1F+xd669DPBIgt743ta+O//4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dFjyeIiDGdGTlZoZvsW9cwb+urS0NRxBMFf3+Y+rsAE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI utility to find subdomains from curated passive online sources";
|
||||
homepage = "https://github.com/hueristiq/xsubfind3r";
|
||||
changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
140
pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
Normal file
140
pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, runCommand
|
||||
|
||||
# script interpreters
|
||||
, bash
|
||||
, jdk
|
||||
, perl
|
||||
, python3
|
||||
, ruby
|
||||
, snobol4
|
||||
, tk
|
||||
|
||||
# TeX Live prerequisites
|
||||
, texliveBinaries
|
||||
}:
|
||||
|
||||
{ pname
|
||||
, revision
|
||||
, version ? toString revision
|
||||
, sha512
|
||||
, mirrors
|
||||
, extraVersion ? ""
|
||||
, fixedHashes ? { }
|
||||
, postUnpack ? ""
|
||||
, stripPrefix ? 1
|
||||
, license ? [ ]
|
||||
, hasHyphens ? false
|
||||
, hasManpages ? false
|
||||
, hasRunfiles ? false
|
||||
, hasTlpkg ? false
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
let
|
||||
meta = { license = map (x: lib.licenses.${x}) license; };
|
||||
|
||||
commonPassthru = {
|
||||
inherit pname revision version;
|
||||
} // lib.optionalAttrs (args ? extraRevision) {
|
||||
inherit (args) extraRevision;
|
||||
};
|
||||
|
||||
# build run, doc, source, tlpkg containers
|
||||
mkContainer = tlType: passthru: sha512:
|
||||
let
|
||||
# NOTE: the fixed naming scheme must match generated-fixed-hashes.nix
|
||||
# the basename used by upstream (without ".tar.xz" suffix)
|
||||
urlName = pname + (lib.optionalString (tlType != "run" && tlType != "tlpkg") ".${tlType}");
|
||||
# name + version for the derivation
|
||||
tlName = urlName + (lib.optionalString (tlType == "tlpkg") ".tlpkg") + "-${version}${extraVersion}";
|
||||
fixedHash = fixedHashes.${tlType} or null; # be graceful about missing hashes
|
||||
|
||||
urls = args.urls or (if args ? url then [ args.url ] else
|
||||
map (up: "${up}/archive/${urlName}.r${toString revision}.tar.xz") mirrors);
|
||||
in
|
||||
runCommand "texlive-${tlName}"
|
||||
({
|
||||
src = fetchurl { inherit urls sha512; };
|
||||
inherit meta passthru stripPrefix tlType;
|
||||
} // lib.optionalAttrs (fixedHash != null) {
|
||||
outputHash = fixedHash;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
})
|
||||
(''
|
||||
mkdir "$out"
|
||||
if [[ "$tlType" == "tlpkg" ]]; then
|
||||
tar -xf "$src" \
|
||||
--strip-components=1 \
|
||||
-C "$out" --anchored --exclude=tlpkg/tlpobj --keep-old-files \
|
||||
tlpkg
|
||||
else
|
||||
tar -xf "$src" \
|
||||
--strip-components="$stripPrefix" \
|
||||
-C "$out" --anchored --exclude=tlpkg --keep-old-files
|
||||
fi
|
||||
'' + postUnpack);
|
||||
|
||||
tex = [
|
||||
(
|
||||
let passthru = commonPassthru
|
||||
// lib.optionalAttrs (args ? deps) { tlDeps = args.deps; }
|
||||
// lib.optionalAttrs (args ? formats) { inherit (args) formats; }
|
||||
// lib.optionalAttrs hasHyphens { inherit hasHyphens; }; in
|
||||
if hasRunfiles then mkContainer "run" passthru sha512.run
|
||||
else (passthru // { tlType = "run"; })
|
||||
)
|
||||
];
|
||||
|
||||
doc = let passthru = commonPassthru
|
||||
// lib.optionalAttrs hasManpages { inherit hasManpages; }; in
|
||||
lib.optional (sha512 ? doc) (mkContainer "doc" passthru sha512.doc);
|
||||
|
||||
source = lib.optional (sha512 ? source) (mkContainer "source" commonPassthru sha512.source);
|
||||
|
||||
tlpkg = let passthru = commonPassthru
|
||||
// lib.optionalAttrs (args ? postactionScript) { postactionScript = args.postactionScript; }; in
|
||||
lib.optional hasTlpkg (mkContainer "tlpkg" passthru sha512.run);
|
||||
|
||||
bin = lib.optional (args ? binfiles && args.binfiles != [ ]) (
|
||||
let
|
||||
# find interpreters for the script extensions found in tlpdb
|
||||
extToInput = {
|
||||
jar = jdk;
|
||||
lua = texliveBinaries.luatex;
|
||||
py = python3;
|
||||
rb = ruby;
|
||||
sno = snobol4;
|
||||
tcl = tk;
|
||||
texlua = texliveBinaries.luatex;
|
||||
tlu = texliveBinaries.luatex;
|
||||
};
|
||||
run = lib.head tex;
|
||||
in
|
||||
runCommand "texlive-${pname}.bin-${version}"
|
||||
{
|
||||
passthru = commonPassthru // { tlType = "bin"; };
|
||||
inherit meta;
|
||||
# shebang interpreters
|
||||
buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput);
|
||||
# absolute scripts folder
|
||||
scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname);
|
||||
# binaries info
|
||||
inherit (args) binfiles;
|
||||
binlinks = builtins.attrNames (args.binlinks or { });
|
||||
bintargets = builtins.attrValues (args.binlinks or { });
|
||||
binfolders = [ (lib.getBin texliveBinaries.core) ] ++
|
||||
lib.optional (texliveBinaries ? ${pname}) (lib.getBin texliveBinaries.${pname});
|
||||
# build scripts
|
||||
patchScripts = ./patch-scripts.sed;
|
||||
makeBinContainers = ./make-bin-containers.sh;
|
||||
}
|
||||
''
|
||||
. "$makeBinContainers"
|
||||
${args.postFixup or ""}
|
||||
''
|
||||
);
|
||||
in
|
||||
{ pkgs = tex ++ doc ++ source ++ tlpkg ++ bin; }
|
||||
|
|
@ -33,7 +33,7 @@ let
|
|||
tlpdbVersion = tlpdb."00texlive.config";
|
||||
|
||||
# the set of TeX Live packages, collections, and schemes; using upstream naming
|
||||
tl = let
|
||||
overriddenTlpdb = let
|
||||
# most format -> engine links are generated by texlinks according to fmtutil.cnf at combine time
|
||||
# so we remove them from binfiles, and add back the ones texlinks purposefully ignore (e.g. mptopdf)
|
||||
removeFormatLinks = lib.mapAttrs (_: attrs:
|
||||
|
|
@ -43,9 +43,9 @@ let
|
|||
in if binNotFormats != [] then attrs // { binfiles = binNotFormats; } else removeAttrs attrs [ "binfiles" ]
|
||||
else attrs);
|
||||
|
||||
orig = removeFormatLinks (removeAttrs tlpdb [ "00texlive.config" ]);
|
||||
orig = removeFormatLinks (removeAttrs tlpdb [ "00texlive.config" ]); in
|
||||
|
||||
overridden = lib.recursiveUpdate orig rec {
|
||||
lib.recursiveUpdate orig rec {
|
||||
#### overrides of texlive.tlpdb
|
||||
|
||||
#### nonstandard script folders
|
||||
|
|
@ -355,8 +355,8 @@ let
|
|||
# hardcode revision numbers (since texlive.infra, tlshell are not in either system or user texlive.tlpdb)
|
||||
tlshell.postFixup = ''
|
||||
substituteInPlace "$out"/bin/tlshell \
|
||||
--replace '[dict get $::pkgs texlive.infra localrev]' '${toString overridden."texlive.infra".revision}' \
|
||||
--replace '[dict get $::pkgs tlshell localrev]' '${toString overridden.tlshell.revision}'
|
||||
--replace '[dict get $::pkgs texlive.infra localrev]' '${toString orig."texlive.infra".revision}' \
|
||||
--replace '[dict get $::pkgs tlshell localrev]' '${toString orig.tlshell.revision}'
|
||||
'';
|
||||
#### dependency changes
|
||||
|
||||
|
|
@ -380,7 +380,7 @@ let
|
|||
npp-for-context.license = [ "gpl3Only" ];
|
||||
|
||||
texdoc = {
|
||||
extraRevision = ".tlpdb${toString tlpdbVersion.revision}";
|
||||
extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
|
||||
extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
|
||||
|
||||
# build Data.tlpdb.lua (part of the 'tlType == "run"' package)
|
||||
|
|
@ -428,39 +428,6 @@ let
|
|||
};
|
||||
}; # overrides
|
||||
|
||||
in lib.mapAttrs mkTLPkg overridden;
|
||||
|
||||
# create a TeX package: an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations
|
||||
mkTLPkg = pname: attrs:
|
||||
let
|
||||
version = attrs.version or (toString attrs.revision);
|
||||
mkPkgV = tlType: let
|
||||
pkg = attrs // {
|
||||
sha512 = attrs.sha512.${if tlType == "tlpkg" then "run" else tlType};
|
||||
inherit pname tlType version;
|
||||
} // lib.optionalAttrs (attrs.hasManpages or false) {
|
||||
hasManpages = true;
|
||||
};
|
||||
in mkPkg pkg;
|
||||
run = if (attrs.hasRunfiles or false) then mkPkgV "run"
|
||||
# the fake derivations are used for filtering of hyphenation patterns and formats
|
||||
else ({
|
||||
inherit pname version;
|
||||
tlType = "run";
|
||||
hasHyphens = attrs.hasHyphens or false;
|
||||
tlDeps = map (n: tl.${n}) (attrs.deps or []);
|
||||
} // lib.optionalAttrs (attrs ? formats) { inherit (attrs) formats; });
|
||||
in {
|
||||
# TL pkg contains lists of packages: runtime files, docs, sources, tlpkg, binaries
|
||||
pkgs =
|
||||
# tarball of a collection/scheme itself only contains a tlobj file
|
||||
[ run ]
|
||||
++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc")
|
||||
++ lib.optional (attrs.sha512 ? source) (mkPkgV "source")
|
||||
++ lib.optional (attrs.hasTlpkg or false) (mkPkgV "tlpkg")
|
||||
++ lib.optional (attrs ? binfiles && attrs.binfiles != []) (mkPkgBin pname version run attrs);
|
||||
};
|
||||
|
||||
version = {
|
||||
# day of the snapshot being taken
|
||||
year = "2023";
|
||||
|
|
@ -477,7 +444,7 @@ let
|
|||
# need to be used instead. Ideally, for the release branches of NixOS we
|
||||
# should be switching to the tlnet-final versions
|
||||
# (https://tug.org/historic/).
|
||||
urlPrefixes = with version; lib.optionals final [
|
||||
mirrors = with version; lib.optionals final [
|
||||
# tlnet-final snapshot; used when texlive.tlpdb is frozen
|
||||
# the TeX Live yearly freeze typically happens in mid-March
|
||||
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString texliveYear}/tlnet-final"
|
||||
|
|
@ -491,7 +458,7 @@ let
|
|||
];
|
||||
|
||||
tlpdbxz = fetchurl {
|
||||
urls = map (up: "${up}/tlpkg/texlive.tlpdb.xz") urlPrefixes;
|
||||
urls = map (up: "${up}/tlpkg/texlive.tlpdb.xz") mirrors;
|
||||
hash = "sha256-vm7DmkH/h183pN+qt1p1wZ6peT2TcMk/ae0nCXsCoMw=";
|
||||
};
|
||||
|
||||
|
|
@ -506,102 +473,17 @@ let
|
|||
# map: name -> fixed-output hash
|
||||
fixedHashes = lib.optionalAttrs useFixedHashes (import ./fixed-hashes.nix);
|
||||
|
||||
# NOTE: the fixed naming scheme must match generated-fixed-hashes.nix
|
||||
# name for the URL
|
||||
mkURLName = { pname, tlType, ... }: pname + lib.optionalString (tlType != "run" && tlType != "tlpkg") ".${tlType}";
|
||||
# name + revision for the fixed output hashes
|
||||
mkFixedName = { tlType, revision, extraRevision ? "", ... }@attrs: mkURLName attrs + (lib.optionalString (tlType == "tlpkg") ".tlpkg") + ".r${toString revision}${extraRevision}";
|
||||
# name + version for the derivation
|
||||
mkTLName = { tlType, version, extraVersion ? "", ... }@attrs: mkURLName attrs + (lib.optionalString (tlType == "tlpkg") ".tlpkg") + "-${version}${extraVersion}";
|
||||
buildTeXLivePackage = import ./build-texlive-package.nix {
|
||||
inherit lib fetchurl runCommand bash jdk perl python3 ruby snobol4 tk;
|
||||
texliveBinaries = bin;
|
||||
};
|
||||
|
||||
# build tlType == "bin" containers based on `binfiles` in TLPDB
|
||||
# see UPGRADING.md for how to keep the list of shebangs up to date
|
||||
mkPkgBin = let extToInput = {
|
||||
jar = jdk;
|
||||
lua = bin.luatex;
|
||||
py = python3;
|
||||
rb = ruby;
|
||||
sno = snobol4;
|
||||
tcl = tk;
|
||||
texlua = bin.luatex;
|
||||
tlu = bin.luatex;
|
||||
}; in pname: version: run:
|
||||
{ binfiles, scriptsFolder ? pname, postFixup ? "", scriptExts ? [], extraBuildInputs ? [], binlinks ? {}, ... }@args:
|
||||
runCommand "texlive-${pname}.bin-${version}"
|
||||
{
|
||||
# metadata for texlive.combine
|
||||
passthru = {
|
||||
inherit pname version;
|
||||
tlType = "bin";
|
||||
};
|
||||
# shebang interpreters
|
||||
buildInputs = extraBuildInputs ++ [ bash perl ] ++ (lib.attrVals scriptExts extToInput);
|
||||
# absolute scripts folder
|
||||
scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + scriptsFolder);
|
||||
# binaries info
|
||||
inherit binfiles;
|
||||
binlinks = builtins.attrNames binlinks;
|
||||
bintargets = builtins.attrValues binlinks;
|
||||
binfolders = [ (lib.getBin bin.core) ] ++ lib.optional (bin ? ${pname}) (lib.getBin bin.${pname});
|
||||
# build scripts
|
||||
patchScripts = ./patch-scripts.sed;
|
||||
makeBinContainers = ./make-bin-containers.sh;
|
||||
}
|
||||
''
|
||||
. "$makeBinContainers"
|
||||
${postFixup}
|
||||
'';
|
||||
|
||||
# create a derivation that contains an unpacked upstream TL package
|
||||
mkPkg = { pname, tlType, revision, version, sha512, extraRevision ? "", postUnpack ? "", stripPrefix ? 1, hasManpages ? false, ... }@args:
|
||||
let
|
||||
# the basename used by upstream (without ".tar.xz" suffix)
|
||||
urlName = mkURLName args;
|
||||
tlName = mkTLName args;
|
||||
fixedHash = fixedHashes.${mkFixedName args} or null; # be graceful about missing hashes
|
||||
|
||||
urls = args.urls or (if args ? url then [ args.url ] else
|
||||
map (up: "${up}/archive/${urlName}.r${toString revision}.tar.xz") (args.urlPrefixes or urlPrefixes));
|
||||
|
||||
in runCommand "texlive-${tlName}"
|
||||
( {
|
||||
src = fetchurl { inherit urls sha512; };
|
||||
meta = {
|
||||
license = map (x: lib.licenses.${x}) (args.license or []);
|
||||
};
|
||||
inherit stripPrefix tlType;
|
||||
# metadata for texlive.combine
|
||||
passthru = {
|
||||
inherit pname tlType revision version extraRevision;
|
||||
} // lib.optionalAttrs (tlType == "run" && args ? deps) {
|
||||
tlDeps = map (n: tl.${n}) args.deps;
|
||||
} // lib.optionalAttrs (tlType == "run") {
|
||||
hasHyphens = args.hasHyphens or false;
|
||||
} // lib.optionalAttrs (tlType == "tlpkg" && args ? postactionScript) {
|
||||
postactionScript = args.postactionScript;
|
||||
}
|
||||
// lib.optionalAttrs (tlType == "run" && args ? formats) { inherit (args) formats; }
|
||||
// lib.optionalAttrs (tlType == "doc" && hasManpages) { hasManpages = true; };
|
||||
} // lib.optionalAttrs (fixedHash != null) {
|
||||
outputHash = fixedHash;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
}
|
||||
)
|
||||
( ''
|
||||
mkdir "$out"
|
||||
if [[ "$tlType" == "tlpkg" ]]; then
|
||||
tar -xf "$src" \
|
||||
--strip-components=1 \
|
||||
-C "$out" --anchored --exclude=tlpkg/tlpobj --keep-old-files \
|
||||
tlpkg
|
||||
else
|
||||
tar -xf "$src" \
|
||||
--strip-components="$stripPrefix" \
|
||||
-C "$out" --anchored --exclude=tlpkg --keep-old-files
|
||||
fi
|
||||
'' + postUnpack
|
||||
);
|
||||
tl = lib.mapAttrs (pname: { revision, extraRevision ? "", ... }@args:
|
||||
buildTeXLivePackage (args
|
||||
# NOTE: the fixed naming scheme must match generate-fixed-hashes.nix
|
||||
// { inherit mirrors pname; fixedHashes = fixedHashes."${pname}-${toString revision}${extraRevision}" or { }; }
|
||||
// lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n}) (args.deps or [ ]); })
|
||||
) overriddenTlpdb;
|
||||
|
||||
# combine a set of TL packages into a single TL meta-package
|
||||
combinePkgs = pkgList: lib.catAttrs "pkg" (
|
||||
|
|
@ -640,6 +522,7 @@ in
|
|||
# for backward compatibility
|
||||
latexindent = lib.findFirst (p: p.tlType == "bin") tl.latexindent.pkgs;
|
||||
};
|
||||
|
||||
combine = assert assertions; combine;
|
||||
|
||||
# Pre-defined combined packages for TeX Live schemes,
|
||||
|
|
@ -652,7 +535,7 @@ in
|
|||
scheme-basic = [ free gfl gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ];
|
||||
scheme-context = [ bsd2 bsd3 cc-by-sa-40 free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21
|
||||
lppl1 lppl13c mit ofl publicDomain x11 ];
|
||||
scheme-full = [ artistic1-cl8 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20
|
||||
scheme-full = [ artistic1-cl8 artistic2 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20
|
||||
cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth
|
||||
lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
|
||||
scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,32 +1,33 @@
|
|||
with import ../../../../.. { };
|
||||
|
||||
with lib; let
|
||||
# NOTE: the fixed naming scheme must match default.nix
|
||||
# name for the URL
|
||||
mkURLName = { pname, tlType, ... }: pname + lib.optionalString (tlType != "run" && tlType != "tlpkg") ".${tlType}";
|
||||
# name + revision for the fixed output hashes
|
||||
mkFixedName = { tlType, revision, extraRevision ? "", ... }@attrs: mkURLName attrs + (lib.optionalString (tlType == "tlpkg") ".tlpkg") + ".r${toString revision}${extraRevision}";
|
||||
|
||||
uniqueByName = fods: catAttrs "fod" (genericClosure {
|
||||
startSet = map (fod: { key = fod.name; inherit fod; }) fods;
|
||||
operator = _: [ ];
|
||||
});
|
||||
isFod = p: p.tlType != "bin" && isDerivation p;
|
||||
|
||||
# ugly hack to extract combine from collection-latexextra, since it is masked by texlive.combine
|
||||
combine = lib.findFirst (p: (lib.head p.pkgs).pname == "combine") { pkgs = []; } (lib.head texlive.collection-latexextra.pkgs).tlDeps;
|
||||
all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs;
|
||||
combine = lib.findFirst (p: (lib.head p.pkgs).pname == "combine") { pkgs = [ ]; } (lib.head texlive.collection-latexextra.pkgs).tlDeps;
|
||||
all = filter (p: p ? pkgs) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ])) ++ [ combine ];
|
||||
sorted = sort (a: b: (head a.pkgs).pname < (head b.pkgs).pname) all;
|
||||
fods = filter isFod (concatMap (p: p.pkgs or [ ]) all);
|
||||
|
||||
# fixed hashes only for run, doc, source, tlpkg types
|
||||
fods = sort (a: b: a.name < b.name) (uniqueByName (filter (p: isDerivation p && p.tlType != "bin") all));
|
||||
|
||||
computeHash = fod: runCommand "${fod.name}-fixed-hash"
|
||||
computeHash = fod: runCommand "${fod.pname}-${fod.tlType}-fixed-hash"
|
||||
{ buildInputs = [ nix ]; inherit fod; }
|
||||
''echo -n "$(nix-hash --base32 --type sha256 "$fod")" >"$out"'';
|
||||
|
||||
hash = fod: fod.outputHash or (builtins.readFile (computeHash fod));
|
||||
hashLine = fod: ''
|
||||
"${mkFixedName fod}"="${hash fod}";
|
||||
'';
|
||||
|
||||
hashes = { pkgs }:
|
||||
concatMapStrings ({ tlType, ... }@p: lib.optionalString (isFod p) (''${tlType}="${hash p}";'')) pkgs;
|
||||
|
||||
hashLine = { pkgs }@pkg:
|
||||
let
|
||||
fods = lib.filter isFod pkgs;
|
||||
first = lib.head fods;
|
||||
# NOTE: the fixed naming scheme must match default.nix
|
||||
fixedName = with first; "${pname}-${toString revision}${first.extraRevision or ""}";
|
||||
in
|
||||
lib.optionalString (fods != [ ]) ''
|
||||
${strings.escapeNixIdentifier fixedName}={${hashes pkg}};
|
||||
'';
|
||||
in
|
||||
{
|
||||
# fixedHashesNix uses 'import from derivation' which does not parallelize well
|
||||
|
|
@ -34,8 +35,8 @@ in
|
|||
newHashes = map computeHash (filter (fod: ! fod ? outputHash) fods);
|
||||
|
||||
fixedHashesNix = writeText "fixed-hashes.nix"
|
||||
''
|
||||
{
|
||||
${lib.concatMapStrings hashLine fods}}
|
||||
'';
|
||||
''
|
||||
{
|
||||
${lib.concatMapStrings hashLine sorted}}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -416,6 +416,7 @@ mapAliases ({
|
|||
dolphinEmu = dolphin-emu; # Added 2021-11-10
|
||||
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
|
||||
dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16
|
||||
dotty = scala_3; # Added 2023-08-20
|
||||
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
|
||||
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
|
||||
|
|
@ -1583,6 +1584,7 @@ mapAliases ({
|
|||
shipyard = jumppad; # Added 2023-06-06
|
||||
sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
|
||||
sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
|
||||
signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17
|
||||
sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24
|
||||
skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22
|
||||
skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -276,6 +276,8 @@ with pkgs;
|
|||
|
||||
astrolog = callPackage ../applications/science/astronomy/astrolog { };
|
||||
|
||||
astronomer = callPackage ../tools/misc/astronomer { };
|
||||
|
||||
atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
|
||||
|
||||
_0x = callPackage ../tools/misc/0x { };
|
||||
|
|
@ -1800,6 +1802,8 @@ with pkgs;
|
|||
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
||||
immich-cli = callPackage ../tools/misc/immich-cli { };
|
||||
|
||||
inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
|
||||
|
||||
jobber = callPackage ../tools/system/jobber { };
|
||||
|
|
@ -8388,6 +8392,8 @@ with pkgs;
|
|||
|
||||
ggobi = callPackage ../tools/graphics/ggobi { };
|
||||
|
||||
ggshield = callPackage ../tools/security/ggshield { };
|
||||
|
||||
ghost = callPackage ../tools/security/ghost { };
|
||||
|
||||
ghostunnel = callPackage ../tools/networking/ghostunnel { };
|
||||
|
|
@ -13015,8 +13021,6 @@ with pkgs;
|
|||
# aka., pgp-tools
|
||||
signing-party = callPackage ../tools/security/signing-party { };
|
||||
|
||||
signumone-ks = callPackage ../applications/misc/signumone-ks { };
|
||||
|
||||
sigtop = callPackage ../tools/backup/sigtop { };
|
||||
|
||||
silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
|
||||
|
|
@ -17278,8 +17282,6 @@ with pkgs;
|
|||
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
|
||||
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; };
|
||||
scala_3 = callPackage ../development/compilers/scala { };
|
||||
# deprecated
|
||||
dotty = scala_3;
|
||||
|
||||
scala = scala_2_13;
|
||||
scala-runners = callPackage ../development/compilers/scala-runners {
|
||||
|
|
@ -19742,6 +19744,8 @@ with pkgs;
|
|||
|
||||
openocd = callPackage ../development/embedded/openocd { };
|
||||
|
||||
openocd-rp2040 = callPackage ../development/embedded/openocd-rp2040 { };
|
||||
|
||||
oprofile = callPackage ../development/tools/profiling/oprofile {
|
||||
libiberty_static = libiberty.override { staticBuild = true; };
|
||||
};
|
||||
|
|
@ -22098,6 +22102,8 @@ with pkgs;
|
|||
|
||||
imtui = callPackage ../development/libraries/imtui { };
|
||||
|
||||
immer = callPackage ../development/libraries/immer { };
|
||||
|
||||
imv = callPackage ../applications/graphics/imv { };
|
||||
|
||||
iml = callPackage ../development/libraries/iml { };
|
||||
|
|
@ -24612,7 +24618,7 @@ with pkgs;
|
|||
qt5 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.15) {
|
||||
inherit (__splicedPackages)
|
||||
makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
|
||||
makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
|
||||
bison cups dconf harfbuzz libGL perl gtk3 python3
|
||||
darwin buildPackages;
|
||||
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
|
||||
|
|
@ -27466,9 +27472,6 @@ with pkgs;
|
|||
};
|
||||
|
||||
xorg = let
|
||||
keep = _self: { };
|
||||
extra = _spliced0: { };
|
||||
|
||||
# Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
|
||||
# so as not to have the newly bound xorg items already in scope, which would
|
||||
# have created a cycle.
|
||||
|
|
@ -27483,11 +27486,10 @@ with pkgs;
|
|||
|
||||
generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { };
|
||||
|
||||
xorgPackages = makeScopeWithSplicing
|
||||
(generateSplicesForMkScope "xorg")
|
||||
keep
|
||||
extra
|
||||
(lib.extends overrides generatedPackages);
|
||||
xorgPackages = makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "xorg";
|
||||
f = lib.extends overrides generatedPackages;
|
||||
};
|
||||
|
||||
in recurseIntoAttrs xorgPackages;
|
||||
|
||||
|
|
@ -32134,6 +32136,8 @@ with pkgs;
|
|||
|
||||
muzika = callPackage ../applications/audio/muzika { };
|
||||
|
||||
openutau = callPackage ../applications/audio/openutau { };
|
||||
|
||||
pattypan = callPackage ../applications/misc/pattypan {
|
||||
jdk = jdk.override { enableJavaFX = true; };
|
||||
};
|
||||
|
|
@ -35741,6 +35745,8 @@ with pkgs;
|
|||
|
||||
tev = callPackage ../applications/graphics/tev { };
|
||||
|
||||
textual-paint = callPackage ../applications/graphics/textual-paint { };
|
||||
|
||||
themechanger = callPackage ../applications/misc/themechanger { };
|
||||
|
||||
thinkingRock = callPackage ../applications/misc/thinking-rock { };
|
||||
|
|
@ -36745,6 +36751,8 @@ with pkgs;
|
|||
|
||||
xscreensaver = callPackage ../misc/screensavers/xscreensaver { };
|
||||
|
||||
xsubfind3r = callPackage ../tools/security/xsubfind3r { };
|
||||
|
||||
xsuspender = callPackage ../applications/misc/xsuspender { };
|
||||
|
||||
xss-lock = callPackage ../misc/screensavers/xss-lock { };
|
||||
|
|
@ -40467,6 +40475,8 @@ with pkgs;
|
|||
|
||||
morph = callPackage ../tools/package-management/morph { };
|
||||
|
||||
mus = callPackage ../applications/audio/mus { };
|
||||
|
||||
muse = libsForQt5.callPackage ../applications/audio/muse { };
|
||||
|
||||
museeks = callPackage ../applications/audio/museeks { };
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPackages, pkgs, targetPackages
|
||||
, generateSplicesForMkScope, makeScopeWithSplicing
|
||||
, generateSplicesForMkScope, makeScopeWithSplicing'
|
||||
, stdenv
|
||||
, preLibcCrossHeaders
|
||||
, config
|
||||
|
|
@ -15,7 +15,10 @@ let
|
|||
(stdenv.targetPlatform.config + "-");
|
||||
in
|
||||
|
||||
makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let
|
||||
makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "darwin";
|
||||
extra = spliced: spliced.apple_sdk.frameworks;
|
||||
f = (self: let
|
||||
inherit (self) mkDerivation callPackage;
|
||||
|
||||
# Must use pkgs.callPackage to avoid infinite recursion.
|
||||
|
|
@ -241,4 +244,5 @@ impure-cmds // appleSourcePackages // chooseLibs // {
|
|||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7321,6 +7321,8 @@ self: super: with self; {
|
|||
|
||||
oca-port = callPackage ../development/python-modules/oca-port { };
|
||||
|
||||
ochre = callPackage ../development/python-modules/ochre { };
|
||||
|
||||
oci = callPackage ../development/python-modules/oci { };
|
||||
|
||||
ocifs = callPackage ../development/python-modules/ocifs { };
|
||||
|
|
@ -9057,6 +9059,8 @@ self: super: with self; {
|
|||
|
||||
pygit2 = callPackage ../development/python-modules/pygit2 { };
|
||||
|
||||
pygitguardian = callPackage ../development/python-modules/pygitguardian { };
|
||||
|
||||
pygithub = callPackage ../development/python-modules/pygithub { };
|
||||
|
||||
pyglet = callPackage ../development/python-modules/pyglet { };
|
||||
|
|
@ -10200,6 +10204,8 @@ self: super: with self; {
|
|||
|
||||
pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { };
|
||||
|
||||
pytest-voluptuous = callPackage ../development/python-modules/pytest-voluptuous { };
|
||||
|
||||
pytest-warnings = callPackage ../development/python-modules/pytest-warnings { };
|
||||
|
||||
pytest-watch = callPackage ../development/python-modules/pytest-watch { };
|
||||
|
|
@ -12248,6 +12254,8 @@ self: super: with self; {
|
|||
|
||||
stopit = callPackage ../development/python-modules/stopit { };
|
||||
|
||||
stransi = callPackage ../development/python-modules/stransi { };
|
||||
|
||||
strategies = callPackage ../development/python-modules/strategies { };
|
||||
|
||||
stravalib = callPackage ../development/python-modules/stravalib { };
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@ in
|
|||
|
||||
# prefill 2 fields of the function for convenience
|
||||
makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
|
||||
makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; };
|
||||
|
||||
# generate 'otherSplices' for 'makeScopeWithSplicing'
|
||||
generateSplicesForMkScope = attr:
|
||||
|
|
|
|||
Loading…
Reference in a new issue