Merge staging-next into staging
This commit is contained in:
commit
71a0dc0490
|
@ -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
|
||||
|
||||
|
|
|
@ -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.";
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -8,36 +8,36 @@ let
|
|||
smokepingPidDir = "/run";
|
||||
configFile =
|
||||
if cfg.config == null
|
||||
then
|
||||
''
|
||||
*** General ***
|
||||
cgiurl = ${cfg.cgiUrl}
|
||||
contact = ${cfg.ownerEmail}
|
||||
datadir = ${smokepingHome}/data
|
||||
imgcache = ${smokepingHome}/cache
|
||||
imgurl = ${cfg.imgUrl}
|
||||
linkstyle = ${cfg.linkStyle}
|
||||
${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
|
||||
owner = ${cfg.owner}
|
||||
pagedir = ${smokepingHome}/cache
|
||||
piddir = ${smokepingPidDir}
|
||||
${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
|
||||
smokemail = ${cfg.smokeMailTemplate}
|
||||
*** Presentation ***
|
||||
template = ${cfg.presentationTemplate}
|
||||
${cfg.presentationConfig}
|
||||
*** Alerts ***
|
||||
${cfg.alertConfig}
|
||||
*** Database ***
|
||||
${cfg.databaseConfig}
|
||||
*** Probes ***
|
||||
${cfg.probeConfig}
|
||||
*** Targets ***
|
||||
${cfg.targetConfig}
|
||||
${cfg.extraConfig}
|
||||
''
|
||||
else
|
||||
cfg.config;
|
||||
then
|
||||
''
|
||||
*** General ***
|
||||
cgiurl = ${cfg.cgiUrl}
|
||||
contact = ${cfg.ownerEmail}
|
||||
datadir = ${smokepingHome}/data
|
||||
imgcache = ${smokepingHome}/cache
|
||||
imgurl = ${cfg.imgUrl}
|
||||
linkstyle = ${cfg.linkStyle}
|
||||
${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
|
||||
owner = ${cfg.owner}
|
||||
pagedir = ${smokepingHome}/cache
|
||||
piddir = ${smokepingPidDir}
|
||||
${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
|
||||
smokemail = ${cfg.smokeMailTemplate}
|
||||
*** Presentation ***
|
||||
template = ${cfg.presentationTemplate}
|
||||
${cfg.presentationConfig}
|
||||
*** Alerts ***
|
||||
${cfg.alertConfig}
|
||||
*** Database ***
|
||||
${cfg.databaseConfig}
|
||||
*** Probes ***
|
||||
${cfg.probeConfig}
|
||||
*** Targets ***
|
||||
${cfg.targetConfig}
|
||||
${cfg.extraConfig}
|
||||
''
|
||||
else
|
||||
cfg.config;
|
||||
|
||||
configPath = pkgs.writeText "smokeping.conf" configFile;
|
||||
cgiHome = pkgs.writeScript "smokeping.fcgi" ''
|
||||
|
@ -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";
|
||||
|
|
|
@ -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 ];
|
||||
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;
|
||||
specialisation.manual-config.configuration = {
|
||||
services.taskserver.pki.manual = {
|
||||
ca.cert = snakeOil.cacert;
|
||||
server.cert = snakeOil.cert;
|
||||
server.key = snakeOil.key;
|
||||
server.crl = snakeOil.crl;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -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="
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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}");
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
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;
|
||||
};
|
||||
}
|
|
@ -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 = [
|
||||
|
|
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 ];
|
||||
};
|
||||
}
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.387.2";
|
||||
version = "2.401.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-XjnLBtm56xijIYtFoHxru4Afs1O3dOtb93SfiRtQDKk=";
|
||||
hash = "sha256-YAtz6r95eFLjmRlUG4T3aG/2Abl8d7ROsAhD65HH3Ww=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "martin";
|
||||
version = "0.8.4";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "martin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8TuEwJEtJSyGPrqTPo145oGszyFyGiok9xWm9MkOxzw=";
|
||||
hash = "sha256-JHNmGjdbTC3WDmgVM20hXU5IX87DUaWfblIPUe0BUJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+Mj2mKLRh6ZLERAi2kyMzjlgY4tgOGYyn/ZoVPz+1BY=";
|
||||
cargoHash = "sha256-JK1Q0Sn3FCv6DuGsMySsORJBRpTfMdD/Y4dP8qPc1D8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.69.0";
|
||||
version = "1.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TPsi03SKlcy6QJ91vtgpDwTD2YMfo2fPgKnbmkZG9NQ=";
|
||||
sha256 = "sha256-PTgoCKhIQYt6FDMiHDdPqdyLR+wImGPYSshOT/WZz7U=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustic-rs";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustic-rs";
|
||||
repo = "rustic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OZ80foq6DQZoJuJsQT4hxAHvzYn+uJbqG29wiZ7mPi8=";
|
||||
hash = "sha256-LAOU2cnKb+TEWNiXJkpgqNxuU16g/Kc3swGIUc8t9x0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xdSAdw6YY6mYZDBKkH20wfB1oNiKecC7XhRKLUaHsTQ=";
|
||||
cargoHash = "sha256-OTIdl2x5m90rEwNBu3LL3rFQ0FVS3GDYU7gf8P7CTaQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
22
pkgs/tools/misc/mdslides/default.nix
Normal file
22
pkgs/tools/misc/mdslides/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mdslides";
|
||||
version = "unstable-2022-12-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dadoomer";
|
||||
repo = "markdown-slides";
|
||||
rev = "fd27dd09cf90f00093a393338e08953c8d65d68e";
|
||||
sha256 = "sha256-31ALsy1P/vfI+H6Onmg4TXLeKbVAQ1FlnFs4k6ZOgHQ=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
longDescription = "Using markdown, write simple but beautiful presentations with math, animations and media, which can be visualized in a web browser or exported to PDF.";
|
||||
homepage = "https://github.com/dadoomer/markdown-slides";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.qjoly ];
|
||||
};
|
||||
}
|
42
pkgs/tools/misc/qt6ct/default.nix
Normal file
42
pkgs/tools/misc/qt6ct/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
let
|
||||
inherit (lib) getDev;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt6ct";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trialuser02";
|
||||
repo = "qt6ct";
|
||||
rev = version;
|
||||
sha256 = "BFE5aUgn3uFJWTgd4sUwP2L9RZwwwr5jVtAapA9vYbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtbase qtsvg qtwayland ];
|
||||
|
||||
qmakeFlags = [
|
||||
"LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
|
||||
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
"LIBDIR=${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt6 Configuration Tool";
|
||||
homepage = "https://github.com/trialuser02/qt6ct";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ Flakebi Scrumplex ];
|
||||
};
|
||||
}
|
|
@ -1,22 +1,47 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, python3
|
||||
, nixosTests
|
||||
, testers
|
||||
, sqlite3-to-mysql
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
# sqlite3-to-mysql is incompatible with versions > 1.4.44 of sqlalchemy
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.4.44";
|
||||
format = "setuptools";
|
||||
src = fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-LdpflnGa6Js+wPG3lpjYbrmuyx1U6ZCrs/3ZLAS0apA=";
|
||||
};
|
||||
});
|
||||
};
|
||||
self = py;
|
||||
};
|
||||
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "1.4.16";
|
||||
format = "setuptools";
|
||||
version = "1.4.19";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Fxt1zOyEnBuMkCLCABfijo0514NbFocdsjrQU43qVhY=";
|
||||
hash = "sha256-gtXwDLHl5f1sXLm+b8l08bY/XJkN+zVtd7m45K0CAYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
mysql-connector
|
||||
pytimeparse
|
||||
|
@ -38,9 +63,12 @@ python3Packages.buildPythonApplication rec {
|
|||
# run package tests as a separate nixos test
|
||||
passthru.tests = {
|
||||
nixosTest = nixosTests.sqlite3-to-mysql;
|
||||
version = testers.testVersion {
|
||||
package = sqlite3-to-mysql;
|
||||
command = "sqlite3mysql --version";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Python tool to transfer data from SQLite 3 to MySQL";
|
||||
homepage = "https://github.com/techouse/sqlite3-to-mysql";
|
||||
|
|
|
@ -183,8 +183,8 @@ in lib.makeExtensible (self: {
|
|||
};
|
||||
|
||||
nix_2_16 = common {
|
||||
version = "2.16.0";
|
||||
hash = "sha256-KjcQkI2HgbP7KOlHxb2DvyHISQXo2OExvvjqTyK7P0o=";
|
||||
version = "2.16.1";
|
||||
hash = "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU=";
|
||||
};
|
||||
|
||||
# The minimum Nix version supported by Nixpkgs
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, gnupg
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -17,7 +18,7 @@ buildGoModule rec {
|
|||
sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
|
||||
vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.62.2";
|
||||
version = "0.62.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-11uxu9oa0lSZH+zd+Uj2P9flw9wp9UD7bXKP4jxXDoE=";
|
||||
hash = "sha256-GZj0grVqpIE+BwCUpcDnoa7Lnm+FXu4wNbfINA9uuzQ=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-n0daAFCP0KtS1mQGfq/EQv2m6c8jjdbFR6YWSeClHBg=";
|
||||
vendorHash = "sha256-pK8Gse/Qb+Z3QHEq35gB72Lvsm7ot4HmH62sxhVopv8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goawk";
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = "goawk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U7fJq9BiWHhyM/I8gVX+PjrGZKanhBgWQWIn9ynOvQI=";
|
||||
sha256 = "sha256-mrByeZt/EkTbcqcp3eUquKkrz4tReEms1VEla511uQc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -1417,6 +1417,7 @@ mapAliases ({
|
|||
qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24
|
||||
qt515 = qt5; # Added 2022-11-24
|
||||
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
|
||||
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
|
||||
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
|
||||
qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
|
||||
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
|
||||
|
|
|
@ -924,7 +924,6 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
antlr = antlr4_10;
|
||||
boost = boost177; # Configure checks for specific version.
|
||||
protobuf = protobuf3_19;
|
||||
icu = icu69;
|
||||
};
|
||||
|
||||
|
@ -23114,6 +23113,8 @@ with pkgs;
|
|||
|
||||
markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { };
|
||||
|
||||
mdslides = callPackage ../tools/misc/mdslides { };
|
||||
|
||||
micropython = callPackage ../development/interpreters/micropython { };
|
||||
|
||||
MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer {
|
||||
|
@ -24076,6 +24077,8 @@ with pkgs;
|
|||
|
||||
simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; };
|
||||
|
||||
sioclient = callPackage ../development/libraries/sioclient { };
|
||||
|
||||
sfml = callPackage ../development/libraries/sfml {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
|
||||
};
|
||||
|
@ -33274,9 +33277,7 @@ with pkgs;
|
|||
|
||||
notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { };
|
||||
|
||||
nova-filters = callPackage ../applications/audio/nova-filters {
|
||||
boost = boost172;
|
||||
};
|
||||
nova-filters = callPackage ../applications/audio/nova-filters { };
|
||||
|
||||
nvi = callPackage ../applications/editors/nvi { };
|
||||
|
||||
|
|
|
@ -5493,6 +5493,8 @@ self: super: with self; {
|
|||
|
||||
knack = callPackage ../development/python-modules/knack { };
|
||||
|
||||
kneed = callPackage ../development/python-modules/kneed { };
|
||||
|
||||
kombu = callPackage ../development/python-modules/kombu { };
|
||||
|
||||
konnected = callPackage ../development/python-modules/konnected { };
|
||||
|
|
|
@ -31,12 +31,16 @@ in
|
|||
|
||||
inherit (kdeFrameworks) kcoreaddons;
|
||||
|
||||
qt6ct = callPackage ../tools/misc/qt6ct { };
|
||||
|
||||
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
||||
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { };
|
||||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
qxlsx = callPackage ../development/libraries/qxlsx { };
|
||||
|
|
|
@ -233,6 +233,17 @@
|
|||
};
|
||||
version = "3.2.4";
|
||||
};
|
||||
bulma-clean-theme = {
|
||||
dependencies = ["jekyll" "jekyll-seo-tag"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qvnl0xgzxbgyniv5m52mm5mr4rmgn3mqx0qa9xhl3lj75mfdfgh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.1";
|
||||
};
|
||||
byebug = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
Loading…
Reference in a new issue