Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-11-05 00:13:14 +00:00 committed by GitHub
commit 85f6f75959
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
183 changed files with 2387 additions and 3413 deletions

View File

@ -343,7 +343,24 @@ rec {
, newScope
}:
{ otherSplices
# Attrs from `self` which won't be spliced.
# Avoid using keep, it's only used for a python hook workaround, added in PR #104201.
# ex: `keep = (self: { inherit (self) aAttr; })`
, keep ? (_self: {})
# Additional attrs to add to the sets `callPackage`.
# When the package is from a subset (but not a subset within a package IS #211340)
# within `spliced0` it will be spliced.
# When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`.
# If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced
# ex:
# ```
# nix-repl> darwin.apple_sdk.frameworks.CoreFoundation
# «derivation ...CoreFoundation-11.0.0.drv»
# nix-repl> darwin.CoreFoundation
# error: attribute 'CoreFoundation' missing
# nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { }
# «derivation ...CoreFoundation-11.0.0.drv»
# ```
, extra ? (_spliced0: {})
, f
}:

View File

@ -115,6 +115,7 @@ rec {
};
gnu64 = { config = "x86_64-unknown-linux-gnu"; };
gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix
gnu32 = { config = "i686-unknown-linux-gnu"; };
musl64 = { config = "x86_64-unknown-linux-musl"; };

View File

@ -1411,6 +1411,12 @@
githubId = 58516559;
name = "Alexander Rezvov";
};
argrat = {
email = "n.bertazzo@protonmail.com";
github = "argrat";
githubId = 98821629;
name = "Nicolò Bertazzo";
};
arian-d = {
email = "arianxdehghani@gmail.com";
github = "arian-d";
@ -19179,6 +19185,12 @@
githubId = 43315;
name = "William Roe";
};
wladmis = {
email = "dev@wladmis.org";
github = "wladmis";
githubId = 5000261;
name = "Wladmis";
};
wldhx = {
email = "wldhx+nixpkgs@wldhx.me";
github = "wldhx";

View File

@ -440,6 +440,7 @@ with lib.maintainers; {
members = [
GaetanLepage
natsukium
thomasjm
];
scope = "Maintain Jupyter and related packages.";
shortName = "Jupyter";

View File

@ -42,11 +42,6 @@ in {
<https://github.com/swaywm/sway/wiki> and
"man 5 sway" for more information'');
enableRealtime = mkEnableOption (lib.mdDoc ''
add CAP_SYS_NICE capability on `sway` binary for realtime scheduling
privileges. This may improve latency and reduce stuttering, specially in
high load scenarios'') // { default = true; };
package = mkOption {
type = with types; nullOr package;
default = defaultSwayPackage;
@ -154,14 +149,6 @@ in {
"sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";
};
};
security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) {
sway = {
owner = "root";
group = "root";
source = "${cfg.package}/bin/sway";
capabilities = "cap_sys_nice+ep";
};
};
# To make a Sway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; }
(import ./wayland-session.nix { inherit lib pkgs; })

View File

@ -27,6 +27,7 @@ in {
then pkgs.writeText "throttled.conf" cfg.extraConfig
else "${pkgs.throttled}/etc/throttled.conf";
hardware.cpu.x86.msr.enable = true;
# Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs.
# See https://github.com/erpalma/throttled/issues/215
hardware.cpu.x86.msr.settings.allow-writes =

View File

@ -220,7 +220,7 @@ in
"catch_workers_output" = true;
};
phpEnv = {
FRESHRSS_DATA_PATH = "${cfg.dataDir}";
DATA_PATH = "${cfg.dataDir}";
};
};
};
@ -267,7 +267,7 @@ in
WorkingDirectory = cfg.package;
};
environment = {
FRESHRSS_DATA_PATH = cfg.dataDir;
DATA_PATH = cfg.dataDir;
};
script =
@ -302,7 +302,7 @@ in
wantedBy = [ "multi-user.target" ];
startAt = "*:0/5";
environment = {
FRESHRSS_DATA_PATH = cfg.dataDir;
DATA_PATH = cfg.dataDir;
};
serviceConfig = defaultServiceConfig //{
ExecStart = "${cfg.package}/app/actualize_script.php";

View File

@ -29,7 +29,7 @@ let
libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (lib)
getBin optionalString literalExpression
getBin optionalAttrs optionalString literalExpression
mkRemovedOptionModule mkRenamedOptionModule
mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
@ -178,7 +178,7 @@ in
capabilities = "cap_sys_nice+ep";
source = "${getBin plasma5.kwin}/bin/kwin_wayland";
};
} // mkIf (!cfg.runUsingSystemd) {
} // optionalAttrs (!cfg.runUsingSystemd) {
start_kdeinit = {
setuid = true;
owner = "root";

View File

@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpodder";
version = "3.11.3";
version = "3.11.4";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "p8BgpvMK1kP4VnRfmcvSMbXmWs5DmWBZ6te7L9b+UJQ=";
sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4=";
};
patches = [

View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.24";
version = "10.26";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
sha256 = "sha256-18rHv9sbxpuMfMrqoSSeEncDmQlWpdA/xNPoYJoIgJ0=";
sha256 = "sha256-SXuuAavvqzZ7DRX6SKfPfC1smbTHVHUAv80w0RHLfpg=";
stripRoot = false;
};
nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "12.0.4";
version = "13.0.0";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-pOs3VfgpDUD8KiBmJ37qpGLguxOXm5cr+jlTEeRZ4Bk=";
sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "besu";
version = "23.7.3";
version = "23.10.0";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-wSymqYYVV+C/jycHb4yK/M5vFWRofl8Cv9yWwrGIRv8=";
sha256 = "sha256-PHXzeSv9sIknBbN48Li/wU72zs8div5xHY2Gh+1mh88=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.200.0";
version = "1.201.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0=";
hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4=";
};
postPatch = ''

View File

@ -11,13 +11,13 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2023.10.02",
"hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q="
"rev": "2023.10.30",
"hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw="
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2023.10.03",
"hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo="
"rev": "2023.10.30",
"hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
@ -36,7 +36,7 @@
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
"rev": "2023.06.29",
"rev": "2023.06.30",
"hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
},
"Emmet-Pascal": {

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "greenfoot";
version = "3.8.0";
version = "3.8.1";
src = fetchurl {
# We use the deb here. First instinct might be to go for the "generic" JAR
# download, but that is actually a graphical installer that is much harder
# to unpack than the deb.
url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb";
sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk=";
sha256 = "sha256-utGSAbP74O1t1iEoN0CwiZVc8HxdCxhozPPMwQCtkEE=";
};
nativeBuildInputs = [ dpkg wrapGAppsHook ];

File diff suppressed because it is too large Load Diff

View File

@ -360,12 +360,12 @@
};
dart = buildGrammar {
language = "dart";
version = "0.0.0+rev=e14bbac";
version = "0.0.0+rev=f71e310";
src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377";
hash = "sha256-9CNKTaP9XudM6BDUlXmroJZ31c3eqjF2s0+Bb5mcfm4=";
rev = "f71e310a93010863f4b17a2a501ea8e2032c345b";
hash = "sha256-6iRUtQ1bol0a7whK35MaJ3UKrxmTAzchQ8Yxy4TeerE=";
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
@ -593,12 +593,12 @@
};
forth = buildGrammar {
language = "forth";
version = "0.0.0+rev=e7d1f8a";
version = "0.0.0+rev=9018923";
src = fetchFromGitHub {
owner = "AlexanderBrevig";
repo = "tree-sitter-forth";
rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0";
hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU=";
rev = "90189238385cf636b9ee99ce548b9e5b5e569d48";
hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws=";
};
meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth";
};
@ -681,12 +681,12 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
version = "0.0.0+rev=2339ffe";
version = "0.0.0+rev=f58a4a4";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "2339ffe87a88d0b7838c015592c8269eb0063140";
hash = "sha256-O3yzJjxrHdDoqcYu4ZDqrMuzinb0/0ub4puaSZPaG3c=";
rev = "f58a4a4bc55b9b43dfa7c4106257422764f97776";
hash = "sha256-COCQXia5TiPjJ8/WZELB2lARbn/5YeNvunrm+GHFDQs=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
@ -714,12 +714,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=32c8f1e";
version = "0.0.0+rev=0589025";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c";
hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs=";
rev = "0589025ee57e335fe0698190a1bc322748d8f026";
hash = "sha256-/lNo6p4hsl7TiWzIdJOuSHu0RFwPYdZGIVzlcgKOWr4=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@ -736,12 +736,12 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=952739a";
version = "0.0.0+rev=bea82d3";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "952739a25a7c014882aa777f1a32da8950f31f58";
hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4=";
rev = "bea82d337801e472e35b5cd08038afdf13263768";
hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@ -978,12 +978,12 @@
};
htmldjango = buildGrammar {
language = "htmldjango";
version = "0.0.0+rev=717e83a";
version = "0.0.0+rev=8873e3d";
src = fetchFromGitHub {
owner = "interdependence";
repo = "tree-sitter-htmldjango";
rev = "717e83aefd328735beeeb671f3f95b2624e70c57";
hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs=";
rev = "8873e3df89f9ea1d33f6235e516b600009288557";
hash = "sha256-zVpjgnP39ToEDf59Ldq/DhRVKZOGaWX+usVOcSsJX3k=";
};
meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango";
};
@ -1033,12 +1033,12 @@
};
janet_simple = buildGrammar {
language = "janet_simple";
version = "0.0.0+rev=bd9cbaf";
version = "0.0.0+rev=3c6f947";
src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-janet-simple";
rev = "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6";
hash = "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM=";
rev = "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce";
hash = "sha256-wpiI0KQ4fy7fGTT3+oDfQy9zEuWmF5P/xSc1pLeA++I=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
};
@ -1165,12 +1165,12 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=5baa0fe";
version = "0.0.0+rev=494fb76";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "5baa0fe2288830f88bd38e328b08d829f3914164";
hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk=";
rev = "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8";
hash = "sha256-AnUqNfqs8QMeiwltaVNnYGxEnqCeAyTi4nNEyUsH8F0=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@ -1220,12 +1220,12 @@
};
liquidsoap = buildGrammar {
language = "liquidsoap";
version = "0.0.0+rev=4620ab7";
version = "0.0.0+rev=cff1fea";
src = fetchFromGitHub {
owner = "savonet";
repo = "tree-sitter-liquidsoap";
rev = "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75";
hash = "sha256-M9HTG58WMvQ1PS7oRDeJ+bUwe+bmXf/fuTc6inEtkek=";
rev = "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056";
hash = "sha256-WWq7aLFqjHnNe280u4+4SuqD+x73ww75fAE/Zm5ttAs=";
};
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
};
@ -1408,6 +1408,28 @@
};
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
};
nim = buildGrammar {
language = "nim";
version = "0.0.0+rev=1f9308c";
src = fetchFromGitHub {
owner = "alaviss";
repo = "tree-sitter-nim";
rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281";
hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc=";
};
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
};
nim_format_string = buildGrammar {
language = "nim_format_string";
version = "0.0.0+rev=d45f750";
src = fetchFromGitHub {
owner = "aMOPel";
repo = "tree-sitter-nim-format-string";
rev = "d45f75022d147cda056e98bfba68222c9c8eca3a";
hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0=";
};
meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string";
};
ninja = buildGrammar {
language = "ninja";
version = "0.0.0+rev=0a95cfd";
@ -1512,12 +1534,12 @@
};
odin = buildGrammar {
language = "odin";
version = "0.0.0+rev=d165dbe";
version = "0.0.0+rev=751f779";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-odin";
rev = "d165dbee27617dab2653e38737d96ede1030d14f";
hash = "sha256-NxF3aSDtXGMcE7v0BrYQbnUM/hophanKgsYX1ad8AFY=";
rev = "751f7796fa76075cff52edd1afff569a8a09c2a7";
hash = "sha256-VKcyuoXSRN4PAHQKzfuCKB9lg5y5MQyofy3FkN79Nrw=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-odin";
};
@ -1567,23 +1589,23 @@
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=495ea4b";
version = "0.0.0+rev=e99bb52";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811";
hash = "sha256-6xLeT4dfBnxysrfW7kX3KyW96dfJgN4L040xI8IWVMU=";
rev = "e99bb5283805db4cb86c964722d709df21b0ac16";
hash = "sha256-PiQIHB94UYvm0fHeBcjJiegcfZ3Rqhs1lxusGdXQ5zI=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=0e02e7f";
version = "0.0.0+rev=33e3016";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "0e02e7fab7913a0e77343edb347c8f17cac1f0ba";
hash = "sha256-cHXstpU5XaBv9vO59DKol7PfrVLc0olBLlhkb3wFNDE=";
rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6";
hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
@ -1854,12 +1876,12 @@
};
rego = buildGrammar {
language = "rego";
version = "0.0.0+rev=b2667c9";
version = "0.0.0+rev=9ac75e7";
src = fetchFromGitHub {
owner = "FallenAngel97";
repo = "tree-sitter-rego";
rev = "b2667c975f07b33be3ceb83bea5cfbad88095866";
hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM=";
rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf";
hash = "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=";
};
meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
};
@ -2077,12 +2099,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=caf2938";
version = "0.0.0+rev=25be0b8";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b";
hash = "sha256-PbbPp6CsnrFj7/OwF957MEbSf3PekXon7dMkcoHMO7c=";
rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286";
hash = "sha256-ztiTMusfPkCpzqiEQt+HmkLt6gDhHt6dBdjIOb4ZBxs=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@ -2099,12 +2121,12 @@
};
ssh_config = buildGrammar {
language = "ssh_config";
version = "0.0.0+rev=e400863";
version = "0.0.0+rev=9dcfe0f";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-ssh-config";
rev = "e4008633536870f3fed3198c96503250af0b0a12";
hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI=";
rev = "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e";
hash = "sha256-X7zfOxOVZ99vbCqRSt3rhtiaolByRPspldu9XF1B/XY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
};
@ -2121,12 +2143,12 @@
};
strace = buildGrammar {
language = "strace";
version = "0.0.0+rev=0dc85e4";
version = "0.0.0+rev=d819cdd";
src = fetchFromGitHub {
owner = "sigmaSd";
repo = "tree-sitter-strace";
rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e";
hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q=";
rev = "d819cdd5dbe455bd3c859193633c8d91c0df7c36";
hash = "sha256-u2LznohljEq7WEoVbwr1ZyV+qbchDuoktJFCeh4iePg=";
};
meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace";
};
@ -2199,12 +2221,12 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=b075f2f";
version = "0.0.0+rev=884a034";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a";
hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes=";
rev = "884a034e0ae29ce72649041a603deacdfb4a3275";
hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@ -2346,12 +2368,12 @@
};
twig = buildGrammar {
language = "twig";
version = "0.0.0+rev=779ee5a";
version = "0.0.0+rev=eaf80e6";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-twig";
rev = "779ee5ab1e065dcef7f51f253030dc875445b25f";
hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A=";
rev = "eaf80e6af969e25993576477a9dbdba3e48c1305";
hash = "sha256-fp7HcdJEFxi/zBFSrM86THwBMpqFwAGugcTVbPk3bd4=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
};
@ -2367,6 +2389,17 @@
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
};
typoscript = buildGrammar {
language = "typoscript";
version = "0.0.0+rev=43b221c";
src = fetchFromGitHub {
owner = "Teddytrombone";
repo = "tree-sitter-typoscript";
rev = "43b221c0b76e77244efdaa9963e402a17c930fbc";
hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc=";
};
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
};
ungrammar = buildGrammar {
language = "ungrammar";
version = "0.0.0+rev=debd26f";
@ -2380,12 +2413,12 @@
};
unison = buildGrammar {
language = "unison";
version = "0.0.0+rev=694c8c0";
version = "0.0.0+rev=a69d087";
src = fetchFromGitHub {
owner = "kylegoetz";
repo = "tree-sitter-unison";
rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a";
hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4=";
rev = "a69d087590f2ca057d1ef1a393de7e22869bb557";
hash = "sha256-9eDWvNkY3rEz6khluAJuTXF95CF384IRptaRXGOHma4=";
};
generate = true;
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
@ -2514,12 +2547,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=8abdb5e";
version = "0.0.0+rev=61ed52f";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4";
hash = "sha256-Pmj7Tk9GSeRNIvWODo9StI1c0Hx35B/G15r4kGvErgs=";
rev = "61ed52fa76a1797b7d22b831959b3abbbfdb7a05";
hash = "sha256-SE4BKB1IKsvNFeqrLAzajSfB9dbLQlSSvSpzOBNChcQ=";
};
location = "libs/tree-sitter-wing";
generate = true;

View File

@ -470,6 +470,7 @@ https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
https://github.com/SidOfc/mkdx/,,
https://github.com/mawkler/modicator.nvim/,HEAD,
https://github.com/tomasr/molokai/,,
https://github.com/benlubas/molten-nvim/,HEAD,
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD,

View File

@ -760,7 +760,7 @@ in
# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];
postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2";
postBuild = "cd pcsx2";
meta = {
description = "Port of PCSX2 to libretro";
license = lib.licenses.gpl3Plus;

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "azpainter";
version = "3.0.6";
version = "3.0.7";
src = fetchFromGitLab {
owner = "azelpg";
repo = pname;
rev = "v${version}";
hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I=";
hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI=";
};
nativeBuildInputs = [

View File

@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
binaryNativeCode
];
license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ];
maintainers = with maintainers; [ zane ];
maintainers = with maintainers; [ ];
};
}

View File

@ -0,0 +1,60 @@
From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 2 Nov 2023 17:32:07 +0100
Subject: [PATCH] NIXOS: don't ignore PYTHONPATH
On NixOS or rather within nixpkgs we provide the runtime Python
packages via the PYTHONPATH environment variable. FreeCAD tries its
best to ignore Python environment variables that are being inherited
from the environment. For Python versions >=3.11 it also tries to
initialize the interpreter config without any environmental data. We
have to initialize the configuration *with* the information from the
environment for our packaging to work.
Upstream has purposely isolated the environments AFAIK and thus
shouldn't accept this patch (as is). What they might accept (once
support for older Python versions has been dropped) is removing the
PYTHONPATH specific putenv calls.
---
src/Base/Interpreter.cpp | 2 +-
src/Main/MainGui.cpp | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp
index 52c47168af..9966bd0013 100644
--- a/src/Base/Interpreter.cpp
+++ b/src/Base/Interpreter.cpp
@@ -554,7 +554,7 @@ void initInterpreter(int argc,char *argv[])
{
PyStatus status;
PyConfig config;
- PyConfig_InitIsolatedConfig(&config);
+ PyConfig_InitPythonConfig(&config);
status = PyConfig_SetBytesArgv(&config, argc, argv);
if (PyStatus_Exception(status)) {
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index 48ae847ef4..28813df383 100644
--- a/src/Main/MainGui.cpp
+++ b/src/Main/MainGui.cpp
@@ -112,17 +112,14 @@ int main( int argc, char ** argv )
// See https://forum.freecad.org/viewtopic.php?f=18&t=20600
// See Gui::Application::runApplication()
putenv("LC_NUMERIC=C");
- putenv("PYTHONPATH=");
#elif defined(FC_OS_MACOSX)
(void)QLocale::system();
- putenv("PYTHONPATH=");
#elif defined(__MINGW32__)
const char* mingw_prefix = getenv("MINGW_PREFIX");
const char* py_home = getenv("PYTHONHOME");
if (!py_home && mingw_prefix)
_putenv_s("PYTHONHOME", mingw_prefix);
#else
- _putenv("PYTHONPATH=");
// https://forum.freecad.org/viewtopic.php?f=4&t=18288
// https://forum.freecad.org/viewtopic.php?f=3&t=20515
const char* fc_py_home = getenv("FC_PYTHONHOME");
--
2.42.0

View File

@ -108,6 +108,10 @@ stdenv.mkDerivation (finalAttrs: {
qtx11extras
];
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
];
cmakeFlags = [
"-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
"-DBUILD_FLAT_MESH:BOOL=ON"
@ -127,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
'';
# Their main() removes PYTHONPATH=, and we rely on it.
preConfigure = ''
sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';

View File

@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "gthumb";
version = "3.12.3";
version = "3.12.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-k9s11xQCxIoILVDPQIW7a4DkvVyLmxYaH3tRhBsQBxE=";
sha256 = "sha256-rdaTrArrmjDYKboDoGIIKJ0/aGjcOwJXNUnogZDHlOg=";
};
nativeBuildInputs = [

View File

@ -27,6 +27,12 @@ mkDerivation rec {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch";
hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw=";
})
(fetchpatch {
name = "krita-opencolorio-2.3-compat.patch";
url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch";
hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ=";
includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ];
})
];
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

View File

@ -4,11 +4,11 @@ let
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
in buildDotnetPackage rec {
pname = "keepass";
version = "2.54";
version = "2.55";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg=";
hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc=";
};
sourceRoot = ".";

View File

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "0.65.1";
version = "0.69.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU=";
hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c=";
# 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;
@ -43,7 +43,7 @@ buildGoModule rec {
installShellFiles
];
vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM=";
vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4=";
doCheck = false;

View File

@ -74,13 +74,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "waybar";
version = "0.9.23";
version = "0.9.24";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = finalAttrs.version;
hash = "sha256-MYOnEqoIN74rw/+DdTLdZXG8JmF70j5hPXhahfp32m0=";
hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0=";
};
postUnpack = lib.optional cavaSupport ''

View File

@ -1,39 +1,39 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k=";
hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI=";
hash_darwin_aarch64 =
"sha256-aD/bHIxMm1OQu6un8cTYLPWoq/cC6kd1hTkxLEqGGRM=";
hash_linux = "sha256-Ie5wtKXz27/vI97Ku7dqqQicR+tujgFUzANAIKTRw8M=";
version = "118.0.5993.70";
"sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow=";
hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y=";
version = "119.0.6045.105";
};
deps = {
gn = {
hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=";
rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4";
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
rev = "991530ce394efb58fcd848195469022fa17ae126";
url = "https://gn.googlesource.com/gn";
version = "2023-08-10";
version = "2023-09-12";
};
};
hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44=";
hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc=";
version = "118.0.5993.117";
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
version = "119.0.6045.105";
};
ungoogled-chromium = {
deps = {
gn = {
hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=";
rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4";
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
rev = "991530ce394efb58fcd848195469022fa17ae126";
url = "https://gn.googlesource.com/gn";
version = "2023-08-10";
version = "2023-09-12";
};
ungoogled-patches = {
hash = "sha256-10kSaLteFtvg3nGffslRpAxmc7nFsp0rA8gwm8jqt/8=";
rev = "118.0.5993.117-1";
hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc=";
rev = "119.0.6045.105-1";
};
};
hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44=";
hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc=";
version = "118.0.5993.117";
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
version = "119.0.6045.105";
};
}

View File

@ -32,6 +32,9 @@
, libuuid
, systemd
, wayland
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
}:
let
@ -179,7 +182,9 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram "$out/bin/${longName}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}"
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
'';
passthru.updateScript = ./update.py;

View File

@ -35,16 +35,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.4.11";
version = "3.5.0";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "refs/tags/v${version}";
hash = "sha256-H14a1JzFvzxoNDv8WGzHgfalLnDZ+nX19BbM5ptrEes=";
hash = "sha256-3MwSiI21j2tMqdDInK7Q+QDMiFCophJyNXMOXMwJeEQ=";
};
vendorHash = "sha256-0563OHMNkKZcmLY1nHS70pbtrufY1d1WNXrxcCl6MKY=";
vendorHash = "sha256-Zh/r4/+x67C1yXGW/R+FYKiGFaGPEV//Sg9cWwVIMxI=";
doCheck = false;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "flink";
version = "1.17.1";
version = "1.18.0";
src = fetchurl {
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM=";
sha256 = "sha256-mwlpRx/snaTymCubVLTnvN5SpXO2EWl9qZ8seNtNKtI=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "k8sgpt";
version = "0.3.17";
version = "0.3.19";
src = fetchFromGitHub {
owner = "k8sgpt-ai";
repo = "k8sgpt";
rev = "v${version}";
hash = "sha256-vSytBicpYWs7MqVts+3d6qVZ19nrM1oi00YRPmCQb/I=";
hash = "sha256-yXlcTU0efgjcWy4nlhEIjd9dzErKyAW9gFhacOXv6pA=";
};
vendorHash = "sha256-UFXESGdipfM/TI/9ZSVwoUPsd3LVeEmTFB6sVqkkzQo=";
vendorHash = "sha256-/yibMktAzoUCGED8oJWmNZJxOY0UM0zMl4Qww6olOZY=";
CGO_ENABLED = 0;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubedb-cli";
version = "0.35.1";
version = "0.36.0";
src = fetchFromGitHub {
owner = "kubedb";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-vpjz2t5wnSWbxc5kdASXIaq2m7izqmC3aSLXvnC+IyE=";
sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w=";
};
vendorHash = null;

View File

@ -15,17 +15,17 @@
buildGoModule rec {
inherit pname;
version = "2.3.1";
version = "2.4.3";
tags = lib.optionals enableGateway [ "gateway" ];
src = fetchFromGitHub {
owner = "kumahq";
repo = "kuma";
rev = version;
hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I=";
hash = "sha256-MAruZVXkokwiRIIo84dikIEUuYYJLgTDl4Zgivrltyk=";
};
vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA=";
vendorHash = "sha256-F428xc4YeTtBMlTEUdEdbLwtm2MPpCkDib/dgRTT/3Y=";
# no test files
doCheck = false;

View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "stable";
version = "2.14.1";
sha256 = "1fxwy8c1zcjwnv055czn9ixalpvq710k0m82633n73a0ixnlmjbv";
vendorHash = "sha256-hOuvIndyGGvNWYmzE0rho/Y30/ilCzeBtL5GEvl9QqU=";
version = "2.14.2";
sha256 = "0j7w1x88fxbwlmdj111l3v02m8a2p75zsjj847d09a901jav3ih5";
vendorHash = "sha256-yEwz9CopCbK8mOUxzjDG3nsbWzhJlA3JTO4nYN8G68E=";
}

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "pv-migrate";
version = "1.3.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "utkuozdemir";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8=";
sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c=";
};
subPackages = [ "cmd/pv-migrate" ];
vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0=";
vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0=";
ldflags = [
"-s"

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "goeland";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "slurdge";
repo = pname;
rev = "v${version}";
sha256 = "sha256-b/A76f9/pFDdG1ZiHQnJrxYmlvFIjhZZhTIGl09cMcg=";
sha256 = "sha256-bjPmhNJFkN0N0Mx3Q4RJuNfeqFy9v8KphiAU1WyKCo4=";
};
vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8=";
vendorHash = "sha256-jYrPsVagGgvpQ9Zj3o2kB82xgw/yaJS9BXxuqMkNjEA=";
ldflags = [
"-s"

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "9.2.0";
version = "9.4.0";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
sha256 = "sha256-bvcKM9rBUHZFvoFKW/ksjrgqJfovcHaoDNEcSWhHJTU=";
sha256 = "sha256-bOK6QP9uLMJP9pgts4EyvW0WIKqcfhtvb1heG629Q38=";
};
nativeBuildInputs = [

View File

@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.36.0";
hash = "sha256-zoeRBBu+eYWibpCUiyDOcDVKFQSRI+l1dZgUlESdUsk=";
version = "6.37.0";
hash = "sha256-oPW2YHyYsbTvQ+8VQtaubBki7w2wd1tlgVmPL5v5E5s=";
};
signal-desktop-beta = {
dir = "Signal Beta";
version = "6.36.0-beta.2";
hash = "sha256-LOfKdyXosU0bJB35+TSszfHROPhLvMtngzy4zFeVVmI=";
version = "6.38.0-beta.1";
hash = "sha256-DZXqq4AD1arP+o5xbuR8yD5By5VPBtClchScZb2Nb1U=";
};
}

View File

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "pyrosimple";
version = "2.11.4";
version = "2.12.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "kannibalox";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-jzLckRFdjivWcyM3NWSVBauT5/7A1jTICtK2j65Wojo=";
hash = "sha256-6TDfNkEqtSrPpyExJ/68GAalIo9pSNiIDo7KdqwoulQ=";
};
pythonRelaxDeps = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "3.5.1";
version = "3.6.1";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "v${version}";
hash = "sha256-nYr9M9jRtKDZdtCWirpLAKA/tgz07N6/EI6JV4NzjXM=";
hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE=";
};
vendorHash = "sha256-I7vDmSLccJSov5RlTtzrQTc+uCprMxwOrHkroL9oZXE=";
vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU=";
nativeBuildInputs = [ pkg-config ];

View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.3.6";
version = "0.3.7";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ=";
hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws=";
stripRoot = false;
};

View File

@ -8,16 +8,16 @@
stdenvNoCC.mkDerivation rec {
pname = "cloudlog";
version = "2.4.11";
version = "2.5.0";
src = fetchFromGitHub {
owner = "magicbug";
repo = "Cloudlog";
rev = version;
hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE=";
hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo=";
};
postPath = ''
postPatch = ''
substituteInPlace index.php \
--replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');"
'';

View File

@ -21,10 +21,10 @@ in
stdenv.mkDerivation rec {
pname = "gwyddion";
version = "2.63";
version = "2.64";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
sha256 = "sha256-FSs/Dbnr1shEw/W51DhUFPb61tM+0atc6wxY81EiTdM=";
sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw=";
};
nativeBuildInputs = [ pkg-config file ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "UHDM";
# When updating this package, also consider updating science/logic/surelog
version = "1.76";
version = "1.77";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-Q/u5lvILYDT5iScES3CTPIm/B5apoOHXOQmCsZ73NlU=";
hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ=";
fetchSubmodules = false; # we use all dependencies from nix
};

View File

@ -27,7 +27,7 @@
}:
let
version = "1.16.1";
version = "1.16.2";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -99,7 +99,7 @@ stdenv.mkDerivation {
owner = "dnkl";
repo = "foot";
rev = version;
hash = "sha256-laE4Ytt64ao1vvF05g4l1AkEnKPwKRYCVCybsX1Ae9U=";
hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM=";
};
separateDebugInfo = true;

View File

@ -26,13 +26,13 @@
mkDerivation rec {
pname = "haruna";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitLab {
owner = "multimedia";
repo = "haruna";
rev = "v${version}";
hash = "sha256-x3tgH2eoLVELQKbgNLvJPGQsay8iOfMY/BGLOEov3OM=";
hash = "sha256-6UXgAb42DttNgmO5KRFC5M6kuYrv+GIxQ0EQ4P5cgUI=";
domain = "invent.kde.org";
};

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pkg-config
, which
, frei0r
@ -34,12 +35,19 @@ stdenv.mkDerivation {
"-DBUILD_QT6=1"
];
patches = [
(fetchpatch {
# Taken from https://github.com/olive-editor/olive/pull/2294.
name = "olive-editor-openimageio-2.3-compat.patch";
url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
})
];
# https://github.com/olive-editor/olive/issues/2200
patchPhase = ''
runHook prePatch
postPatch = ''
substituteInPlace ./app/node/project/serializer/serializer230220.cpp \
--replace 'QStringRef' 'QStringView'
runHook postPatch
'';
nativeBuildInputs = [

View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.7.7";
version = "1.7.8";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
hash = "sha256-5Tw7xltrsp+yGrdJ0O4MoFUvIaEiCQpMip5X1kfV/iM=";
hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM=";
};
vendorHash = null;

View File

@ -44,8 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
# Use /run/current-system/sw/share and /etc instead of /nix/store
# references:
./sway-config-nixos-paths.patch
# Drop ambient capabilities after getting SCHED_RR
./drop_ambient_capabilities.patch
];
strictDeps = true;

View File

@ -1,41 +0,0 @@
From e7d9098e81289ae99d07ec3eac1fec1d303b8fe4 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 5 Oct 2023 15:23:35 +0100
Subject: [PATCH] drop ambient capabilities
Within NixOS the only possibility to gain cap_sys_nice is using the
security.wrapper infrastructure. However to pass the capabilities to the
wrapped program, they are raised to the ambient set. To fix this we make
sure to drop the ambient capabilities during sway startup and realtime
setup. Otherwise all programs started by sway also gain cap_sys_nice,
which is not something we want.
Co-authored-by: Rouven Czerwinski <rouven@czerwinskis.de>
---
sway/realtime.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sway/realtime.c b/sway/realtime.c
index 11154af0..06f872a8 100644
--- a/sway/realtime.c
+++ b/sway/realtime.c
@@ -3,6 +3,7 @@
#include <unistd.h>
#include <pthread.h>
#include "sway/server.h"
+#include "sys/prctl.h"
#include "log.h"
static void child_fork_callback(void) {
@@ -10,6 +11,8 @@ static void child_fork_callback(void) {
param.sched_priority = 0;
+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0);
+
int ret = pthread_setschedparam(pthread_self(), SCHED_OTHER, &param);
if (ret != 0) {
sway_log(SWAY_ERROR, "Failed to reset scheduler policy on fork");
--
2.42.0

View File

@ -0,0 +1,33 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "borealis-cursors";
version = "2.0";
src = fetchFromGitHub {
owner = "alvatip";
repo = "Borealis-cursors";
rev = finalAttrs.version;
hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
cp -a Borealis-cursors $out/share/icons
runHook postInstall
'';
meta = with lib; {
description = "Cursor theme using a custom color palette inspired by boreal colors";
homepage = "https://www.gnome-look.org/s/Gnome/p/1717914";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with lib.maintainers; [ argrat ];
};
})

View File

@ -27,13 +27,13 @@
assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl);
stdenv.mkDerivation (finalAttrs: {
pname = "composefs";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "containers";
repo = "composefs";
rev = "v${finalAttrs.version}";
hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE=";
hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY=";
};
strictDeps = true;
@ -75,9 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
# MUSL: https://github.com/containers/composefs/issues/204
substituteInPlace tests/Makefile \
--replace " check-checksums" ""
'' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) ''
# seccomp sandbox breaks these tests
# MUSL: https://github.com/containers/composefs/issues/206
'' + lib.optionalString enableValgrindCheck ''
# valgrind is incompatible with seccomp
substituteInPlace tests/test-checksums.sh \
--replace "composefs-from-json" "composefs-from-json --no-sandbox"
'';

View File

@ -0,0 +1,53 @@
{ lib
, buildGoModule
, fetchFromGitHub
, nix-update-script
, testers
, mercure
}:
buildGoModule rec {
pname = "mercure";
version = "0.15.5";
src = fetchFromGitHub {
owner = "dunglas";
repo = "mercure";
rev = "v${version}";
hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA=";
};
sourceRoot = "source/caddy";
vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw=";
subPackages = [ "mercure" ];
excludedPackages = [ "../cmd/mercure" ];
ldflags = [
"-s"
"-w"
"-X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks v${version} Caddy'"
];
doCheck = false;
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
version = "v${version}";
package = mercure;
command = "mercure version";
};
};
meta = with lib; {
description = "An open, easy, fast, reliable and battery-efficient solution for real-time communications";
homepage = "https://github.com/dunglas/mercure";
changelog = "https://github.com/dunglas/mercure/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ gaelreyrol ];
platforms = platforms.unix;
mainProgram = "mercure";
};
}

View File

@ -1,27 +1,33 @@
{ lib
, stdenv
, testers
, fetchFromGitHub
, rustPlatform
, darwin
, numbat
}:
rustPlatform.buildRustPackage rec {
pname = "numbat";
version = "1.6.3";
version = "1.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
rev = "v${version}";
hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g=";
hash = "sha256-KX/V1cVZoPtkP/ehnvcTeaQavHlHP6NJ7g+FbOaYKC4=";
};
cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY=";
cargoHash = "sha256-skCvIMz50GqveyawVHicpEqMknvZuYNvp1u+gW4wG8A=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
passthru.tests.version = testers.testVersion {
package = numbat;
};
meta = with lib; {
description = "High precision scientific calculator with full support for physical units";
longDescription = ''

View File

@ -2,26 +2,25 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, openssl
, libiconv
, pkg-config
, installShellFiles
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "tuxmux";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "edeneast";
repo = pname;
rev = "v${version}";
hash = "sha256-QySDC/aEU9Fo0UbRUNvgBQLfESYzENGfS8Tl/ycn1YY=";
hash = "sha256-BZ1Vo1NIpzUBGyvd/UbxLaFbrLzoaP8kn/8GoAYBmlo=";
};
cargoHash = "sha256-MlLTaN+KMeF0A1hh0oujLYWqjwrbmoNzoRoXjeCUf7I=";
cargoHash = "sha256-HIYQPHLMhQtpCIkl5EzjJGHXzBtw7mY85l5bqapw3rg=";
buildInputs = [ openssl ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]);
buildInputs = [ libiconv ];
nativeBuildInputs = [ pkg-config installShellFiles ];
postInstall = ''

View File

