mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fe909b3939
@ -90,7 +90,7 @@
|
||||
|
||||
- [Gancio](https://gancio.org/), a shared agenda for local communities. Available as [services.gancio](#opt-services.gancio.enable).
|
||||
|
||||
- [Goatcounter](https://www.goatcounter.com/), an easy web analytics platform with no tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable).
|
||||
- [Goatcounter](https://www.goatcounter.com/), an easy web analytics platform with no tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcounter.enable).
|
||||
|
||||
- [Privatebin](https://github.com/PrivateBin/PrivateBin/), a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable).
|
||||
|
||||
|
||||
@ -7,6 +7,22 @@
|
||||
"date": "2021-12-07",
|
||||
"new": "cmp-tmux"
|
||||
},
|
||||
"compe-conjure": {
|
||||
"date": "2024-11-19",
|
||||
"new": "cmp-conjure"
|
||||
},
|
||||
"compe-latex-symbols": {
|
||||
"date": "2024-11-19",
|
||||
"new": "cmp-latex-symbols"
|
||||
},
|
||||
"compe-tabnine": {
|
||||
"date": "2024-11-19",
|
||||
"new": "cmp-tabnine"
|
||||
},
|
||||
"compe-zsh": {
|
||||
"date": "2024-11-19",
|
||||
"new": "cmp-zsh"
|
||||
},
|
||||
"fern-vim": {
|
||||
"date": "2024-05-12",
|
||||
"new": "vim-fern"
|
||||
@ -43,6 +59,10 @@
|
||||
"date": "2021-08-22",
|
||||
"new": "bufferline-nvim"
|
||||
},
|
||||
"nvim-compe": {
|
||||
"date": "2024-11-19",
|
||||
"new": "nvim-cmp"
|
||||
},
|
||||
"nvim-lsp": {
|
||||
"date": "2020-08-31",
|
||||
"new": "nvim-lspconfig"
|
||||
|
||||
@ -2561,54 +2561,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/rhysd/committia.vim/";
|
||||
};
|
||||
|
||||
compe-conjure = buildVimPlugin {
|
||||
pname = "compe-conjure";
|
||||
version = "2020-12-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "compe-conjure";
|
||||
rev = "8d00e1dcee861a296bab36c06511ae4e083d5a0c";
|
||||
sha256 = "1ral3rmzw96xsvjnlf65mvlnvm05jmy90abrgay6ilng20bfxjiz";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/compe-conjure/";
|
||||
};
|
||||
|
||||
compe-latex-symbols = buildVimPlugin {
|
||||
pname = "compe-latex-symbols";
|
||||
version = "2021-05-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldsteinE";
|
||||
repo = "compe-latex-symbols";
|
||||
rev = "70f58e53e142e3c59fe0f673dd54ce690ae57367";
|
||||
sha256 = "0p4xss3zyp6002hsa6dx989zhp672mc30b57w5cjhcgbknw0iy1l";
|
||||
};
|
||||
meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/";
|
||||
};
|
||||
|
||||
compe-tabnine = buildVimPlugin {
|
||||
pname = "compe-tabnine";
|
||||
version = "2021-09-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tzachar";
|
||||
repo = "compe-tabnine";
|
||||
rev = "33e4af509c27da9ef2c9c3002c01e3ec031797d4";
|
||||
sha256 = "1lzyia2s66kcxpr6d3db4rcgxlcddfg6gpz8rbg333hdasly383w";
|
||||
};
|
||||
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
|
||||
};
|
||||
|
||||
compe-zsh = buildVimPlugin {
|
||||
pname = "compe-zsh";
|
||||
version = "2021-04-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamago324";
|
||||
repo = "compe-zsh";
|
||||
rev = "1a46a0ee661242f6a015b2abead34b606bb97171";
|
||||
sha256 = "0m8fmsx4bwmgqgjpwpldckp68hpx6qfschwdg275xsxkzw8pdnbk";
|
||||
};
|
||||
meta.homepage = "https://github.com/tamago324/compe-zsh/";
|
||||
};
|
||||
|
||||
competitest-nvim = buildVimPlugin {
|
||||
pname = "competitest.nvim";
|
||||
version = "2024-11-16";
|
||||
@ -8731,18 +8683,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/terrortylor/nvim-comment/";
|
||||
};
|
||||
|
||||
nvim-compe = buildVimPlugin {
|
||||
pname = "nvim-compe";
|
||||
version = "2021-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-compe";
|
||||
rev = "d186d739c54823e0b010feb205c6f97792322c08";
|
||||
sha256 = "1cl3c4cazzpjj2wmsi42czrklzngzm82bbb9ivmcsa40rfz2lsk3";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
|
||||
};
|
||||
|
||||
nvim-completion-manager = buildVimPlugin {
|
||||
pname = "nvim-completion-manager";
|
||||
version = "2018-07-27";
|
||||
@ -9846,6 +9786,42 @@ final: prev:
|
||||
meta.homepage = "https://github.com/zbirenbaum/nvterm/";
|
||||
};
|
||||
|
||||
nvzone-menu = buildVimPlugin {
|
||||
pname = "nvzone-menu";
|
||||
version = "2024-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvzone";
|
||||
repo = "menu";
|
||||
rev = "657bfc91382c0928453d9a4d0a10ec92db5de2bb";
|
||||
sha256 = "0wssihrhqqkla5sc03sfnd4ai873ap81pgcgfzf70p85i42pbkvm";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvzone/menu/";
|
||||
};
|
||||
|
||||
nvzone-minty = buildVimPlugin {
|
||||
pname = "nvzone-minty";
|
||||
version = "2024-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvzone";
|
||||
repo = "minty";
|
||||
rev = "a3d69bd63fc98f640815f94b797bf978e9193022";
|
||||
sha256 = "1chq2qqa2yps366rh5gdylvlz09q13ilw2k4cr95a2ivp887qcyz";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvzone/minty/";
|
||||
};
|
||||
|
||||
nvzone-volt = buildVimPlugin {
|
||||
pname = "nvzone-volt";
|
||||
version = "2024-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvzone";
|
||||
repo = "volt";
|
||||
rev = "41c03a5d6a0a8a997e774a3482d82e5ef820c6ba";
|
||||
sha256 = "0iw3idylw2g63ndc3fidivwb1230l29bg7scy0p0aqw2ddywknhy";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvzone/volt/";
|
||||
};
|
||||
|
||||
obsidian-nvim = buildVimPlugin {
|
||||
pname = "obsidian.nvim";
|
||||
version = "2024-08-01";
|
||||
|
||||
@ -752,31 +752,6 @@ in
|
||||
nvimRequireCheck = "competitest";
|
||||
};
|
||||
|
||||
compe-conjure = super.compe-conjure.overrideAttrs {
|
||||
dependencies = [ self.conjure ];
|
||||
};
|
||||
|
||||
compe-latex-symbols = super.compe-latex-symbols.overrideAttrs {
|
||||
dependencies = [ self.nvim-compe ];
|
||||
};
|
||||
|
||||
compe-tabnine = super.compe-tabnine.overrideAttrs {
|
||||
dependencies = [ self.nvim-compe ];
|
||||
buildInputs = [ tabnine ];
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $target/binaries/${tabnine.version}
|
||||
ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
|
||||
'';
|
||||
};
|
||||
|
||||
compe-zsh = super.compe-zsh.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-compe
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
nvimRequireCheck = "compiler-explorer";
|
||||
@ -1991,6 +1966,14 @@ in
|
||||
nvimRequireCheck = "ufo";
|
||||
};
|
||||
|
||||
nvzone-menu = super.nvzone-menu.overrideAttrs {
|
||||
dependencies = with self; [ nvzone-volt ];
|
||||
};
|
||||
|
||||
nvzone-minty = super.nvzone-minty.overrideAttrs {
|
||||
dependencies = with self; [ nvzone-volt ];
|
||||
};
|
||||
|
||||
obsidian-nvim = super.obsidian-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
nvimRequireCheck = "obsidian";
|
||||
@ -2013,6 +1996,12 @@ in
|
||||
configurePhase = "cd vim";
|
||||
};
|
||||
|
||||
one-nvim = super.one-nvim.overrideAttrs {
|
||||
# E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
|
||||
# https://github.com/Th3Whit3Wolf/one-nvim/issues/23
|
||||
meta.broken = true;
|
||||
};
|
||||
|
||||
# The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we
|
||||
# avoid choosing one of them and leave it to the user
|
||||
openscad-nvim = super.openscad-nvim.overrideAttrs {
|
||||
@ -2604,7 +2593,8 @@ in
|
||||
};
|
||||
|
||||
tmux-complete-vim = super.tmux-complete-vim.overrideAttrs {
|
||||
dependencies = with self; [ nvim-compe ];
|
||||
# Vim plugin with optional nvim-compe lua module
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
todo-comments-nvim = super.todo-comments-nvim.overrideAttrs {
|
||||
|
||||
@ -212,10 +212,6 @@ https://github.com/wincent/command-t/,,
|
||||
https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
|
||||
https://github.com/numtostr/comment.nvim/,,
|
||||
https://github.com/rhysd/committia.vim/,,
|
||||
https://github.com/hrsh7th/compe-conjure/,,
|
||||
https://github.com/GoldsteinE/compe-latex-symbols/,,
|
||||
https://github.com/tzachar/compe-tabnine/,,
|
||||
https://github.com/tamago324/compe-zsh/,,
|
||||
https://github.com/xeluxee/competitest.nvim/,HEAD,
|
||||
https://github.com/krady21/compiler-explorer.nvim/,HEAD,
|
||||
https://github.com/Zeioth/compiler.nvim/,HEAD,
|
||||
@ -725,7 +721,6 @@ https://github.com/weilbith/nvim-code-action-menu/,,
|
||||
https://github.com/willothy/nvim-cokeline/,HEAD,
|
||||
https://github.com/nvchad/nvim-colorizer.lua/,,
|
||||
https://github.com/terrortylor/nvim-comment/,,
|
||||
https://github.com/hrsh7th/nvim-compe/,,
|
||||
https://github.com/roxma/nvim-completion-manager/,,
|
||||
https://github.com/klen/nvim-config-local/,,
|
||||
https://github.com/andythigpen/nvim-coverage/,HEAD,
|
||||
@ -818,6 +813,9 @@ https://github.com/roxma/nvim-yarp/,,
|
||||
https://github.com/andersevenrud/nvim_context_vt/,,
|
||||
https://github.com/neovim/nvimdev.nvim/,,
|
||||
https://github.com/zbirenbaum/nvterm/,HEAD,
|
||||
https://github.com/nvzone/menu/,HEAD,nvzone-menu
|
||||
https://github.com/nvzone/minty/,HEAD,nvzone-minty
|
||||
https://github.com/nvzone/volt/,HEAD,nvzone-volt
|
||||
https://github.com/epwalsh/obsidian.nvim/,HEAD,
|
||||
https://github.com/nvimdev/oceanic-material/,,
|
||||
https://github.com/mhartington/oceanic-next/,,
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-atari800",
|
||||
"rev": "683a37f25e34af6cb22ee4c4f9acf9db53d49662",
|
||||
"hash": "sha256-B7EwI0ii8hqkcg314hWi06OI7E5unufkKSak53pqrAY="
|
||||
"rev": "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b",
|
||||
"hash": "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE="
|
||||
},
|
||||
"version": "unstable-2024-10-01"
|
||||
"version": "unstable-2024-10-31"
|
||||
},
|
||||
"beetle-gba": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -135,10 +135,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-wswan-libretro",
|
||||
"rev": "440e9228592a3f603d7d09e8bee707b0163f545f",
|
||||
"hash": "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE="
|
||||
"rev": "2aeb47d3a58bf0360c686f842d9bb5bd201306fe",
|
||||
"hash": "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"blastem": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -175,10 +175,10 @@
|
||||
"src": {
|
||||
"owner": "DerKoun",
|
||||
"repo": "bsnes-hd",
|
||||
"rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8",
|
||||
"hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI="
|
||||
"rev": "0bb7b8645e22ea2476cabd58f32e987b14686601",
|
||||
"hash": "sha256-YzWSZMn6v5hWIHnp6KmmpevCsf35Vi2BCcmFMnrFPH0="
|
||||
},
|
||||
"version": "unstable-2023-04-26"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"bsnes-mercury": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -246,10 +246,10 @@
|
||||
"src": {
|
||||
"owner": "schellingb",
|
||||
"repo": "dosbox-pure",
|
||||
"rev": "9b4147fd14332a7354c9b76fa72653bda2d919e9",
|
||||
"hash": "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I="
|
||||
"rev": "39dd77adff71cd2ae17d80a0e48fad8583ade8e4",
|
||||
"hash": "sha256-ZC3JX4BG+FUR/lcEUupISz1s8Q0AdqkO4XVIPi1L5vg="
|
||||
},
|
||||
"version": "unstable-2024-09-28"
|
||||
"version": "unstable-2024-11-16"
|
||||
},
|
||||
"easyrpg": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -297,51 +297,51 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "e226068f979cd8fbfc3be9780d16cfb1405095b0",
|
||||
"hash": "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM="
|
||||
"rev": "9f53af4e332476ba99d0c056668fbb35cfb527c3",
|
||||
"hash": "sha256-sTzjIuEBTKt2rZfSadQa1pDLFclLL/vwjgkTMK1ZzPQ="
|
||||
},
|
||||
"version": "unstable-2024-09-23"
|
||||
"version": "unstable-2024-10-16"
|
||||
},
|
||||
"flycast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "d689c50e21bf956913ac607933cd4082eaedc06b",
|
||||
"hash": "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k=",
|
||||
"rev": "d618abc3205fe185b26afe58eb5472b800ae0b42",
|
||||
"hash": "sha256-hlYu1RXfzDHJh5nqBQkcwjrLtFV5AIxdBw5PZn0SUNg=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-10-05"
|
||||
"version": "unstable-2024-11-17"
|
||||
},
|
||||
"fmsx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fmsx-libretro",
|
||||
"rev": "cf97a3c6da07d5f8e98c90c907ad987ffea432e0",
|
||||
"hash": "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA="
|
||||
"rev": "9eb5f25df5397212a3e3088ca1a64db0740bbe5f",
|
||||
"hash": "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"freeintv": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "freeintv",
|
||||
"rev": "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87",
|
||||
"hash": "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0="
|
||||
"rev": "beab9af119fc117833d2d866d8d4ea0857ec0236",
|
||||
"hash": "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"fuse": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fuse-libretro",
|
||||
"rev": "6fd07d90acc38a1b8835bf16539b833f21aaa38f",
|
||||
"hash": "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s="
|
||||
"rev": "99df66eac096400d4d6d8fae2215192b6f03277e",
|
||||
"hash": "sha256-o8FbDxke2JCUlmDZEHxMBY4f/WyHm1J76R43w+LVJfM="
|
||||
},
|
||||
"version": "unstable-2024-09-20"
|
||||
"version": "unstable-2024-11-18"
|
||||
},
|
||||
"gambatte": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -489,10 +489,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mesen",
|
||||
"rev": "91db6be681f70b2080525c267af6132555323ea1",
|
||||
"hash": "sha256-rw/bwHaeglO/DPeOCFHAWF5Y5DXVKiteO4bWZjTB4rI="
|
||||
"rev": "791c5e8153ee6e29691d45b5df2cf1151ff416f9",
|
||||
"hash": "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic="
|
||||
},
|
||||
"version": "unstable-2024-06-09"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"mesen-s": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -581,10 +581,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "nxengine-libretro",
|
||||
"rev": "11fc0892dc6b99b36ecf318006834932cd5b817a",
|
||||
"hash": "sha256-PlU3op50yPgDUXZxSOlltMf/30JLrotpp61UHK1uKB8="
|
||||
"rev": "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2",
|
||||
"hash": "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-10-21"
|
||||
},
|
||||
"o2em": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
59
pkgs/by-name/en/ente-web/package.nix
Normal file
59
pkgs/by-name/en/ente-web/package.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
extraBuildEnv ? { },
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web";
|
||||
version = "0.9.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "web" ];
|
||||
rev = "refs/tags/photos-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-DqfUUXY79CndEqPT8TR4PasLtaSCtqZaV2kp10Vu4PQ=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/yarn.lock";
|
||||
hash = "sha256-tgFh8Av1Wl77N4hR2Y5TQp9lEH4ZCQnCIWMPmlZBlV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
# See: https://github.com/ente-io/ente/blob/main/web/apps/photos/.env
|
||||
env = extraBuildEnv;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r apps/photos/out $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Web client for Ente Photos";
|
||||
homepage = "https://ente.io/";
|
||||
changelog = "https://github.com/ente-io/ente/releases";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
surfaceflinger
|
||||
pinpox
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, readline
|
||||
@ -67,20 +66,13 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gap";
|
||||
# https://www.gap-system.org/Releases/
|
||||
version = "4.12.2";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
|
||||
sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g=";
|
||||
sha256 = "sha256-l5Tb26b7mY4KLQqoziH8iEitPT+cyZk7C44gvn4dvro=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gap-system/gap/commit/c786e229413a44b7462196716b99ae9bb0071f4c.patch";
|
||||
hash = "sha256-g3jrEMSavHAUKlHoPqWmOw49hWHU+29SA788Klnr0Uw=";
|
||||
})
|
||||
];
|
||||
|
||||
# remove all non-essential packages (which take up a lot of space)
|
||||
preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + ''
|
||||
patchShebangs .
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, blueprint-compiler
|
||||
, pkg-config
|
||||
@ -9,21 +10,21 @@
|
||||
, libdrm
|
||||
, vulkan-loader
|
||||
, coreutils
|
||||
, hwdata
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lact";
|
||||
version = "0.5.6";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ilya-zlobintsev";
|
||||
repo = "LACT";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iz6Pl+A7Y/Ljot3QH2GaopgtfuYLpTLSq6uSprQ2EEU=";
|
||||
hash = "sha256-goNwLtVjNY3O/BhFrCcM3X11dtM34XgfHL6bh+YFoIY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uoMkz+0Jr07GpMRUKuJvrTTSAGdhLf35q/8but1fwIk=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-rgpBmoGCNMU5nFVxzNtqsPaOn93mHW5P2isKgbP9UN4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
@ -40,25 +41,18 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
checkFlags = [
|
||||
# tries and fails to initialize gtk
|
||||
"--skip=app::root_stack::thermals_page::fan_curve_frame::tests::set_get_curve"
|
||||
"--skip=app::pages::thermals_page::fan_curve_frame::tests::set_get_curve"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lact-daemon/src/server/system.rs \
|
||||
--replace 'Command::new("uname")' 'Command::new("${coreutils}/bin/uname")'
|
||||
--replace-fail 'Command::new("uname")' 'Command::new("${coreutils}/bin/uname")'
|
||||
|
||||
substituteInPlace res/lactd.service \
|
||||
--replace ExecStart={lact,$out/bin/lact}
|
||||
--replace-fail ExecStart={lact,$out/bin/lact}
|
||||
|
||||
substituteInPlace res/io.github.lact-linux.desktop \
|
||||
--replace Exec={lact,$out/bin/lact}
|
||||
|
||||
pushd $cargoDepsCopy/pciid-parser
|
||||
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
substituteInPlace src/lib.rs --subst-var-by hwdata ${hwdata}
|
||||
substituteInPlace .cargo-checksum.json \
|
||||
--replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
popd
|
||||
--replace-fail Exec={lact,$out/bin/lact}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@ -67,17 +61,16 @@ rustPlatform.buildRustPackage rec {
|
||||
install -Dm444 res/io.github.lact-linux.png -t $out/share/pixmaps
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/bin/.lact-wrapped \
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
postFixup = lib.optionalString stdenv.targetPlatform.isElf ''
|
||||
patchelf $out/bin/.lact-wrapped --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Linux AMDGPU Controller";
|
||||
homepage = "https://github.com/ilya-zlobintsev/LACT";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ figsoda atemu ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "lact";
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,9 +35,8 @@
|
||||
pango,
|
||||
sqlite,
|
||||
udev,
|
||||
wayland,
|
||||
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
|
||||
versionCheckHook,
|
||||
}:
|
||||
@ -111,6 +110,7 @@ stdenv.mkDerivation rec {
|
||||
pango
|
||||
sqlite
|
||||
udev
|
||||
vulkan-loader
|
||||
wayland
|
||||
];
|
||||
|
||||
@ -118,12 +118,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/sys_info_v2/gatherer.rs \
|
||||
--replace-fail '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"'
|
||||
|
||||
substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \
|
||||
--replace-fail "libGL.so.1" "${libGL}/lib/libGL.so.1"
|
||||
|
||||
substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \
|
||||
--replace-fail '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"'
|
||||
|
||||
SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer
|
||||
SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop
|
||||
|
||||
@ -151,12 +145,27 @@ stdenv.mkDerivation rec {
|
||||
versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}";
|
||||
doInstallCheck = true;
|
||||
|
||||
env = {
|
||||
# Make sure libGL and libvulkan can be found by dlopen()
|
||||
RUSTFLAGS = toString (
|
||||
map (flag: "-C link-arg=" + flag) [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
"-lGL"
|
||||
"-lvulkan"
|
||||
"-Wl,--pop-state"
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
|
||||
homepage = "https://gitlab.com/mission-center-devs/mission-center";
|
||||
changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
getchoo
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "missioncenter";
|
||||
};
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libsodium
|
||||
, buildGoModule
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libsodium,
|
||||
buildGoModule,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
||||
version = "0.9.53";
|
||||
pname = "museum";
|
||||
version = "0.9.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
@ -18,10 +18,16 @@ buildGoModule rec {
|
||||
hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY=";
|
||||
|
||||
sourceRoot = "${src.name}/server";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libsodium ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libsodium
|
||||
];
|
||||
|
||||
# fatal: "Not running tests in non-test environment"
|
||||
doCheck = false;
|
||||
@ -34,15 +40,15 @@ buildGoModule rec {
|
||||
$out/share/museum
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "API server for ente.io";
|
||||
homepage = "https://github.com/ente-io/ente/tree/main/server";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ surfaceflinger pinpox ];
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
surfaceflinger
|
||||
pinpox
|
||||
];
|
||||
mainProgram = "museum";
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
vendorHash = "sha256-Vz9AodHoClSmo51ExdOS4bWH13i1Sug++LQMIsZY2xY=";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openasar";
|
||||
version = "0-unstable-2024-09-06";
|
||||
version = "0-unstable-2024-11-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "f92ee8c3dc6b6ff9829f69a1339e0f82a877929c";
|
||||
hash = "sha256-V2oZ0mQbX+DHDZfTj8sV4XS6r9NOmJYHvYOGK6X/+HU=";
|
||||
rev = "ef4470849624032a8eb7265eabd23158aa5a2356";
|
||||
hash = "sha256-U9wYKen5MfE/WTKL0SICN0v3DPMLqblMYQVAbkZnfjY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -40,11 +40,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openmpi";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y=";
|
||||
sha256 = "sha256-vUGD/LxDR3wlR5m0Kd8abldsBC50otL4s31Tey/5gVc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pinocchio";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = "pinocchio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8V+n1TwFojXKOVkGG8k9aXVadt2NBFlZKba93L+NRNU=";
|
||||
hash = "sha256-8lRGdtN3V0pfRH3f70H8n2pt5CGQkUY1wKg9gUY0toQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -54,13 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export MPLCONFIGDIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# CMAKE_BUILD_TYPE defaults to Release in this package,
|
||||
# which enable -O3, which break some tests
|
||||
# ref. https://github.com/stack-of-tasks/pinocchio/issues/2304#issuecomment-2231018300
|
||||
postConfigure = ''
|
||||
substituteInPlace CMakeCache.txt --replace-fail '-O3' '-O2'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerjoular";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joular";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-zcG/R8isL7WcwsIFovnRKZ5DCtZu4vJWOximFY9ARuE=";
|
||||
hash = "sha256-rM6fV2Jw9C1LjMQ1RhV8DJQcUcyQmXtANXWAkO03O18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prrte";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openpmix";
|
||||
repo = "prrte";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0JHtUpGFdPKmgUk0+MNxTfZIUDz/vY/CV+Mqbmv0JFw=";
|
||||
hash = "sha256-Jw9/M2rpGTA19qssDaZV+9FYlIvz8wgL5oUDdWwidHI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py
|
||||
index 871cc4705a2..4b718136b91 100644
|
||||
index ab39d93c280..e6501c083d5 100644
|
||||
--- a/src/sage_docbuild/builders.py
|
||||
+++ b/src/sage_docbuild/builders.py
|
||||
@@ -106,31 +106,6 @@ def builder_helper(type):
|
||||
@ -48,13 +48,13 @@ index 871cc4705a2..4b718136b91 100644
|
||||
if build_options.ABORT_ON_ERROR:
|
||||
raise
|
||||
diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
|
||||
index 5621fe9e456..b1b91ce7b2c 100644
|
||||
index 62b2d3cb112..aa7dc07741b 100644
|
||||
--- a/src/sage_docbuild/sphinxbuild.py
|
||||
+++ b/src/sage_docbuild/sphinxbuild.py
|
||||
@@ -323,3 +323,8 @@ def runsphinx():
|
||||
sys.stderr = saved_stderr
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
@@ -331,3 +331,8 @@ def runsphinx():
|
||||
|
||||
if not sys.warnoptions:
|
||||
warnings.filters = original_filters[:]
|
||||
+
|
||||
+if __name__ == '__main__':
|
||||
+ import sys
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
# all get the same sources with the same patches applied.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.4";
|
||||
version = "10.5.rc0";
|
||||
pname = "sage-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA=";
|
||||
hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg=";
|
||||
};
|
||||
|
||||
# contains essential files (e.g., setup.cfg) generated by the bootstrap script.
|
||||
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
|
||||
configure-src = fetchurl {
|
||||
# the hash below is the tagged commit's _parent_. it can also be found by looking for
|
||||
# the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}
|
||||
url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz";
|
||||
hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4=";
|
||||
url = "mirror://sageupstream/configure/configure-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz";
|
||||
hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s=";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
@ -54,20 +54,6 @@ stdenv.mkDerivation rec {
|
||||
# fix those bugs themselves. This is for critical bugfixes, where "critical"
|
||||
# == "causes (transient) doctest failures / somebody complained".
|
||||
bugfixPatches = [
|
||||
# https://github.com/sagemath/sage/pull/38628, landed in 10.5.beta4
|
||||
(fetchpatch {
|
||||
name = "pari-stack-cysignals-exception.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/4a9c985b769b1209902c970ade1892f18ab48c10.diff";
|
||||
hash = "sha256-S6NdonB7needJlQdx52Huk34Q8/vG3nyGicA5JpsdWc=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
|
||||
(fetchpatch {
|
||||
name = "glpk-aarch64-hang-workaround.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
|
||||
hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
|
||||
})
|
||||
|
||||
# compile libs/gap/element.pyx with -O1
|
||||
# a more conservative version of https://github.com/sagemath/sage/pull/37951
|
||||
./patches/gap-element-crash.patch
|
||||
@ -80,26 +66,6 @@ stdenv.mkDerivation rec {
|
||||
# should come from or be proposed to upstream. This list will probably never
|
||||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = [
|
||||
# https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3
|
||||
(fetchpatch {
|
||||
name = "cython-3.0.11-upgrade.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
|
||||
hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3
|
||||
(fetchpatch {
|
||||
name = "sympy-1.13.2-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff";
|
||||
sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0
|
||||
(fetchpatch {
|
||||
name = "numpy-2.0-compat.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff";
|
||||
sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -17,6 +20,19 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
installShellCompletion --cmd spacectl \
|
||||
--bash <(${emulator} $out/bin/spacectl completion bash) \
|
||||
--fish <(${emulator} $out/bin/spacectl completion fish) \
|
||||
--zsh <(${emulator} $out/bin/spacectl completion zsh) \
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/spacelift-io/spacectl";
|
||||
description = "Spacelift client and CLI";
|
||||
|
||||
92
pkgs/by-name/up/upscaler/package.nix
Normal file
92
pkgs/by-name/up/upscaler/package.nix
Normal file
@ -0,0 +1,92 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
glib,
|
||||
gtk4,
|
||||
meson,
|
||||
ninja,
|
||||
gitUpdater,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
blueprint-compiler,
|
||||
python3Packages,
|
||||
pkg-config,
|
||||
libadwaita,
|
||||
wrapGAppsHook4,
|
||||
upscayl-ncnn,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "upscaler";
|
||||
version = "1.4.0";
|
||||
|
||||
pyproject = false; # meson instead of pyproject
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Upscaler";
|
||||
rev = version;
|
||||
hash = "sha256-Dy8tykIbK5o0XulurG+TxORZZSxfRe5Kjh6aGpsh+0Y=";
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace upscaler/window.py \
|
||||
--replace-fail '"upscayl-bin",' '"${lib.getExe upscayl-ncnn}",'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook4
|
||||
meson
|
||||
ninja
|
||||
desktop-file-utils
|
||||
appstream
|
||||
blueprint-compiler
|
||||
pkg-config
|
||||
gtk4
|
||||
glib
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pygobject3
|
||||
pillow
|
||||
vulkan
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
upscayl-ncnn
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "network_tests" false)
|
||||
];
|
||||
|
||||
# NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
|
||||
# is skipped by `buildPythonApplication`
|
||||
# https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296
|
||||
postInstallCheck = ''
|
||||
mesonCheckPhase
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
|
||||
|
||||
meta = {
|
||||
description = "Upscale and enhance images";
|
||||
homepage = "https://tesk.page/upscaler";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
grimmauld
|
||||
getchoo
|
||||
aleksana
|
||||
];
|
||||
mainProgram = "upscaler";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
27
pkgs/by-name/up/upscayl-ncnn/cmakelists.patch
Normal file
27
pkgs/by-name/up/upscayl-ncnn/cmakelists.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7e4da27..85cf911 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -106,20 +106,13 @@ if(USE_SYSTEM_NCNN)
|
||||
message(STATUS "Using glslang install located at ${GLSLANG_TARGET_DIR}")
|
||||
|
||||
find_package(Threads)
|
||||
+ find_package(glslang REQUIRED)
|
||||
+ find_package(SPIRV-Tools-opt REQUIRED)
|
||||
|
||||
- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
|
||||
- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
|
||||
if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
|
||||
# hlsl support can be optional
|
||||
include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
|
||||
endif()
|
||||
- include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
|
||||
- include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
|
||||
-
|
||||
- if (NOT TARGET glslang OR NOT TARGET SPIRV)
|
||||
- message(WARNING "glslang or SPIRV target not found! USE_SYSTEM_NCNN will be turned off.")
|
||||
- set(USE_SYSTEM_NCNN OFF)
|
||||
- endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
22
pkgs/by-name/up/upscayl-ncnn/models_path.patch
Normal file
22
pkgs/by-name/up/upscayl-ncnn/models_path.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 9d44c3d..40d2b27 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -207,7 +207,7 @@ static void print_usage()
|
||||
fprintf(stderr, " -w width resize output to a width (default=W:default), use '-r help' for more details\n");
|
||||
fprintf(stderr, " -c compress compression of the output image, default 0 and varies to 100\n");
|
||||
fprintf(stderr, " -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n");
|
||||
- fprintf(stderr, " -m model-path folder path to the pre-trained models. default=models\n");
|
||||
+ fprintf(stderr, " -m model-path folder path to the pre-trained models. default=REPLACE_MODELS\n");
|
||||
fprintf(stderr, " -n model-name model name (default=realesrgan-x4plus, can be realesr-animevideov3 | realesrgan-x4plus-anime | realesrnet-x4plus or any other model)\n");
|
||||
fprintf(stderr, " -g gpu-id gpu device to use (default=auto) can be 0,1,2 for multi-gpu\n");
|
||||
fprintf(stderr, " -j load:proc:save thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu\n");
|
||||
@@ -688,7 +688,7 @@ int main(int argc, char **argv)
|
||||
bool resizeProvided = false;
|
||||
bool hasCustomWidth = false;
|
||||
std::vector<int> tilesize;
|
||||
- path_t model = PATHSTR("models");
|
||||
+ path_t model = PATHSTR("REPLACE_MODELS");
|
||||
path_t modelname = PATHSTR("realesrgan-x4plus");
|
||||
std::vector<int> gpuid;
|
||||
int jobs_load = 1;
|
||||
92
pkgs/by-name/up/upscayl-ncnn/package.nix
Normal file
92
pkgs/by-name/up/upscayl-ncnn/package.nix
Normal file
@ -0,0 +1,92 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
glslang,
|
||||
installShellFiles,
|
||||
lib,
|
||||
libwebp,
|
||||
ncnn,
|
||||
stdenv,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
}:
|
||||
|
||||
# upscayl-ncnn is a fork of /pkgs/by-name/re/realesrgan-ncnn-vulkan, so the nix package is basically the same.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "upscayl-ncnn";
|
||||
version = "20240601-103425";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "upscayl";
|
||||
repo = "upscayl-ncnn";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-rGnjL+sU5x3VXHnvuYXVdxGmHdj9eBkIZK3CwL89lN0=";
|
||||
};
|
||||
|
||||
models = fetchzip {
|
||||
# Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update
|
||||
url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesrgan-ncnn-vulkan-20220424-ubuntu.zip";
|
||||
hash = "sha256-1YiPzv1eGnHrazJFRvl37+C1F2xnoEbN0UQYkxLT+JQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cmakelists.patch
|
||||
./models_path.patch
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.cpp --replace REPLACE_MODELS $out/share/models
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
glslang
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_SYSTEM_NCNN" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_WEBP" true)
|
||||
(lib.cmakeFeature "GLSLANG_TARGET_DIR" "${glslang}/lib/cmake")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-loader
|
||||
libwebp
|
||||
ncnn
|
||||
vulkan-headers
|
||||
glslang
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share
|
||||
|
||||
installBin upscayl-bin
|
||||
ln -s ${finalAttrs.models}/models $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${
|
||||
lib.makeLibraryPath [ vulkan-loader ]
|
||||
}";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/upscayl/upscayl-ncnn/releases/tag/${finalAttrs.version}";
|
||||
description = "Upscayl backend powered by the NCNN framework and Real-ESRGAN architecture";
|
||||
homepage = "https://github.com/upscayl/upscayl-ncnn";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "upscayl-bin";
|
||||
maintainers = with lib.maintainers; [
|
||||
grimmauld
|
||||
getchoo
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@ -1,38 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
mandown,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
curl,
|
||||
openssl,
|
||||
mandown,
|
||||
zellij,
|
||||
testers,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.41.1";
|
||||
version = "0.41.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EUoJHM0Jm0uFKFeHhtzon/ZRC615SHfYa1gr4RnCNBw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xdWfaXWmqFJuquE7n3moUjGuFqKB90OE6lqPuC3onOg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rI3pa0dvC/OVJz8gzD1bM0Q+8OWwvGj+jGDEMSbSb2I=";
|
||||
# Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
|
||||
# the vendored one
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail ', "vendored_curl"' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-38hTOsa1a5vpR1i8GK1aq1b8qaJoCE74ewbUOnun+Qs=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
# Workaround for https://github.com/zellij-org/zellij/issues/3720
|
||||
postPatch = ''
|
||||
substituteInPlace zellij-utils/Cargo.toml \
|
||||
--replace-fail 'isahc = "1.7.2"' 'isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
installShellFiles
|
||||
@ -46,12 +47,17 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
# Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs
|
||||
doInstallCheck = stdenv.hostPlatform.libc == "glibc";
|
||||
installCheckPhase = ''
|
||||
installCheckPhase = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
|
||||
runHook preInstallCheck
|
||||
|
||||
ldd "$out/bin/zellij" | grep libcurl.so
|
||||
@ -63,7 +69,6 @@ rustPlatform.buildRustPackage rec {
|
||||
''
|
||||
mandown docs/MANPAGE.md > zellij.1
|
||||
installManPage zellij.1
|
||||
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd $pname \
|
||||
@ -72,14 +77,14 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/zellij setup --generate-completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = zellij; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Terminal workspace with batteries included";
|
||||
homepage = "https://zellij.dev/";
|
||||
changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [
|
||||
therealansh
|
||||
_0x4A6F
|
||||
abbe
|
||||
|
||||
93
pkgs/development/gnuradio-modules/fosphor/default.nix
Normal file
93
pkgs/development/gnuradio-modules/fosphor/default.nix
Normal file
@ -0,0 +1,93 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchgit,
|
||||
gnuradio,
|
||||
cmake,
|
||||
pkg-config,
|
||||
logLib,
|
||||
mpir,
|
||||
gmp,
|
||||
boost,
|
||||
libGL,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
freetype,
|
||||
fftwFloat,
|
||||
qt5,
|
||||
python,
|
||||
enableGLFW ? true,
|
||||
glfw3,
|
||||
enablePNG ? true,
|
||||
libpng,
|
||||
gnuradioOlder,
|
||||
gnuradioAtLeast,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "gr-fosphor";
|
||||
version = "unstable-2024-03-23";
|
||||
|
||||
# It is a gitea instance, but its archive service doesn't work very well so
|
||||
# we can't use it.
|
||||
src = fetchgit {
|
||||
url = "https://gitea.osmocom.org/sdr/gr-fosphor.git";
|
||||
rev = "74d54fc0b3ec9aeb7033686526c5e766f36eaf24";
|
||||
hash = "sha256-FBmH4DmKATl0FPFU7T30OrYYmxlSTTLm1SZpt0o1qkw=";
|
||||
};
|
||||
disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
logLib
|
||||
mpir
|
||||
gmp
|
||||
boost
|
||||
libGL
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
freetype
|
||||
fftwFloat
|
||||
]
|
||||
++ lib.optionals (gnuradio.hasFeature "gr-qtgui") [
|
||||
qt5.qtbase
|
||||
]
|
||||
++ lib.optionals (gnuradio.hasFeature "python-support") [
|
||||
python.pkgs.pybind11
|
||||
python.pkgs.numpy
|
||||
]
|
||||
++ lib.optionals enableGLFW [
|
||||
glfw3
|
||||
]
|
||||
++ lib.optionals enablePNG [
|
||||
libpng
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_QT" (gnuradio.hasFeature "gr-qtgui"))
|
||||
(lib.cmakeBool "ENABLE_PYTHON" (gnuradio.hasFeature "python-support"))
|
||||
(lib.cmakeBool "ENABLE_GLFW" enableGLFW)
|
||||
(lib.cmakeBool "ENABLE_PNG" enablePNG)
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "GNU Radio block for RTSA-like spectrum visualization using OpenCL and OpenGL acceleration";
|
||||
longDescription = ''
|
||||
You'll need to install an OpenCL ICD for it to work.
|
||||
See https://nixos.org/manual/nixos/stable/#sec-gpu-accel-opencl
|
||||
'';
|
||||
homepage = "https://projects.osmocom.org/projects/sdr/wiki/Fosphor";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ chuangzhu ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
47
pkgs/development/python-modules/gower/default.nix
Normal file
47
pkgs/development/python-modules/gower/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
scipy,
|
||||
pandas,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "gower";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwwjk366";
|
||||
repo = "gower";
|
||||
rev = "d92f2145e65efe305143e9e30cc69b722d1c52e3";
|
||||
hash = "sha256-9S4uUEuntKyFbUY4wdYshsVT5Cssc/MCHqOnKHwZoVI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-pyproject_toml.patch
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
scipy
|
||||
pandas
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gower" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gower's distance calculation in Python";
|
||||
homepage = "https://github.com/wwwjk366/gower";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ b-rodrigues ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index dc396ba..d12ba41 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -18,4 +18,5 @@ classifiers = [
|
||||
"License :: OSI Approved :: MIT License",
|
||||
"Operating System :: OS Independent",
|
||||
]
|
||||
+dynamic = ["license", "dependencies"]
|
||||
|
||||
[project.urls]
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "5.0.0";
|
||||
version = "5.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0+tD+CtbR9MdqXH2CXWsXxyr5YM9gToExFnDQZa+gWM=";
|
||||
hash = "sha256-x4EzVm22iZhGysg2iMtuil2tNJn4/8cWYyULLowODGc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optree";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "metaopt";
|
||||
repo = "optree";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HuzfQ1arAF/DbJd9MF0jAxfzWvOHtAfkEMUF+aPfaII=";
|
||||
hash = "sha256-/Y2pMpVPz4EXyWoW++K3FFf67Ym6yUs0ZQI4y0GVwmo=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
63
pkgs/development/python-modules/vulkan/default.nix
Normal file
63
pkgs/development/python-modules/vulkan/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
cffi,
|
||||
fetchFromGitHub,
|
||||
inflection,
|
||||
jinja2,
|
||||
lib,
|
||||
pysdl2,
|
||||
setuptools,
|
||||
vulkan-loader,
|
||||
wheel,
|
||||
xmltodict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vulkan";
|
||||
version = "1.3.275.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "realitix";
|
||||
repo = "vulkan";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-b1jHNKdHF7pIC6H4O2yxy36Ppb60J0uN2P0WaCw51Gc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vulkan/_vulkan.py \
|
||||
--replace-fail 'lib = ffi.dlopen(name)' 'lib = ffi.dlopen("${vulkan-loader}/lib/" + name)'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
inflection
|
||||
jinja2
|
||||
pysdl2
|
||||
xmltodict
|
||||
cffi
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vulkan"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Ultimate Python binding for Vulkan API";
|
||||
homepage = "https://github.com/realitix/vulkan";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
grimmauld
|
||||
getchoo
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -17,13 +17,13 @@
|
||||
let
|
||||
data = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "path-of-building-data";
|
||||
version = "2.49.0";
|
||||
version = "2.49.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UfDue+VhdOtSxtGa5Mt6k4gZGyy2KyEiPiBqGVVOGsI=";
|
||||
hash = "sha256-rxvReL2ofdaQdKmIg2lMDT0thN1IkeJMf1B7+HWlQaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -21,15 +21,15 @@ let
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-Okp/+glgeIKzHIcW/9AJAmBEcXPm7ANM23iU/Q4jhf8=";
|
||||
aarch64-linux = "sha256-x0hQ/EZGM8XjIqpPGMzxTsL7oUg4YMvc/xNfvmU/sJE=";
|
||||
x86_64-darwin = "sha256-Y7N8flvk3HpaSYjg6RJlCfN6eMsM8AuqIJ+oef85+8s=";
|
||||
x86_64-linux = "sha256-Egp+U/I9i1PQc/MruGRaOpJtDQUQAyRmu4nC71e8fWM=";
|
||||
aarch64-darwin = "sha256-Ht8M0gHO6a+JVUGEZXdU2LFiNCx2jrGmErXT6kVTje0=";
|
||||
aarch64-linux = "sha256-d3/6NxctWbMBSR7CPF2N46g1TJc63KnKKqZcu2p0A80=";
|
||||
x86_64-darwin = "sha256-diShDytcYY+9/gNDAQM+xZ/79o40Qs+62dtxpW0EfaQ=";
|
||||
x86_64-linux = "sha256-bb3UzRr0Df4QejSsFzL7x9PnyULL3ML8CL6EGmsqelM=";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.25.4.4818";
|
||||
version = "1.26.1.4844";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@ -31,21 +31,15 @@ mkDerivation rec {
|
||||
url = "https://github.com/open-eid/DigiDoc4-Client/commit/bb324d18f0452c2ab1b360ff6c42bb7f11ea60d7.patch";
|
||||
hash = "sha256-JpaU9inupSDsZKhHk+sp5g+oUynVFxR7lshjTXoFIbU=";
|
||||
})
|
||||
|
||||
# Regularly update this with what's on https://src.fedoraproject.org/rpms/qdigidoc/blob/rawhide/f/sandbox.patch
|
||||
# This prevents attempts to download TSL lists inside the build sandbox.
|
||||
# The list files are regularly updated (get new signatures), though this also happens at application runtime.
|
||||
./sandbox.patch
|
||||
];
|
||||
|
||||
# Check https://dss.nowina.lu/tl-info, "Pivots loaded" section
|
||||
tsl = fetchurl {
|
||||
url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-341.xml";
|
||||
hash = "sha256-/TI8qYxXzourjGFPBpsQzi9Depi7lLQ2JaV+FyP0FtE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkg-config qttools ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace client/CMakeLists.txt \
|
||||
--replace $\{TSL_URL} file://${tsl}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
flatbuffers
|
||||
libdigidocpp
|
||||
|
||||
11123
pkgs/tools/security/qdigidoc/sandbox.patch
Normal file
11123
pkgs/tools/security/qdigidoc/sandbox.patch
Normal file
File diff suppressed because one or more lines are too long
@ -39,6 +39,8 @@ in {
|
||||
|
||||
ais = callPackage ../development/gnuradio-modules/ais/default.nix { };
|
||||
|
||||
fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { };
|
||||
|
||||
grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };
|
||||
|
||||
gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };
|
||||
|
||||
@ -5409,6 +5409,8 @@ self: super: with self; {
|
||||
|
||||
goveelights = callPackage ../development/python-modules/goveelights { };
|
||||
|
||||
gower = callPackage ../development/python-modules/gower { };
|
||||
|
||||
gpapi = callPackage ../development/python-modules/gpapi { };
|
||||
|
||||
gpaw = callPackage ../development/python-modules/gpaw { };
|
||||
@ -17565,6 +17567,8 @@ self: super: with self; {
|
||||
|
||||
vulcan-api = callPackage ../development/python-modules/vulcan-api { };
|
||||
|
||||
vulkan = callPackage ../development/python-modules/vulkan { };
|
||||
|
||||
vultr = callPackage ../development/python-modules/vultr { };
|
||||
|
||||
vulture = callPackage ../development/python-modules/vulture { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user