mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 21:09:00 +02:00
Merge master into haskell-updates
This commit is contained in:
commit
260d57a39a
|
@ -1057,7 +1057,7 @@ benchmark component.
|
|||
`dontBenchmark drv`
|
||||
: Set `doBenchmark` to `false` for `drv`.
|
||||
|
||||
`setBuildTargets list drv`
|
||||
`setBuildTargets drv list`
|
||||
: Sets the `buildTarget` argument for `drv` so that the targets specified in `list` are built.
|
||||
|
||||
`doCoverage drv`
|
||||
|
|
|
@ -198,8 +198,38 @@ rec {
|
|||
default:
|
||||
# Input list
|
||||
list:
|
||||
let found = filter pred list;
|
||||
in if found == [] then default else head found;
|
||||
let
|
||||
# A naive recursive implementation would be much simpler, but
|
||||
# would also overflow the evaluator stack. We use `foldl'` as a workaround
|
||||
# because it reuses the same stack space, evaluating the function for one
|
||||
# element after another. We can't return early, so this means that we
|
||||
# sacrifice early cutoff, but that appears to be an acceptable cost. A
|
||||
# clever scheme with "exponential search" is possible, but appears over-
|
||||
# engineered for now. See https://github.com/NixOS/nixpkgs/pull/235267
|
||||
|
||||
# Invariant:
|
||||
# - if index < 0 then el == elemAt list (- index - 1) and all elements before el didn't satisfy pred
|
||||
# - if index >= 0 then pred (elemAt list index) and all elements before (elemAt list index) didn't satisfy pred
|
||||
#
|
||||
# We start with index -1 and the 0'th element of the list, which satisfies the invariant
|
||||
resultIndex = foldl' (index: el:
|
||||
if index < 0 then
|
||||
# No match yet before the current index, we need to check the element
|
||||
if pred el then
|
||||
# We have a match! Turn it into the actual index to prevent future iterations from modifying it
|
||||
- index - 1
|
||||
else
|
||||
# Still no match, update the index to the next element (we're counting down, so minus one)
|
||||
index - 1
|
||||
else
|
||||
# There's already a match, propagate the index without evaluating anything
|
||||
index
|
||||
) (-1) list;
|
||||
in
|
||||
if resultIndex < 0 then
|
||||
default
|
||||
else
|
||||
elemAt list resultIndex;
|
||||
|
||||
/* Return true if function `pred` returns true for at least one
|
||||
element of `list`.
|
||||
|
|
|
@ -518,6 +518,46 @@ runTests {
|
|||
expected = false;
|
||||
};
|
||||
|
||||
testFindFirstExample1 = {
|
||||
expr = findFirst (x: x > 3) 7 [ 1 6 4 ];
|
||||
expected = 6;
|
||||
};
|
||||
|
||||
testFindFirstExample2 = {
|
||||
expr = findFirst (x: x > 9) 7 [ 1 6 4 ];
|
||||
expected = 7;
|
||||
};
|
||||
|
||||
testFindFirstEmpty = {
|
||||
expr = findFirst (abort "when the list is empty, the predicate is not needed") null [];
|
||||
expected = null;
|
||||
};
|
||||
|
||||
testFindFirstSingleMatch = {
|
||||
expr = findFirst (x: x == 5) null [ 5 ];
|
||||
expected = 5;
|
||||
};
|
||||
|
||||
testFindFirstSingleDefault = {
|
||||
expr = findFirst (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ];
|
||||
expected = null;
|
||||
};
|
||||
|
||||
testFindFirstNone = {
|
||||
expr = builtins.tryEval (findFirst (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]);
|
||||
expected = { success = false; value = false; };
|
||||
};
|
||||
|
||||
# Makes sure that the implementation doesn't cause a stack overflow
|
||||
testFindFirstBig = {
|
||||
expr = findFirst (x: x == 1000000) null (range 0 1000000);
|
||||
expected = 1000000;
|
||||
};
|
||||
|
||||
testFindFirstLazy = {
|
||||
expr = findFirst (x: x == 1) 7 [ 1 (abort "list elements after the match must not be evaluated") ];
|
||||
expected = 1;
|
||||
};
|
||||
|
||||
# ATTRSETS
|
||||
|
||||
|
|
|
@ -538,7 +538,6 @@ with lib.maintainers; {
|
|||
ma27
|
||||
fadenb
|
||||
mguentner
|
||||
ekleog
|
||||
ralith
|
||||
dandellion
|
||||
sumnerevans
|
||||
|
|
|
@ -12,6 +12,29 @@ Unfortunately, Nixpkgs currently lacks a way to query available
|
|||
configuration options.
|
||||
:::
|
||||
|
||||
::: {.note}
|
||||
Alternatively, many packages come with extensions one might add.
|
||||
Examples include:
|
||||
- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp)
|
||||
- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests)
|
||||
|
||||
You can use them like this:
|
||||
```nix
|
||||
environment.systemPackages = with pkgs; [
|
||||
sl
|
||||
(pass.withExtensions (subpkgs: with subpkgs; [
|
||||
pass-audit
|
||||
pass-otp
|
||||
pass-genphrase
|
||||
]))
|
||||
(python3.withPackages (subpkgs: with subpkgs; [
|
||||
requests
|
||||
]))
|
||||
cowsay
|
||||
];
|
||||
```
|
||||
:::
|
||||
|
||||
Apart from high-level options, it's possible to tweak a package in
|
||||
almost arbitrary ways, such as changing or disabling dependencies of a
|
||||
package. For instance, the Emacs package in Nixpkgs by default has a
|
||||
|
|
|
@ -20,7 +20,7 @@ let
|
|||
pkgs.adwaita-qt6
|
||||
]
|
||||
else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
|
||||
else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
|
||||
else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ]
|
||||
else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
|
||||
else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]
|
||||
else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible.";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
x86_64-linux = "/nix/store/mc43d38fibi94pp5crfwacl5gbslccd0-nix-2.13.3";
|
||||
i686-linux = "/nix/store/09m966pj26cgd4ihlg8ihl1106j3vih8-nix-2.13.3";
|
||||
aarch64-linux = "/nix/store/7f191d125akld27gc6jl0r13l8pl7x0h-nix-2.13.3";
|
||||
x86_64-darwin = "/nix/store/1wn9jkvi2zqfjnjgg7lnp30r2q2y8whd-nix-2.13.3";
|
||||
aarch64-darwin = "/nix/store/8w0v2mffa10chrf1h66cbvbpw86qmh85-nix-2.13.3";
|
||||
x86_64-linux = "/nix/store/ny9r65799s7xhp605bc2753sjvzkxrrs-nix-2.15.1";
|
||||
i686-linux = "/nix/store/ck55dz5klc7szi8rx9ghhm8gi2b5q5bw-nix-2.15.1";
|
||||
aarch64-linux = "/nix/store/cl0a02vr28913dgw98hrm45a4baqr3z1-nix-2.15.1";
|
||||
x86_64-darwin = "/nix/store/wq228jdbz16pp2lnxf32n8dv27pw53p8-nix-2.15.1";
|
||||
aarch64-darwin = "/nix/store/x11cpsjg4q236msfz5scc325pfp9xy64-nix-2.15.1";
|
||||
}
|
||||
|
|
|
@ -35,8 +35,17 @@ in
|
|||
###### implementation
|
||||
|
||||
config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) {
|
||||
environment.etc.nanorc.text = lib.concatStrings [ cfg.nanorc
|
||||
(lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ];
|
||||
environment.etc.nanorc.text = lib.concatStringsSep LF (
|
||||
( lib.optionals cfg.syntaxHighlight [
|
||||
"# The line below is added because value of programs.nano.syntaxHighlight is set to true"
|
||||
''include "${pkgs.nano}/share/nano/*.nanorc"''
|
||||
""
|
||||
])
|
||||
++ ( lib.optionals (cfg.nanorc != "") [
|
||||
"# The lines below have been set from value of programs.nano.nanorc"
|
||||
cfg.nanorc
|
||||
])
|
||||
);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -116,8 +116,8 @@ in
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ config.environment.etc."exim.conf".source ];
|
||||
serviceConfig = {
|
||||
ExecStart = "+${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}";
|
||||
ExecReload = "+${coreutils}/bin/kill -HUP $MAINPID";
|
||||
ExecStart = "!${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}";
|
||||
ExecReload = "!${coreutils}/bin/kill -HUP $MAINPID";
|
||||
User = cfg.user;
|
||||
};
|
||||
preStart = ''
|
||||
|
|
|
@ -520,10 +520,17 @@ in
|
|||
will set up automatically for each build. This prevents impurities
|
||||
in builds by disallowing access to dependencies outside of the Nix
|
||||
store by using network and mount namespaces in a chroot environment.
|
||||
|
||||
This is enabled by default even though it has a possible performance
|
||||
impact due to the initial setup time of a sandbox for each build. It
|
||||
doesn't affect derivation hashes, so changing this option will not
|
||||
trigger a rebuild of packages.
|
||||
|
||||
When set to "relaxed", this option permits derivations that set
|
||||
`__noChroot = true;` to run outside of the sandboxed environment.
|
||||
Exercise caution when using this mode of operation! It is intended to
|
||||
be a quick hack when building with packages that are not easily setup
|
||||
to be built reproducibly.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -121,6 +121,11 @@ let
|
|||
default = false;
|
||||
description = lib.mdDoc "Allow users to edit datasources from the UI.";
|
||||
};
|
||||
jsonData = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
description = lib.mdDoc "Extra data for datasource plugins.";
|
||||
};
|
||||
secureJsonData = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
|
|
|
@ -141,7 +141,7 @@ in
|
|||
'';
|
||||
};
|
||||
linkStyle = mkOption {
|
||||
type = types.enum ["original" "absolute" "relative"];
|
||||
type = types.enum [ "original" "absolute" "relative" ];
|
||||
default = "relative";
|
||||
example = "absolute";
|
||||
description = lib.mdDoc "DNS name for the urls generated in the cgi.";
|
||||
|
@ -301,7 +301,8 @@ in
|
|||
];
|
||||
security.wrappers = {
|
||||
fping =
|
||||
{ setuid = true;
|
||||
{
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${pkgs.fping}/bin/fping";
|
||||
|
@ -339,16 +340,16 @@ in
|
|||
};
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
|
||||
ln -sf ${cfg.package}/htdocs/css ${smokepingHome}/css
|
||||
ln -sf ${cfg.package}/htdocs/js ${smokepingHome}/js
|
||||
ln -sf ${cgiHome} ${smokepingHome}/smokeping.fcgi
|
||||
ln -snf ${cfg.package}/htdocs/css ${smokepingHome}/css
|
||||
ln -snf ${cfg.package}/htdocs/js ${smokepingHome}/js
|
||||
ln -snf ${cgiHome} ${smokepingHome}/smokeping.fcgi
|
||||
${cfg.package}/bin/smokeping --check --config=${configPath}
|
||||
${cfg.package}/bin/smokeping --static --config=${configPath}
|
||||
'';
|
||||
};
|
||||
systemd.services.thttpd = mkIf cfg.webService {
|
||||
requiredBy = [ "multi-user.target"];
|
||||
requires = [ "smokeping.service"];
|
||||
requiredBy = [ "multi-user.target" ];
|
||||
requires = [ "smokeping.service" ];
|
||||
path = with pkgs; [ bash rrdtool smokeping thttpd ];
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
|
|
|
@ -308,7 +308,9 @@ in
|
|||
libvirt/nwfilter/*.xml );
|
||||
do
|
||||
mkdir -p /var/lib/$(dirname $i) -m 755
|
||||
cp -npd ${cfg.package}/var/lib/$i /var/lib/$i
|
||||
if [ ! -e /var/lib/$i ]; then
|
||||
cp -pd ${cfg.package}/var/lib/$i /var/lib/$i
|
||||
fi
|
||||
done
|
||||
|
||||
# Copy generated qemu config to libvirt directory
|
||||
|
|
|
@ -69,23 +69,14 @@ in {
|
|||
testOrganisation.users = [ "alice" "foo" ];
|
||||
anotherOrganisation.users = [ "bob" ];
|
||||
};
|
||||
};
|
||||
|
||||
# New generation of the server with manual config
|
||||
newServer = { lib, nodes, ... }: {
|
||||
imports = [ server ];
|
||||
specialisation.manual-config.configuration = {
|
||||
services.taskserver.pki.manual = {
|
||||
ca.cert = snakeOil.cacert;
|
||||
server.cert = snakeOil.cert;
|
||||
server.key = snakeOil.key;
|
||||
server.crl = snakeOil.crl;
|
||||
};
|
||||
# This is to avoid assigning a different network address to the new
|
||||
# generation.
|
||||
networking = lib.mapAttrs (lib.const lib.mkForce) {
|
||||
interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4;
|
||||
inherit (nodes.server.config.networking)
|
||||
hostName primaryIPAddress extraHosts;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -103,7 +94,8 @@ in {
|
|||
testScript = { nodes, ... }: let
|
||||
cfg = nodes.server.config.services.taskserver;
|
||||
portStr = toString cfg.listenPort;
|
||||
newServerSystem = nodes.newServer.config.system.build.toplevel;
|
||||
specialisations = "${nodes.server.system.build.toplevel}/specialisation";
|
||||
newServerSystem = "${specialisations}/manual-config";
|
||||
switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
|
||||
in ''
|
||||
from shlex import quote
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eartag";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "knuxify";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-120voKmlEDsVSxNfqmwBvTB90dQUwnf2CtxvOKqi8+U=";
|
||||
sha256 = "sha256-4Kk/+iQNRqba5W/AdPlZ17Siwyy+WQuRYCb7M68S71I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec {
|
|||
mutagen
|
||||
pytaglib
|
||||
python-magic
|
||||
pyacoustid
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
@ -1,33 +1,50 @@
|
|||
{lib, stdenv, fetchurl, scons, boost, ladspaH, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, scons
|
||||
, boost
|
||||
, ladspaH
|
||||
, libcxxabi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "0.2-2";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nova-filters";
|
||||
version = "0.2-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz";
|
||||
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
|
||||
url = "https://klingt.org/~tim/nova-filters/nova-filters_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-0WgxMDjhx2b39FKRwLrm8LrTO5nS0xE7+bRwQfcmBpg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
buildInputs = [ boost ladspaH ];
|
||||
postPatch = ''
|
||||
substituteInPlace SConstruct \
|
||||
--replace "'TERM' : os.environ['TERM']," "" \
|
||||
--replace "Options" "Variables" \
|
||||
--replace "-fomit-frame-pointer -ffast-math -mfpmath=sse" "-I${boost.dev}/include -I${ladspaH}/include" \
|
||||
--replace "env.has_key('cxx')" "True" \
|
||||
--replace "env['cxx']" "'${stdenv.cc.targetPrefix}c++'" \
|
||||
--replace "-Wl,--strip-all" "${lib.optionalString stdenv.isDarwin "-L${libcxxabi}/lib"}"
|
||||
|
||||
patchPhase = ''
|
||||
# remove TERM:
|
||||
sed -i -e '4d' SConstruct
|
||||
sed -i 's@Options@Variables@g' SConstruct
|
||||
sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct
|
||||
sed -i "s@env.has_key('cxx')@'cxx' in env@g" SConstruct
|
||||
sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp
|
||||
sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp
|
||||
sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
|
||||
substituteInPlace filters.cpp \
|
||||
--replace "LADSPA_HINT_SAMPLE_RATE, 0, 0.5" "LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5"
|
||||
|
||||
substituteInPlace nova/source/dsp/filter.hpp \
|
||||
--replace "= check" "= detail::filter_base<internal_type, checked>::check"
|
||||
|
||||
substituteInPlace nova/source/primitives/float.hpp \
|
||||
--replace "boost/detail/endian.hpp" "boost/predef/other/endian.h" \
|
||||
--replace "BOOST_LITTLE_ENDIAN" "BOOST_ENDIAN_LITTLE_BYTE"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
scons
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LADSPA plugins based on filters of nova";
|
||||
homepage = "http://klingt.org/~tim/nova-filters/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "TKLIB=-l${tk.libPrefix}" "TCLLIB=-l${tcl.libPrefix}" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/vkeybd --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Virtual MIDI keyboard";
|
||||
homepage = "https://www.alsa-project.org/~tiwai/alsa.html";
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UJvpEWR49m1B21eMrh0LiJ2bguM7hNux0ywDj6oJbDU=";
|
||||
sha256 = "sha256-3FbrNSwVNrxf++7C23XSWmeTfTRP56/7QeQOlggVpao=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch
|
||||
, pkg-config, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, glib, protobuf, util-linux, qrencode
|
||||
|
@ -20,6 +20,14 @@ mkDerivation rec {
|
|||
sha256 = "sha256-TuDc47TZOEQA5Lr4DQkEhnO/Szp9h71xPjaBL3jFWuM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "boost1770.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/boost1770.patch?h=litecoin-qt&id=dc75ad854af123f375b5b683be64aa14573170d7";
|
||||
hash = "sha256-PTkYQRA8n5a9yR2AvpzH5natsXT2W6Xjo0ONCPJx78k=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib zeromq fmt
|
||||
miniupnpc glib protobuf util-linux libevent ]
|
||||
|
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.194.4";
|
||||
version = "1.195.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-suZROvrbi02jRnueoet2wT2+dxNuWgv8X6tIvlOPHPI=";
|
||||
hash = "sha256-7KAT7rWq4jjSz/oxw8K+WrWwJWf0Dq8cR0oyHtA4R9g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
32
pkgs/applications/editors/cudatext/deps.json
generated
32
pkgs/applications/editors/cudatext/deps.json
generated
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"EncConv": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.01.02",
|
||||
"hash": "sha256-4/ih4sBDel2wm+YFpNcwHoOrK8AgHe3Jbqxl+CYrQFM="
|
||||
"rev": "2023.04.16",
|
||||
"hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc="
|
||||
},
|
||||
"ATBinHex-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -11,33 +11,33 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.17",
|
||||
"hash": "sha256-yt5i3txXqHs7MoQepY+tbzv1wxwAegm9C+rWZtxJ4zE="
|
||||
"rev": "2023.05.31",
|
||||
"hash": "sha256-/CN6wa5XN5ERdFnqOXxxtT08ObtlToqe3YsLpiog40w="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.17",
|
||||
"hash": "sha256-6hz1oOnappiXktvvEBWXsaI/hnJ9mbnS5hWnyCVN2Ys="
|
||||
"rev": "2023.05.31",
|
||||
"hash": "sha256-N+ypCg9Tmg+/Y7KMXTZR4aiRqbsHZwKIUidVPthEJvI="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.12",
|
||||
"hash": "sha256-/BAWc5RR7hZCNjyuLqiq9OdJxvRqliMWiC7o0tCtELY="
|
||||
"rev": "2023.05.31",
|
||||
"hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.17",
|
||||
"hash": "sha256-tzQEL23k7ZhnOxN9IOD0lG/2FNOdjuS8vP+0f6IU8Ks="
|
||||
"rev": "2023.05.31",
|
||||
"hash": "sha256-sejyNiPmTboP6HlXao+RaMaEf67tAv4mXDHVkkMErPE="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.12",
|
||||
"hash": "sha256-Y+F/pdPzmXqqCqB0TCOboA4md/2QMHhzlVxR5NJF3+0="
|
||||
"rev": "2023.05.31",
|
||||
"hash": "sha256-z0RGk0/oWTPpp/VSM4PBPLWIIQ5cVkQXlQyciW++SH0="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.01.02",
|
||||
"hash": "sha256-NnPrQAqmKg3Lh16Qp/LZVS4JRtAxXi3qRovLTbzUyYQ="
|
||||
"rev": "2023.05.15",
|
||||
"hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -51,7 +51,7 @@
|
|||
},
|
||||
"bgrabitmap": {
|
||||
"owner": "bgrabitmap",
|
||||
"rev": "v11.5.3",
|
||||
"hash": "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="
|
||||
"rev": "v11.5.4",
|
||||
"hash": "sha256-Js7MQ1JYAl2cpnjgDOXeLcWBCrjjCnDORayRpSFoFhM="
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
{ pkgs, lib, tree-sitter, ... }:
|
||||
{ pkgs, lib }:
|
||||
|
||||
let
|
||||
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
grammarToAttrSet = drv:
|
||||
{
|
||||
name = "lib/lib${lib.strings.removeSuffix "-grammar" (lib.strings.getName drv)}${libExt}";
|
||||
path = "${drv}/parser";
|
||||
};
|
||||
in
|
||||
{
|
||||
with-all-grammars = pkgs.linkFarm "emacs-treesit-grammars"
|
||||
(map grammarToAttrSet pkgs.tree-sitter.allGrammars);
|
||||
|
||||
# Use this one like this:
|
||||
# treesit-grammars.with-grammars (grammars: with grammars; [tree-sitter-bash])
|
||||
# Usage:
|
||||
# treesit-grammars.with-grammars (p: [ p.tree-sitter-bash p.tree-sitter-c ... ])
|
||||
with-grammars = fn: pkgs.linkFarm "emacs-treesit-grammars"
|
||||
(map grammarToAttrSet (fn pkgs.tree-sitter.builtGrammars));
|
||||
in
|
||||
{
|
||||
inherit with-grammars;
|
||||
|
||||
with-all-grammars = with-grammars builtins.attrValues;
|
||||
}
|
||||
|
|
12
pkgs/applications/editors/lapce/Cargo.lock
generated
12
pkgs/applications/editors/lapce/Cargo.lock
generated
|
@ -2556,7 +2556,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"lapce-proxy",
|
||||
"lapce-ui",
|
||||
|
@ -2564,7 +2564,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce-core"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
@ -2637,7 +2637,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce-data"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"alacritty_terminal",
|
||||
"anyhow",
|
||||
|
@ -2689,7 +2689,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce-proxy"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"alacritty_terminal",
|
||||
"anyhow",
|
||||
|
@ -2742,7 +2742,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce-rpc"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"crossbeam-channel",
|
||||
|
@ -2758,7 +2758,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lapce-ui"
|
||||
version = "0.2.7"
|
||||
version = "0.2.8"
|
||||
dependencies = [
|
||||
"Inflector",
|
||||
"alacritty_terminal",
|
||||
|
|
|
@ -24,21 +24,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lapce";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lapce";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xq/xLoVvETGp+Yxlh3wbg74R+U9eqjFOKJyt/AUybvU=";
|
||||
sha256 = "sha256-cfQQ+PaInUB6B61sZ9iS/zt3L6Vc/vPOJTtEwR0BLco=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"druid-0.7.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
|
||||
"druid-derive-0.4.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
|
||||
"druid-shell-0.7.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
|
||||
"font-kit-0.11.0" = "sha256-MsUbFhWd3GdqchzwrRPuzpz3mNYde00HwA9EIRBc2SQ=";
|
||||
"fount-0.1.0" = "sha256-ptPnisGuzip3tQUuwtPU+ETiIzxMvIgAvlIGyGw/4wI=";
|
||||
"human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w=";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost169, eigen
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen
|
||||
, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive
|
||||
, fetchpatch }:
|
||||
|
||||
|
@ -20,8 +20,12 @@ stdenv.mkDerivation {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "7i #include <stack>" es-app/src/views/gamelist/ISimpleGameListView.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ alsa-lib boost169 curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
|
||||
buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
|
||||
|
||||
installPhase = ''
|
||||
install -D ../emulationstation $out/bin/emulationstation
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wibo";
|
||||
version = "0.3.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decompals";
|
||||
repo = "wibo";
|
||||
rev = version;
|
||||
hash = "sha256-J5h/RpF+twb5fBjSDQMVB5SoTWWs8VD/EUuikuj73YA=";
|
||||
hash = "sha256-oq/i0Hb2y5pwDEvaqSyC4+6LH1oUbvDZ/62l+V3S7Uk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.7" else "8.10.7-11.BETA";
|
||||
version = if channel == "stable" then "8.10.7" else "8.10.8-10.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
|
@ -33,19 +33,19 @@ let
|
|||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "sha256-O7dzNRukIk654FoS1HxqHYcB8mLNORvz59p3skRXuYM=";
|
||||
sha256 = "sha256-ngxNVYTVA5KyD1kh5oxClWxj9Kox8Yp4L+ryqxQHh3I=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
sha256 = "sha256-npEVlGwMmYXH4wW6VvAhPzWNFOZl1LvuCnOgvm94rds=";
|
||||
sha256 = "sha256-5f0GXROQ+NCE25nbrY4MsE76AETNleiVBxpSlvVes5k=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
sha256 = "sha256-Z0IZNEU8ggSF20SZziT5UTEMiWPNdVWY82nhuGyeFVU=";
|
||||
sha256 = "sha256-JrTs8wCnCqNtKfKNTjEDadVbwZ5Lolz7ggYR7sIpFEU=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
sha256 = "sha256-qy1Vr6nDJo44Qd7mKZYR65+tIaSq0YOjjw84/mg1RgE=";
|
||||
sha256 = "sha256-RTnaxYt9rEbGcr827cYNiF1g+a485TThpSADW9tTcPE=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.112.7";
|
||||
version = "0.113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8vvIMCnxS/1MsooSmNPeHE9VxYYOVyKiExr8oSgcYF4=";
|
||||
hash = "sha256-oKGRbgr4jaau6wfo6Q/yhYgambGa+wb3ENtk6wrb0J0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c=";
|
||||
vendorHash = "sha256-+eVaV6iGsubMt6cq0lKP0i69BlYW8jwx6lT6rwhZAoA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.10.18";
|
||||
version = "2.10.19";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
@ -16,8 +16,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-oo3li8w1uem9lyFqwnrZ7Fl1R7Hrd8W+PHcIiaL2/+U=";
|
||||
x86_64-darwin = "sha256-xYNp6WW8uPBrfuUgE5LI+1PuQK+vTA11eOtkz2ogpk0=";
|
||||
x86_64-linux = "sha256-+QvaEB+4eA3grnqbLfFMEtNyizlvovtV/BvTa9gSZGU=";
|
||||
x86_64-darwin = "sha256-BK951HLf+L1x9TDlqW11mNnnrnHfZ4qbKk25OIVXnuM=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
@ -36,7 +36,7 @@ let
|
|||
'';
|
||||
homepage = "https://joplinapp.org";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ hugoreeves ];
|
||||
maintainers = with maintainers; [ hugoreeves qjoly ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
|
||||
|
|
|
@ -3,15 +3,15 @@
|
|||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18721";
|
||||
version = "18746";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-nc6itoblAzP064xTTF8q990TiRX3+zf5uk+enS+C5Jo=";
|
||||
hash = "sha256-TzRs7YPpCzsgGAeaW0px2aZsUJj8yqIpoUf7RIzAsZg=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
|
||||
hash = "sha256-uaj32PupxAS5Pa7us9sIeeepGJ6BIljm41e6onB7zxQ=";
|
||||
hash = "sha256-4ZQ75KiQDmmswSHklnS1yX5sQ/MChYoU//i37VXh8Zo=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-keyboard-configurator";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "keyboard-configurator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Mb07OlmYl/dNxCdBrAq7mgXZvi0oqtt76UX8TMWUPY=";
|
||||
sha256 = "sha256-RaJOtlnjxYiA6WrKRmIG3McAzc35zR3uMScLy2kLx98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
udev
|
||||
];
|
||||
|
||||
cargoHash = "sha256-3IAljoL4cabZ9rpgqPrgG7ofwETHS/9OlBKjxTwCDTU=";
|
||||
cargoHash = "sha256-qoOaLDzJ9WqCnI/kBSiu6DZx1HWU8Cd8ch6VVcgIfB4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard configuration application for System76 keyboards and laptops";
|
||||
|
|
|
@ -75,10 +75,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
substituteInPlace variety_lib/varietyconfig.py \
|
||||
--replace "__variety_data_directory__ = \"../data\"" \
|
||||
"__variety_data_directory__ = \"$out/share/variety\""
|
||||
substituteInPlace data/scripts/set_wallpaper \
|
||||
--replace /bin/bash ${runtimeShell}
|
||||
substituteInPlace data/scripts/get_wallpaper \
|
||||
--replace /bin/bash ${runtimeShell}
|
||||
substituteInPlace variety/VarietyWindow.py \
|
||||
--replace '[script,' '["${runtimeShell}", script,' \
|
||||
--replace 'check_output(script)' 'check_output(["${runtimeShell}", script])'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
|
||||
wrapProgram $out/bin/wnb --prefix PATH : "$out/bin"
|
||||
'';
|
||||
|
||||
|
|
|
@ -155,7 +155,6 @@ let
|
|||
curl
|
||||
libepoxy
|
||||
libffi
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "114") [
|
||||
libevdev
|
||||
] ++ lib.optional systemdSupport systemd
|
||||
++ lib.optionals cupsSupport [ libgcrypt cups ]
|
||||
|
@ -170,7 +169,6 @@ let
|
|||
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
|
||||
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
|
||||
./patches/angle-wayland-include-protocol.patch
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "114") [
|
||||
# We need to revert this patch to build M114+ with LLVM 16:
|
||||
(githubPatch {
|
||||
# Reland [clang] Disable autoupgrading debug info in ThinLTO builds
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "114.0.5735.90",
|
||||
"sha256": "1n16fp0zf38n7i8zb86ilx8g62xjnahf7q0c3zwj6n8pnqh8c6h7",
|
||||
"sha256bin64": "1dgz21ycc41nxz8y5fqz73ll96vvlrf8vxfn65vy654jw7dsdpw6",
|
||||
"version": "114.0.5735.106",
|
||||
"sha256": "0jihf4gv7n2kkp78n42ha4ick8mzixb4xrfdk84iqazmifrb066z",
|
||||
"sha256bin64": "1zlw9gjb2fmjf1d952adqg07cyq60yck0aarz20lcvv2jzb7s46i",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-04-19",
|
||||
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "113.0.5672.126",
|
||||
"sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",
|
||||
"sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka",
|
||||
"version": "114.0.5735.90",
|
||||
"sha256": "1n16fp0zf38n7i8zb86ilx8g62xjnahf7q0c3zwj6n8pnqh8c6h7",
|
||||
"sha256bin64": "1dgz21ycc41nxz8y5fqz73ll96vvlrf8vxfn65vy654jw7dsdpw6",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-03-18",
|
||||
"version": "2023-04-19",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
|
||||
"sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
|
||||
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
|
||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "113.0.5672.126-1",
|
||||
"sha256": "0s47zpl5qw5755hjhzk9g8l3ns9cwdzskq6dh1biyx1qpw0h8pld"
|
||||
"rev": "114.0.5735.90-1",
|
||||
"sha256": "1g4wjpxvzrdmm5cnc94s1j13hh2n6cq6vdw1hy53lr7nqkpsj1jb"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jjjDu/vyAoytHQss43lUILEdT2kV8dXHyVNT0uaSmwM=";
|
||||
hash = "sha256-DpgCxnwkNP2mZNYygxFLMufEijYoLr4qor0DYCmbps8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "113.0-3",
|
||||
"packageVersion": "113.0.2-1",
|
||||
"source": {
|
||||
"rev": "113.0-3",
|
||||
"sha256": "0pqjchkpdgsxdsylawsnbszjmx4aybyvlsc2a8qdnck5rpnxl1p2"
|
||||
"rev": "113.0.2-1",
|
||||
"sha256": "0wbs6bgcjrxjnh0wk6qz329zy0dlma0wdwb3law877y9dphilh47"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "113.0",
|
||||
"sha512": "96b0f0774083270f4fcce06085b177ced25ba05da7291d777f1da1d5bbad30721bc6363b76e06ccb64fc092778c8326a426a8bfdfa3cbaafd4f1169b924744a5"
|
||||
"version": "113.0.2",
|
||||
"sha512": "7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kluctl";
|
||||
version = "2.20.2";
|
||||
version = "2.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kluctl";
|
||||
repo = "kluctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VCPRGICbALYoD1LIrNnPXQLWGqWr+IznQP70K+L4tvk=";
|
||||
hash = "sha256-Z3tXfzbVs0FWTsi6vbM6BNQBLeCseWn4yBR5PNeRz2s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z0eiWU5CFMfK6fz+LUtxtSP/MAuVn7iOHB+A7Uv2OQY=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HVIPKfoAfBZH8wA2GMabhTkYxDLvP15XoZuTVSy2i8M=";
|
||||
sha256 = "sha256-d88IEbsk0bwC9Mzag3UOFVcSblCjaWXhKXC8iZr6V1s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1wqPMT8JJ29K0BcooPj7jaXMKIVlN6YvFwneYnqaeDk=";
|
||||
hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ix18Mi4a1kW7C6rcwwFc6TDwzs3vYxNz3M3d5pD8l6c=";
|
||||
vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.16.3";
|
||||
version = "5.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TlXwjgk+sT5lvswbDKjun0PhkfqDfk1IzGZ9NCMdw9s=";
|
||||
sha256 = "sha256-X/ei4BXj2tuFeHt4QZQ4QI6m15emOMjSrK+GxAqRMFM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ahneuZExefFKGYDxa+F8IhKPDjw8+kdZ5Hj+k1BDxcU=";
|
||||
vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
|
|
@ -155,11 +155,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-SGwCEcPNxWw7Bsa4SQ1uWJ1rH/PZlkAMwvDy/fnXU3w=",
|
||||
"hash": "sha256-oKYBeJsFhxLCFLsVc7p0TFGIVYj2xKPC3+EfNedHuu4=",
|
||||
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
|
||||
"owner": "F5Networks",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.17.1",
|
||||
"rev": "v1.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -282,13 +282,13 @@
|
|||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-bay1hBIfgYBqY1SSpbezPMW4L6ZpJIYfH/5up13wgUo=",
|
||||
"hash": "sha256-1vGpPvsy3SztlreNy0kcpTFtRaeq34G3B+Zo3obdHIw=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.25.0",
|
||||
"rev": "v3.26.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-0KuoVcM/pvXMxdLL1HO6XsVTUOfQylzl6yGfQF6HdvQ="
|
||||
"vendorHash": "sha256-w0UcFUlpS6j/q2xKCFghgL+kcy1zBVvEqQjigtzzfks="
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
|
@ -354,13 +354,13 @@
|
|||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-mMkwJyZL1ll26ZfJ7Whk/upyfh1xNl+5S1mtVM1ZMuM=",
|
||||
"hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v1.14.2",
|
||||
"rev": "v1.14.3",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k="
|
||||
"vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-wWGqEwo8dMD+2UeaHSzoo+uXrsHNZRDrGhgneACScPM=",
|
||||
|
@ -437,22 +437,22 @@
|
|||
"vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-fOgHJ7fTuMYTEO0GfYkuNRumA++geAx4UiVFMjVq3c8=",
|
||||
"hash": "sha256-emfKbO9RGX+DiBik3Hz84IqZGrCV8JBAPt2fHAu8yxc=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.67.0",
|
||||
"rev": "v4.68.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-keX6FMqAaWJS8qZ1TjHye94hJ532voVp6atwDuy3u5g=",
|
||||
"hash": "sha256-yhaEGLdRzfSaWfdqKdeRYHj0neaBZ4WS+o8wB+Vsb7g=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.67.0",
|
||||
"rev": "v4.68.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
|
||||
},
|
||||
|
@ -493,11 +493,11 @@
|
|||
"vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="
|
||||
},
|
||||
"helm": {
|
||||
"hash": "sha256-1yoFtTuB8GI2eazW85isgKYOcyL2codoXvTE0VCu5ZI=",
|
||||
"hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v2.10.0",
|
||||
"rev": "v2.10.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="
|
||||
},
|
||||
|
@ -620,13 +620,13 @@
|
|||
"vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y="
|
||||
},
|
||||
"keycloak": {
|
||||
"hash": "sha256-pp/l9lVB2+bGrp/cUVt9C3R7PenqKegqm829WhTKsWk=",
|
||||
"hash": "sha256-557IxT6Zpfig7XLpWG0DahsWsgnTD7XAlIgU9CmQH5c=",
|
||||
"homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",
|
||||
"owner": "mrparkers",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v4.2.0",
|
||||
"rev": "v4.3.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-UnWHUD9T4nTT6Y2UrvBIdIk9eA8l0vWJ/IpEY3PIzDU="
|
||||
"vendorHash": "sha256-GhmawLENmRuG5ZbXEZAw8pYmHn2SN2ONzfSIVEyN4U4="
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
|
||||
|
@ -638,11 +638,11 @@
|
|||
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
|
||||
},
|
||||
"kubernetes": {
|
||||
"hash": "sha256-dbt54fHUGjZRDKoh5JPO13jyxtHgzzvSFHZwOG4mbDY=",
|
||||
"hash": "sha256-k3NObpn1/P+hDx32Wjcd5HqFKC8NFUx6gkxlRDyw/vQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.21.0",
|
||||
"rev": "v2.21.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -1044,11 +1044,11 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-gaQN06gJIsJVRmURzs7cWQEX7bM0LCMJfzR10PslFh4=",
|
||||
"hash": "sha256-0Y9fJFiPLIuurA6OKKnbTvuUe0xFoSyZLQFPkh/LIvY=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.121.0",
|
||||
"rev": "v1.122.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-hfg3XyBf5V+NJTzCoHbnTU4HkEdQsllqcH2NjeTmlf0="
|
||||
},
|
||||
|
|
|
@ -5,21 +5,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tfautomv";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "padok-team";
|
||||
owner = "busser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-shpoi/N/gfzisjj1tvZGSEuorqaoOJMhYOjx+Y8F/Ds=";
|
||||
hash = "sha256-/Pli1gTG/68BtPdvF+BAwxFaeBrjj69h6Mtcbfm7UZ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BjmtUamecTSwT7gHM/6uz1r/P8O0TWzp9Dk43rdmxXU=";
|
||||
vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/padok-team/tfautomv";
|
||||
homepage = "https://github.com/busser/tfautomv";
|
||||
description = "When refactoring a Terraform codebase, you often need to write moved blocks. This can be tedious. Let tfautomv do it for you";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.31";
|
||||
"version" = "1.11.32";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "urCMClvyJx6e0UXDAcZysZvw3Qb6cnPjiy/aR4Uqtzs=";
|
||||
"desktopYarnHash" = "1yrdg7fn533qg6wzg99s2si68nlzgvp9wiyallq0s2b665bznqxj";
|
||||
"webSrcHash" = "eVZ3SaUqM2YQehQNIS5kVQ98HrNwovYsZwHCndCcFa4=";
|
||||
"webYarnHash" = "0xzwvhpvxzslvcybyn3si91fyi6a7xnrgib5dj6v5lcha1xd32w7";
|
||||
"desktopSrcHash" = "eUxqai6DZ18D67dGZQNxly6/wP0lEdkxR4H9oWUr8lI=";
|
||||
"desktopYarnHash" = "09qcp69jgl5dcwhpvwcx8q60m2xr1paq0dih8a3zyjydrq9kggda";
|
||||
"webSrcHash" = "JyYC7VmnXZ2w3uXgCFv6iVSZBkPHl243+fCsymgqwzk=";
|
||||
"webYarnHash" = "037airq21dvr6rbsc94xmdcd30yvqc5ffz4sz2avfky6g1y84nq7";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,16 +22,16 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "3.1.2-12912";
|
||||
_hash = "80d33f88";
|
||||
version = "3.1.2-13107";
|
||||
_hash = "ad5b5393";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb";
|
||||
hash = "sha256-F+zIHqYWKiCHYNJZ5hRw0rzltizjuqhVxbpzQGagoZ0=";
|
||||
hash = "sha256-mBfeexWEYpGybFFianUFvlzMv0HoFR4EeFcwlGVXIRA=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb";
|
||||
hash = "sha256-5n4T0mlfEh9/84wUYiH437R95Qz6/SKDq/AK6baiW24=";
|
||||
hash = "sha256-V6kR2lb63nnNIEhn64Yg0BYYlz7W0Cw60TwnKaJuLgs=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.51";
|
||||
version = "3.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-+5eni4i3LoPE0+Qzw4f6I//y5MzGxgj3NrT7YtYs/Fw=";
|
||||
hash = "sha256-20z9gS4AWs0WiZir7fO/E1ou7H+sbySc1AX2IaPNng0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LeWI5wbq06sBhAf5gqK8Zr8nmB9W1tDUUqF1HeZa1SM=";
|
||||
vendorHash = "sha256-sBvXNnZUblplDDHRy4agKSyafm2dBtS2PSMVO3MfckY=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
|
|
@ -66,7 +66,9 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
postInstall = ''
|
||||
# paperwork-shell needs to be re-wrapped with access to paperwork
|
||||
cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
|
||||
for exe in paperwork-cli paperwork-json; do
|
||||
cp ${python3Packages.paperwork-shell}/bin/.$exe-wrapped $out/bin/$exe
|
||||
done
|
||||
# install desktop files and icons
|
||||
XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user
|
||||
|
||||
|
@ -120,6 +122,9 @@ python3Packages.buildPythonApplication rec {
|
|||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
$out/bin/paperwork-gtk chkdeps
|
||||
|
||||
$out/bin/paperwork-cli chkdeps
|
||||
$out/bin/paperwork-json chkdeps
|
||||
|
||||
# content of make test, without the dep on make install
|
||||
python -m unittest discover --verbose -s tests
|
||||
|
||||
|
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.62.1";
|
||||
version = "0.63.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-tENX2F+kZSrltvaZm3ZaUld3es8Bt8LCpEVGxAOFVm0=";
|
||||
hash = "sha256-zMlRxj10NS47Q88UWM1s0WvhhQXS4I00JyzmigyYOmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
, speexdsp
|
||||
, hamlib_4
|
||||
, wxGTK32
|
||||
, sioclient
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, AppKit
|
||||
, AVFoundation
|
||||
|
@ -24,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HDHXVTkXC1fCqj4lnxURmXvQNtwDX4zA6/QFnYceUI4=";
|
||||
hash = "sha256-m8Myo/5jt+rnV8cAR2p20aAHnbatTkIXGSVhLebAP9g=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
|
|||
speexdsp
|
||||
hamlib_4
|
||||
wxGTK32
|
||||
sioclient
|
||||
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ])
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dataexplorer";
|
||||
version = "3.7.7";
|
||||
version = "3.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-tZ/+m+CeOE+84LbqXYPBGSMRkRU2oGnJpAP5OQkYmfY=";
|
||||
sha256 = "sha256-NiCtUqavYNUXsTkgi2V9u2qn8dBTLTEm52ju450d5Lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "16.0.1",
|
||||
"repo_hash": "sha256-TApZSavGA361Pue0u21Der6CUABhp/hwewUe9YExLAs=",
|
||||
"version": "16.0.2",
|
||||
"repo_hash": "sha256-qAwO/5eyyYdpwSUg3lC8jOFoBc8H6yhgiHUbx+Ww6Uc=",
|
||||
"yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v16.0.1-ee",
|
||||
"rev": "v16.0.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "16.0.1",
|
||||
"GITLAB_PAGES_VERSION": "16.0.1",
|
||||
"GITALY_SERVER_VERSION": "16.0.2",
|
||||
"GITLAB_PAGES_VERSION": "16.0.2",
|
||||
"GITLAB_SHELL_VERSION": "14.20.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "16.0.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "16.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "16.0.1";
|
||||
version = "16.0.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
@ -24,7 +24,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2OlCjwcJ0RydbKI15X4wZ20XVclC44McNig95UndDGg=";
|
||||
sha256 = "sha256-dtGtWV+lfTp9pKipAHx3FUIPaUobiRLsKYbULpuIgRY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "16.0.1";
|
||||
version = "16.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RbsPWc3Dc/rMLnSID0dZmHMg3+uK91kI+DXBYPSy81w=";
|
||||
sha256 = "sha256-AUX6JIkElYZHjy/RFBVXRb3ZnbWkaNyApZNMT6zsBAU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "16.0.1";
|
||||
version = "16.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bilibili";
|
||||
version = "1.10.1-1";
|
||||
version = "1.10.1-4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
||||
hash = "sha256-Kx45erpxS66/CWmo4Csw0jhp23u03fn7r+vkq5CtJg0=";
|
||||
hash = "sha256-/jvgCEqd0kSAs3U7eJQ7fFyHdGcyV/7nMnNgQpDVgm0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "steam-library";
|
||||
namespace = "plugin.program.steam.library";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aanderse";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ai8k55bamzkx7awk3dl8ksw93pan3h9b1xlylcldy7a0ddldzdg";
|
||||
sha256 = "sha256-LVdFih0n/lkjyaYf8jw0IFlcDiXXOtUH2N9OduV1H9Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "icewm";
|
||||
version = "3.3.5";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = "icewm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZxHeRfdSKhU7osITPLZmC5M2Nji3GjHLPuYphsZXNJw=";
|
||||
hash = "sha256-5RIjvmoqxMLnSW2P122rEa8MghWfwLHFtYgXwcFPF38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "24.1.0";
|
||||
version = "24.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
@ -1,95 +1,95 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "03jwgk8gd1n2rihwjgwk6zkly77pw2w9gyacs8rl0nx3v5yf1fzb";
|
||||
iosevka-aile = "0s7dfqm731xzlqgb5vbycks8mycxd27bapxs9hd2dqa07ixk8sl5";
|
||||
iosevka-curly = "1x2r3zhk3b69c462nj3b5fa890719rzffhl1b3pdl4bsldskdl7z";
|
||||
iosevka-curly-slab = "1v81vqjyknr2iyzzznmr18vnzhlv94ca0mz84ki9gq977kvz6cav";
|
||||
iosevka-etoile = "1xcyyfkrxl6a555jh6j7jlxp276qlcgmxjik86dch881ya7pz8c0";
|
||||
iosevka-slab = "0xl16zr4lf9m5a6ni4zydns8pc9nql9fq0bkvjf716s49s24gpyb";
|
||||
iosevka-ss01 = "122avzcwnhi25w99mvvpfxmd9y3acipc469lksvhysl0a8cbnk7q";
|
||||
iosevka-ss02 = "0p6vak2lgkj51mfqhdfk3rv20fdch8a29kqis1rmrr75fnbh2r75";
|
||||
iosevka-ss03 = "0zx04d82fnz9msb065y2avjvjz0fy881mafqfvc9qkl7ifzn27m7";
|
||||
iosevka-ss04 = "1y78yjamdsldw0p5j9955mcxzpxsgmqqki65kmpg5p1ygng2489r";
|
||||
iosevka-ss05 = "02ksvn933piqjcxbss7w60lh968vnyvxv36hn1fd67vqjdg4fi5x";
|
||||
iosevka-ss06 = "03xn8m2qwf1hx37rjbh0wfwzhfsyzjdyarq09kqmqiba1ik0mfk3";
|
||||
iosevka-ss07 = "0653xp8xkylvjlgzdk4drh31s3l7vr2l8yll1lbzc91mip6j4q0c";
|
||||
iosevka-ss08 = "1v4z6c9qqnalbllkns7qvzcygpymzd62lh35g2b93x8mxj0gdrcv";
|
||||
iosevka-ss09 = "05wc0pvrxw5ghws0g1ldaq29jm116shmfjxhk98nc2lxp3j6bbrd";
|
||||
iosevka-ss10 = "1hrccz2rlwxcp5m4z14jm9q4ix90z0sqinayi3xjh8yns59r049s";
|
||||
iosevka-ss11 = "1l66xyam4vgly46vavvvax54radi0r1bhgqgwp5x2r1m98l5da7i";
|
||||
iosevka-ss12 = "013igxaqb8jfg4b1ssz2jlkyvvf60b4kn08f9z6mlh2hkcv11wwy";
|
||||
iosevka-ss13 = "1y1w1r3ddyyvngs3x4gjk68w4shbrcka951i5qkf5236hn5hqixm";
|
||||
iosevka-ss14 = "1gpz4fk19nd28akgsl75jqkz3jmgra1njgjrb9wx35schzbgj6rf";
|
||||
iosevka-ss15 = "1dapsqa28pqnv3bg9j3qba8qid0kla333xbj5v7zga635qz2gnkw";
|
||||
iosevka-ss16 = "0cdai2lf38dbn978zpmhbc5qza9s92zyrrph63zhd9dbp0l8ljiv";
|
||||
iosevka-ss17 = "0js37r1r8swpxcfhwf7w6n5r3azhsrfviw1q6z45pcz1v5l9igph";
|
||||
iosevka-ss18 = "1cvyi5xiqxns2apkzr806wpfdfkss0nxkwp6di2lzbxfh93q5jvc";
|
||||
sgr-iosevka = "0020i3p6328kq29vvhmmlic06760s3gffi6pa4yz04dwxfjah3k9";
|
||||
sgr-iosevka-aile = "1fzlgz102fhygnv4gyfkiz8wr5c6cf49m94d7gifswx6skj1jl2l";
|
||||
sgr-iosevka-curly = "1lbdfszj2a620dlak2ffrrfzp419bfknaiw0njk98wflfb3sjncp";
|
||||
sgr-iosevka-curly-slab = "1hfg19aq0az9qgwh4dckf0n6mr7dm8fd2jxsqxjklhhdfa3s1cbm";
|
||||
sgr-iosevka-etoile = "0ml9y2aiwwp64dl2na7rmcylzzlmr6al4habh07pn4ijjmxd2zz2";
|
||||
sgr-iosevka-fixed = "1c29nmbckmjqkk574cgs6hr9mdkfidp35d61gpvpxg64nsv6cvmv";
|
||||
sgr-iosevka-fixed-curly = "0jj8i57hl7q9bz9lk5mki4ifh2w2pd2n1fs6mqk29znas3mf0djf";
|
||||
sgr-iosevka-fixed-curly-slab = "15gl43yhch9rny5ibz56m55r48a0qrbm7an3in4pzp34l6wjk8mq";
|
||||
sgr-iosevka-fixed-slab = "1wrw39c5yg2i1lsnz5msdql4srn0xr6lkincjkg6zgbqb22ah4lq";
|
||||
sgr-iosevka-fixed-ss01 = "0vq1kmfd6hydkmfidc28b1dchnwlwvmfh2nnrz88f3fc2hhb02ck";
|
||||
sgr-iosevka-fixed-ss02 = "0m36lb668qgc6jaaxizrnzm8wl4jbri6qfk107lkjz3vas0v7k4y";
|
||||
sgr-iosevka-fixed-ss03 = "05srwzs7a5mmm9g2b67m712fsw8dgf6m7mxywc1mp9m3fhjyqxwk";
|
||||
sgr-iosevka-fixed-ss04 = "1q4rz9q52p3zhshn8djl69b16q544x7ky8nrpdladiah9dyrimr5";
|
||||
sgr-iosevka-fixed-ss05 = "0w5qvl2vwijvwz5wvvwaixwqlgn2dfm5x7x6p5c00nwmcrlxghn0";
|
||||
sgr-iosevka-fixed-ss06 = "0jyyj35xz8wcrxr822f2rcq6imkc8v9d14zn4q8a3srh06d6n3mq";
|
||||
sgr-iosevka-fixed-ss07 = "09pikb09c863sq5hmcy4zk8449js2lxj02jph2p5fvsvzqbqwda0";
|
||||
sgr-iosevka-fixed-ss08 = "1s7n327a6lsfb845jz4zyl56dpyf6h13sn9jm65h3qhfxadcfgpp";
|
||||
sgr-iosevka-fixed-ss09 = "1rxisww2xsa6fxh6qd4n7rxwa04rlk1rz5x8jqsh9ajrlx31dxmg";
|
||||
sgr-iosevka-fixed-ss10 = "0xfj5c8wkw8429aj49jidwaqf53qgqms3wfqws87plshaz94r3rs";
|
||||
sgr-iosevka-fixed-ss11 = "01zsrgxmlly1hylfpq7sd07mk1anm9si69f0p9akidaffp7ki0bz";
|
||||
sgr-iosevka-fixed-ss12 = "1j53kbnxq3hki5hwa3y794kb7m89kg7wv5a7ml6h08dvqlqivi13";
|
||||
sgr-iosevka-fixed-ss13 = "04yvah2nns6lk8w71jyhfnnks3bc3frkpa11a79sw46wwmn2hnr4";
|
||||
sgr-iosevka-fixed-ss14 = "1k85xm5rrwj15iyvh4492q8ls6aqvq00xbmg1l27q6599369abjy";
|
||||
sgr-iosevka-fixed-ss15 = "0r1ka2a3b9kdzrdkic5h22wrf2kwwhdvz29xniymlrnqgy6rq5im";
|
||||
sgr-iosevka-fixed-ss16 = "0cls0rxc22xz11rirga4ijd1rn4l3am32agjhl11lm6z4h7rjl06";
|
||||
sgr-iosevka-fixed-ss17 = "1sm61q99jm6bykwm03z32cskgzwpcnn1f5x12clgyw6m6m7nccm9";
|
||||
sgr-iosevka-fixed-ss18 = "18fihrmsclbfy3vsaw6bmv0bvrjph6ik5p3k15jl9hh6i9qnhpyd";
|
||||
sgr-iosevka-slab = "0a0a4zm2prdnzkiir1zm2clvvwcpn1l89s9crvv2qi5ll55h35pq";
|
||||
sgr-iosevka-ss01 = "0fw9ic1zl7sd4gf1b73704n6frmagg6v4r6lc6j195ni4px6n4wx";
|
||||
sgr-iosevka-ss02 = "1icsr5d177r7dlry80ya5522rp4kr7vy5ad35w0p11566qq9f0r6";
|
||||
sgr-iosevka-ss03 = "0sxzmzwg6ryr6jfhvviqgzlhizfwcrl6fhmm3mmr2g0lyrc2shna";
|
||||
sgr-iosevka-ss04 = "13b4y73s39hqm4bxk6nx439w1rd33n2q2d8zplwgsy8zpznf2v04";
|
||||
sgr-iosevka-ss05 = "0slkzah2icshqcf8izviyid3qm9qdvnmaf65a1l0fhzamx3fsf03";
|
||||
sgr-iosevka-ss06 = "04i88ky5139wbn4d1vglq8xl51srii12lx0329pggfrpi7xxpd8q";
|
||||
sgr-iosevka-ss07 = "0a34k93n3cckgvirqxj6qg7qg4mqr3cm19zbwj8h6mnsndrndkhz";
|
||||
sgr-iosevka-ss08 = "06qhv6dfs4y8601kkcqp2zg6pk61v2zfpnpxwwsbviaf45zjp74r";
|
||||
sgr-iosevka-ss09 = "1g89ygl86iljzgs1h15p484a8m6af9n1s5rbami8cry35sx4sqmg";
|
||||
sgr-iosevka-ss10 = "0bwx7ic6jidq3d8dkinzygjvd1z5b1zi7x926a6fvc6hm0jd1nak";
|
||||
sgr-iosevka-ss11 = "0jx4k1kb0j09a18d43vhfwap5cr1g0z7afwmhnbj78q4g19jx04c";
|
||||
sgr-iosevka-ss12 = "0qkp2ds57c03w0j41a4vykk0zxn26sqy4r03mzbm61j33zpp4c2v";
|
||||
sgr-iosevka-ss13 = "0v9a3cz3m2yh7yk7q3r7rx1g4q3a8098fn8hbswz4sr7gw0niyps";
|
||||
sgr-iosevka-ss14 = "0zd0bkzvgvj89dm6yr7bjzi7fc62k6i03zx5mqna3npyxzrxmnn0";
|
||||
sgr-iosevka-ss15 = "0ambby6s312q9b86src5l2fq4g13cx98hjllviya9r0rp76nabdx";
|
||||
sgr-iosevka-ss16 = "0qcpfflxzvzqm5dfx0939lqj74nf3ssxg8kprds0hxlaq076wv90";
|
||||
sgr-iosevka-ss17 = "0f6d5gnwcpall09wn4djifg6vwv7884xc9ylklrnn8w7f6y66sj8";
|
||||
sgr-iosevka-ss18 = "0fmmyi3iqmsfmnx18jls6fs72y8878qd3ma0afh698p06kpbnqvn";
|
||||
sgr-iosevka-term = "1bwz17kigznwr917gs0kwc5q69d0485kgbinqbdjad4a9ig4dwl3";
|
||||
sgr-iosevka-term-curly = "0zzg4cm6xzhvnnn3bc97pd303nzgf9r2qi450kcb2rpybnb7j4wl";
|
||||
sgr-iosevka-term-curly-slab = "1nipn2vj6m5fz63f1jwimxjrc27bsk04f3km0lymvsabpfhr3afx";
|
||||
sgr-iosevka-term-slab = "0f0qpz98skkc1app981ijf9ggqr3im969n53dsqw4n9vprkpg4s9";
|
||||
sgr-iosevka-term-ss01 = "0aj94rmv5mw344vnxji0cqbzwfbigjdgj3gsbx141vdcb4mmx3i4";
|
||||
sgr-iosevka-term-ss02 = "0l1m102c8kwa35anhvaig4fpw9c4y1b84qlja1griakvz48i34dw";
|
||||
sgr-iosevka-term-ss03 = "1sgmmgqq1ij6lfyvlfn31dgmh0wxy4x6758sj7fybjs65gl5lrnk";
|
||||
sgr-iosevka-term-ss04 = "0lq0vmfsp9zlmg8v97rqjyf6pk1i35q8ljzbn6f6pdhgl83004w9";
|
||||
sgr-iosevka-term-ss05 = "01mkdp2a6qxksxn3isg0j50a3vys0syw3vmn6af7mpis46zgjpj6";
|
||||
sgr-iosevka-term-ss06 = "0dfwvnlbmyjbvd116fhzwkyyn6jxlgrhcz01m3rhgs42gsczjhmj";
|
||||
sgr-iosevka-term-ss07 = "0k6653cc4ldhyrzx6gam06hyssy516shswp4qmgqhcl08wx5fpbk";
|
||||
sgr-iosevka-term-ss08 = "12faci0m988wrwa0i7lf84scpjakmfqs0m0jbbqb488l413h5l7h";
|
||||
sgr-iosevka-term-ss09 = "05ivmp2yfjjzqwqlh5d3pin8y24hmm17fkw5q1synv7d67p6pfqy";
|
||||
sgr-iosevka-term-ss10 = "0piiqscfxpa19v947xzqz2x1bbscin3fr9wllrkhfd22ianjaagd";
|
||||
sgr-iosevka-term-ss11 = "0mpbv8lxbv967nmnb0csbkf9pj9zb1lawsxagmnw098fj6kc3305";
|
||||
sgr-iosevka-term-ss12 = "1fzm2rslayd3k72fnh2j4zx86r0dh2d82r1h6k0v3wkvyi6fx9nb";
|
||||
sgr-iosevka-term-ss13 = "0w37h547ys5xmiayphj1ihm1kwwvpvw7v4ypdmp5vdy7grih986q";
|
||||
sgr-iosevka-term-ss14 = "0f0diws4q86190h8mlvrzww34zb7za7glvaqy252pfw6p2xyp784";
|
||||
sgr-iosevka-term-ss15 = "11kv4hz2zsjgyakkrw77gljrvpb53p8q7xw0m75h5plbcz661gn2";
|
||||
sgr-iosevka-term-ss16 = "1mxnhvbgrxnpvgj6bjk4g7xakw0f8iqwpnjbyswv1ykklm75rmz4";
|
||||
sgr-iosevka-term-ss17 = "033dhx0rbkh8nlckqgjxffjcp91anjwc2n566f231asyry6jqr3m";
|
||||
sgr-iosevka-term-ss18 = "160zd6aygzjz4hfgljg0996iifxqabmfkjd51935x3vg52ays8fa";
|
||||
iosevka = "1gn59969vxl83jv3zzcbfsl54gph693p0bz70dkqfh0vxby5dl7y";
|
||||
iosevka-aile = "0vqlbbnc5ybcbxn48svcf689mqhwf4slv72b8vvcjjvpyppmrdf9";
|
||||
iosevka-curly = "1w86x4ixsh493idm8ab0awk15h01d98w8dcvqa6vmc2d98bm0zhr";
|
||||
iosevka-curly-slab = "0bcq5zmgvfdz0bc73hrvnbn3rk5s10ryy35g655whqqx2wn8rk5a";
|
||||
iosevka-etoile = "0s3295m5gflg9kq7lz49b1vb5ssdg31mkcvzq0w6c1v43sr9c3j7";
|
||||
iosevka-slab = "0qydc6s9y896lfs867w7pqq352qwxbkspxz880fanpg66a4mb78f";
|
||||
iosevka-ss01 = "135bjfpjvyqbylf1a0mbx6zfhxdipbfxn6kvdzbylcvaxmlkbmk7";
|
||||
iosevka-ss02 = "00czg6i97qdp4460yis2khhsk6p8pws3d4s9cw3s23kaxbh3cafl";
|
||||
iosevka-ss03 = "1wpifmkrf8vxsg1fz7mkafskhcdbiwm0j34qcyc8hxyy9g5xy0pf";
|
||||
iosevka-ss04 = "0wrzzx5jwlmkw0alv55gikr0qwl2aqia3jpixbr2pmp8qj78asai";
|
||||
iosevka-ss05 = "01sxgqhmxs9zra5gjcqkj8rkflr1p83jlnhqc4davd4h4pgdwqsx";
|
||||
iosevka-ss06 = "1nzjnnqz6p0by2vl0f052m7dqvfcjx62clfdybc3k2b6vd8p91pz";
|
||||
iosevka-ss07 = "1ib52g4gnj950b24y550wilip4311slsq001smf06bk64v0xyzb9";
|
||||
iosevka-ss08 = "1kv22lnm8k9s8d39swny9ci8ybqbplqmgvfb4sh9gq8ikwbada7c";
|
||||
iosevka-ss09 = "1q0yablkn1v94w204flkxpwf4zgzzrch1vk0x4ijcyw7bjwv2wlb";
|
||||
iosevka-ss10 = "0s6fgq1mwfd56fx9iggisa87warpy8kwlnzrp52wadc6wml6pwp1";
|
||||
iosevka-ss11 = "0iry12x9wmv8w6b00r0g0vnxjc4y40i6b68ml85qwp9xwrrbg4qg";
|
||||
iosevka-ss12 = "1ry8b32l6bzas8h1lx7ymvf5c5hyz5sppqf4ygdxy6hcc6bqcmpf";
|
||||
iosevka-ss13 = "1id288j7d8ppxcvgd0ylrc3rncnypg094ai8s539gxhlcfni0xn7";
|
||||
iosevka-ss14 = "0ggfswcdy0kl7y6b1pqi0fx1lppljrd7g5mk94zylqg0p1qz8jg2";
|
||||
iosevka-ss15 = "11zm07lna8pipzdm2xlxsq3ps7c85vv913wwbm01l0h7g5n6cr4h";
|
||||
iosevka-ss16 = "13ggwcpdh6cx07hwi801n00mmm440xxr6lylgg013sbf7iasry18";
|
||||
iosevka-ss17 = "0c5ixksqzshafg627fgsq5pwn79bmxg4n5q983halvwfwl0bnzbn";
|
||||
iosevka-ss18 = "09qfm54rqixd5alzpx6kdsy1w9693ciij3f3kr1150b4rnd6ilc7";
|
||||
sgr-iosevka = "0ab0dpryalq62j1zbayx8cjzl4bhr9gzm8x8yk4kbvqaf6rzjf4h";
|
||||
sgr-iosevka-aile = "15hd88zbx76qc1imwxpgi5xnn7bg18fsvi3mhva9xsssqlah7lws";
|
||||
sgr-iosevka-curly = "0a9jm2brda6x0g3rpvms4whb33cmk7fs9fphx1nf2lr2ydlhbz81";
|
||||
sgr-iosevka-curly-slab = "00yvzbs5dri7hrazgfppb1zw0d72krhh789kkad00nhyx9ijls5z";
|
||||
sgr-iosevka-etoile = "1i7ahs88xbfzyzhbg1vkp9r6mzfabpgnbihzbdbc9xffhd9m8b69";
|
||||
sgr-iosevka-fixed = "05dy6b64ssar4lm6aw6bn6l43ljx8zca93q8b0hrgjgp5rf83hia";
|
||||
sgr-iosevka-fixed-curly = "1nl2pm785n0rc3jyadclavy56c3k64yaplgsr3yyj5ic2clfg896";
|
||||
sgr-iosevka-fixed-curly-slab = "1gkhxwvwqszfiqphfbb1ijlyqbihrwj1n6n67wzkll464wj4il6k";
|
||||
sgr-iosevka-fixed-slab = "005y0zixp3g00i12jq3x6ahgfjbbxp9wz65mmbxdrggih34ws5r1";
|
||||
sgr-iosevka-fixed-ss01 = "0z48q8ry6xyz9b0bbfy65qi6plffv4920wy473inidymj3lmy18s";
|
||||
sgr-iosevka-fixed-ss02 = "0srq607x6nmhn9b0b7j33gfn57x6n32zl3prxzkvsc9z1dmg8nm8";
|
||||
sgr-iosevka-fixed-ss03 = "1sxn9jkmhk7qp42lli075m05lz38a1rjnxkg5j3qdrxdha2alqsf";
|
||||
sgr-iosevka-fixed-ss04 = "0h89vl5qym80g48idp81ii6ag3542s042r0hyda5ddkxw2alm38j";
|
||||
sgr-iosevka-fixed-ss05 = "0b5c6sagz0z7sxsk16dwf8kvmxzjzn9n0aps2f665ap9nf2bvqny";
|
||||
sgr-iosevka-fixed-ss06 = "11k1jk7z5ri1q49jj5ds5blbwrvvqk0fskc1jwjxx0jw5qhm1qxs";
|
||||
sgr-iosevka-fixed-ss07 = "0yfh7726z2xa6lrlm4nc04syqh32im1ck8c191sv2340c708vg2d";
|
||||
sgr-iosevka-fixed-ss08 = "0g9iig16jn39x46xz5h97k1rg07alpx272fv4aqpkibx7d4kpk4a";
|
||||
sgr-iosevka-fixed-ss09 = "03fjsfyhgaxmnc0b2qz6a3pk7w0cpdfdqiqamqcxz6iqfbaqlk6l";
|
||||
sgr-iosevka-fixed-ss10 = "1jz8qq259h6k2bqqhpq161sqgpcnqxm56rrk0kjcw6vgrschbiqg";
|
||||
sgr-iosevka-fixed-ss11 = "14zj34cpkwb63gni23ls5icrkzxq16h09ggdgismxbbrymirw1yb";
|
||||
sgr-iosevka-fixed-ss12 = "15hfkabmxb53f9ljwknxyr91h1awdmaa24kxq1hmbgwz7g4az7yr";
|
||||
sgr-iosevka-fixed-ss13 = "1xiwaqjbhkj1hxqsp99c5skynzhanbp5mhlw04n006ay1kq9zjxs";
|
||||
sgr-iosevka-fixed-ss14 = "0zapvxk4d8dn0jadm8ilvaqzlasc9g79v18y807zadcadhf7xmz3";
|
||||
sgr-iosevka-fixed-ss15 = "19r7kdgpn1vqmhaj5dxhccfxyzpdcaxgdmic2nzhjcjkxg09mvs7";
|
||||
sgr-iosevka-fixed-ss16 = "1na9bmgw29q62lbc5fjlbkjivncq71w3n6c02prcmpyn0xnlpqzc";
|
||||
sgr-iosevka-fixed-ss17 = "1zabrx1bxr0pb1cbdp9vdzahjvwpignyp5qb466qiy8l6pyhx1sh";
|
||||
sgr-iosevka-fixed-ss18 = "037srmxnq5jzgj2yf6l04msyvzp54sklxkjda2ibifywrac7fkk4";
|
||||
sgr-iosevka-slab = "1fwjscd1r7f8k43m55svcyz38y4qlr329nmr2ji5h9cg08shi1gf";
|
||||
sgr-iosevka-ss01 = "19c4cdpm8a543cj4wfakvhfmnbqvr5hp3c284w01z40wzx35zc2y";
|
||||
sgr-iosevka-ss02 = "0rd79vrfgrmml9y6dc8k1b6flihhc1fgrab2rja4640qjn7ak8sj";
|
||||
sgr-iosevka-ss03 = "18clr1swv0zkvwza46a3rl0z95cnvh7knidwk87wi1a4i5144dbp";
|
||||
sgr-iosevka-ss04 = "1b02b0dvqpiw02b8g82pgk6a7ywj4wml00hkc26j5k0vmw7dxbvj";
|
||||
sgr-iosevka-ss05 = "1z92ki8hq29qgnfpy65vnbrfhb17vb4wxa7ga0051vdyc6kbkip0";
|
||||
sgr-iosevka-ss06 = "08nbrrvxdlf82112x9vd157sqvppkbfz21wzisyva6kzjips4d1v";
|
||||
sgr-iosevka-ss07 = "13ghjry05y87z2i9kkrwf46gjzbhmhx32vqf8cbjnwr2scb3d2sd";
|
||||
sgr-iosevka-ss08 = "09m9wraz90lc64jdyc8wjdmqdcll44v9j4yr2hw494c27883bk73";
|
||||
sgr-iosevka-ss09 = "1ada6dykasd7mb8haari9bwzl75bfp2y0c177vk2lc869f845l5l";
|
||||
sgr-iosevka-ss10 = "15c4h8plvy9mmjz8rv8jjhlby3g0x674il01gc54q70sv4g1lj2h";
|
||||
sgr-iosevka-ss11 = "1d1hrxj7vv8lhxsqjfn9wz12wsnhv5accc06dpra3sraqajilxga";
|
||||
sgr-iosevka-ss12 = "0s75j0wrg2j52v0irlamsqf46izri58wls1fjs3p6ckjasn0jlb7";
|
||||
sgr-iosevka-ss13 = "1nq6bjf6v87vni7s63nayx6dr01r219gxni0md4xbsqf7in31ncm";
|
||||
sgr-iosevka-ss14 = "09kphmfr1yxa7whlzni1nbmyhrcpnbaqqzmbr1n18dahlq8wf4hv";
|
||||
sgr-iosevka-ss15 = "0nnap51bhhbbdljxpcsbg7kzjb6a6psdfr06jf8z969q56288gmr";
|
||||
sgr-iosevka-ss16 = "0rdvsrqfkj6wbmmxf0xgc9pjlc43n6y433ziflgv71r7zp25rbch";
|
||||
sgr-iosevka-ss17 = "1ylndvsyq78n0wp3dnpj6ili7jagfa2hbr019dnnm485mw2lf34a";
|
||||
sgr-iosevka-ss18 = "0mkc63kz9xqxqzzygbz4r462dlrcm0s2x975r33q1knz1fag43gm";
|
||||
sgr-iosevka-term = "1f7aammqiwjvf49r7aa6ivbm539imb2vh51mqml9kagxyaz134bb";
|
||||
sgr-iosevka-term-curly = "031i5rjwczghxcsks17hbwzhyfkalydfj255f7f15pq3mphj2svq";
|
||||
sgr-iosevka-term-curly-slab = "1srjdhp667nbjrraxqqc3653zmw8ji33nnsvfqxmrs7jy1w16mic";
|
||||
sgr-iosevka-term-slab = "0grhsha5f88h7326wy7fh9frk9xx28zbsk75rz6xxlh4qb3lqqx3";
|
||||
sgr-iosevka-term-ss01 = "1c68h9zav5j76ylvw5yddscs6xk5i9fck8b7zphhqljyd5pk3i89";
|
||||
sgr-iosevka-term-ss02 = "0kccl4i7wykaf4c234jh8qd1rxkc920533wn163xfpmb820c1lnw";
|
||||
sgr-iosevka-term-ss03 = "1gl89w29mwir92s1zcvnvqg7apr1cr1fp56si1xk8i2smg9al540";
|
||||
sgr-iosevka-term-ss04 = "093wxxw6v3sbds77izlsshn0yr8slchns2j858vjw2cm5nv14ps3";
|
||||
sgr-iosevka-term-ss05 = "1b29jabdb2ca0yrs54x1ahx5fqz51va5khd3mlwqrbrjbz5hzfdb";
|
||||
sgr-iosevka-term-ss06 = "1i4nrs5vh02xs1gh8i2c89gpzskxgrbfvgvna18d909mxqkwcj23";
|
||||
sgr-iosevka-term-ss07 = "04xsxb7gch3srq86p23yvbn2l4pqg35fvg0ydsnnx7zxck711yh0";
|
||||
sgr-iosevka-term-ss08 = "19zcyqb45fyxiwzpf6fcnbmsp1sxw6axxyl21ffc2qnamkbnh0cq";
|
||||
sgr-iosevka-term-ss09 = "0z2li5gmyp4l8s5fwbcayg4fmdm6ilxa13mwm29nnrq3qfxs7jf5";
|
||||
sgr-iosevka-term-ss10 = "08hl6ivvy5yycd8nrqk3q0c1lciw1dacsdccq6p3wnhraj4jvgpg";
|
||||
sgr-iosevka-term-ss11 = "1mzkvqs0pszaizhlbs81ryspjq8mxnriqsg7ci5f1a5wfv5x4m0w";
|
||||
sgr-iosevka-term-ss12 = "0nwb0jv6pq5dqzm9i0wy2ixqhwkc46z6735swy4kl08s6ywnby3f";
|
||||
sgr-iosevka-term-ss13 = "0k2dbrn64i52rbv0rv9j41d20iqvmbsggmi75vnmvmyahm00agmn";
|
||||
sgr-iosevka-term-ss14 = "0niq6iy6snd52l2qv248r5i4kbb0jrfnmscmc8hla04r43pfw9yi";
|
||||
sgr-iosevka-term-ss15 = "05j96kmc0n88v1c0ygiypma4ddxnbvxmjj2yp6h76xzyhxvdl69l";
|
||||
sgr-iosevka-term-ss16 = "1x9ipw7m42yhd33dxm5qzzqimszklcav26rqdmzam8m6slg6cwg9";
|
||||
sgr-iosevka-term-ss17 = "0y9nw69jp8mnmbxhly16d8dnwpjgpgllimr7icqlbc9dr2nzzhm9";
|
||||
sgr-iosevka-term-ss18 = "0sh3vhv3p42fgx4z5gg9b3v4nynnjxnn5fjzyiv044957djs4rvb";
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sarasa-gothic";
|
||||
version = "0.40.7";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchurl {
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
hash = "sha256-muxmoTfAZWLhPp4rx91PDnYogBGHuD4esYjE2kZiOAY=";
|
||||
hash = "sha256-3WcBuBTm3ASuCvLh+2R/idLKBjCTnk4qIRaOo590ugU=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "44.1";
|
||||
version = "44.2.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NggCpZXj7brZYsjOo1O2K6qL5AdRO1FiyJyTPKU4eqk=";
|
||||
sha256 = "2cYvAkcn96dvxqXaeIorAkffAaccKmARQ8YqrA/0Hkw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -36,7 +36,14 @@ let
|
|||
echo "${metadata}" | base64 --decode > $out/metadata.json
|
||||
'';
|
||||
};
|
||||
dontBuild = true;
|
||||
nativeBuildInputs = with pkgs; [ glib ];
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
if [ -d schemas ]; then
|
||||
glib-compile-schemas --strict schemas
|
||||
fi
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gnome-shell/extensions/
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
gtk3, libxfce4ui, libxfce4util, pango, harfbuzz, gdk-pixbuf, atk }:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages(ps: [ ps.pygobject3 ]);
|
||||
pythonEnv = python3.withPackages(ps: [ ps.pygobject3 ps.psutil ]);
|
||||
makeTypelibPath = lib.makeSearchPathOutput "lib/girepository-1.0" "lib/girepository-1.0";
|
||||
in mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-panel-profiles";
|
||||
version = "1.0.13";
|
||||
version = "1.0.14";
|
||||
|
||||
sha256 = "sha256-B3Q5d3KBN5m8wY82CIbIugJC8nNS+OcgKchn+TGrDhc=";
|
||||
sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8=";
|
||||
|
||||
nativeBuildInputs = [ intltool gettext ];
|
||||
propagatedBuildInputs = [ pythonEnv ];
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib, erlang }:
|
||||
let
|
||||
version = "0.46.2";
|
||||
version = "0.47.1";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
|
@ -24,7 +24,7 @@ rebar3Relx {
|
|||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-J0Qa8s8v/KT4/Jaj9JYsfvzviMUx8FnX0nMoeH8bkB8=";
|
||||
sha256 = "sha256-pW78CBOM0Yi5taPHdCfTTb9H1fbhuQFpf6jaf0cTQdA=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, libxml2
|
||||
, ncurses
|
||||
, zlib
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
|
@ -38,5 +39,6 @@ rustPlatform.buildRustPackage {
|
|||
homepage = "https://bfc.wilfred.me.uk";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
broken = stdenv.isAarch64 && stdenv.isLinux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,306 +0,0 @@
|
|||
From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
|
||||
From: Liu Hao <lh_mouse@126.com>
|
||||
Date: Wed, 25 Apr 2018 21:54:19 +0800
|
||||
Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
|
||||
|
||||
Signed-off-by: Liu Hao <lh_mouse@126.com>
|
||||
---
|
||||
config/gthr.m4 | 1 +
|
||||
gcc/config.gcc | 3 +++
|
||||
gcc/config/i386/mingw-mcfgthread.h | 1 +
|
||||
gcc/config/i386/mingw-w64.h | 2 +-
|
||||
gcc/config/i386/mingw32.h | 11 ++++++++++-
|
||||
gcc/configure | 2 +-
|
||||
gcc/configure.ac | 2 +-
|
||||
libatomic/configure.tgt | 2 +-
|
||||
libgcc/config.host | 6 ++++++
|
||||
libgcc/config/i386/gthr-mcf.h | 1 +
|
||||
libgcc/config/i386/t-mingw-mcfgthread | 2 ++
|
||||
libgcc/configure | 1 +
|
||||
libstdc++-v3/configure | 1 +
|
||||
libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
|
||||
libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++
|
||||
libstdc++-v3/src/c++11/thread.cc | 9 +++++++++
|
||||
16 files changed, 80 insertions(+), 5 deletions(-)
|
||||
create mode 100644 gcc/config/i386/mingw-mcfgthread.h
|
||||
create mode 100644 libgcc/config/i386/gthr-mcf.h
|
||||
create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
|
||||
|
||||
diff --git a/config/gthr.m4 b/config/gthr.m4
|
||||
index 7b29f1f3327..82e21fe1709 100644
|
||||
--- a/config/gthr.m4
|
||||
+++ b/config/gthr.m4
|
||||
@@ -21,6 +21,7 @@ case $1 in
|
||||
tpf) thread_header=config/s390/gthr-tpf.h ;;
|
||||
vxworks) thread_header=config/gthr-vxworks.h ;;
|
||||
win32) thread_header=config/i386/gthr-win32.h ;;
|
||||
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
|
||||
esac
|
||||
AC_SUBST(thread_header)
|
||||
])
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 46a9029acec..112c24e95a3 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
|
||||
if test x$enable_threads = xposix ; then
|
||||
tm_file="${tm_file} i386/mingw-pthread.h"
|
||||
fi
|
||||
+ if test x$enable_threads = xmcf ; then
|
||||
+ tm_file="${tm_file} i386/mingw-mcfgthread.h"
|
||||
+ fi
|
||||
tm_file="${tm_file} i386/mingw32.h"
|
||||
# This makes the logic if mingw's or the w64 feature set has to be used
|
||||
case ${target} in
|
||||
diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
|
||||
new file mode 100644
|
||||
index 00000000000..ec381a7798f
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/i386/mingw-mcfgthread.h
|
||||
@@ -0,0 +1 @@
|
||||
+#define TARGET_USE_MCFGTHREAD 1
|
||||
diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
|
||||
index 484dc7a9e9f..a15bbeea500 100644
|
||||
--- a/gcc/config/i386/mingw-w64.h
|
||||
+++ b/gcc/config/i386/mingw-w64.h
|
||||
@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
"%{mwindows:-lgdi32 -lcomdlg32} " \
|
||||
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
|
||||
fvtable-verify=std:-lvtv -lpsapi} " \
|
||||
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
|
||||
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
|
||||
|
||||
#undef SPEC_32
|
||||
#undef SPEC_64
|
||||
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
|
||||
index 0612b87199a..76cea94f3b7 100644
|
||||
--- a/gcc/config/i386/mingw32.h
|
||||
+++ b/gcc/config/i386/mingw32.h
|
||||
@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see
|
||||
| MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
|
||||
| MASK_MS_BITFIELD_LAYOUT)
|
||||
|
||||
+#ifndef TARGET_USE_MCFGTHREAD
|
||||
+#define CPP_MCFGTHREAD() ((void)0)
|
||||
+#define LIB_MCFGTHREAD ""
|
||||
+#else
|
||||
+#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__"))
|
||||
+#define LIB_MCFGTHREAD " -lmcfgthread "
|
||||
+#endif
|
||||
+
|
||||
/* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
|
||||
is for compatibility with native compiler. */
|
||||
#define EXTRA_OS_CPP_BUILTINS() \
|
||||
@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
builtin_define_std ("WIN64"); \
|
||||
builtin_define ("_WIN64"); \
|
||||
} \
|
||||
+ CPP_MCFGTHREAD(); \
|
||||
} \
|
||||
while (0)
|
||||
|
||||
@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see
|
||||
"%{mwindows:-lgdi32 -lcomdlg32} " \
|
||||
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
|
||||
fvtable-verify=std:-lvtv -lpsapi} " \
|
||||
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
|
||||
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
|
||||
|
||||
/* Weak symbols do not get resolved if using a Windows dll import lib.
|
||||
Make the unwind registration references strong undefs. */
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 6121e163259..52f0e00efe6 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -11693,7 +11693,7 @@ case ${enable_threads} in
|
||||
target_thread_file='single'
|
||||
;;
|
||||
aix | dce | lynx | mipssde | posix | rtems | \
|
||||
- single | tpf | vxworks | win32)
|
||||
+ single | tpf | vxworks | win32 | mcf)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
*)
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index b066cc609e1..4ecdba88de7 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -1612,7 +1612,7 @@ case ${enable_threads} in
|
||||
target_thread_file='single'
|
||||
;;
|
||||
aix | dce | lynx | mipssde | posix | rtems | \
|
||||
- single | tpf | vxworks | win32)
|
||||
+ single | tpf | vxworks | win32 | mcf)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
*)
|
||||
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
|
||||
index ea8c34f8c71..23134ad7363 100644
|
||||
--- a/libatomic/configure.tgt
|
||||
+++ b/libatomic/configure.tgt
|
||||
@@ -145,7 +145,7 @@ case "${target}" in
|
||||
*-*-mingw*)
|
||||
# OS support for atomic primitives.
|
||||
case ${target_thread_file} in
|
||||
- win32)
|
||||
+ win32 | mcf)
|
||||
config_path="${config_path} mingw"
|
||||
;;
|
||||
posix)
|
||||
diff --git a/libgcc/config.host b/libgcc/config.host
|
||||
index 11b4acaff55..9fbd38650bd 100644
|
||||
--- a/libgcc/config.host
|
||||
+++ b/libgcc/config.host
|
||||
@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
|
||||
posix)
|
||||
tmake_file="i386/t-mingw-pthread $tmake_file"
|
||||
;;
|
||||
+ mcf)
|
||||
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
|
||||
+ ;;
|
||||
esac
|
||||
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
|
||||
if test x$ac_cv_sjlj_exceptions = xyes; then
|
||||
@@ -761,6 +764,9 @@ x86_64-*-mingw*)
|
||||
posix)
|
||||
tmake_file="i386/t-mingw-pthread $tmake_file"
|
||||
;;
|
||||
+ mcf)
|
||||
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
|
||||
+ ;;
|
||||
esac
|
||||
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
|
||||
if test x$ac_cv_sjlj_exceptions = xyes; then
|
||||
diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
|
||||
new file mode 100644
|
||||
index 00000000000..5ea2908361f
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/i386/gthr-mcf.h
|
||||
@@ -0,0 +1 @@
|
||||
+#include <mcfgthread/gthread.h>
|
||||
diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
|
||||
new file mode 100644
|
||||
index 00000000000..4b9b10e32d6
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/i386/t-mingw-mcfgthread
|
||||
@@ -0,0 +1,2 @@
|
||||
+SHLIB_PTHREAD_CFLAG =
|
||||
+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
|
||||
diff --git a/libgcc/configure b/libgcc/configure
|
||||
index b2f3f870844..eff889dc3b3 100644
|
||||
--- a/libgcc/configure
|
||||
+++ b/libgcc/configure
|
||||
@@ -5451,6 +5451,7 @@ case $target_thread_file in
|
||||
tpf) thread_header=config/s390/gthr-tpf.h ;;
|
||||
vxworks) thread_header=config/gthr-vxworks.h ;;
|
||||
win32) thread_header=config/i386/gthr-win32.h ;;
|
||||
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
|
||||
esac
|
||||
|
||||
|
||||
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||
index ba094be6f15..979a5ab9ace 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -15187,6 +15187,7 @@ case $target_thread_file in
|
||||
tpf) thread_header=config/s390/gthr-tpf.h ;;
|
||||
vxworks) thread_header=config/gthr-vxworks.h ;;
|
||||
win32) thread_header=config/i386/gthr-win32.h ;;
|
||||
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
|
||||
esac
|
||||
|
||||
|
||||
diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
|
||||
index de920d714c6..665fb74bd6b 100644
|
||||
--- a/libstdc++-v3/libsupc++/atexit_thread.cc
|
||||
+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
|
||||
@@ -25,6 +25,22 @@
|
||||
#include <cstdlib>
|
||||
#include <new>
|
||||
#include "bits/gthr.h"
|
||||
+
|
||||
+#ifdef __USING_MCFGTHREAD__
|
||||
+
|
||||
+#include <mcfgthread/gthread.h>
|
||||
+namespace __cxxabiv1 {
|
||||
+extern "C" int
|
||||
+__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
|
||||
+ void *obj, void *dso_handle)
|
||||
+ _GLIBCXX_NOTHROW
|
||||
+{
|
||||
+ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
|
||||
+ (void)dso_handle;
|
||||
+}
|
||||
+}
|
||||
+#else // __USING_MCFGTHREAD__
|
||||
+
|
||||
#ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
|
||||
}
|
||||
|
||||
#endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
|
||||
+
|
||||
+#endif // __USING_MCFGTHREAD__
|
||||
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
|
||||
index 3a2ec3ad0d6..8b4cc96199b 100644
|
||||
--- a/libstdc++-v3/libsupc++/guard.cc
|
||||
+++ b/libstdc++-v3/libsupc++/guard.cc
|
||||
@@ -28,6 +28,27 @@
|
||||
#include <cxxabi.h>
|
||||
#include <exception>
|
||||
#include <new>
|
||||
+
|
||||
+#ifdef __USING_MCFGTHREAD__
|
||||
+
|
||||
+#include <mcfgthread/gthread.h>
|
||||
+
|
||||
+namespace __cxxabiv1 {
|
||||
+
|
||||
+extern "C" int __cxa_guard_acquire(__guard *g){
|
||||
+ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
|
||||
+}
|
||||
+extern "C" void __cxa_guard_abort(__guard *g) throw() {
|
||||
+ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
|
||||
+}
|
||||
+extern "C" void __cxa_guard_release(__guard *g) throw() {
|
||||
+ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
|
||||
+}
|
||||
+
|
||||
+}
|
||||
+
|
||||
+#else // __USING_MCFGTHREAD__
|
||||
+
|
||||
#include <ext/atomicity.h>
|
||||
#include <ext/concurrence.h>
|
||||
#include <bits/atomic_lockfree_defines.h>
|
||||
@@ -425,3 +446,5 @@ namespace __cxxabiv1
|
||||
#endif
|
||||
}
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
|
||||
index 8238817c2e9..0c6a1f85f6f 100644
|
||||
--- a/libstdc++-v3/src/c++11/thread.cc
|
||||
+++ b/libstdc++-v3/src/c++11/thread.cc
|
||||
@@ -55,6 +55,15 @@ static inline int get_nprocs()
|
||||
#elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
|
||||
# include <unistd.h>
|
||||
# define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
|
||||
+#elif defined(_WIN32)
|
||||
+# include <windows.h>
|
||||
+static inline int get_nprocs()
|
||||
+{
|
||||
+ SYSTEM_INFO sysinfo;
|
||||
+ GetSystemInfo(&sysinfo);
|
||||
+ return (int)sysinfo.dwNumberOfProcessors;
|
||||
+}
|
||||
+# define _GLIBCXX_NPROCS get_nprocs()
|
||||
#else
|
||||
# define _GLIBCXX_NPROCS 0
|
||||
#endif
|
||||
--
|
||||
2.17.0
|
||||
|
|
@ -121,9 +121,7 @@ let majorVersion = "13";
|
|||
|
||||
# Use absolute path in GNAT dylib install names on Darwin
|
||||
++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch
|
||||
|
||||
# Obtain latest patch with ../update-mcfgthread-patches.sh
|
||||
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
|
||||
;
|
||||
|
||||
/* Cross-gcc settings (build == host != target) */
|
||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, boost169
|
||||
, pinnedBoost ? boost169
|
||||
, boost
|
||||
, llvmPackages
|
||||
, gmp
|
||||
, emacs
|
||||
|
@ -33,7 +32,14 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
|
||||
};
|
||||
|
||||
patches = [ ./patch-limits.diff ];
|
||||
patches = [
|
||||
./patch-limits.diff
|
||||
(fetchpatch {
|
||||
name = "remove-uses-of-deprecated-boost-apis.patch";
|
||||
url = "https://github.com/mozart/mozart2/commit/4256d3a9122e1cbb01400a1807bdee66088ff274.patch";
|
||||
hash = "sha256-AnOrBnxoCxqis+RdCsq8EKBg//jcNHSOFYUvf7vh+Hc=";
|
||||
})
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
cp ${bootcompiler} bootcompiler/bootcompiler.jar
|
||||
|
@ -55,7 +61,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
buildInputs = [
|
||||
pinnedBoost
|
||||
boost
|
||||
gmp
|
||||
emacs
|
||||
jre_headless
|
||||
|
@ -68,6 +74,9 @@ in stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ layus h7x4 ];
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://mozart.github.io";
|
||||
platforms = platforms.all;
|
||||
# Trace/BPT trap: 5
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -9,13 +9,14 @@ mkCoqDerivation {
|
|||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."2.1".sha256 = "sha256-oN/zvnePq64Nt7l/zIDLdhb4t9ayKxnZCsn+pzqS030=";
|
||||
release."2.0".sha256 = "sha256-x9AEFadlYiIIOxAhjv4Vc/dxdRZC7AdWQ6AByvLOFDk=";
|
||||
release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z";
|
||||
release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; }
|
||||
{ cases = [ (range "8.12" "8.17") (isGe "1.12") ]; out = "2.1"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
|
||||
|
|
|
@ -11,6 +11,10 @@ stdenv.mkDerivation {
|
|||
sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "1i #include <algorithm>" src/Plist.cpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost NSPlist pugixml ];
|
||||
|
||||
|
|
|
@ -25,13 +25,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2023.Q2.1";
|
||||
version = "2023.Q2.2";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "znjv50seqN2Rdzwnu/5ks6q1uiUacM/Z5fzMyCgv0b8=";
|
||||
sha256 = "V6DszDpiwvIcfWh2f8+1sWTQJHxwsxm0LoxSLoJOWHo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
# https://www.aquamaniac.de/rdm/projects/aqbanking/files
|
||||
aqbanking = {
|
||||
version = "6.5.3";
|
||||
hash = "sha256-bGK/JqpC5psh4Yi1T2pdgl1to03hoUy8O2fYWpcFE24=";
|
||||
releaseId = "467";
|
||||
version = "6.5.4";
|
||||
hash = "sha256-DRbOrnbwcY5GZjj0VHqLFJJ/HY2YMiB5zWSBrd4wrJk=";
|
||||
releaseId = "499";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
, runCommand
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
, hip
|
||||
|
@ -88,9 +87,6 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
ckProfiler = runCommand "ckProfiler" { preferLocalBuild = true; } ''
|
||||
cp -a ${ck}/bin/ckProfiler $out
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
inherit (ck) pname version outputs src passthru requiredSystemFeatures meta;
|
||||
|
||||
|
@ -102,8 +98,7 @@ in stdenv.mkDerivation {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -as ${ckProfiler} $out/bin/ckProfiler
|
||||
mkdir -p $out
|
||||
cp -an ${ck}/* $out
|
||||
'' + lib.optionalString buildTests ''
|
||||
cp -a ${ck.test} $test
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "egl-wayland";
|
||||
version = "1.1.11";
|
||||
version = "1.1.12";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -24,18 +24,9 @@ stdenv.mkDerivation rec {
|
|||
owner = "Nvidia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xb0d8spr4GoGZl/8C8BoPMPN7PAlzuQV11tEJbOQQ4U=";
|
||||
hash = "sha256-KxlUuoj2HJhkqkIX+Pic/0+36g/N3qfAAlnvYO2Y6uQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove after next update
|
||||
# https://github.com/NVIDIA/egl-wayland/pull/79
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NVIDIA/egl-wayland/commit/13737c6af4c0a7cfef5ec9013a4382bbeb7b495c.patch";
|
||||
hash = "sha256-EEqI6iJb+uv0HkhnauYNxSzny4YapTm73PLgK8A9Km8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Declares an includedir but doesn't install any headers
|
||||
# CMake's `pkg_check_modules(NAME wayland-eglstream IMPORTED_TARGET)` considers this an error
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kimageannotator";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ksnip";
|
||||
repo = "kImageAnnotator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fWMaat5IguEZwoEJiEjGrWIbOqdJhs25qOebxpWVQQk=";
|
||||
sha256 = "sha256-lNoYAJ5yTC5H0gWPVkBGhLroRhFCPyC1DsVBy0IrqL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools ];
|
||||
|
|
|
@ -15,6 +15,16 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch";
|
||||
sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-boost-1.73-1.patch";
|
||||
url = "https://github.com/libLAS/libLAS/commit/af431abce95076b59f4eb7c6ef0930ca57c8a063.patch";
|
||||
hash = "sha256-2lr028t5hq3oOLZFXnvIJXCUsoVHbG/Mus93OZvi5ZU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-boost-1.73-2.patch";
|
||||
url = "https://github.com/libLAS/libLAS/commit/0d3b8d75f371a6b7c605bbe5293091cb64a7e2d3.patch";
|
||||
hash = "sha256-gtNIazR+l1h+Xef+4qQc7EVi+Nlht3F8CrwkINothtA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mlt";
|
||||
version = "7.14.0";
|
||||
version = "7.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BmvgDj/zgGJNpTy5A9XPOl+9001Kc0qSFSqQ3gwZPmI=";
|
||||
sha256 = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -5,8 +5,9 @@
|
|||
, qmake
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, kwindowsystem
|
||||
, qtx11extras ? null
|
||||
, kwindowsystem ? null
|
||||
, qtwayland
|
||||
, libX11
|
||||
, libXext
|
||||
, qttools
|
||||
|
@ -34,11 +35,10 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtx11extras
|
||||
kwindowsystem
|
||||
libX11
|
||||
libXext
|
||||
];
|
||||
] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
|
||||
|
||||
sourceRoot = "source/Kvantum";
|
||||
|
||||
|
@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/tsujan/Kvantum";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = with maintainers; [ romildo Scrumplex ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,13 +24,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ];
|
||||
|
||||
# error: no member named 'file_string' in 'boost::filesystem::path'
|
||||
env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Washington-University/CiftiLib";
|
||||
description = "Library for reading and writing CIFTI files";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "1i #include <map>" include/iSpike/YarpConnection.hpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
|
@ -16,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Spiking neural interface between iCub and a spiking neural simulator";
|
||||
homepage = "https://sourceforge.net/projects/ispike/";
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.nico202 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
rev = version;
|
||||
hash = "sha256-cKDKdwkmvmB7O5tvCYtAHFdZFlcTk3I95AuA0dr+oX8=";
|
||||
hash = "sha256-GefuMsMFmNyAn+xmnRqUjyWFHqiF/kIzqBCF6mk3vx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
38
pkgs/development/libraries/sioclient/default.nix
Normal file
38
pkgs/development/libraries/sioclient/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, asio
|
||||
, rapidjson
|
||||
, websocketpp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sioclient";
|
||||
version = "unstable-2023-02-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "socketio";
|
||||
repo = "socket.io-client-cpp";
|
||||
rev = "b10474e3eaa6b27e75dbc1382ac9af74fdf3fa85";
|
||||
hash = "sha256-bkuFA6AvZvBpnO6Lixqx8Ux5Dy5NHWGB2y1VF7allC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
asio
|
||||
rapidjson
|
||||
websocketpp
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++11 implementation of Socket.IO client";
|
||||
homepage = "https://github.com/socketio/socket.io-client-cpp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "47";
|
||||
version = "48";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/BdSB7CD/ob8vinYDZVy0FNU23PSCiHF8jHGQUDsm1w=";
|
||||
hash = "sha256-HxZoHul8Nef52st/e10jjtRUvI9NGXuX6/pFYoFI/80=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncmy";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "long2ice";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc=";
|
||||
hash = "sha256-2DqQclwTfHo3YFlJ7xL3cVnhGyS4ZE7VYYv6TBqRNL0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blinkpy";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "fronzbot";
|
||||
repo = "blinkpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6la8rCmMtH2N4/P5OVGht1wgSuiW16MmF5a422LADV4=";
|
||||
hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
description = "Read Google Cloud Storage, Azure Blobs, and local paths with the same interface";
|
||||
homepage = "https://github.com/christopher-hesse/blobfile";
|
||||
changelog = "https://github.com/christopher-hesse/blobfile/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,20 +1,23 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python-dateutil
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, tzlocal
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "croniter";
|
||||
version = "1.3.14";
|
||||
version = "1.3.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0Gex+VtVPG6C2VqYPEZWlZE9zRL0eouaqTigRQ2U3V4=";
|
||||
hash = "sha256-kko4/aiPZ17Gg1Zn4dMqw3/w1lUJwhUnKdFv8gXjKmU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -34,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to iterate over datetime object with cron like format";
|
||||
homepage = "https://github.com/kiorky/croniter";
|
||||
changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
, pypng
|
||||
, pyqrcode
|
||||
, pyramid
|
||||
, pyramid_jinja2
|
||||
, pyramid-jinja2
|
||||
, pysocks
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
@ -60,7 +60,7 @@ buildPythonPackage rec {
|
|||
pypng
|
||||
pyqrcode
|
||||
pyramid
|
||||
pyramid_jinja2
|
||||
pyramid-jinja2
|
||||
pysocks
|
||||
requests
|
||||
tzlocal
|
||||
|
|
|
@ -42,14 +42,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fvprH3gaYRmhCslLR5Te2Q24rMvngCKBzSb4Zk/+1Zw=";
|
||||
hash = "sha256-Kmtvv/W1ndB77xC8sBm+4uqXowsqZW1RNGWWckMkut8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "0.54.2";
|
||||
version = "0.54.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wvb+GcNt9oCe3B21GHCCFLL8Zy0QzaxrVwHFK5ZmqRY=";
|
||||
hash = "sha256-xkLqZmAzYfmfv9l1+PR8j5S7O5gKVh63+Jb9aZiLS8s=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dwdwfsapi";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zeSV2acjtSWUYnrMjEBtrSPlXRvrNQRX5SYPYHnaOy0=";
|
||||
hash = "sha256-7le1F+581JwrBX/C1aaqsDaSpIt0yNsNKiGnJtHUg5s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -33,6 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
|
||||
homepage = "https://github.com/stephan192/dwdwfsapi";
|
||||
changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ elohmeier ];
|
||||
};
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.15.1";
|
||||
version = "6.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-s07LZeT2vTtBU/48heGFrW74D1iqkxRaLh+LTD35mu8=";
|
||||
hash = "sha256-BPk1F50aUNzROfK/r73AlMX2LIDgsn0R5HUthht/ItU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gehomesdk";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-M0G+UvFCegKEDA+0PI1voesMqIItKC0591ruZ4YvjMU=";
|
||||
hash = "sha256-iX8Vb6uUn1a7qVxwL6ZFy1YAANaSrucpOOijI1ufZco=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "geopandas";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "geopandas";
|
||||
repo = "geopandas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-k9/IowWi0jABeNhAjdJqbfcxp4eNzisTqS3RKBK2p58=";
|
||||
hash = "sha256-8H0IO+Oabl1ZOHHvMFHnPEyW0xH/G4wuUtkZrsP6K3k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "getmac";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "GhostofGoes";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5g7FSdlwGeohbjOX3ErTKn83VDFtWV7fVq6zziAjCq0=";
|
||||
hash = "sha256-B9agBmSrD3ZhqpGclZdMQNRSLSkepR6iduP1yrYz9tU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glom";
|
||||
version = "23.1.1";
|
||||
version = "23.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-t0QjCeAT/rb+qyBhl6v4rsMoNexwnYqSqFFDIvZMDv8=";
|
||||
hash = "sha256-AxaZKA+kZmBI5D0uq2i+EET/zUh6t0rLeS3i7rC8JRU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -27,9 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"' \
|
||||
--replace 'license = "ISC"' 'license = {file = "LICENSE"}' \
|
||||
--replace 'version = {source = "scm"}' 'license-expression = "ISC"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hass-nabucasa";
|
||||
version = "0.66.2";
|
||||
version = "0.67.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "nabucasa";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LlVT5WRd2uhUaghThJ5ghPbX40QjqTenUC4txMx3Jlo=";
|
||||
hash = "sha256-/cu7+fMbe9kyWGGBGBwjsiA6PXoUJZ7IFzpEcnVSLn0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
53
pkgs/development/python-modules/kneed/default.nix
Normal file
53
pkgs/development/python-modules/kneed/default.nix
Normal file
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kneed";
|
||||
version = "0.8.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arvkevi";
|
||||
repo = "kneed";
|
||||
rev = "v${version}";
|
||||
sha256 = "K742mOnwTUY09EtbDYM9guqszK1wxgkofPhSjDyB8Ss=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=kneed" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
matplotlib
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Fails when matplotlib is installed
|
||||
"tests/test_no_matplotlib.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Knee point detection in Python";
|
||||
homepage = "https://github.com/arvkevi/kneed";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ tm-drtina ];
|
||||
};
|
||||
}
|
|
@ -40,7 +40,6 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'license = "ISC"' 'license = {text = "ISC"}' \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue