Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
f442a49be3
180 changed files with 2317 additions and 946 deletions
|
|
@ -95,6 +95,27 @@ installPhase() {
|
|||
genericBuild
|
||||
```
|
||||
|
||||
### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell}
|
||||
|
||||
To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use
|
||||
|
||||
```bash
|
||||
nix-shell '<nixpkgs>' -A some_package
|
||||
eval ${unpackPhase:-unpackPhase}
|
||||
cd $sourceRoot
|
||||
eval ${patchPhase:-patchPhase}
|
||||
eval ${configurePhase:-configurePhase}
|
||||
eval ${buildPhase:-buildPhase}
|
||||
```
|
||||
|
||||
To modify a [phase](#sec-stdenv-phases), first print it with
|
||||
|
||||
```bash
|
||||
type buildPhase
|
||||
```
|
||||
|
||||
then change it in a text editor, and paste it back to the terminal.
|
||||
|
||||
## Tools provided by `stdenv` {#sec-tools-of-stdenv}
|
||||
|
||||
The standard environment provides the following packages:
|
||||
|
|
|
|||
|
|
@ -5188,6 +5188,12 @@
|
|||
githubId = 606000;
|
||||
name = "Gabriel Adomnicai";
|
||||
};
|
||||
garaiza-93 = {
|
||||
email = "araizagustavo93@gmail.com";
|
||||
github = "garaiza-93";
|
||||
githubId = 57430880;
|
||||
name = "Gustavo Araiza";
|
||||
};
|
||||
Gabriel439 = {
|
||||
email = "Gabriel439@gmail.com";
|
||||
github = "Gabriella439";
|
||||
|
|
@ -8567,6 +8573,12 @@
|
|||
githubId = 22085373;
|
||||
name = "Luis Hebendanz";
|
||||
};
|
||||
luizirber = {
|
||||
email = "nixpkgs@luizirber.org";
|
||||
github = "luizirber";
|
||||
githubId = 6642;
|
||||
name = "Luiz Irber";
|
||||
};
|
||||
luizribeiro = {
|
||||
email = "nixpkgs@l9o.dev";
|
||||
matrix = "@luizribeiro:matrix.org";
|
||||
|
|
@ -10523,6 +10535,12 @@
|
|||
github = "nikstur";
|
||||
githubId = 61635709;
|
||||
};
|
||||
nintron = {
|
||||
email = "nintron@sent.com";
|
||||
github = "Nintron27";
|
||||
githubId = 47835714;
|
||||
name = "Nintron";
|
||||
};
|
||||
ngerstle = {
|
||||
name = "Nicholas Gerstle";
|
||||
email = "ngerstle@gmail.com";
|
||||
|
|
@ -11305,6 +11323,12 @@
|
|||
githubId = 15645854;
|
||||
name = "Brad Christensen";
|
||||
};
|
||||
paveloom = {
|
||||
email = "paveloom@riseup.net";
|
||||
github = "paveloom";
|
||||
githubId = 49961859;
|
||||
name = "Pavel Sobolev";
|
||||
};
|
||||
payas = {
|
||||
email = "relekarpayas@gmail.com";
|
||||
github = "bhankas";
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ with lib;
|
|||
beam = super.beam_nox;
|
||||
cairo = super.cairo.override { x11Support = false; };
|
||||
dbus = super.dbus.override { x11Support = false; };
|
||||
ffmpeg_4 = super.ffmpeg_4-headless;
|
||||
ffmpeg_5 = super.ffmpeg_5-headless;
|
||||
ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
|
||||
# dep of graphviz, libXpm is optional for Xpm support
|
||||
gd = super.gd.override { withXorg = false; };
|
||||
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ let
|
|||
|
||||
publicKey = mkOption {
|
||||
example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
|
||||
type = types.str;
|
||||
type = types.singleLineStr;
|
||||
description = lib.mdDoc "The base64 public key of the peer.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
peer1 = {
|
||||
privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg=";
|
||||
publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=";
|
||||
# readFile'd keys may have trailing newlines, emulate this
|
||||
publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=\n";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,24 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdkaac";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
|
||||
sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-37781.patch";
|
||||
url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch";
|
||||
sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ fdk_aac ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "GxPlugins.lv2";
|
||||
version = "0.9";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877";
|
||||
sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mmtc";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE=";
|
||||
sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk=";
|
||||
cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "praat";
|
||||
version = "6.3.07";
|
||||
version = "6.3.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hWR6mYD0vBJbX07D/HtFE9qwdbxMliHLCsNDXVYcm1Y=";
|
||||
sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
# the file should be executable but it isn't so our wrapper doesn't run
|
||||
preFixup = ''
|
||||
chmod 555 $out/bin/puddletag
|
||||
wrapQtApp $out/bin/puddletag
|
||||
'';
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ appimageTools.wrapType2 rec {
|
|||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.png \
|
||||
$out/share/icons/hicolor/1024x1024/apps/${pname}.png
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec {
|
|||
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
anyio
|
||||
(toPythonModule chia)
|
||||
pytest # required at runtime by the "test" command
|
||||
pytest-asyncio
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
let chia = python3Packages.buildPythonApplication rec {
|
||||
pname = "chia";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "chia-blockchain";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8=";
|
||||
hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,12 +5,12 @@
|
|||
{
|
||||
ada = buildGrammar {
|
||||
language = "ada";
|
||||
version = "e9e2ec9";
|
||||
version = "42cc2eb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "briot";
|
||||
repo = "tree-sitter-ada";
|
||||
rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121";
|
||||
hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg=";
|
||||
rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba";
|
||||
hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/briot/tree-sitter-ada";
|
||||
};
|
||||
|
|
@ -271,12 +271,12 @@
|
|||
};
|
||||
diff = buildGrammar {
|
||||
language = "diff";
|
||||
version = "1d63cd4";
|
||||
version = "f69bde8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-diff";
|
||||
rev = "1d63cd49529ef3153393cf8f620718b274bba715";
|
||||
hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk=";
|
||||
rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f";
|
||||
hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
|
||||
};
|
||||
|
|
@ -404,12 +404,12 @@
|
|||
};
|
||||
fish = buildGrammar {
|
||||
language = "fish";
|
||||
version = "6675b56";
|
||||
version = "f917690";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ram02z";
|
||||
repo = "tree-sitter-fish";
|
||||
rev = "6675b56266b3f615fb112205b6b83a79315309c4";
|
||||
hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A=";
|
||||
rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9";
|
||||
hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
|
||||
};
|
||||
|
|
@ -426,12 +426,12 @@
|
|||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "bfa6fd4";
|
||||
version = "069bd7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20";
|
||||
hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0=";
|
||||
rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
|
||||
hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
|
|
@ -470,12 +470,12 @@
|
|||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "5d43d78";
|
||||
version = "31ebb7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "5d43d78c276570f76773685f08baf9e4ada09639";
|
||||
hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y=";
|
||||
rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
|
||||
hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
|
|
@ -1046,12 +1046,12 @@
|
|||
};
|
||||
norg = buildGrammar {
|
||||
language = "norg";
|
||||
version = "6348056";
|
||||
version = "1a30509";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "tree-sitter-norg";
|
||||
rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712";
|
||||
hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI=";
|
||||
rev = "1a305093569632de50f9a316ff843dcda25b4ef5";
|
||||
hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
|
||||
};
|
||||
|
|
@ -1258,12 +1258,12 @@
|
|||
};
|
||||
racket = buildGrammar {
|
||||
language = "racket";
|
||||
version = "dc9c334";
|
||||
version = "1a5df02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-racket";
|
||||
rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37";
|
||||
hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
|
||||
rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b";
|
||||
hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
|
||||
};
|
||||
|
|
@ -1525,12 +1525,12 @@
|
|||
};
|
||||
teal = buildGrammar {
|
||||
language = "teal";
|
||||
version = "1ae8c68";
|
||||
version = "2158ecc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "euclidianAce";
|
||||
repo = "tree-sitter-teal";
|
||||
rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2";
|
||||
hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc=";
|
||||
rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2";
|
||||
hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
|
||||
|
|
@ -1549,12 +1549,12 @@
|
|||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "763ae3d";
|
||||
version = "d1f350b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f";
|
||||
hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M=";
|
||||
rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da";
|
||||
hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -700,6 +700,10 @@ self: super: {
|
|||
callPackage ./nvim-treesitter/overrides.nix { } self super
|
||||
);
|
||||
|
||||
nvim-ufo = super.nvim-ufo.overrideAttrs (old: {
|
||||
dependencies = with self; [ promise-async ];
|
||||
});
|
||||
|
||||
octo-nvim = super.octo-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim plenary-nvim ];
|
||||
});
|
||||
|
|
@ -1092,7 +1096,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles=";
|
||||
cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -472,6 +472,7 @@ https://github.com/figsoda/nix-develop.nvim/,HEAD,
|
|||
https://github.com/tamago324/nlsp-settings.nvim/,main,
|
||||
https://github.com/tjdevries/nlua.nvim/,,
|
||||
https://github.com/mcchrish/nnn.vim/,,
|
||||
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
|
||||
https://github.com/folke/noice.nvim/,HEAD,
|
||||
https://github.com/arcticicestudio/nord-vim/,,
|
||||
https://github.com/shaunsingh/nord.nvim/,,
|
||||
|
|
@ -551,6 +552,7 @@ https://github.com/windwp/nvim-ts-autotag/,,
|
|||
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
|
||||
https://github.com/mrjones2014/nvim-ts-rainbow/,,
|
||||
https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD,
|
||||
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
|
||||
https://github.com/kyazdani42/nvim-web-devicons/,,
|
||||
https://github.com/AckslD/nvim-whichkey-setup.lua/,,
|
||||
https://github.com/roxma/nvim-yarp/,,
|
||||
|
|
@ -590,6 +592,7 @@ https://github.com/andweeb/presence.nvim/,,
|
|||
https://github.com/sotte/presenting.vim/,,
|
||||
https://github.com/vim-scripts/prev_indent/,,
|
||||
https://github.com/ahmedkhalf/project.nvim/,,
|
||||
https://github.com/kevinhwang91/promise-async/,HEAD,
|
||||
https://github.com/frigoeu/psc-ide-vim/,,
|
||||
https://github.com/purescript-contrib/purescript-vim/,,
|
||||
https://github.com/python-mode/python-mode/,,
|
||||
|
|
@ -716,6 +719,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD,
|
|||
https://github.com/ron89/thesaurus_query.vim/,,
|
||||
https://github.com/itchyny/thumbnail.vim/,,
|
||||
https://github.com/vim-scripts/timestamp.vim/,,
|
||||
https://github.com/levouh/tint.nvim/,HEAD,
|
||||
https://github.com/tomtom/tlib_vim/,,
|
||||
https://github.com/wellle/tmux-complete.vim/,,
|
||||
https://github.com/edkolev/tmuxline.vim/,,
|
||||
|
|
|
|||
|
|
@ -734,6 +734,7 @@ in
|
|||
|
||||
picodrive = mkLibretroCore {
|
||||
core = "picodrive";
|
||||
version = "unstable-2023-02-15";
|
||||
dontConfigure = true;
|
||||
makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -352,8 +352,8 @@
|
|||
"picodrive": {
|
||||
"owner": "libretro",
|
||||
"repo": "picodrive",
|
||||
"rev": "62873cab5366999207c197e9f55987daee10be4a",
|
||||
"sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=",
|
||||
"rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043",
|
||||
"sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"play": {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
openssl
|
||||
slang
|
||||
zip
|
||||
] ++ lib.optional x11Support [ libX11 ]
|
||||
] ++ lib.optionals x11Support [ libX11 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "8.5.0";
|
||||
version = "8.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
||||
sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0=";
|
||||
sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE=";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${version}/saga-gis";
|
||||
|
|
|
|||
104
pkgs/applications/graphics/structorizer/default.nix
Executable file
104
pkgs/applications/graphics/structorizer/default.nix
Executable file
|
|
@ -0,0 +1,104 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, jdk11
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "structorizer";
|
||||
version = "3.32-11";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
type = "Application";
|
||||
name = "Structorizer";
|
||||
desktopName = "Structorizer";
|
||||
genericName = "Diagram creator";
|
||||
comment = meta.description;
|
||||
icon = pname;
|
||||
exec = pname;
|
||||
terminal = false;
|
||||
mimeTypes = [ "application/nsd" ];
|
||||
categories = [
|
||||
"Development"
|
||||
"Graphics"
|
||||
"VectorGraphics"
|
||||
"RasterGraphics"
|
||||
"ComputerScience"
|
||||
];
|
||||
keywords = [ "nsd" "diagrams" ];
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fesch";
|
||||
repo = "Structorizer.Desktop";
|
||||
rev = version;
|
||||
hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk=";
|
||||
};
|
||||
|
||||
patches = [ ./makeStructorizer.patch ./makeBigJar.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ];
|
||||
|
||||
buildInputs = [ jdk11 ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x makeStructorizer
|
||||
chmod +x makeBigJar
|
||||
|
||||
patchShebangs --build makeStructorizer
|
||||
patchShebangs --build makeBigJar
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./makeStructorizer
|
||||
./makeBigJar
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d $out/bin $out/share/mime/packages
|
||||
|
||||
install -D ${pname}.jar -t $out/share/java/
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/${pname} \
|
||||
--add-flags "-jar $out/share/java/${pname}.jar"
|
||||
|
||||
cat << EOF > $out/share/mime/packages/structorizer.xml
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/nsd">
|
||||
<comment xml:lang="en">Nassi-Shneiderman diagram</comment>
|
||||
<comment xml:lang="de">Nassi-Shneiderman-Diagramm</comment>
|
||||
<glob pattern="*.nsd"/>
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
EOF
|
||||
|
||||
cd src/lu/fisch/${pname}/gui
|
||||
install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png
|
||||
for icon_width in 24 32 48 64 128 256; do
|
||||
install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create Nassi-Shneiderman diagrams (NSD)";
|
||||
homepage = "https://structorizer.fisch.lu";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ annaaurora ];
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/graphics/structorizer/makeBigJar.patch
Normal file
31
pkgs/applications/graphics/structorizer/makeBigJar.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
Reason: Running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.class, only the jar.
|
||||
|
||||
diff --git a/makeBigJar b/makeBigJar
|
||||
index 25547020..c34d0d9c 100644
|
||||
--- a/makeBigJar
|
||||
+++ b/makeBigJar
|
||||
@@ -75,9 +75,8 @@ jars="bsh-2.1.0 \
|
||||
freehep-xml-2.1.1 \
|
||||
freehep"
|
||||
|
||||
-# Apple specific stuff is only used if it exists and the compiled class is available
|
||||
-if test -f ../bin/lu/fisch/structorizer/application/AppleStructorizerApplication.class -a \
|
||||
- -f AppleJavaExtensions.jar; then
|
||||
+# Apple specific stuff is only used if the jar is available
|
||||
+if test -f lib/AppleJavaExtensions.jar; then
|
||||
jars="$jars AppleJavaExtensions"
|
||||
fi
|
||||
|
||||
@@ -114,12 +113,3 @@ echo "Done"
|
||||
# remove the jar-directory
|
||||
rm -R jar/
|
||||
|
||||
-if test -n "$start_compiled"; then
|
||||
- # execute the archive
|
||||
- echo; echo "Running Structorizer from all-in-one jar"
|
||||
- if test "$start_compiled" = "s"; then
|
||||
- java -jar structorizer.jar
|
||||
- else
|
||||
- java -jar structorizer.jar &
|
||||
- fi
|
||||
-fi # start block end
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
Reason: There is no StructorizerApplet.java anywhere in the source, no .cgt files and running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.java, only the jar.
|
||||
|
||||
diff --git a/makeStructorizer b/makeStructorizer
|
||||
index 99a5e8d3..e954be13 100644
|
||||
--- a/makeStructorizer
|
||||
+++ b/makeStructorizer
|
||||
@@ -117,18 +117,6 @@ echo "Done"
|
||||
echo; echo "Compiling Structorizer..."
|
||||
javac $str_javac_opts -classpath "$str_classpath" Structorizer.java
|
||||
echo "Done"
|
||||
-echo; echo "Compiling Structorizer Applet..."
|
||||
-javac $str_javac_opts -classpath "$str_classpath" StructorizerApplet.java
|
||||
-echo "Done"
|
||||
-
|
||||
-# OS specific classes
|
||||
-if test -n "$do_apple"; then
|
||||
- echo; echo "Compiling Apple specific code..."
|
||||
- javac $str_javac_opts -classpath "$str_classpath" lu/fisch/structorizer/application/AppleStructorizerApplication.java
|
||||
- echo "Done"
|
||||
-else
|
||||
- echo; echo "Apple specific code skipped"
|
||||
-fi
|
||||
|
||||
# copying some other files to binary tree
|
||||
echo; echo "Copying resources..."
|
||||
@@ -147,7 +135,6 @@ cp lu/fisch/structorizer/gui/*.txt ../bin/lu/fisch/structorizer/gui/
|
||||
cp lu/fisch/structorizer/gui/*.xml ../bin/lu/fisch/structorizer/gui/
|
||||
cp lu/fisch/structorizer/locales/*.txt ../bin/lu/fisch/structorizer/locales/
|
||||
cp lu/fisch/structorizer/generators/*.txt ../bin/lu/fisch/structorizer/generators/
|
||||
-cp lu/fisch/structorizer/parsers/*.cgt ../bin/lu/fisch/structorizer/parsers/
|
||||
cp lu/fisch/structorizer/parsers/*.egt ../bin/lu/fisch/structorizer/parsers/
|
||||
cp lu/fisch/structorizer/parsers/*.grm ../bin/lu/fisch/structorizer/parsers/
|
||||
cp lu/fisch/structorizer/parsers/*.xsd ../bin/lu/fisch/structorizer/parsers/
|
||||
@@ -155,20 +142,5 @@ cp lu/fisch/structorizer/parsers/*.nsd ../bin/lu/fisch/structorizer/parsers/
|
||||
cp lu/fisch/structorizer/*.properties ../bin/lu/fisch/structorizer/
|
||||
echo "Done"
|
||||
|
||||
-if test -n "$start_compiled"; then
|
||||
-
|
||||
- # changing into binary directory
|
||||
- cd ../bin/
|
||||
-
|
||||
- # run the application
|
||||
- echo; echo "Running Structorizer from compiled class files"
|
||||
- if test "$start_compiled" = "s"; then
|
||||
- java -cp $str_classpath Structorizer
|
||||
- else
|
||||
- java -cp $str_classpath Structorizer &
|
||||
- fi
|
||||
-
|
||||
-fi # start block end
|
||||
-
|
||||
# move back into the folder where we started
|
||||
popd >/dev/null
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "holochain-launcher";
|
||||
version = "0.6.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
|
||||
sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E=";
|
||||
sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
hash = "sha256-+nBLmbu1aRnfWYNhTBUJdRmdlud8FK7LZFvDNFDrhiI=";
|
||||
hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, Libsystem
|
||||
, SystemConfiguration
|
||||
, installShellFiles
|
||||
, libiconv
|
||||
|
|
@ -9,20 +10,25 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pueue";
|
||||
version = "2.1.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = "pueue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag=";
|
||||
hash = "sha256-vJJ3qQb38b0vr7o+7rc3z5wftI6Ko4mJiGLvVzyjTeE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk=";
|
||||
cargoHash = "sha256-3taLua69kqPnNraIZIesMkFguCbPWTF5Hu9s2Lc02ZA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Libsystem
|
||||
SystemConfiguration
|
||||
libiconv
|
||||
];
|
||||
|
|
|
|||
26
pkgs/applications/misc/tuckr/default.nix
Normal file
26
pkgs/applications/misc/tuckr/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuckr";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaphGL";
|
||||
repo = "Tuckr";
|
||||
rev = version;
|
||||
sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0=";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./update-cargo-lock.diff ];
|
||||
|
||||
cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM=";
|
||||
|
||||
doCheck = false; # test result: FAILED. 5 passed; 3 failed;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A super powered replacement for GNU Stow";
|
||||
homepage = "https://github.com/RaphGL/Tuckr";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mimame ];
|
||||
};
|
||||
}
|
||||
49
pkgs/applications/misc/tuckr/update-cargo-lock.diff
Normal file
49
pkgs/applications/misc/tuckr/update-cargo-lock.diff
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
diff --git i/Cargo.lock w/Cargo.lock
|
||||
index 5f5dd43..d7c8370 100644
|
||||
--- i/Cargo.lock
|
||||
+++ w/Cargo.lock
|
||||
@@ -107,9 +107,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
-version = "4.1.4"
|
||||
+version = "4.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
|
||||
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
-version = "0.3.0"
|
||||
+version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01"
|
||||
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
|
||||
[[package]]
|
||||
name = "inout"
|
||||
@@ -319,9 +319,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
-version = "1.17.0"
|
||||
+version = "1.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
|
||||
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
|
||||
[[package]]
|
||||
name = "opaque-debug"
|
||||
@@ -597,7 +597,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tuckr"
|
||||
-version = "0.6.1"
|
||||
+version = "0.7.0"
|
||||
dependencies = [
|
||||
"chacha20poly1305",
|
||||
"clap",
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waylock";
|
||||
version = "0.6.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w=";
|
||||
hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "110.0.5481.77",
|
||||
"sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
|
||||
"sha256bin64": "0jjdgfps6siy9hk2r553vvh0jmkn987ad77sv2zqs9gvx0vsrwgp",
|
||||
"version": "110.0.5481.100",
|
||||
"sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
|
||||
"sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "110.0.5481.30",
|
||||
"sha256_linux": "08j28ahyahlgmy67hcm8b1vd4kilvf2yvc25746a46gdf8zz0nmw",
|
||||
"sha256_darwin": "0xlq0fi9g15yvd6ysqcfkxpbr37av32h0f3af9vxl8vbywjfsxn4",
|
||||
"sha256_darwin_aarch64": "03j47ha9janbawbjxy9n84sx70iisk6qr0bvb218cq5j1d5x058b"
|
||||
"version": "110.0.5481.77",
|
||||
"sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20",
|
||||
"sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00",
|
||||
"sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "110.0.5481.78",
|
||||
"sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj",
|
||||
"sha256bin64": null,
|
||||
"version": "110.0.5481.100",
|
||||
"sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
|
||||
"sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "110.0.5481.78-1",
|
||||
"sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c"
|
||||
"rev": "110.0.5481.100-1",
|
||||
"sha256": "02bmlx2wk9jiqm4az7g8r5ycmpgm5pkb7nivpx2jbmrb0g3qcx9q"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "109.0.1-2",
|
||||
"packageVersion": "110.0-1",
|
||||
"source": {
|
||||
"rev": "109.0.1-2",
|
||||
"sha256": "1b5572i7aqad0pmjw88d3mhmhhhacp505z0d9l4l89r7gadssbwb"
|
||||
"rev": "110.0-1",
|
||||
"sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "109.0.1",
|
||||
"sha512": "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"
|
||||
"version": "110.0",
|
||||
"sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "roxctl";
|
||||
version = "3.73.1";
|
||||
version = "3.73.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "stackrox";
|
||||
rev = version;
|
||||
sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs=";
|
||||
sha256 = "sha256-5MMSQy7SUFZhUycv1Kfkz46aY2tMldNZOH63wlQjq6o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg=";
|
||||
hash = "sha256-bgwSkI5XxtPhm4XrDPUhOErHawkLf34tFsw5SkQrm74=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0=";
|
||||
vendorHash = "sha256-hkfzn9wOc7W0CIs72Cn3qZ5iFrDAffSFa4BnRt6fsF8=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -639,20 +639,20 @@
|
|||
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
|
||||
},
|
||||
"kubernetes": {
|
||||
"hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=",
|
||||
"hash": "sha256-UqMPeyMTXTnVknFqhCSm/wG8IYLW63n/wSvc5/ofjW0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.17.0",
|
||||
"rev": "v2.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=",
|
||||
"hash": "sha256-41lGYGf2t9q5tLHZbL2IksmYAy4Dw3nBZuiSOuG9/r8=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.9.4",
|
||||
"rev": "v2.9.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk="
|
||||
},
|
||||
|
|
@ -811,11 +811,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-mzAfqJcAZEFGmptjaXAtbmcrtVyufd2LLTe8TmFHtQc=",
|
||||
"hash": "sha256-PjtsFrUwLsSLXog/n6JkFLFPZm7FPa/n8N5IJ0vkuuE=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.107.0",
|
||||
"rev": "v4.108.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -883,11 +883,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"pagerduty": {
|
||||
"hash": "sha256-oD8YytttqaZwYk8/c5t7TvFpxw3QViZpkHiOpuMxaFI=",
|
||||
"hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v2.10.2",
|
||||
"rev": "v2.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -1045,13 +1045,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-5irTp8teFShAd0FV2fIKf4dE9WokmxK3rREEozinQZM=",
|
||||
"hash": "sha256-u+wOQwLejlS8Bap8M92wu1jdc0NAemnJsUjNIacGX+A=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.99.0",
|
||||
"rev": "v1.100.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yuGUEy9us2BL2v06tL3XDcpCujQk8H2DUzQiJQQNsvo="
|
||||
"vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
|
|
@ -1090,11 +1090,11 @@
|
|||
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-NglAzuZr3OqLHunMbmLm7Cnh24otQXRP1y3ZaDFrXAc=",
|
||||
"hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.79.9",
|
||||
"rev": "v1.79.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -12,18 +12,18 @@
|
|||
}:
|
||||
|
||||
let
|
||||
generic = { version, sha256, vendorSha256 ? null, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ];
|
||||
generic = { version, hash, vendorHash ? null, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "version" "hash" "vendorHash" ];
|
||||
in
|
||||
buildGoModule ({
|
||||
pname = "terraform";
|
||||
inherit version vendorSha256;
|
||||
inherit version vendorHash;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
|
@ -168,9 +168,9 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.3.8";
|
||||
sha256 = "sha256-AXLk5s3qu3QZ1aXx/FwPNq3hM26skBj0wyn/x8nVMkE=";
|
||||
vendorSha256 = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY=";
|
||||
version = "1.3.9";
|
||||
hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4=";
|
||||
vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "senpai";
|
||||
version = "unstable-2023-01-03";
|
||||
version = "unstable-2023-02-13";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~taiite";
|
||||
repo = "senpai";
|
||||
rev = "5414edb01f30ad9480e211030db1bcd858e5f741";
|
||||
sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA=";
|
||||
rev = "1318e784bd2bba3765aee97811a3f0053d3a6723";
|
||||
sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg=";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dht";
|
||||
version = "0.25";
|
||||
version = "0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# Use transmission fork from post-0.25-transmission branch
|
||||
# Use transmission fork from post-0.27-transmission branch
|
||||
owner = "transmission";
|
||||
repo = pname;
|
||||
rev = "25e12bb39eea3d433602de6390796fec8a8f3620";
|
||||
sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s=";
|
||||
rev = "015585510e402a057ec17142711ba2b568b5fd62";
|
||||
sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "super-productivity";
|
||||
version = "7.12.1";
|
||||
version = "7.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
|
||||
sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y=";
|
||||
sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-01-31";
|
||||
version = "unstable-2023-02-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "44206849d03c8983e41d2aeca70a06e04365d88d";
|
||||
sha256 = "bUyM0zWVO7HWBiWi0mhkDlVxgqMHoFiR78XpiG8q/V4=";
|
||||
rev = "16d449a3bf2805c1fc683fdc183e0e8390074252";
|
||||
sha256 = "jm6bLu+6G3VMSyB56B5qATqFZ3sXjm8s66Gx2oZyvFA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
, libXdmcp
|
||||
, lndir
|
||||
, unixODBC
|
||||
, fetchpatch
|
||||
|
||||
, util-linux
|
||||
, libselinux
|
||||
|
|
@ -34,6 +35,7 @@
|
|||
, at-spi2-core
|
||||
, libXtst
|
||||
, pcre2
|
||||
, libdeflate
|
||||
|
||||
, swig4
|
||||
, python
|
||||
|
|
@ -50,7 +52,6 @@
|
|||
, withNgspice
|
||||
, withScripting
|
||||
, withI18n
|
||||
, withPCM
|
||||
, debug
|
||||
, sanitizeAddress
|
||||
, sanitizeThreads
|
||||
|
|
@ -71,6 +72,19 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# upstream issue 12941 (attempted to upstream, but appreciably unacceptable)
|
||||
./writable.patch
|
||||
]
|
||||
++ optionals (stable) # the 2 wxGTK ones should in the next stable point release
|
||||
[
|
||||
(fetchpatch { # for wxGTK 3.2.2.1's .1 field
|
||||
name = "support wxWidgets subrelease field";
|
||||
url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff";
|
||||
hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54=";
|
||||
})
|
||||
(fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython
|
||||
name = "relax wxPython check to just major.minor";
|
||||
url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff";
|
||||
hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU=";
|
||||
})
|
||||
];
|
||||
|
||||
# tagged releases don't have "unknown"
|
||||
|
|
@ -87,6 +101,7 @@ stdenv.mkDerivation rec {
|
|||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DKICAD_USE_EGL=ON"
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491
|
||||
]
|
||||
++ optionals (withScripting) [
|
||||
"-DKICAD_SCRIPTING_WXPYTHON=ON"
|
||||
|
|
@ -116,12 +131,6 @@ stdenv.mkDerivation rec {
|
|||
]
|
||||
++ optionals (withI18n) [
|
||||
"-DKICAD_BUILD_I18N=ON"
|
||||
]
|
||||
++ optionals (!withPCM && stable) [
|
||||
"-DKICAD_PCM=OFF"
|
||||
]
|
||||
++ optionals (!stable) [ # upstream issue 12491
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -166,8 +175,9 @@ stdenv.mkDerivation rec {
|
|||
boost
|
||||
swig4
|
||||
python
|
||||
unixODBC
|
||||
libdeflate
|
||||
]
|
||||
++ optional (!stable) unixODBC
|
||||
++ optional (withScripting) wxPython
|
||||
++ optional (withNgspice) libngspice
|
||||
++ optional (withOCC) opencascade-occt
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
, sanitizeThreads ? false
|
||||
, with3d ? true
|
||||
, withI18n ? true
|
||||
, withPCM ? true # Plugin and Content Manager
|
||||
, srcs ? { }
|
||||
}:
|
||||
|
||||
|
|
@ -118,7 +117,7 @@ stdenv.mkDerivation rec {
|
|||
inherit stable baseName;
|
||||
inherit kicadSrc kicadVersion;
|
||||
inherit wxGTK python wxPython;
|
||||
inherit withOCC withNgspice withScripting withI18n withPCM;
|
||||
inherit withOCC withNgspice withScripting withI18n;
|
||||
inherit debug sanitizeAddress sanitizeThreads;
|
||||
};
|
||||
|
||||
|
|
@ -150,15 +149,15 @@ stdenv.mkDerivation rec {
|
|||
"--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
|
||||
# required to open a bug report link in firefox-wayland
|
||||
"--set-default MOZ_DBUS_REMOTE 1"
|
||||
"--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints"
|
||||
"--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols"
|
||||
"--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template"
|
||||
"--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template"
|
||||
"--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template"
|
||||
"--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints"
|
||||
"--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols"
|
||||
"--set-default KICAD7_TEMPLATE_DIR ${templates}/share/kicad/template"
|
||||
"--prefix KICAD7_TEMPLATE_DIR : ${symbols}/share/kicad/template"
|
||||
"--prefix KICAD7_TEMPLATE_DIR : ${footprints}/share/kicad/template"
|
||||
]
|
||||
++ optionals (with3d)
|
||||
[
|
||||
"--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels"
|
||||
"--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels"
|
||||
]
|
||||
++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]
|
||||
|
||||
|
|
@ -172,7 +171,7 @@ stdenv.mkDerivation rec {
|
|||
let
|
||||
bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin";
|
||||
tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];
|
||||
utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ];
|
||||
utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ];
|
||||
in
|
||||
(concatStringsSep "\n"
|
||||
(flatten [
|
||||
|
|
|
|||
|
|
@ -3,45 +3,45 @@
|
|||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "6.0.11";
|
||||
version = "7.0.0";
|
||||
src = {
|
||||
rev = "2627ca5db025d40933329af642df28c4a2193dbf";
|
||||
sha256 = "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq";
|
||||
rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216";
|
||||
sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "6.0.11";
|
||||
version = "7.0.0";
|
||||
libSources = {
|
||||
symbols.rev = "c2277d1e39c5e9ba5e04ca5ef3eb252a74291375";
|
||||
symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp";
|
||||
templates.rev = "049baf307d2fdf5e6138ebab40a8be720b4ae62e";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "72fb90dda096bd59295ccc2c8c0881ee02a1221c";
|
||||
footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h";
|
||||
packages3d.rev = "3fc9daed3ca80a1b6f3bbb1ef505f0dc79972d44";
|
||||
packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz";
|
||||
symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f";
|
||||
symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm";
|
||||
templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200";
|
||||
templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv";
|
||||
footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c";
|
||||
footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry";
|
||||
packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037";
|
||||
packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n";
|
||||
};
|
||||
};
|
||||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2022-12-19";
|
||||
version = "2023-02-14";
|
||||
src = {
|
||||
rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692";
|
||||
sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0";
|
||||
rev = "29c4482bc898f627cebcd5f64e063e8a813a5445";
|
||||
sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2022-12-19";
|
||||
version = "2023-02-14";
|
||||
libSources = {
|
||||
symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e";
|
||||
symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb";
|
||||
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6";
|
||||
footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h";
|
||||
packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267";
|
||||
packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp";
|
||||
symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a";
|
||||
symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn";
|
||||
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a";
|
||||
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
|
||||
footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf";
|
||||
footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk";
|
||||
packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e";
|
||||
packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.8.1",
|
||||
"repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=",
|
||||
"version": "15.8.3",
|
||||
"repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=",
|
||||
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.8.1-ee",
|
||||
"rev": "v15.8.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.8.1",
|
||||
"GITLAB_PAGES_VERSION": "15.8.1",
|
||||
"GITALY_SERVER_VERSION": "15.8.3",
|
||||
"GITLAB_PAGES_VERSION": "15.8.3",
|
||||
"GITLAB_SHELL_VERSION": "14.15.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.8.1";
|
||||
version = "15.8.3";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE=";
|
||||
sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.8.1";
|
||||
version = "15.8.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitmux";
|
||||
version = "0.7.10";
|
||||
version = "0.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0=";
|
||||
sha256 = "sha256-JPrXq4+53cem0TVnm1/AJz/mYcEKaYzqhptJU4V2U0o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig=";
|
||||
vendorHash = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig=";
|
||||
|
||||
# GitHub source does contain a regression test for the module
|
||||
# but it requires networking as it git clones a repo from github
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "srvc";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilica";
|
||||
repo = "rs-srvc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g=";
|
||||
sha256 = "sha256-gid3zPN9fdUqqNnRKvhEfzO4rJqZ3lWwmlP6SWEUyAY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto=";
|
||||
cargoHash = "sha256-UWKD2qXyxGepFK90QkyhyR7PJrK1wUiwQZjApoz9tqU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mpc-qt";
|
||||
version = "22.02";
|
||||
version = "23.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpc-qt";
|
||||
repo = "mpc-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DRbNDrWnaTT4A0dRFAv9MX/MDwV/rXIw+R8fQJmVN+g=";
|
||||
sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake qttools ];
|
||||
|
|
|
|||
96
pkgs/applications/video/subtitleedit/default.nix
Normal file
96
pkgs/applications/video/subtitleedit/default.nix
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, fetchzip
|
||||
, ffmpeg
|
||||
, gtk2
|
||||
, hunspell
|
||||
, icoutils
|
||||
, mono
|
||||
, mpv
|
||||
, tesseract4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subtitleedit";
|
||||
version = "3.6.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
|
||||
sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
preUnpack = ''
|
||||
rm -rf source
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
icoutils
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [
|
||||
gtk2
|
||||
hunspell
|
||||
mpv
|
||||
tesseract4
|
||||
];
|
||||
|
||||
runtimeBins = lib.makeBinPath [
|
||||
ffmpeg
|
||||
hunspell
|
||||
tesseract4
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
|
||||
|
||||
cp -r * $out/bin/
|
||||
ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so
|
||||
makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \
|
||||
--add-flags "$out/bin/SubtitleEdit.exe" \
|
||||
--prefix LD_LIBRARY_PATH : ${runtimeLibs} \
|
||||
--prefix PATH : ${runtimeBins}
|
||||
|
||||
wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico
|
||||
icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico
|
||||
icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico
|
||||
icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico
|
||||
icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = "Subtitle Edit";
|
||||
exec = "subtitleedit";
|
||||
icon = "subtitleedit";
|
||||
comment = meta.description;
|
||||
categories = [ "Video" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A subtitle editor";
|
||||
homepage = "https://nikse.dk/subtitleedit/";
|
||||
license = licenses.gpl3Plus;
|
||||
longDescription = ''
|
||||
With Subtitle Edit you can easily adjust a subtitle if it is out of sync with
|
||||
the video in several different ways. You can also use it for making
|
||||
new subtitles from scratch (using the time-line /waveform/spectrogram)
|
||||
or for translating subtitles.
|
||||
'';
|
||||
maintainers = with maintainers; [ paveloom ];
|
||||
platforms = platforms.all;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.17";
|
||||
version = "1.6.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5Kpqgn4g08i8UVw9mfK5gc2wSx4wTk6NIzbT7tzY+ho=";
|
||||
hash = "sha256-ApQKdd+S02YFNDVrrSKVHZmR1ZQwcU1KoQRfhOP9VHQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -137,6 +137,18 @@ let
|
|||
fi
|
||||
done
|
||||
|
||||
declare -a x11_args
|
||||
# Always mount a tmpfs on /tmp/.X11-unix
|
||||
# Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277
|
||||
x11_args+=(--tmpfs /tmp/.X11-unix)
|
||||
|
||||
# Try to guess X socket path. This doesn't cover _everything_, but it covers some things.
|
||||
if [[ "$DISPLAY" == :* ]]; then
|
||||
display_nr=''${DISPLAY#?}
|
||||
local_socket=/tmp/.X11-unix/X$display_nr
|
||||
x11_args+=(--ro-bind-try "$local_socket" "$local_socket")
|
||||
fi
|
||||
|
||||
cmd=(
|
||||
${bubblewrap}/bin/bwrap
|
||||
--dev-bind /dev /dev
|
||||
|
|
@ -171,6 +183,7 @@ let
|
|||
"''${ro_mounts[@]}"
|
||||
"''${symlinks[@]}"
|
||||
"''${auto_mounts[@]}"
|
||||
"''${x11_args[@]}"
|
||||
${concatStringsSep "\n " extraBwrapArgs}
|
||||
${init runScript}/bin/${name}-init ${initArgs}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,10 +30,17 @@ rec {
|
|||
else lib.optional platform.isUnix "unix"
|
||||
++ lib.optional platform.isWindows "windows";
|
||||
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor
|
||||
toTargetVendor = platform: let
|
||||
inherit (platform.parsed) vendor;
|
||||
in platform.rustc.platform.vendor or {
|
||||
"w64" = "pc";
|
||||
}.${vendor.name} or vendor.name;
|
||||
|
||||
# Returns the name of the rust target, even if it is custom. Adjustments are
|
||||
# because rust has slightly different naming conventions than we do.
|
||||
toRustTarget = platform: let
|
||||
inherit (platform.parsed) cpu vendor kernel abi;
|
||||
inherit (platform.parsed) cpu kernel abi;
|
||||
cpu_ = platform.rustc.platform.arch or {
|
||||
"armv7a" = "armv7";
|
||||
"armv7l" = "armv7";
|
||||
|
|
@ -41,9 +48,7 @@ rec {
|
|||
"armv5tel" = "armv5te";
|
||||
"riscv64" = "riscv64gc";
|
||||
}.${cpu.name} or cpu.name;
|
||||
vendor_ = platform.rustc.platform.vendor or {
|
||||
"w64" = "pc";
|
||||
}.${vendor.name} or vendor.name;
|
||||
vendor_ = toTargetVendor platform;
|
||||
in platform.rustc.config
|
||||
or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
|
||||
|
||||
|
|
|
|||
|
|
@ -35,10 +35,12 @@ rec {
|
|||
mkdir -p $out/lib
|
||||
|
||||
# Copy what we need from Glibc.
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/ld-linux*.so.? $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libc.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libm.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* $out/lib
|
||||
cp -p \
|
||||
${pkgs.stdenv.cc.libc}/lib/ld-*.so.? \
|
||||
${pkgs.stdenv.cc.libc}/lib/libc.so.* \
|
||||
${pkgs.stdenv.cc.libc}/lib/libm.so.* \
|
||||
${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \
|
||||
$out/lib
|
||||
|
||||
# Copy BusyBox.
|
||||
cp -pd ${pkgs.busybox}/bin/* $out/bin
|
||||
|
|
@ -49,7 +51,7 @@ rec {
|
|||
for i in $out/bin/*; do
|
||||
if [ -f "$i" -a ! -L "$i" ]; then
|
||||
echo "patching $i..."
|
||||
patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
|
||||
patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true
|
||||
fi
|
||||
done
|
||||
''; # */
|
||||
|
|
|
|||
32
pkgs/data/icons/volantes-cursors/default.nix
Normal file
32
pkgs/data/icons/volantes-cursors/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, inkscape
|
||||
, xcursorgen
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "volantes-cursors";
|
||||
version = "2022-08-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "varlesh";
|
||||
repo = "volantes-cursors";
|
||||
rev = "b13a4bbf6bd1d7e85fadf7f2ecc44acc198f8d01";
|
||||
hash = "sha256-vJe1S+YHrUBwJSwt2+InTu5ho2FOtz7FjDxu0BIA1Js=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ inkscape xcursorgen ];
|
||||
|
||||
makeTargets = [ "build" ];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pling.com/p/1356095/";
|
||||
description = "Classic cursor theme with a flying style";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jordanisaacs ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
38
pkgs/data/themes/tokyo-night-gtk/default.nix
Normal file
38
pkgs/data/themes/tokyo-night-gtk/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gtk-engine-murrine
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "tokyo-night-gtk";
|
||||
version = "2023.01.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyo-Night-GTK-Theme";
|
||||
rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb";
|
||||
sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a themes/* $out/share/themes
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme based on the Tokyo Night colour palette.";
|
||||
homepage = "www.pling.com/p/1681315/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ garaiza-93 ];
|
||||
};
|
||||
}
|
||||
79
pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
Normal file
79
pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, qtmultimedia
|
||||
, qtwebengine
|
||||
, libvlc
|
||||
, gst_all_1
|
||||
, gtest
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-voice-note";
|
||||
version = "5.10.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZDw/kGmhcoTPDUsZa9CYhrVbK4Uo75G0L4q4cCBPr7E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/common/audiowatcher.cpp \
|
||||
--replace "/usr/share" "$out/share"
|
||||
substituteInPlace assets/deepin-voice-note.desktop \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
qtmultimedia
|
||||
qtwebengine
|
||||
libvlc
|
||||
gtest
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0";
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple memo software with texts and voice recordings";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-voice-note";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -39,11 +39,13 @@ let
|
|||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
|
||||
#### Go Packages
|
||||
go-lib = callPackage ./go-package/go-lib { inherit replaceAll; };
|
||||
go-gir-generator = callPackage ./go-package/go-gir-generator { };
|
||||
go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
|
||||
dde-api = callPackage ./go-package/dde-api { inherit replaceAll; };
|
||||
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
|
||||
|
||||
#### TOOLS
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
From c8f597bd7286a76e7ce371e4f7982d9d2700868a Mon Sep 17 00:00:00 2001
|
||||
From: rewine <luhongxu@deepin.org>
|
||||
Date: Wed, 28 Dec 2022 23:06:53 +0800
|
||||
Subject: [PATCH] fix PATH for NixOS
|
||||
|
||||
---
|
||||
device/main.go | 2 +-
|
||||
locale-helper/main.go | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/device/main.go b/device/main.go
|
||||
index 6c5404c..f79bcfc 100644
|
||||
--- a/device/main.go
|
||||
+++ b/device/main.go
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
var logger = log.NewLogger(dbusServiceName)
|
||||
|
||||
func main() {
|
||||
- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
|
||||
+ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
|
||||
service, err := dbusutil.NewSystemService()
|
||||
if err != nil {
|
||||
logger.Fatal("failed to new system service:", err)
|
||||
diff --git a/locale-helper/main.go b/locale-helper/main.go
|
||||
index 0866e48..ef000b5 100644
|
||||
--- a/locale-helper/main.go
|
||||
+++ b/locale-helper/main.go
|
||||
@@ -45,7 +45,7 @@ var (
|
||||
)
|
||||
|
||||
func main() {
|
||||
- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
|
||||
+ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
|
||||
logger.BeginTracing()
|
||||
defer logger.EndTracing()
|
||||
|
||||
--
|
||||
2.38.1
|
||||
|
||||
109
pkgs/desktops/deepin/go-package/dde-api/default.nix
Normal file
109
pkgs/desktops/deepin/go-package/dde-api/default.nix
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, buildGoPackage
|
||||
, replaceAll
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, deepin-gettext-tools
|
||||
, alsa-lib
|
||||
, go-dbus-factory
|
||||
, go-gir-generator
|
||||
, go-lib
|
||||
, libcanberra
|
||||
, libgudev
|
||||
, librsvg
|
||||
, poppler
|
||||
, pulseaudio
|
||||
, gdk-pixbuf-xlib
|
||||
, dbus
|
||||
, coreutils
|
||||
, deepin-desktop-base
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "dde-api";
|
||||
version = "5.5.32";
|
||||
|
||||
goPackagePath = "github.com/linuxdeepin/dde-api";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-F+vEOSpysqVtjs8de5mCmeANuCbYUQ860ZHl5rwNYac=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-PATH-for-NixOS.patch ];
|
||||
|
||||
postPatch = replaceAll "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
|
||||
+ replaceAll "/usr/share/i18n/language_info.json" "${deepin-desktop-base}/share/i18n/language_info.json"
|
||||
+ replaceAll "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
|
||||
+ replaceAll "/usr/bin/true" "${coreutils}/bin/true"
|
||||
+ replaceAll "/usr/sbin/alsactl" "alsactl"
|
||||
+ ''
|
||||
substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \
|
||||
--replace "/usr/share/dde-api" "$out/share/dde-api"
|
||||
substituteInPlace themes/{theme.go,settings.go} \
|
||||
--replace "/usr/share" "/run/current-system/sw/share"
|
||||
'';
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
deepin-gettext-tools
|
||||
wrapQtAppsHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
go-dbus-factory
|
||||
go-gir-generator
|
||||
go-lib
|
||||
gtk3
|
||||
alsa-lib
|
||||
libcanberra
|
||||
libgudev
|
||||
librsvg
|
||||
poppler
|
||||
pulseaudio
|
||||
gdk-pixbuf-xlib
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
GOPATH="$GOPATH:${go-dbus-factory}/share/gocode"
|
||||
GOPATH="$GOPATH:${go-gir-generator}/share/gocode"
|
||||
GOPATH="$GOPATH:${go-lib}/share/gocode"
|
||||
make -C go/src/${goPackagePath}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/lib/deepin-api/*; do
|
||||
wrapProgram $binary "''${qtWrapperArgs[@]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc";
|
||||
homepage = "https://github.com/linuxdeepin/dde-api";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
210
pkgs/desktops/deepin/go-package/dde-api/deps.nix
generated
Normal file
210
pkgs/desktops/deepin/go-package/dde-api/deps.nix
generated
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/alecthomas/kingpin.v2";
|
||||
rev = "v2.2.6";
|
||||
sha256 = "sha256-uViE2kPj7tMrGYVjjdLOl2jFDmmu+3P7GvnZBse2zVY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/disintegration/imaging";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/disintegration/imaging";
|
||||
rev = "v1.6.2";
|
||||
sha256 = "sha256-pSeMTPvSkxlthh65LjNYYhPLvCZDkBgVgAGYWW0Aguo=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/linuxdeepin/go-x11-client";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-x11-client";
|
||||
rev = "0.6.9";
|
||||
sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-sqlites";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-sqlite3";
|
||||
rev = "v1.14.12";
|
||||
sha256 = "sha256-SLW1FyyfJGPUid1epgmJHZGJebI77Wg5WMAPiz1GcYs=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/godbus/dbus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/godbus/dbus";
|
||||
rev = "v5.1.0";
|
||||
sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "v1.5.1";
|
||||
sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/sys";
|
||||
rev = "289d7a0edf712062d9f1484b07bdf2383f48802f";
|
||||
sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "v1.7.1";
|
||||
sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "v1.1.1";
|
||||
sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc";
|
||||
sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/objx";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/objx";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v3";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-yaml/yaml";
|
||||
rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc";
|
||||
sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/image";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/image";
|
||||
rev = "a8550c1d254a56cf1762a2993881d2b23c0c83dd";
|
||||
sha256 = "sha256-gtRGCsCe8tKLsZWhKLL8c5whz9rCMoCHfH13rcSW/OM=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/alecthomas/units";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/alecthomas/units";
|
||||
rev = "b94a6e3cc13755c0a75fffecbb089eb346fc4289";
|
||||
sha256 = "sha256-uriYmwxT69xbmWKO/5OAyeMa2lFBOJDrU2KtQh/+ZjY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/alecthomas/template";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/alecthomas/template";
|
||||
rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
|
||||
sha256 = "sha256-RsS4qxdRQ3q+GejA8D9Iu31A/mZNms4LbJ7518jWiu4=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cryptix/wav";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cryptix/wav";
|
||||
rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
|
||||
sha256 = "sha256-psUCHRFGEOpN3obFbCvSfW0AGEFSI29d0q4MFsHG3qI=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fogleman/gg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fogleman/gg";
|
||||
rev = "v1.3.0";
|
||||
sha256 = "sha256-Fs2JI0FmF4N5EzXJzGAPZMxZxo6wKyebkN/iBZ9sdNo=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/freetype";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/freetype";
|
||||
rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4";
|
||||
sha256 = "sha256-rOOsv1sNLbYEKnwXZtUlB2CXVkFANyzZy2E7w2QbnKQ=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gosexy/gettext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gosexy/gettext";
|
||||
rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
|
||||
sha256 = "sha256-8U2oSi446U13c3uqcbg/14okypxKmckRuvWfZlGHVys=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/nfnt/resize";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nfnt/resize";
|
||||
rev = "83c6a9932646f83e3267f353373d47347b6036b2";
|
||||
sha256 = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/youpy/go-wav";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/youpy/go-wav";
|
||||
rev = "v0.3.2";
|
||||
sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zaf/g711";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zaf/g711";
|
||||
rev = "v1.2";
|
||||
sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/youpy/go-riff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/youpy/go-riff";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8=";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
|
|
@ -64,11 +64,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "43.2";
|
||||
version = "43.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM=";
|
||||
sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rygel";
|
||||
version = "0.42.0";
|
||||
version = "0.42.1";
|
||||
|
||||
# TODO: split out lib
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s=";
|
||||
sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -180,6 +180,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";
|
||||
description = "The Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -120,8 +120,7 @@ let
|
|||
'' + concatProducts "postInstall";
|
||||
|
||||
preFixup = lib.optionalString (stdenv.isLinux) ''
|
||||
# Find all executables in any directory that contains '/bin/'
|
||||
for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do
|
||||
for bin in $(find "$out/bin" -executable -type f); do
|
||||
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
|
||||
done
|
||||
'' + concatProducts "preFixup";
|
||||
|
|
|
|||
|
|
@ -74,6 +74,17 @@ stdenv.mkDerivation ({
|
|||
runHook postUnpack
|
||||
'';
|
||||
|
||||
# Allow autoPatchelf to automatically fix lib references between products
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
mkdir -p $out/lib
|
||||
shopt -s globstar
|
||||
ln -s $out/languages/**/lib/*.so $out/lib
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
|
|
|
|||
|
|
@ -22,20 +22,28 @@ in
|
|||
rec {
|
||||
inherit buildGraalvm buildGraalvmProduct;
|
||||
|
||||
graalvm11-ce = buildGraalvm rec {
|
||||
### Java 11 ###
|
||||
|
||||
# Mostly available for build purposes, not to be exposed at the top level
|
||||
graalvm11-ce-bare = buildGraalvm rec {
|
||||
version = "22.3.1";
|
||||
javaVersion = "11";
|
||||
src = fetchurl (source "graalvm-ce" javaVersion);
|
||||
meta.platforms = builtins.attrNames javaPlatform;
|
||||
products = [ ];
|
||||
};
|
||||
|
||||
graalvm11-ce = graalvm11-ce-bare.override {
|
||||
products = [ native-image-installable-svm-java11 ];
|
||||
};
|
||||
|
||||
# Mostly available for testing, not to be exposed at the top level
|
||||
graalvm11-ce-full = graalvm11-ce.override {
|
||||
graalvm11-ce-full = graalvm11-ce-bare.override {
|
||||
products = [
|
||||
js-installable-svm-java11
|
||||
llvm-installable-svm-java11
|
||||
native-image-installable-svm-java11
|
||||
nodejs-installable-svm-java11
|
||||
python-installable-svm-java11
|
||||
ruby-installable-svm-java11
|
||||
wasm-installable-svm-java11
|
||||
|
|
@ -60,6 +68,13 @@ rec {
|
|||
src = fetchurl (source "native-image-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec {
|
||||
javaVersion = "11";
|
||||
version = "22.3.1";
|
||||
src = fetchurl (source "nodejs-installable-svm" javaVersion);
|
||||
graalvm-ce = graalvm11-ce-bare;
|
||||
};
|
||||
|
||||
python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec {
|
||||
javaVersion = "11";
|
||||
version = "22.3.1";
|
||||
|
|
@ -79,20 +94,28 @@ rec {
|
|||
src = fetchurl (source "wasm-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
graalvm17-ce = buildGraalvm rec {
|
||||
### Java 17 ###
|
||||
|
||||
# Mostly available for build purposes, not to be exposed at the top level
|
||||
graalvm17-ce-bare = buildGraalvm rec {
|
||||
version = "22.3.1";
|
||||
javaVersion = "17";
|
||||
src = fetchurl (source "graalvm-ce" javaVersion);
|
||||
meta.platforms = builtins.attrNames javaPlatform;
|
||||
products = [ ];
|
||||
};
|
||||
|
||||
graalvm17-ce = graalvm17-ce-bare.override {
|
||||
products = [ native-image-installable-svm-java17 ];
|
||||
};
|
||||
|
||||
# Mostly available for testing, not to be exposed at the top level
|
||||
graalvm17-ce-full = graalvm17-ce.override {
|
||||
graalvm17-ce-full = graalvm17-ce-bare.override {
|
||||
products = [
|
||||
js-installable-svm-java17
|
||||
llvm-installable-svm-java17
|
||||
native-image-installable-svm-java17
|
||||
nodejs-installable-svm-java17
|
||||
python-installable-svm-java17
|
||||
ruby-installable-svm-java17
|
||||
wasm-installable-svm-java17
|
||||
|
|
@ -117,6 +140,13 @@ rec {
|
|||
src = fetchurl (source "native-image-installable-svm" javaVersion);
|
||||
};
|
||||
|
||||
nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec {
|
||||
javaVersion = "17";
|
||||
version = "22.3.1";
|
||||
src = fetchurl (source "nodejs-installable-svm" javaVersion);
|
||||
graalvm-ce = graalvm17-ce-bare;
|
||||
};
|
||||
|
||||
python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec {
|
||||
javaVersion = "17";
|
||||
version = "22.3.1";
|
||||
|
|
|
|||
|
|
@ -34,6 +34,40 @@
|
|||
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
};
|
||||
"nodejs-installable-svm" = {
|
||||
"11-linux-aarch64" = {
|
||||
sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar";
|
||||
};
|
||||
"17-linux-aarch64" = {
|
||||
sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar";
|
||||
};
|
||||
"11-linux-amd64" = {
|
||||
sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar";
|
||||
};
|
||||
"17-linux-amd64" = {
|
||||
sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar";
|
||||
};
|
||||
"11-darwin-aarch64" = {
|
||||
sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar";
|
||||
};
|
||||
"17-darwin-aarch64" = {
|
||||
sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar";
|
||||
};
|
||||
"11-darwin-amd64" = {
|
||||
sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
"17-darwin-amd64" = {
|
||||
sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a";
|
||||
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar";
|
||||
};
|
||||
};
|
||||
"wasm-installable-svm" = {
|
||||
"11-linux-aarch64" = {
|
||||
sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, graalvm-ce
|
||||
, graalvmCEPackages
|
||||
, javaVersion
|
||||
, src
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@ graalvmCEPackages.buildGraalvmProduct rec {
|
|||
inherit src javaVersion version;
|
||||
product = "llvm-installable-svm";
|
||||
|
||||
postUnpack = ''
|
||||
ln -s $out/languages/llvm/native/lib/*.so $out/lib
|
||||
'';
|
||||
|
||||
# TODO: improve this test
|
||||
graalvmPhases.installCheckPhase = ''
|
||||
echo "Testing llvm"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, graalvmCEPackages
|
||||
, graalvm-ce
|
||||
, javaVersion
|
||||
, src
|
||||
, version
|
||||
}:
|
||||
|
||||
graalvmCEPackages.buildGraalvmProduct rec {
|
||||
inherit src javaVersion version;
|
||||
product = "nodejs-installable-svm";
|
||||
|
||||
extraNativeBuildInputs = [ graalvm-ce ];
|
||||
|
||||
# TODO: improve test
|
||||
graalvmPhases.installCheckPhase = ''
|
||||
echo "Testing NodeJS"
|
||||
$out/bin/npx --help
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, graalvmCEPackages
|
||||
, llvm-installable-svm
|
||||
, openssl
|
||||
, javaVersion
|
||||
, musl
|
||||
, src
|
||||
, version
|
||||
, llvm-installable-svm
|
||||
}:
|
||||
|
||||
graalvmCEPackages.buildGraalvmProduct rec {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ set -eou pipefail
|
|||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
tmpfile="$(mktemp --suffix=.nix)"
|
||||
|
||||
trap 'rm -rf "$tmpfile"' EXIT
|
||||
|
||||
info() { echo "[INFO] $*"; }
|
||||
|
||||
echo_file() { echo "$@" >> "$tmpfile"; }
|
||||
|
|
@ -43,6 +45,7 @@ declare -r -A products_urls=(
|
|||
[js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar"
|
||||
[llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar"
|
||||
[native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar"
|
||||
[nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar"
|
||||
[python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar"
|
||||
[ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar"
|
||||
[wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar"
|
||||
|
|
@ -59,7 +62,7 @@ readonly platforms=(
|
|||
"17-darwin-amd64"
|
||||
)
|
||||
|
||||
info "Generating hashes.nix file for 'graalvm-ce' $new_version. This will take a while..."
|
||||
info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..."
|
||||
|
||||
# Indentation of `echo_file` function is on purpose to make it easier to visualize the output
|
||||
echo_file "# Generated by $0 script"
|
||||
|
|
@ -68,14 +71,16 @@ for product in "${!products_urls[@]}"; do
|
|||
url="${products_urls["${product}"]}"
|
||||
echo_file " \"$product\" = {"
|
||||
for platform in "${platforms[@]}"; do
|
||||
# Reuse cache as long the version is the same
|
||||
if [[ "$current_version" == "$new_version" ]]; then
|
||||
previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r || true)"
|
||||
args=("${url//@platform@/$platform}")
|
||||
# Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same
|
||||
# e.g.: when adding a new product and running this script with FORCE=1
|
||||
if [[ "$current_version" == "$new_version" ]] && \
|
||||
previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then
|
||||
args+=("$previous_hash" "--type" "sha256")
|
||||
else
|
||||
previous_hash=""
|
||||
info "Hash in '$product' for '$platform' not found. Re-downloading it..."
|
||||
fi
|
||||
# Lack of quoting in $previous_hash is proposital
|
||||
if hash="$(nix-prefetch-url "${url//@platform@/$platform}" $previous_hash)"; then
|
||||
if hash="$(nix-prefetch-url "${args[@]}")"; then
|
||||
echo_file " \"$platform\" = {"
|
||||
echo_file " sha256 = \"$hash\";"
|
||||
echo_file " url = \"${url//@platform@/${platform}}\";"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.27";
|
||||
hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g=";
|
||||
version = "8.0.28";
|
||||
hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.15";
|
||||
hash = "sha256-GNoKlCKPQgf4uePiPogfK3TQ1srvuQi9tYY9SgEDXMY=";
|
||||
version = "8.1.16";
|
||||
hash = "sha256-zZ8OoU2C2UVVh6SaC2yAKnuNj/eXA/n0ixfbAQ+2M84=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.2";
|
||||
hash = "sha256-9SI6UnTtqLQMGeR94N5GeMZdZEAcz3EOJGSWLrgTaAQ=";
|
||||
version = "8.2.3";
|
||||
hash = "sha256-h7tYhl849eKUGBMCkVLOohAv4pYbtNaLiPgx3dBUjQ8=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "httplib";
|
||||
version = "0.11.4";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg=";
|
||||
hash = "sha256-Qr8jaZSj5xPiTF8reur09/R2jrtDk5hxHKeVTccHbZQ=";
|
||||
};
|
||||
|
||||
# Header-only library.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libayatana-appindicator";
|
||||
version = "0.5.91";
|
||||
version = "0.5.92";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "AyatanaIndicators";
|
||||
repo = "libayatana-appindicator";
|
||||
rev = version;
|
||||
sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys=";
|
||||
sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-kg/dVarfmDibZXLGY4zXfReNQ1DC4T/3g54g8zxNmEs=";
|
||||
sha256 = "sha256-gyGlx43LdBkZvwN8EeZvaLzdTgYT3PFnSX9eZyAWNc4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocrand";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "ROCmSoftwarePlatform";
|
||||
repo = "rocRAND";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY=";
|
||||
hash = "sha256-xK1JRTW+7odlXRQV9WC6ZfXqRKow/TQ9grHCigw+/us=";
|
||||
fetchSubmodules = true; # For inline hipRAND
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE=";
|
||||
sha256 = "sha256-KyxtAOKhk3p/TuA0jz2hMCkGDwKLPC7rIodhHvcE4tk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sofia-sip";
|
||||
version = "1.13.12";
|
||||
version = "1.13.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM=";
|
||||
sha256 = "sha256-ZFQmm1GX7Uptyb9pIdTHccpoSLO4WdZuVPnMalOcfK0=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vte";
|
||||
version = "0.70.2";
|
||||
version = "0.70.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA=";
|
||||
sha256 = "sha256-lFcTSgLzFX/KBPfg05vbDzCZvgo86CtxOdDJioB0jyM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -48,13 +48,6 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
|
||||
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
|
||||
})
|
||||
|
||||
# Fix copying text with GTK 4.
|
||||
# https://gitlab.gnome.org/GNOME/vte/-/issues/2584
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch";
|
||||
hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -62,16 +62,6 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA=";
|
||||
};
|
||||
|
||||
# Workaround for pkgsMusl.wxGTK32 failing as:
|
||||
# "./src/unix/uilocale.cpp:650:37: error: ‘_NL_IDENTIFICATION_TERRITORY’ was not declared in this scope"
|
||||
# On upgrade, please test building wxwidgets for pkgsMusl, and remove this patch if unnecessary.
|
||||
patches = lib.optional stdenv.hostPlatform.isMusl [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/wxWidgets/wxWidgets/commit/1faf1796b23b2503296d9b1e9ad39047d633f8c9.patch";
|
||||
sha256 = "sha256-0FbfzGzzkriLD2iDcRcBXgYqjHtxFsmSlhGE5d18/bo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.22.1";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "0h1012mdw8k4hf1fflxhbq7rq1gpwgs7a9v5sghc9minjc3b3z8h";
|
||||
sha256 = "0g508x79vhn7phmk4vlr3c213k0vi6yk0mpfcz5jcg4mpdapfmri";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@ buildDunePackage rec {
|
|||
pname = "npy";
|
||||
version = "0.0.9";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LaurentMazare";
|
||||
repo = "${pname}-ocaml";
|
||||
rev = version;
|
||||
sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
|
||||
hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ camlzip ];
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ buildDunePackage rec {
|
|||
pname = "owl-base";
|
||||
version = "1.0.2";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
|
||||
sha256 = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM=";
|
||||
hash = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.10";
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Numerical computing library for Ocaml";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@
|
|||
buildDunePackage rec {
|
||||
pname = "owl";
|
||||
|
||||
inherit (owl-base) version src meta useDune2;
|
||||
inherit (owl-base) version src meta;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
buildInputs = [ dune-configurator stdio ];
|
||||
|
|
|
|||
|
|
@ -17,15 +17,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "torch";
|
||||
version = "0.15";
|
||||
version = "0.17";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LaurentMazare";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = version;
|
||||
sha256 = "sha256-EXJqlAGa0LwQKY8IlmcoJs0l2eRTiUhuzMHfakrslXU=";
|
||||
hash = "sha256-z/9NUBjeFWE63Z/e8OyzDiy8hrn6qzjaiBH8G9MPeos=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
|
|
@ -19,19 +18,19 @@ buildPythonPackage rec {
|
|||
version = "2022.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/bachya/aioambient/pull/97
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"'
|
||||
--replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -47,7 +46,6 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
|
@ -65,6 +63,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for the Ambient Weather API";
|
||||
homepage = "https://github.com/bachya/aioambient";
|
||||
changelog = "https://github.com/bachya/aioambient/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, aiohttp
|
||||
, async-timeout
|
||||
, asyncio-dgram
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
|
|
@ -10,22 +9,24 @@
|
|||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioguardian";
|
||||
version = "2022.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
|
||||
hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
@ -40,17 +41,11 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
asyncio-dgram
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'docutils = "<0.18"' 'docutils = "*"'
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
"examples/"
|
||||
];
|
||||
|
|
@ -62,10 +57,11 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = " Python library to interact with Elexa Guardian devices";
|
||||
longDescription = ''
|
||||
aioguardian is a Pytho3, asyncio-focused library for interacting with the
|
||||
aioguardian is an asyncio-focused library for interacting with the
|
||||
Guardian line of water valves and sensors from Elexa.
|
||||
'';
|
||||
homepage = "https://github.com/bachya/aioguardian";
|
||||
changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,19 +3,21 @@
|
|||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, prettytable
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosomecomfort";
|
||||
version = "0.0.7";
|
||||
|
||||
version = "0.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkmer";
|
||||
repo = "AIOSomecomfort";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA=";
|
||||
hash = "sha256-SwNHLDizkpOP+zSDzn84J2l8ltZi/ponnptzuVJMHUA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,6 +34,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "AsyicIO client for US models of Honeywell Thermostats";
|
||||
homepage = "https://github.com/mkmer/AIOSomecomfort";
|
||||
changelog = "https://github.com/mkmer/AIOSomecomfort/releases/tag/${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.12.2";
|
||||
version = "6.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qzMVKDTJX8/E+2Xs1Tyc0b8cmz6tF57dYwQnS4KzSFI=";
|
||||
hash = "sha256-4tRdgxVyn0Kcu+/atEbTgFCtezbZ46oewb6vKRTQKaA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyauth";
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ctTuabTfLhYJL/yv0k6oXP7JV0+qRFA0SARI3XopTeM=";
|
||||
hash = "sha256-tVvqzKsCvvSgKB3xRBMnIQLEDzCaPO/h8cM8WMpzi6M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,20 +17,25 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "jsbronder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
|
||||
rev = "refs/tagsv${version}";
|
||||
hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
# OSError: AF_UNIX path too long
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
disabledTests = [
|
||||
"test_protocol_pause_resume"
|
||||
# TypeError: socket type must be 2
|
||||
"test_from_socket_bad_socket"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -40,6 +45,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python support for higher level Datagram";
|
||||
homepage = "https://github.com/jsbronder/asyncio-dgram";
|
||||
changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncmy";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "long2ice";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-UWwqQ0ZYGoOsgRC7ROV9DDBQ/l/vXWB6uHpQ/WaFRAw=";
|
||||
sha256 = "sha256-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-appconfiguration";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07";
|
||||
sha256 = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue