Merge staging-next into staging
This commit is contained in:
commit
dd424ee92c
|
@ -106,12 +106,12 @@ This is a warning
|
|||
|
||||
The following are supported:
|
||||
|
||||
- [`caution`](https://tdg.docbook.org/tdg/5.0/caution.html)
|
||||
- [`important`](https://tdg.docbook.org/tdg/5.0/important.html)
|
||||
- [`note`](https://tdg.docbook.org/tdg/5.0/note.html)
|
||||
- [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html)
|
||||
- [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html)
|
||||
- [`example`](https://tdg.docbook.org/tdg/5.0/example.html)
|
||||
- `caution`
|
||||
- `important`
|
||||
- `note`
|
||||
- `tip`
|
||||
- `warning`
|
||||
- `example`
|
||||
|
||||
Example admonitions require a title to work.
|
||||
If you don't provide one, the manual won't be built.
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
# Global configuration {#chap-packageconfig}
|
||||
|
||||
Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true:
|
||||
Nix comes with certain defaults about which packages can and cannot be installed, based on a package's metadata.
|
||||
By default, Nix will prevent installation if any of the following criteria are true:
|
||||
|
||||
- The package is thought to be broken, and has had its `meta.broken` set to `true`.
|
||||
|
||||
|
@ -10,23 +11,14 @@ Nix comes with certain defaults about what packages can and cannot be installed,
|
|||
|
||||
- The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's `meta.knownVulnerabilities`.
|
||||
|
||||
Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. `nix-env -qa` will (attempt to) hide any packages that would be refused.
|
||||
Each of these criteria can be altered in the Nixpkgs configuration.
|
||||
|
||||
Each of these criteria can be altered in the nixpkgs configuration.
|
||||
:::{.note}
|
||||
All this is checked during evaluation already, and the check includes any package that is evaluated.
|
||||
In particular, all build-time dependencies are checked.
|
||||
:::
|
||||
|
||||
The nixpkgs configuration for a NixOS system is set in the `configuration.nix`, as in the following example:
|
||||
|
||||
```nix
|
||||
{
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
However, this does not allow unfree software for individual users. Their configurations are managed separately.
|
||||
|
||||
A user's nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:
|
||||
A user's Nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:
|
||||
|
||||
```nix
|
||||
{
|
||||
|
@ -34,7 +26,10 @@ A user's nixpkgs configuration is stored in a user-specific configuration file l
|
|||
}
|
||||
```
|
||||
|
||||
Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software.
|
||||
:::{.caution}
|
||||
Unfree software is not tested or built in Nixpkgs continuous integration, and therefore not cached.
|
||||
Most unfree licenses prohibit either executing or distributing the software.
|
||||
:::
|
||||
|
||||
## Installing broken packages {#sec-allow-broken}
|
||||
|
||||
|
|
|
@ -10523,6 +10523,12 @@
|
|||
githubId = 845652;
|
||||
name = "Kier Davis";
|
||||
};
|
||||
kiike = {
|
||||
email = "me@enric.me";
|
||||
github = "kiike";
|
||||
githubId = 464625;
|
||||
name = "Enric Morales";
|
||||
};
|
||||
kilianar = {
|
||||
email = "mail@kilianar.de";
|
||||
github = "kilianar";
|
||||
|
|
|
@ -1,11 +1,33 @@
|
|||
# Customising Packages {#sec-customising-packages}
|
||||
|
||||
Some packages in Nixpkgs have options to enable or disable optional
|
||||
functionality or change other aspects of the package.
|
||||
The Nixpkgs configuration for a NixOS system is set by the {option}`nixpkgs.config` option.
|
||||
|
||||
::::{.example}
|
||||
# Globally allow unfree packages
|
||||
|
||||
```nix
|
||||
{
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
:::{.note}
|
||||
This only allows unfree software in the given NixOS configuration.
|
||||
For users invoking Nix commands such as [`nix-build`](https://nixos.org/manual/nix/stable/command-ref/nix-build), Nixpkgs is configured independently.
|
||||
See the [Nixpkgs manual section on global configuration](https://nixos.org/manual/nixpkgs/unstable/#chap-packageconfig) for details.
|
||||
:::
|
||||
::::
|
||||
|
||||
<!-- TODO(@fricklerhandwerk)
|
||||
all of the following should go to the Nixpkgs manual, it has nothing to do with NixOS
|
||||
-->
|
||||
|
||||
Some packages in Nixpkgs have options to enable or disable optional functionality, or change other aspects of the package.
|
||||
|
||||
::: {.warning}
|
||||
Unfortunately, Nixpkgs currently lacks a way to query available
|
||||
configuration options.
|
||||
Unfortunately, Nixpkgs currently lacks a way to query available package configuration options.
|
||||
:::
|
||||
|
||||
::: {.note}
|
||||
|
|
|
@ -226,7 +226,7 @@ in {
|
|||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.attrs;
|
||||
type = types.submodule { freeformType = types.attrs; };
|
||||
default = {};
|
||||
description = ''
|
||||
Extra configuration as nix values.
|
||||
|
|
|
@ -18,8 +18,8 @@ let
|
|||
sha256Hash = "sha256-zROBKzQiP4V2P67HgOIkHgn8q/M0zy5MkZozVSiQsWU=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.1.1.3"; # "Android Studio Koala | 2024.1.1 Canary 5"
|
||||
sha256Hash = "sha256-JL2cloR0RhSnr8e62fHhxIzF286fT9sahTuv2OoQVRY=";
|
||||
version = "2024.1.1.4"; # "Android Studio Koala | 2024.1.1 Canary 6"
|
||||
sha256Hash = "sha256-lfig7lFyF7XZowTQKpo6zGeR23VHq/f7vvUDWCs7jeo=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
@ -113,7 +113,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
|||
homepage = "https://github.com/neovide/neovide";
|
||||
changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ck3d multisn8 ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
148
pkgs/applications/misc/inochi2d/creator-dub-lock.json
Normal file
148
pkgs/applications/misc/inochi2d/creator-dub-lock.json
Normal file
|
@ -0,0 +1,148 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"bcaa": {
|
||||
"version": "0.0.8",
|
||||
"sha256": "1v8qy98hjdgfsdx6zg9n09sfpfqsh57nbsn8phw82rssi0gysgsr"
|
||||
},
|
||||
"bindbc-loader": {
|
||||
"version": "1.0.3",
|
||||
"sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j"
|
||||
},
|
||||
"bindbc-sdl": {
|
||||
"version": "1.1.3",
|
||||
"sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88"
|
||||
},
|
||||
"dcv": {
|
||||
"version": "0.3.0",
|
||||
"sha256": "02fd7wig6i618r7l7alw0hfljbwjvq13fkyhwcpsdd7r5x2f7hyk"
|
||||
},
|
||||
"ddbus": {
|
||||
"version": "3.0.0-beta.2",
|
||||
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
|
||||
},
|
||||
"diet-ng": {
|
||||
"version": "1.8.1",
|
||||
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
|
||||
},
|
||||
"dportals": {
|
||||
"version": "0.1.0",
|
||||
"sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh"
|
||||
},
|
||||
"dunit": {
|
||||
"version": "1.0.16",
|
||||
"sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"
|
||||
},
|
||||
"dxml": {
|
||||
"version": "0.4.4",
|
||||
"sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w"
|
||||
},
|
||||
"eventcore": {
|
||||
"version": "0.9.29",
|
||||
"sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa"
|
||||
},
|
||||
"facetrack-d": {
|
||||
"version": "0.7.8",
|
||||
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
|
||||
},
|
||||
"fghj": {
|
||||
"version": "1.0.2",
|
||||
"sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj"
|
||||
},
|
||||
"i18n-d": {
|
||||
"version": "1.0.2",
|
||||
"sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g"
|
||||
},
|
||||
"i2d-imgui": {
|
||||
"version": "0.8.0",
|
||||
"sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw"
|
||||
},
|
||||
"i2d-opengl": {
|
||||
"version": "1.0.0",
|
||||
"sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912"
|
||||
},
|
||||
"imagefmt": {
|
||||
"version": "2.1.2",
|
||||
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
|
||||
},
|
||||
"inmath": {
|
||||
"version": "1.0.6",
|
||||
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
|
||||
},
|
||||
"inochi2d": {
|
||||
"version": "0.8.3",
|
||||
"sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l"
|
||||
},
|
||||
"kra-d": {
|
||||
"version": "0.5.5",
|
||||
"sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz"
|
||||
},
|
||||
"libasync": {
|
||||
"version": "0.8.6",
|
||||
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
|
||||
},
|
||||
"memutils": {
|
||||
"version": "1.0.10",
|
||||
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
|
||||
},
|
||||
"mir-algorithm": {
|
||||
"version": "3.22.0",
|
||||
"sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq"
|
||||
},
|
||||
"mir-core": {
|
||||
"version": "1.7.0",
|
||||
"sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62"
|
||||
},
|
||||
"mir-linux-kernel": {
|
||||
"version": "1.0.1",
|
||||
"sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"
|
||||
},
|
||||
"mir-random": {
|
||||
"version": "2.2.19",
|
||||
"sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb"
|
||||
},
|
||||
"openssl": {
|
||||
"version": "3.3.3",
|
||||
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
|
||||
},
|
||||
"openssl-static": {
|
||||
"version": "1.0.3+3.0.8",
|
||||
"sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr"
|
||||
},
|
||||
"psd-d": {
|
||||
"version": "0.6.3",
|
||||
"sha256": "0qbwkvzgrvd6m67p14ari4iiajmhfi2x1id4da971qxiprfm1993"
|
||||
},
|
||||
"silly": {
|
||||
"version": "1.1.1",
|
||||
"sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb"
|
||||
},
|
||||
"stdx-allocator": {
|
||||
"version": "2.77.5",
|
||||
"sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"
|
||||
},
|
||||
"taggedalgebraic": {
|
||||
"version": "0.11.22",
|
||||
"sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r"
|
||||
},
|
||||
"tinyfiledialogs": {
|
||||
"version": "0.10.1",
|
||||
"sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi"
|
||||
},
|
||||
"vibe-container": {
|
||||
"version": "1.3.0",
|
||||
"sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair"
|
||||
},
|
||||
"vibe-core": {
|
||||
"version": "2.8.2",
|
||||
"sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr"
|
||||
},
|
||||
"vibe-d": {
|
||||
"version": "0.9.8",
|
||||
"sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k"
|
||||
},
|
||||
"vmc-d": {
|
||||
"version": "1.1.3",
|
||||
"sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm"
|
||||
}
|
||||
}
|
||||
}
|
81
pkgs/applications/misc/inochi2d/default.nix
Normal file
81
pkgs/applications/misc/inochi2d/default.nix
Normal file
|
@ -0,0 +1,81 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
# Note for maintainers:
|
||||
#
|
||||
# These packages are only allowed to be packaged under the the condition that we
|
||||
# - patch source/creator/config.d to not point to upstream's bug tracker
|
||||
# - use the "barebones" configuration to remove the mascot and logo from the build
|
||||
#
|
||||
# We have received permission by the owner to go ahead with the packaging, as we have met all the criteria
|
||||
# https://github.com/NixOS/nixpkgs/pull/288841#issuecomment-1950247467
|
||||
|
||||
let
|
||||
mkGeneric = builderArgs: callPackage ./generic.nix { inherit builderArgs; };
|
||||
in
|
||||
{
|
||||
inochi-creator = mkGeneric rec {
|
||||
pname = "inochi-creator";
|
||||
appname = "Inochi Creator";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Inochi2D";
|
||||
repo = "inochi-creator";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wsB9KIZyot2Y+6QpQlIXRzv3cPCdwp2Q/ZfDizAKJc4=";
|
||||
};
|
||||
|
||||
dubLock = ./creator-dub-lock.json;
|
||||
|
||||
patches = [
|
||||
# Upstream asks that we change the bug tracker URL to not point to the upsteam bug tracker
|
||||
(substituteAll {
|
||||
src = ./support-url.patch;
|
||||
assignees = "TomaSajt"; # should be a comma separated list of the github usernames of the maintainers
|
||||
})
|
||||
# Change how duplicate locales differentiate themselves (the store paths were too long)
|
||||
./translations.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
# darwin has slightly different build steps
|
||||
broken = stdenv.isDarwin;
|
||||
changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}";
|
||||
description = "An open source editor for the Inochi2D puppet format";
|
||||
};
|
||||
};
|
||||
|
||||
inochi-session = mkGeneric rec {
|
||||
pname = "inochi-session";
|
||||
appname = "Inochi Session";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Inochi2D";
|
||||
repo = "inochi-session";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yq/uMWEeydZun07/7hgUaAw3IruRqrDuGgbe5NzNYxw=";
|
||||
};
|
||||
|
||||
dubLock = ./session-dub-lock.json;
|
||||
|
||||
preFixup = ''
|
||||
patchelf $out/share/inochi-session/inochi-session --add-needed cimgui.so
|
||||
'';
|
||||
|
||||
dontStrip = true; # symbol lookup error: undefined symbol: , version
|
||||
|
||||
meta = {
|
||||
# darwin has slightly different build steps, aarch fails to build because of some lua related error
|
||||
broken = stdenv.isDarwin || stdenv.isAarch64;
|
||||
changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}";
|
||||
description = "An application that allows streaming with Inochi2D puppets";
|
||||
};
|
||||
};
|
||||
}
|
139
pkgs/applications/misc/inochi2d/generic.nix
Normal file
139
pkgs/applications/misc/inochi2d/generic.nix
Normal file
|
@ -0,0 +1,139 @@
|
|||
{
|
||||
lib,
|
||||
buildDubPackage,
|
||||
fetchFromGitHub,
|
||||
writeShellScriptBin,
|
||||
|
||||
cmake,
|
||||
gettext,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
|
||||
dbus,
|
||||
freetype,
|
||||
SDL2,
|
||||
gnome,
|
||||
|
||||
builderArgs,
|
||||
}:
|
||||
|
||||
let
|
||||
cimgui-src = fetchFromGitHub {
|
||||
owner = "Inochi2D";
|
||||
repo = "cimgui";
|
||||
rev = "49bb5ce65f7d5eeab7861d8ffd5aa2a58ca8f08c";
|
||||
hash = "sha256-XcnZbIjwq7vmYBnMAs+cEpJL8HB8wrL098FXGxC+diA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
inherit (builderArgs)
|
||||
pname
|
||||
appname
|
||||
version
|
||||
dubLock
|
||||
meta
|
||||
;
|
||||
in
|
||||
buildDubPackage (
|
||||
builderArgs
|
||||
// {
|
||||
nativeBuildInputs = [
|
||||
cmake # used for building `i2d-imgui`
|
||||
gettext # used when generating translations
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
|
||||
# A fake git implementation to be used by the `gitver` package
|
||||
# It is a dependency of the main packages and the `inochi2d` dub dependency
|
||||
# A side effect of this script is that `inochi2d` will have the same version listed as the main package
|
||||
(writeShellScriptBin "git" "echo v${version}")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
freetype
|
||||
SDL2
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
# these deps are not listed inside `dub.sdl`, so they didn't get auto-generated
|
||||
# these are used for generating version info when building
|
||||
dubLock = lib.recursiveUpdate (lib.importJSON dubLock) {
|
||||
dependencies = {
|
||||
gitver = {
|
||||
version = "1.6.1";
|
||||
sha256 = "sha256-NCyFik4FbD7yMLd5zwf/w4cHwhzLhIRSVw1bWo/CZB4=";
|
||||
};
|
||||
semver = {
|
||||
version = "0.3.2";
|
||||
sha256 = "sha256-l6c9hniUd5xNsJepq8x30e0JTjmXs4pYUmv4ws+Nrn4=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
cimgui_dir=("$DUB_HOME"/packages/i2d-imgui/*/i2d-imgui)
|
||||
|
||||
# `i2d-imgui` isn't able to find SDL2 by default due to it being written in lower case
|
||||
# this is only an issue when compiling statically (session)
|
||||
substituteInPlace "$cimgui_dir/dub.json" \
|
||||
--replace-fail '"sdl2"' '"SDL2"'
|
||||
|
||||
# The `i2d-cimgui` dub dependency fetched inside the auto-generated `*-deps.nix` file
|
||||
# which doesn't know that it's actually a git repo, so it doesn't fetch its submodules.
|
||||
# Upstream uses a cmake script to fetch the `cimgui` submodule anyway, which we can't do
|
||||
# We get around this by manually pre-fetching the submodule and copying it into the right place
|
||||
cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui"
|
||||
|
||||
# Disable the original cmake fetcher script
|
||||
substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \
|
||||
--replace-fail "PullSubmodules(" "# PullSubmodules(" \
|
||||
--replace-fail "\''${cimgui_SUBMOD_DIR}" "cimgui"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# Generate translations (if possible)
|
||||
. gentl.sh
|
||||
|
||||
# Use the fake git to generate version info
|
||||
dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta
|
||||
'';
|
||||
|
||||
# Use the "barebones" configuration so that we don't include the mascot and icon files in out build
|
||||
dubFlags = [ "--config=barebones" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/${pname}
|
||||
cp -r out/* $out/share/${pname}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = appname;
|
||||
exec = pname;
|
||||
comment = meta.description;
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Add support for `open file` dialog
|
||||
makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnome.zenity ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://inochi2d.com/";
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = pname;
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
} // meta;
|
||||
}
|
||||
)
|
140
pkgs/applications/misc/inochi2d/session-dub-lock.json
Normal file
140
pkgs/applications/misc/inochi2d/session-dub-lock.json
Normal file
|
@ -0,0 +1,140 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"bindbc-loader": {
|
||||
"version": "1.0.3",
|
||||
"sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j"
|
||||
},
|
||||
"bindbc-lua": {
|
||||
"version": "0.5.1",
|
||||
"sha256": "116lcplxxl39x6m2sr9zkszdbrm1pa285sjqijnqxqy99jajnhc7"
|
||||
},
|
||||
"bindbc-sdl": {
|
||||
"version": "1.1.3",
|
||||
"sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88"
|
||||
},
|
||||
"bindbc-spout2": {
|
||||
"version": "0.1.1",
|
||||
"sha256": "03r4xsjpwys4nlfhas4hjqygzs764dzsr789b091iczp56pp9w9z"
|
||||
},
|
||||
"ddbus": {
|
||||
"version": "3.0.0-beta.2",
|
||||
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
|
||||
},
|
||||
"diet-ng": {
|
||||
"version": "1.8.1",
|
||||
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
|
||||
},
|
||||
"dportals": {
|
||||
"version": "0.1.0",
|
||||
"sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh"
|
||||
},
|
||||
"dunit": {
|
||||
"version": "1.0.16",
|
||||
"sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"
|
||||
},
|
||||
"eventcore": {
|
||||
"version": "0.9.29",
|
||||
"sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa"
|
||||
},
|
||||
"facetrack-d": {
|
||||
"version": "0.7.8",
|
||||
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
|
||||
},
|
||||
"fghj": {
|
||||
"version": "1.0.2",
|
||||
"sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj"
|
||||
},
|
||||
"i18n-d": {
|
||||
"version": "1.0.2",
|
||||
"sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g"
|
||||
},
|
||||
"i2d-imgui": {
|
||||
"version": "0.8.0",
|
||||
"sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw"
|
||||
},
|
||||
"i2d-opengl": {
|
||||
"version": "1.0.0",
|
||||
"sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912"
|
||||
},
|
||||
"imagefmt": {
|
||||
"version": "2.1.2",
|
||||
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
|
||||
},
|
||||
"inmath": {
|
||||
"version": "1.0.6",
|
||||
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
|
||||
},
|
||||
"inochi2d": {
|
||||
"version": "0.8.3",
|
||||
"sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l"
|
||||
},
|
||||
"inui": {
|
||||
"version": "1.2.1",
|
||||
"sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx"
|
||||
},
|
||||
"libasync": {
|
||||
"version": "0.8.6",
|
||||
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
|
||||
},
|
||||
"lumars": {
|
||||
"version": "1.6.1",
|
||||
"sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9"
|
||||
},
|
||||
"memutils": {
|
||||
"version": "1.0.10",
|
||||
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
|
||||
},
|
||||
"mir-algorithm": {
|
||||
"version": "3.22.0",
|
||||
"sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq"
|
||||
},
|
||||
"mir-core": {
|
||||
"version": "1.7.0",
|
||||
"sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62"
|
||||
},
|
||||
"mir-linux-kernel": {
|
||||
"version": "1.0.1",
|
||||
"sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"
|
||||
},
|
||||
"openssl": {
|
||||
"version": "3.3.3",
|
||||
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
|
||||
},
|
||||
"openssl-static": {
|
||||
"version": "1.0.3+3.0.8",
|
||||
"sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr"
|
||||
},
|
||||
"silly": {
|
||||
"version": "1.1.1",
|
||||
"sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb"
|
||||
},
|
||||
"stdx-allocator": {
|
||||
"version": "2.77.5",
|
||||
"sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"
|
||||
},
|
||||
"taggedalgebraic": {
|
||||
"version": "0.11.22",
|
||||
"sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r"
|
||||
},
|
||||
"tinyfiledialogs": {
|
||||
"version": "0.10.1",
|
||||
"sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi"
|
||||
},
|
||||
"vibe-container": {
|
||||
"version": "1.3.0",
|
||||
"sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair"
|
||||
},
|
||||
"vibe-core": {
|
||||
"version": "2.8.2",
|
||||
"sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr"
|
||||
},
|
||||
"vibe-d": {
|
||||
"version": "0.9.8",
|
||||
"sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k"
|
||||
},
|
||||
"vmc-d": {
|
||||
"version": "1.1.3",
|
||||
"sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm"
|
||||
}
|
||||
}
|
||||
}
|
13
pkgs/applications/misc/inochi2d/support-url.patch
Normal file
13
pkgs/applications/misc/inochi2d/support-url.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/source/creator/config.d b/source/creator/config.d
|
||||
index 4289703..d8dea4e 100644
|
||||
--- a/source/creator/config.d
|
||||
+++ b/source/creator/config.d
|
||||
@@ -30,7 +30,7 @@ enum INC_BANNER_ARTIST_PAGE = "https://mastodon.art/@nighteden";
|
||||
/**
|
||||
URI for bug reports, for unofficial builds this SHOULD be changed.
|
||||
*/
|
||||
-enum INC_BUG_REPORT_URI = "https://github.com/Inochi2D/inochi-creator/issues/new?assignees=&labels=bug&template=bug-report.yml&title=%5BBUG%5D";
|
||||
+enum INC_BUG_REPORT_URI = "https://github.com/NixOS/nixpkgs/issues/new?assignees=@assignees@&labels=0.kind%3A+bug&projects=&template=bug_report.md&title=inochi-creator:";
|
||||
|
||||
/**
|
||||
URI for feature requests, for the most part this doesn't need to be changed
|
22
pkgs/applications/misc/inochi2d/translations.patch
Normal file
22
pkgs/applications/misc/inochi2d/translations.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
diff --git a/source/creator/core/i18n.d b/source/creator/core/i18n.d
|
||||
index 38761dd..f276ca1 100644
|
||||
--- a/source/creator/core/i18n.d
|
||||
+++ b/source/creator/core/i18n.d
|
||||
@@ -132,7 +132,7 @@ void markDups(TLEntry[] entries) {
|
||||
// If prevEntry has same humanName as entry before prevEntry, or as this entry,
|
||||
// disambiguate with the source folder
|
||||
if (prevIsDup || entryIsDup) {
|
||||
- prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")";
|
||||
+ prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")";
|
||||
prevEntry.humanNameC = prevEntry.humanName.toStringz;
|
||||
}
|
||||
prevIsDup = entryIsDup;
|
||||
@@ -140,7 +140,7 @@ void markDups(TLEntry[] entries) {
|
||||
}
|
||||
|
||||
if (prevIsDup) {
|
||||
- prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")";
|
||||
+ prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")";
|
||||
prevEntry.humanNameC = prevEntry.humanName.toStringz;
|
||||
}
|
||||
}
|
|
@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
|||
|
||||
gnuradioMinimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.17.4";
|
||||
version = "2.17.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7TjmtF0B+dxUcoXXzpF47dHwxhNMKKQ8Mpf/FFTuwl4=";
|
||||
hash = "sha256-9VePsl/vaSTZ1TMyIeaGoZNrZv+O/7BxQ3ubD5S2EjY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -24,41 +24,39 @@
|
|||
# Usually, this option is broken, do not use it except if you know what you are
|
||||
# doing.
|
||||
, sourceDebug ? false
|
||||
, projectDscPath ? {
|
||||
i686 = "OvmfPkg/OvmfPkgIa32.dsc";
|
||||
x86_64 = "OvmfPkg/OvmfPkgX64.dsc";
|
||||
aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc";
|
||||
riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";
|
||||
}.${stdenv.hostPlatform.parsed.cpu.name}
|
||||
or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}")
|
||||
, fwPrefix ? {
|
||||
i686 = "OVMF";
|
||||
x86_64 = "OVMF";
|
||||
aarch64 = "AAVMF";
|
||||
riscv64 = "RISCV_VIRT";
|
||||
}.${stdenv.hostPlatform.parsed.cpu.name}
|
||||
or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}")
|
||||
, metaPlatforms ? edk2.meta.platforms
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
platformSpecific = {
|
||||
i686 = {
|
||||
projectDscPath = "OvmfPkg/OvmfPkgIa32.dsc";
|
||||
fwPrefix = "OVMF";
|
||||
x86_64.msVarsArgs = {
|
||||
flavor = "OVMF_4M";
|
||||
archDir = "X64";
|
||||
};
|
||||
x86_64 = {
|
||||
projectDscPath = "OvmfPkg/OvmfPkgX64.dsc";
|
||||
fwPrefix = "OVMF";
|
||||
msVarsArgs = {
|
||||
flavor = "OVMF_4M";
|
||||
archDir = "X64";
|
||||
};
|
||||
};
|
||||
aarch64 = {
|
||||
projectDscPath = "ArmVirtPkg/ArmVirtQemu.dsc";
|
||||
fwPrefix = "AAVMF";
|
||||
msVarsArgs = {
|
||||
flavor = "AAVMF";
|
||||
archDir = "AARCH64";
|
||||
};
|
||||
};
|
||||
riscv64 = {
|
||||
projectDscPath = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";
|
||||
fwPrefix = "RISCV_VIRT";
|
||||
aarch64.msVarsArgs = {
|
||||
flavor = "AAVMF";
|
||||
archDir = "AARCH64";
|
||||
};
|
||||
};
|
||||
|
||||
cpuName = stdenv.hostPlatform.parsed.cpu.name;
|
||||
|
||||
inherit (platformSpecific.${cpuName})
|
||||
projectDscPath fwPrefix msVarsArgs;
|
||||
inherit (platformSpecific.${cpuName}) msVarsArgs;
|
||||
|
||||
version = lib.getVersion edk2;
|
||||
|
||||
|
@ -152,6 +150,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
|
|||
# release notes accordingly.
|
||||
postInstall = ''
|
||||
mkdir -vp $fd/FV
|
||||
'' + lib.optionalString (builtins.elem fwPrefix [
|
||||
"OVMF" "AAVMF" "RISCV_VIRT"
|
||||
]) ''
|
||||
mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV
|
||||
'' + lib.optionalString stdenv.hostPlatform.isx86 ''
|
||||
mv -v $out/FV/${fwPrefix}.fd $fd/FV
|
||||
|
@ -184,7 +185,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
|
|||
description = "Sample UEFI firmware for QEMU and KVM";
|
||||
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
|
||||
license = lib.licenses.bsd2;
|
||||
inherit (edk2.meta) platforms;
|
||||
platforms = metaPlatforms;
|
||||
maintainers = with lib.maintainers; [ adamcstephens raitobezarius ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
let
|
||||
pname = "jan";
|
||||
version = "0.4.10";
|
||||
version = "0.4.11";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-IOqwz3pJ4veuxQwfkMs0Zf8dNQcQ0HwnR3SPBVvQXtU=";
|
||||
hash = "sha256-EDQK8W0MxwXSNaHx2snByHs2Wr3RXtlNiXajzDMVJpc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
@ -20,7 +20,7 @@ appimageTools.wrapType2 {
|
|||
mv $out/bin/jan-${version} $out/bin/jan
|
||||
install -Dm444 ${appimageContents}/jan.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/jan.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=jan'
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=jan'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
|
|
40
pkgs/by-name/mo/moproxy/package.nix
Normal file
40
pkgs/by-name/mo/moproxy/package.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ fetchFromGitHub
|
||||
, rustPlatform
|
||||
, fetchurl
|
||||
, lib
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec{
|
||||
pname = "moproxy";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorz";
|
||||
repo = "moproxy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EunlvI7I6d93wb3hxgxsyAXkzxRlDu0fq9qqjnbzzWg=";
|
||||
|
||||
preBuild =
|
||||
let
|
||||
webBundle = fetchurl {
|
||||
url = "https://github.com/sorz/moproxy-web/releases/download/v0.1.8/build.zip";
|
||||
hash = "sha256-bLC76LnTWR2/xnDcZtX/t0OUmP7vdI/o3TCRzG9eH/g=";
|
||||
};
|
||||
in
|
||||
''
|
||||
# build script try to download from network
|
||||
sed -i '15s/.*/let zip_path = PathBuf::from("${lib.escape ["/"] (toString webBundle)}");/' build.rs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sorz/moproxy";
|
||||
description = "A transparent TCP to SOCKSv5/HTTP proxy on Linux written in Rust";
|
||||
license = licenses.mit;
|
||||
mainProgram = "moproxy";
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
7
pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix
Normal file
7
pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ lib, OVMF }:
|
||||
|
||||
OVMF.override {
|
||||
projectDscPath = "OvmfPkg/CloudHv/CloudHvX64.dsc";
|
||||
fwPrefix = "CLOUDHV";
|
||||
metaPlatforms = builtins.filter (lib.hasPrefix "x86_64-") OVMF.meta.platforms;
|
||||
}
|
26
pkgs/by-name/re/restls/package.nix
Normal file
26
pkgs/by-name/re/restls/package.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ fetchFromGitHub
|
||||
, rustPlatform
|
||||
, lib
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec{
|
||||
pname = "restls";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "3andne";
|
||||
repo = "restls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KtNLLtStZ7SNndcPxWfNPA2duoXFVePrbNQFPUz2xFg=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/3andne/restls";
|
||||
description = "A Perfect Impersonation of TLS";
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "restls";
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
};
|
||||
}
|
|
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A CLI for indexing and searching packages in Nix expressions";
|
||||
homepage = "https://github.com/replit/rippkgs";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
maintainers = with lib.maintainers; [ eclairevoyant cdmistman ];
|
||||
mainProgram = "rippkgs";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,17 @@
|
|||
{
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"regex"
|
||||
],
|
||||
"path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source",
|
||||
"ref": "v0.25.0",
|
||||
"rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b",
|
||||
"sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
|
@ -11,6 +23,18 @@
|
|||
"sha256": "10d1g09q6p554pwr6a3b6ajnwqbphz3a4cwkfa05jbviflfyzjyk",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/OpenSystemsLab/tempfile.nim/archive/26e0239441755e5edcfd170e9aa566bb9c9eb6f3.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"unicodedb"
|
||||
],
|
||||
"path": "/nix/store/wpilzdf8vdwp7w129yrl821p9qvl3ky3-source",
|
||||
"ref": "0.12.0",
|
||||
"rev": "b055310c08db8f879057b4fec15c8301ee93bb2a",
|
||||
"sha256": "0w77h75vrgp6jiq4dd9i2m4za2cf8qhjkz2wlxiz27yn2isjrndy",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nitely/nim-unicodedb/archive/b055310c08db8f879057b4fec15c8301ee93bb2a.tar.gz"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage {
|
||||
pname = "tridactyl-native";
|
||||
version = "0.3.7";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tridactyl";
|
||||
repo = "native_messenger";
|
||||
rev = "62f19dba573b924703829847feb1bfee68885514";
|
||||
sha256 = "sha256-YGDVcfFcI9cRCCZ4BrO5xTuI9mrGq1lfbEITB7o3vQQ=";
|
||||
rev = "3059abd9fb3f14d598f6c299335c3ebac5bc689a";
|
||||
sha256 = "sha256-gicdpWAoimZMNGLc8w0vtJiFFxeqxB8P4lgWDun7unM=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
@ -26,6 +25,6 @@ buildNimPackage {
|
|||
homepage = "https://github.com/tridactyl/native_messenger";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ timokau dit7ya ];
|
||||
maintainers = with maintainers; [ timokau dit7ya kiike ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "unstable-2024-04-05";
|
||||
version = "unstable-2024-04-15";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "41567558bc1ec4721fee1cc316c3a3cdc627b102";
|
||||
hash = "sha256-Qvq9/kNZAKRHH3NIxiX5+67ibeX5QzK97EhuoplTBDQ=";
|
||||
rev = "b0bfb38dccff4ff7b0fa6d384651f7847a76fd1f";
|
||||
hash = "sha256-OLrIIrcIfFI96+Q2fc0JSqJHBMcoN9+LL5E/YCN21Kc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "wiremock";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
|
||||
hash = "sha256-27DIcfP5R1Qiwl2fhvUQjFsE8pTHTv5MuFqHGa+whVY=";
|
||||
hash = "sha256-HIWhuaW36/kdsj8iZD0ANHQ26olURnYL1q5fcQXHHjw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
, exempi
|
||||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, libjxl
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, libheif
|
||||
|
@ -81,10 +82,11 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
libheif.out
|
||||
|
@ -96,6 +98,7 @@ stdenv.mkDerivation rec {
|
|||
gappsWrapperArgs+=(
|
||||
# Thumbnailers
|
||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||
--prefix XDG_DATA_DIRS : "${libjxl}/share"
|
||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
)
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
, libgudev
|
||||
, libadwaita
|
||||
, libkrb5
|
||||
, libjxl
|
||||
, libpulseaudio
|
||||
, libpwquality
|
||||
, librsvg
|
||||
|
@ -173,10 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
, unzip
|
||||
, shared-mime-info
|
||||
, libgweather
|
||||
, libjxl
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, geoclue2
|
||||
|
@ -188,10 +189,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
, shared-mime-info
|
||||
, libnotify
|
||||
, libexif
|
||||
, libjxl
|
||||
, libseccomp
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
|
@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gappsWrapperArgs+=(
|
||||
# Thumbnailers
|
||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||
--prefix XDG_DATA_DIRS : "${libjxl}/share"
|
||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||
--prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
, xdg-desktop-portal
|
||||
, wayland
|
||||
, gnome
|
||||
, libjxl
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
}:
|
||||
|
@ -50,10 +51,11 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# Pull in WebP and JXL support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
|
|
|
@ -1,32 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailchecker";
|
||||
version = "6.0.1";
|
||||
version = "6.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PXo6dfiAqC1WD/z5NBI6UZVUl/cwlvoqKDyfZI4fn2s=";
|
||||
hash = "sha256-QRysmtKo5KXXAVcyQx2WwuwySUP8vAN/gqXWmgoOPmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"MailChecker"
|
||||
];
|
||||
pythonImportsCheck = [ "MailChecker" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for temporary (disposable/throwaway) email detection";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-hep-testdata";
|
||||
version = "0.4.43";
|
||||
version = "0.4.44";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "scikit-hep";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+CJyo6motrS89eDJct1zh6zOOrrw+yfAODA/BaVm00A=";
|
||||
hash = "sha256-7a1F7180mnbMiEwRWzDQt2EhRsleSoVhWtTc+5DR/2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "5.19.3";
|
||||
version = "5.19.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-9OHulIASsU7udo5p0jxKlb7vZftWcOLmJYQffejOFqQ=";
|
||||
hash = "sha256-dSM3B9C+H0sTnxCkElDXKWUxNtctW1Jgh/nRFWEXc2A=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs-slim ];
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
callPackage ./generic.nix rec {
|
||||
pname = "rkpd2";
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zrp200";
|
||||
repo = "rkpd2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dng/QoG9FTNU/fNVqPtLW/MVhO1uDBkXxWcI5mESUKw=";
|
||||
hash = "sha256-VVqwgwDuIyRd5MU1/64Xz+8TbIOrXcHufs0XqD/Q4ls=";
|
||||
};
|
||||
|
||||
depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.28";
|
||||
version = "2.9.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-2LHWbTvxE8awSUm33XocjWxrY8dosMEaCPOx85+tj4s=";
|
||||
sha256 = "sha256-6icF+Dg4IdCjeqcX058aewj702oCoch6VYqgdCVPoNc=";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
|
|
|
@ -42,13 +42,6 @@ buildPythonApplication rec {
|
|||
"mycli/packages/paramiko_stub/__init__.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Note: test_auto_escaped_col_names is currently failing due to a bug upstream.
|
||||
# TODO: re-enable this test once there is a fix upstream. See
|
||||
# https://github.com/dbcli/mycli/issues/1103 for details.
|
||||
"test_auto_escaped_col_names"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cryptography == 36.0.2" "cryptography"
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, systemd
|
||||
|
@ -46,11 +45,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libreswan";
|
||||
version = "4.12";
|
||||
version = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-roWr5BX3vs9LaiuYl+FxLyflqsnDXfvd28zgrX39mfc=";
|
||||
hash = "sha256-/mDX2zmMjuIlBV2zZeyWiiSuvLxcNQYRMfz/2tG+BK8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -115,14 +114,6 @@ stdenv.mkDerivation rec {
|
|||
-i configs/Makefile
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ignoring-return-value.patch";
|
||||
url = "https://github.com/libreswan/libreswan/commit/ba5bad09f55959872022fa506d5ac06eafe3a314.diff";
|
||||
hash = "sha256-xJ8rZWoRtJixamGY8sjOS+63Lw3RX7620HlRWYfvSxc=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"INITSYSTEM=systemd"
|
||||
|
|
|
@ -266,7 +266,7 @@ self = stdenv.mkDerivation {
|
|||
environments.
|
||||
'';
|
||||
homepage = "https://nixos.org/";
|
||||
license = licenses.lgpl2Plus;
|
||||
license = licenses.lgpl21Plus;
|
||||
inherit maintainers;
|
||||
platforms = platforms.unix;
|
||||
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "govc";
|
||||
version = "0.37.0";
|
||||
version = "0.37.1";
|
||||
|
||||
subPackages = [ "govc" ];
|
||||
|
||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "vmware";
|
||||
repo = "govmomi";
|
||||
sha256 = "sha256-rE19ky/x3pqlz2/6W8ucrctgpJFefEKfzpW4DEDCQ3E=";
|
||||
sha256 = "sha256-lErMWVr0UWR2Hc6fYZiauLz6kAZY/uGPNjm6oJGBAuw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU=";
|
||||
|
|
|
@ -19047,6 +19047,9 @@ with pkgs;
|
|||
|
||||
inotify-tools = callPackage ../development/tools/misc/inotify-tools { };
|
||||
|
||||
inherit (callPackage ../applications/misc/inochi2d { })
|
||||
inochi-creator inochi-session;
|
||||
|
||||
intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { };
|
||||
|
||||
insomnia = callPackage ../development/web/insomnia { };
|
||||
|
|
Loading…
Reference in New Issue
Block a user