@ -11,11 +11,11 @@
gsmakeDerivation rec {
pname = "gnustep-back";
version = "0.29.0";
version = "0.30.0";
src = fetchzip {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz";
sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM=";
sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnustep-make";
version = "2.9.0";
version = "2.9.1";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo=";
sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc=";
};
configureFlags = [

View File

@ -1,6 +1,6 @@
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
let
version = "2201.8.1";
version = "2201.8.2";
codeName = "swan-lake";
in stdenv.mkDerivation {
pname = "ballerina";
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
src = fetchzip {
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
hash = "sha256-tfsaZnZOsKVm56s3nNI/27wrbVg5fcJ8tW2THSQ8ec0=";
hash = "sha256-vTrVcWo7fjcj9oZqIzvVTTynf4dSh5D7PAUYj3Vs8Gg=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -36,7 +36,7 @@ lib.optionals (lib.versionAtLeast version "11.0")
(let
targetPlatformSlash =
if hostPlatform.config == targetPlatform.config
if hostPlatform == targetPlatform
then ""
else "${targetPlatform.config}/";
@ -83,7 +83,7 @@ in
lib.optionalString (!langC) ''
rm -f $out/lib/libgcc_s.so*
''
+ lib.optionalString (hostPlatform.config != targetPlatform.config) ''
+ lib.optionalString (hostPlatform != targetPlatform) ''
mkdir -p $lib/lib/
ln -s ${targetPlatformSlash}lib $lib/lib
''

View File

@ -104,9 +104,6 @@ builder rec {
# See below.
"--without-threads"
]
# Disable JIT on Apple Silicon, as it is not yet supported
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505";
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no"
# At least on x86_64-darwin '-flto' autodetection is not correct:
# https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028
++ lib.optional (stdenv.isDarwin) "--disable-lto";

View File

@ -581,7 +581,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version}
'';
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ];
};
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "eccodes";
version = "2.32.0";
version = "2.32.1";
src = fetchurl {
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
sha256 = "sha256-tX6O6w66DAXWb9pVJ8T/qEtas1xGvLyaIicUKXPMuOY=";
sha256 = "sha256-rSrBvzZXex01xKdxtNF0oG9SKh5e9sH15Tp5X7Ykhj4=";
};
postPatch = ''

View File

@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
pname = "freetds";
version = "1.4.2";
version = "1.4.6";
src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
hash = "sha256-is0TOZicZHCYA+In0ggretJkvmauvU26LGmnaKy4ZxM=";
hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA=";
};
buildInputs = [

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
version = "22.3.11";
version = "22.3.12";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8=";
sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk=";
};
nativeBuildInputs = [ cmake ];

View File

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
version = "5.2.98";
version = "5.2.109";
dontWrapQtApps = true;
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs=";
hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs=";
};
patches = [

View File

@ -0,0 +1,17 @@
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index c122b013..04f36bf0 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
# ZLIB_VERSION_STRING is still available for backward compatibility.
# See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html
- if (@ZLIB_VERSION@) # @ZLIB_VERSION@
- find_dependency(ZLIB @ZLIB_VERSION@)
- else()
- find_dependency(ZLIB @ZLIB_VERSION_STRING@)
- endif()
+ find_dependency(ZLIB)
endif()
if (NOT TARGET MINIZIP::minizip-ng)

View File

@ -27,32 +27,25 @@
stdenv.mkDerivation rec {
pname = "opencolorio";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenColorIO";
rev = "v${version}";
sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ=";
sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE=";
};
patches = [
(fetchpatch {
name = "darwin-no-hidden-l.patch";
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch";
revert = true;
sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo=";
})
(fetchpatch {
name = "pkg-config-absolute-path.patch";
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch";
sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM=";
})
(fetchpatch {
name = "minizip-ng-4.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch";
hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew=";
# Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891.
name = "opencolorio-yaml-cpp-8.0-compat.patch";
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch";
sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg=";
})
# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.
# Needed for zlib >= 1.3 && cmake < 3.27.4.
./broken-cmake-zlib-version.patch
];
postPatch = lib.optionalString stdenv.isDarwin ''
@ -81,14 +74,17 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
"-DOCIO_USE_SSE2NEON=OFF"
# GPU test fails with: freeglut (GPU tests): failed to open display ''
"-DOCIO_BUILD_GPU_TESTS=OFF"
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include"
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng"
] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
# precision issues on non-x86
doCheck = stdenv.isx86_64;
# Tends to fail otherwise.
enableParallelChecking = false;
meta = with lib; {
homepage = "https://opencolorio.org";

View File

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";
};
# Workaround broken zlib version detecion in CMake < 3.37.
postPatch = ''
substituteInPlace ./src/cmake/Config.cmake.in \
--replace " @ZLIB_VERSION@" ""
'';
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [

View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "poco";
version = "1.12.4";
version = "1.12.5";
src = fetchFromGitHub {
owner = "pocoproject";
repo = "poco";
sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc=";
sha256 = "sha256-2macXa2pi5FebSrTIfSQbIiafNCXczNQEP+PFbFxylw=";
rev = "poco-${version}-release";
};

View File

@ -4,7 +4,6 @@
, fetchFromGitLab
, cairo
, cmake
, pcre
, boost
, cups-filters
, curl
@ -20,11 +19,11 @@
, pkg-config
, python3
, scribus
, texlive
, zlib
, withData ? true, poppler_data
, qt5Support ? false, qt6Support ? false, qtbase ? null
, introspectionSupport ? false, gobject-introspection ? null
, gpgmeSupport ? false, gpgme ? null
, utils ? false, nss ? null
, minimal ? false
, suffix ? "glib"
@ -47,13 +46,13 @@ let
in
stdenv.mkDerivation (finalAttrs: rec {
pname = "poppler-${suffix}";
version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too!
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg=";
hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w=";
};
nativeBuildInputs = [
@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: rec {
buildInputs = [
boost
pcre
libiconv
libintl
] ++ lib.optionals withData [
@ -88,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: rec {
qtbase
] ++ lib.optionals introspectionSupport [
gobject-introspection
] ++ lib.optionals gpgmeSupport [
gpgme
];
cmakeFlags = [
@ -95,9 +95,13 @@ stdenv.mkDerivation (finalAttrs: rec {
(mkFlag (!minimal) "GLIB")
(mkFlag (!minimal) "CPP")
(mkFlag (!minimal) "LIBCURL")
(mkFlag (!minimal) "LCMS")
(mkFlag (!minimal) "LIBTIFF")
(mkFlag (!minimal) "NSS3")
(mkFlag utils "UTILS")
(mkFlag qt5Support "QT5")
(mkFlag qt6Support "QT6")
(mkFlag gpgmeSupport "GPGME")
] ++ lib.optionals finalAttrs.doCheck [
"-DTESTDATADIR=${testData}"
];
@ -110,13 +114,24 @@ stdenv.mkDerivation (finalAttrs: rec {
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
# Work around gpgme trying to write to $HOME during qt5 and qt6 tests:
preCheck = lib.optionalString gpgmeSupport ''
HOME_orig="$HOME"
export HOME="$(mktemp -d)"
'';
postCheck = lib.optionalString gpgmeSupport ''
export HOME="$HOME_orig"
unset -v HOME_orig
'';
doCheck = true;
passthru = {
inherit testData;
tests = {
# These depend on internal poppler code that frequently changes.
inherit inkscape cups-filters texlive scribus;
inherit inkscape cups-filters scribus;
};
};

View File

@ -178,12 +178,12 @@ let
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
baseScope = lib.makeScope newScope addPackages;
bootstrapScope = baseScope.overrideScope'(final: prev: {
bootstrapScope = baseScope.overrideScope(final: prev: {
qtbase = prev.qtbase.override { qttranslations = null; };
qtdeclarative = null;
});
finalScope = baseScope.overrideScope'(final: prev: {
finalScope = baseScope.overrideScope(final: prev: {
qttranslations = bootstrapScope.qttranslations;
});
in finalScope

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "osi";
version = "0.108.8";
version = "0.108.9";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Osi";
rev = "releases/${version}";
hash = "sha256-Wyxeyn49QWzGvW6bMwCp39iLkB1eMQUEpIxUgpLcxgA=";
hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw=";
};
buildInputs =

View File

@ -3,36 +3,19 @@
, fetchFromGitHub
, gitUpdater
, cmake
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "yaml-cpp";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "jbeder";
repo = "yaml-cpp";
rev = "yaml-cpp-${version}";
hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
rev = version;
hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
};
patches = [
# https://github.com/jbeder/yaml-cpp/issues/774
# https://github.com/jbeder/yaml-cpp/pull/1037
(fetchpatch {
name = "yaml-cpp-Fix-generated-cmake-config.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
})
# TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
(fetchpatch {
name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk=";
})
];
strictDeps = true;
nativeBuildInputs = [
@ -47,9 +30,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru.updateScript = gitUpdater {
rev-prefix = "yaml-cpp-";
};
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A YAML parser and emitter for C++";

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairq";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "CorantGmbH";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9OO3ox6q08QQcYfz4ArsKy/6jR329bAQPUo+mVYuhJs=";
hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairzone-cloud";
version = "0.3.2";
version = "0.3.4";
pyproject = true;
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
hash = "sha256-aaa2/E6QCeWtTc1c7n0z05Kn3gCCjuQVbdwCgMAYX1A=";
hash = "sha256-X3OhfMW+0oOzubDdSumja//GyI4qgfuyz9/I9xybR9M=";
};
nativeBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiortm";
version = "0.6.3";
version = "0.6.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "MartinHjelmare";
repo = pname;
rev = "v${version}";
hash = "sha256-9Ny1Xby2e1lyrDTZLd6UVASx8/kwjsq4ogMTSKryQqg=";
rev = "refs/tags/v${version}";
hash = "sha256-PFZ8B2Wtjg3xUFYcnthTW5QXLk//lFH25jwpF7hygxQ=";
};
nativeBuildInputs = [

View File

@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "aiosmtplib";
version = "3.0.0";
version = "3.0.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "cole";
repo = pname;
rev = "v${version}";
hash = "sha256-A9pvHj2riIHCd1F+ve6aLdbtl3tPPDovV1AZeWNeOEo=";
repo = "aiosmtplib";
rev = "refs/tags/v${version}";
hash = "sha256-67Z+k+PBIGP2oGb/52dMtsapUsHufvFcX+wWiMj5Jsg=";
};
nativeBuildInputs = [
@ -43,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module which provides a SMTP client";
homepage = "https://github.com/cole/aiosmtplib";
changelog = "https://github.com/cole/aiosmtplib/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "anywidget";
version = "0.7.0";
version = "0.7.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OxwCnCGvSwrVxBzQwxMBqESsETu2q1vdevJHDr/IfUI=";
hash = "sha256-HEy1EGP47FFyuMjvsb+3mGHTQMNJEiDVa4wqaqjbOz0=";
};
# We do not need the jupyterlab build dependency, because we do not need to

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "apipkg";
version = "3.0.1";
version = "3.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "pytest-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY=";
rev = "refs/tags/v${version}";
hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.41.1";
version = "3.41.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "atlassian-api";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-DSIJOp5c/bqOOIZylhUGyIwIco5isA3ytCRR51WfTyI=";
hash = "sha256-MIzBuIeQfAVlllaU02htx1eufRlpe+V9Kzo+EFF45ME=";
};
propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.19.7";
version = "0.19.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-t/LwioUTZ0fNrJUlx83HG1ytmLW64gH6W17Gd2UXets=";
hash = "sha256-d6I1nRL41sWFvv9Nxw5dSJDEv15i9Lni0wySyWruEGU=";
};
buildInputs = lib.optionals stdenv.isDarwin [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "beartype";
version = "0.15.0";
version = "0.16.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Kvao2KcmfM99Jx4aO9kIr7wCXSoJqlESNWfX17N0ON8=";
hash = "sha256-GtqJzy1usw624Vbu0utUkzV3gpN5ENdDgJGOU8Lq4L8=";
};
nativeCheckInputs = [

View File

@ -1,12 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }:
{ lib
, buildPythonPackage
, fetchPypi
, argparse-addons
, humanfriendly
, pyelftools
, pythonOlder
}:
buildPythonPackage rec {
pname = "bincopy";
version = "19.1.0";
version = "20.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aDVkrTBEhrTP1Oc/kiE9ZsJ+8fDGXcb2+FSMQP0X0lY=";
hash = "sha256-FM+0z5cie/Kx9bhWI99MdnrSGa/cn+BzLdLP3/RGr98=";
};
propagatedBuildInputs = [
@ -15,7 +25,9 @@ buildPythonPackage rec {
pyelftools
];
pythonImportsCheck = [ "bincopy" ];
pythonImportsCheck = [
"bincopy"
];
meta = with lib; {
description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)";

View File

@ -1,37 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, ecdsa
, coincurve
, pynacl
, crcmod
, ed25519-blake2b
, py-sr25519-bindings
, cbor2
, coincurve
, crcmod
, ecdsa
, ed25519-blake2b
, fetchFromGitHub
, py-sr25519-bindings
, pycryptodome
, pynacl
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bip-utils";
version = "2.7.1";
version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ebellocchia";
repo = "bip_utils";
rev = "refs/tags/v${version}";
hash = "sha256-QrCkLiGBdZTQCnbWSTN0PeoAsQfg2CoSGdZcbhqTvOk=";
hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "coincurve>=15.0.1,<18.0.0" "coincurve"
'';
propagatedBuildInputs = [
ecdsa
cbor2

View File

@ -6,7 +6,7 @@
let
pname = "boilerpy3";
version = "1.0.6";
version = "1.0.7";
in
buildPythonPackage {
inherit pname version;
@ -18,7 +18,7 @@ buildPythonPackage {
owner = "jmriebold";
repo = "BoilerPy3";
rev = "refs/tags/v${version}";
hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A=";
hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo=";
};
postPatch = ''

View File

@ -363,12 +363,12 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.28.64";
version = "1.28.78";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-zky/LBr6GhTFw8xWp094wMGISAzalgom+Zi5P/FjzgY=";
hash = "sha256-LPjWdNfoXewM9M4I/jGqExgpzHq9NvIZ5ymslTUfTe4=";
};
propagatedBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.31.64";
version = "1.31.78";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-K1sbzvl1nNMgIyJ1PLrNk2s2rtAwFuUjh98y4aojMwo=";
hash = "sha256-zVUOuUqlDXGds8oAt5/7zEgOPe/tBx4SOiQ9+B3UVDA=";
};
nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "botorch";
version = "0.9.2";
version = "0.9.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "pytorch";
repo = pname;
rev = "v${version}";
hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4=";
rev = "refs/tags/v${version}";
hash = "sha256-d8EMmA499Zxyagkqx0JCKMZPwSH4LvBya+raD3v3iZU=";
};
nativeBuildInputs = [

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "boxx";
version = "0.10.10";
version = "0.10.12";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc=";
hash = "sha256-pumkDVyotm8bJEl/rrpNSsP8KZIVIgThGFB/Sy4OdUs=";
};
propagatedBuildInputs = [

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "bsdiff4";
version = "1.2.3";
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw=";
hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc=";
};
pythonImportsCheck = [

View File

@ -0,0 +1,79 @@
{ lib
, buildPythonPackage
, dask
, fetchFromGitHub
, matplotlib
, pint
, pooch
, pytestCheckHook
, pythonOlder
, regex
, rich
, scipy
, setuptools
, setuptools-scm
, shapely
, wheel
, xarray
}:
buildPythonPackage rec {
pname = "cf-xarray";
version = "0.8.6";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "xarray-contrib";
repo = "cf-xarray";
rev = "refs/tags/v${version}";
hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
xarray
];
propagatedBuildInputs = [
xarray
];
passthru.optional-dependencies = {
all = [
matplotlib
pint
pooch
regex
rich
shapely
];
};
nativeCheckInputs = [
dask
pytestCheckHook
scipy
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"cf_xarray"
];
disabledTestPaths = [
# Tests require network access
"cf_xarray/tests/test_accessor.py"
"cf_xarray/tests/test_helpers.py"
];
meta = with lib; {
description = "An accessor for xarray objects that interprets CF attributes";
homepage = "https://github.com/xarray-contrib/cf-xarray";
changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "clarifai-grpc";
version = "9.9.3";
version = "9.10.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-9h/d1w5toxWMHMvVkQiuHySf3+IjeumD4EipgI1kaEs=";
hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs=";
};
propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "garth";
version = "0.4.39";
version = "0.4.41";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-2jmgi0evGqVgtcPRTYpTWG0wFrG1i5W7ryZJslPweNc=";
hash = "sha256-1CnRgPJTG7cpfa/SyhBwVw0Lj6ENI/YY/q2yNeve9c0=";
};
nativeBuildInputs = [

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, httpx
, pyspnego
, pythonOlder
@ -9,7 +8,7 @@
buildPythonPackage rec {
pname = "httpx-ntlm";
version = "1.1.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,18 +16,9 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "httpx_ntlm";
inherit version;
hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I=";
hash = "sha256-Qb6KK6hRQ0hOYX3LkX1LGeOuEq/caIYipJAQNJk7U+Q=";
};
patches = [
# Update version specifiers, https://github.com/ulodciv/httpx-ntlm/pull/15
(fetchpatch {
name = "update-version-specifiers.patch";
url = "https://github.com/ulodciv/httpx-ntlm/commit/dac67a957c5c23df29d4790ddbc7cc4bccfc0e35.patch";
hash = "sha256-YtgRrgGG/x7jvNg+NuQIrkOUdyD6Bk53fRaiXBwiV+o=";
})
];
propagatedBuildInputs = [
httpx
pyspnego
@ -44,6 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "NTLM authentication support for HTTPX";
homepage = "https://github.com/ulodciv/httpx-ntlm";
changelog = "https://github.com/ulodciv/httpx-ntlm/releases/tag/${version}";
license = licenses.isc;
maintainers = with maintainers; [ fab ];
};

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "ical";
version = "5.1.0";
version = "5.1.1";
format = "setuptools";
disabled = pythonOlder "3.10";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM=";
hash = "sha256-ewKQzjtVgx9c6h67epgFNhY4MjR7kFNCr4EKZ+UF2xA=";
};
nativeBuildInputs = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "lxmf";
version = "0.3.7";
version = "0.3.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
hash = "sha256-iiGxAIHZcq3VaSSmGrB16IutJf8JEAeFkvZsEuIbR3g=";
hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.14.0";
version = "5.14.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-HNgH01ZoQLuZ3K9sSYAYa6/ZTbVYsOUFhOqgP7y2F3Q=";
hash = "sha256-lQNsVpkMRn23qzqAa/K6aPrip67TsL+nXpMRqOXNFik=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nomadnet";
version = "0.4.1";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = "refs/tags/${version}";
hash = "sha256-+UWHYhPX54Jc9gnrb2Az5Nc3/kt42/wa+zhUnCWdVU4=";
hash = "sha256-jqevKKOQrVpeCe305VKYnF6ODD5JEdt7du+deSZXreA=";
};
propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More