Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
9ffc727191
@ -315,6 +315,13 @@
|
||||
release it may be removed.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
There is a new module for the <literal>xfconf</literal>
|
||||
program (the Xfce configuration storage system), which has a
|
||||
dbus service.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -116,4 +116,6 @@ Use `configure.packages` instead.
|
||||
|
||||
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
|
||||
|
||||
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@ -230,6 +230,7 @@
|
||||
./programs/weylus.nix
|
||||
./programs/wireshark.nix
|
||||
./programs/wshowkeys.nix
|
||||
./programs/xfconf.nix
|
||||
./programs/xfs_quota.nix
|
||||
./programs/xonsh.nix
|
||||
./programs/xss-lock.nix
|
||||
|
||||
@ -33,12 +33,13 @@ in {
|
||||
|
||||
services.dbus.packages = [
|
||||
package
|
||||
pkgs.xfce.xfconf
|
||||
];
|
||||
|
||||
systemd.packages = [
|
||||
package
|
||||
];
|
||||
|
||||
programs.xfconf.enable = true;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
27
nixos/modules/programs/xfconf.nix
Normal file
27
nixos/modules/programs/xfconf.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.programs.xfconf;
|
||||
|
||||
in {
|
||||
meta = {
|
||||
maintainers = teams.xfce.members;
|
||||
};
|
||||
|
||||
options = {
|
||||
programs.xfconf = {
|
||||
enable = mkEnableOption "Xfconf, the Xfce configuration storage system";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.xfce.xfconf
|
||||
];
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.xfce.xfconf
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -4,10 +4,9 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.desktopManager.xfce;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = teams.xfce.members;
|
||||
};
|
||||
@ -95,7 +94,6 @@ in
|
||||
exo
|
||||
garcon
|
||||
libxfce4ui
|
||||
xfconf
|
||||
|
||||
mousepad
|
||||
parole
|
||||
@ -125,6 +123,7 @@ in
|
||||
xfdesktop
|
||||
] ++ optional cfg.enableScreensaver xfce4-screensaver;
|
||||
|
||||
programs.xfconf.enable = true;
|
||||
programs.thunar.enable = true;
|
||||
|
||||
environment.pathsToLink = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batsignal";
|
||||
version = "1.3.5";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electrickite";
|
||||
repo = "batsignal";
|
||||
rev = version;
|
||||
sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI=";
|
||||
sha256 = "sha256-gZMGbw7Ij1IVQSWOqG/91YrbWTG3I3l6Yp11QbVCfyY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libnotify glib ];
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.13.6";
|
||||
version = "1.13.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5EIXbdVBFkmftD8xK1VJmZH3Ul99fhFSpFLOQNqSXoU=";
|
||||
sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.31.2";
|
||||
sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir";
|
||||
manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb";
|
||||
version = "0.31.3";
|
||||
sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l";
|
||||
manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo=";
|
||||
vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -41,12 +41,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zotero";
|
||||
version = "6.0.8";
|
||||
version = "6.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
sha256 = "sha256-S3s82F6kpjIOIqMIxlZIBT/7eNpLf6dHjOOaCYxdh6E=";
|
||||
sha256 = "sha256-yzMppbvdw7ShYtWdmE5HkqutgivwuJKPkAOGq6WkyuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -157,9 +157,8 @@ stdenv.mkDerivation rec {
|
||||
;
|
||||
|
||||
# debug builds fail all but the python test
|
||||
#doInstallCheck = !debug;
|
||||
# temporarily disabled until upstream issue 9888 is resolved
|
||||
doInstallCheck = false;
|
||||
# stable release doesn't have the fix for upstream issue 9888 yet
|
||||
doInstallCheck = !debug && !stable;
|
||||
installCheckTarget = "test";
|
||||
|
||||
dontStrip = debug;
|
||||
|
||||
@ -3,45 +3,45 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "6.0.5";
|
||||
version = "6.0.6";
|
||||
src = {
|
||||
rev = "a6ca702e916df70e499615d8613102e780e96a40";
|
||||
sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23";
|
||||
rev = "3a73a7531170b37afa1eb22d5924ef8af7f9e71e";
|
||||
sha256 = "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "6.0.5";
|
||||
version = "6.0.6";
|
||||
libSources = {
|
||||
symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693";
|
||||
symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5";
|
||||
templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8";
|
||||
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
|
||||
footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f";
|
||||
footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai";
|
||||
packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e";
|
||||
packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc";
|
||||
symbols.rev = "3df4c49795a65a051fafb1cf81d291be4c891f62";
|
||||
symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d";
|
||||
templates.rev = "17aca4385144bf872e69f41bf5012fd2018cec2c";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "64bae4c4a0d51afbc8129682ef0c2bf28b005c04";
|
||||
footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c";
|
||||
packages3d.rev = "6cb25bc10f8c94fbf71479fe9782aecfcc9952bd";
|
||||
packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya";
|
||||
};
|
||||
};
|
||||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2022-05-06";
|
||||
version = "2022-06-21";
|
||||
src = {
|
||||
rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6";
|
||||
sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2";
|
||||
rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00";
|
||||
sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2022-05-06";
|
||||
version = "2022-06-21";
|
||||
libSources = {
|
||||
symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef";
|
||||
symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8";
|
||||
templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4";
|
||||
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
|
||||
footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9";
|
||||
footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai";
|
||||
packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e";
|
||||
packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc";
|
||||
symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503";
|
||||
symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d";
|
||||
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e";
|
||||
footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c";
|
||||
packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24";
|
||||
packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -105,10 +105,6 @@ for arg; do
|
||||
fi
|
||||
done
|
||||
|
||||
if test -n $deepClone; then
|
||||
leaveDotGit=true
|
||||
fi
|
||||
|
||||
if test -z "$url"; then
|
||||
usage
|
||||
fi
|
||||
|
||||
@ -132,12 +132,17 @@ let
|
||||
libraries ? [],
|
||||
ghc ? pkgs.ghc,
|
||||
ghcArgs ? [],
|
||||
threadedRuntime ? true,
|
||||
strip ? true
|
||||
}:
|
||||
makeBinWriter {
|
||||
let
|
||||
appendIfNotSet = el: list: if elem el list then list else list ++ [ el ];
|
||||
ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs;
|
||||
|
||||
in makeBinWriter {
|
||||
compileScript = ''
|
||||
cp $contentPath tmp.hs
|
||||
${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs
|
||||
${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs
|
||||
mv tmp $out
|
||||
'';
|
||||
inherit strip;
|
||||
|
||||
@ -0,0 +1,90 @@
|
||||
From c1d426bdd477ffeb3dfa03501de089a341b85d0b Mon Sep 17 00:00:00 2001
|
||||
From: Tero Tervala <tero.tervala@unikie.com>
|
||||
Date: Wed, 15 Jun 2022 13:44:55 +0300
|
||||
Subject: [PATCH] Depend on .a instead of .so when building static
|
||||
|
||||
Static build needs to be indicated with environment variable:
|
||||
STATIC_BUILD=1
|
||||
|
||||
Checks are skipped on static builds
|
||||
|
||||
Signed-off-by: Tero Tervala <tero.tervala@unikie.com>
|
||||
---
|
||||
Makefile | 12 +++++++++---
|
||||
tests/Makefile.tests | 11 ++++++++---
|
||||
2 files changed, 17 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ee77115..9f550b4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -198,6 +198,12 @@ LIBFDT_lib = $(LIBFDT_dir)/$(LIBFDT_LIB)
|
||||
LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES))
|
||||
LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION))
|
||||
|
||||
+ifeq ($(STATIC_BUILD),1)
|
||||
+ LIBFDT_dep = $(LIBFDT_archive)
|
||||
+else
|
||||
+ LIBFDT_dep = $(LIBFDT_lib)
|
||||
+endif
|
||||
+
|
||||
include $(LIBFDT_dir)/Makefile.libfdt
|
||||
|
||||
.PHONY: libfdt
|
||||
@@ -261,11 +267,11 @@ convert-dtsv0: $(CONVERT_OBJS)
|
||||
|
||||
fdtdump: $(FDTDUMP_OBJS)
|
||||
|
||||
-fdtget: $(FDTGET_OBJS) $(LIBFDT_lib)
|
||||
+fdtget: $(FDTGET_OBJS) $(LIBFDT_dep)
|
||||
|
||||
-fdtput: $(FDTPUT_OBJS) $(LIBFDT_lib)
|
||||
+fdtput: $(FDTPUT_OBJS) $(LIBFDT_dep)
|
||||
|
||||
-fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib)
|
||||
+fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_dep)
|
||||
|
||||
dist:
|
||||
git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \
|
||||
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
|
||||
index 2f78952..f13b16d 100644
|
||||
--- a/tests/Makefile.tests
|
||||
+++ b/tests/Makefile.tests
|
||||
@@ -60,17 +60,17 @@ TESTS_CLEANDIRS = $(TESTS_CLEANDIRS_L:%=$(TESTS_PREFIX)%)
|
||||
.PHONY: tests
|
||||
tests: $(TESTS) $(TESTS_TREES)
|
||||
|
||||
-$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
|
||||
+$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
|
||||
|
||||
# Not necessary on all platforms; allow -ldl to be excluded instead of forcing
|
||||
# other platforms to patch it out.
|
||||
LIBDL = -ldl
|
||||
-$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
|
||||
+$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
|
||||
@$(VECHO) LD [libdl] $@
|
||||
$(LINK.c) -o $@ $^ $(LIBDL)
|
||||
|
||||
$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
|
||||
- util.o $(LIBFDT_lib)
|
||||
+ util.o $(LIBFDT_dep)
|
||||
|
||||
$(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o
|
||||
|
||||
@@ -83,8 +83,13 @@ tests_clean:
|
||||
rm -f $(TESTS_CLEANFILES)
|
||||
rm -rf $(TESTS_CLEANDIRS)
|
||||
|
||||
+ifeq ($(STATIC_BUILD),1)
|
||||
+check:
|
||||
+ @echo Skipping checks for static build
|
||||
+else
|
||||
check: tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
|
||||
cd $(TESTS_PREFIX); ./run_tests.sh
|
||||
+endif
|
||||
|
||||
ifeq ($(NO_VALGRIND),1)
|
||||
checkm:
|
||||
--
|
||||
2.33.3
|
||||
|
||||
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
||||
# based on without requiring the setup.py rework
|
||||
# https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=383e148b70a47ab15f97a19bb999d54f9c3e810f
|
||||
./python-3.10.patch
|
||||
|
||||
# fix dtc static building
|
||||
./0001-Depend-on-.a-instead-of-.so-when-building-static.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ flex bison pkg-config which ]
|
||||
@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs pylibfdt/
|
||||
'';
|
||||
|
||||
makeFlags = [ "PYTHON=python" ];
|
||||
makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ];
|
||||
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
|
||||
|
||||
# Checks are broken on aarch64 darwin
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation ( rec {
|
||||
pname = "corral";
|
||||
version = "0.5.7";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-OLA09C/6s2PyzreBvqFfzsoRDXiRMbdf3Jgnmawr7k4=";
|
||||
sha256 = "sha256-8hSs1pllAips27Lut1GbSn3E9lbp4BT1L2AlkyDd46o=";
|
||||
};
|
||||
|
||||
buildInputs = [ ponyc ];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zQz8tbxo1Trfeg7zeW/htm+zD4n++guYXUdCHp3cikw=";
|
||||
hash = "sha256-eZNIRUbwJf58DUm/D4Gtkl++z42wjY3m/4K05s2+Z9E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -46,7 +46,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-77RLoSZnzggt8ZWQwRcvMhCYGupF2Kp+u2LFZ9ozXlw=";
|
||||
hash = "sha256-H2+2OS06oeW14Zzd7Twi13XVNaE6O0TJqTnZxxCNW+U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sl5qCH/biH3QBrnfZAQMWd55yKM0PGE/Rx2MscKn4Nk=";
|
||||
hash = "sha256-glfvSaXlT+PuF8ztA5A6+HG9FQ6CsrOn8ZAir8+db7c=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4t1PbxcHxiv8W/M9McaBu7CTLc74gCZ7om3K4fgpFFI=";
|
||||
hash = "sha256-ScJoe0YFM5mipVt+7/hy7BI1qytrpO+qcYjY8roBMfc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IQLtkS4LNyyEOwInd9A3pHGtj80yXARXcQKA3FonPUE=";
|
||||
hash = "sha256-VwZSGWJ3XT34kkpXOiUfObGRK28nb54XZ4iskg7xetk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "karton-mwdb-reporter";
|
||||
version = "unstable-2022-02-22";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
rev = "1afa32251b4826eac4386596b4a20f295699faec";
|
||||
hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2qG/8D6ZlUFJg+BB/QZ9ZMJpbsLei/7TRXd6bF40Fvg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetgear";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "MatMaul";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-eYcMS8gxJO5JXvgIcZEEei5THb+gDdmoad+/Vokis/Q=";
|
||||
sha256 = "sha256-lpCBwz7B6QHLmFQwOz+QA3oJ2GOrE1Y/qjWE328vD2A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.7";
|
||||
version = "9.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vSVkredOekqUAre38jDCE8f8OXd0cNmZ2SmpEQ7+I28=";
|
||||
hash = "sha256-GHVY+V18OwlNI1aQAQCLmeh5Z9fbT5cm+bh9KAY/gkE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.96.0";
|
||||
version = "2.97.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-40xvL7EwCDx/zsYHJhczx1MqVVrwQiDhlcv3QrEuv/E=";
|
||||
hash = "sha256-iHh6WOefWmoLDzZYk1p2TtR0CAudP+paQOOj3RVFlRE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-testing";
|
||||
version = "22.3.0";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic-testing";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-6aJyc5B9e65RPG3FwXAoQByVNdrLAWTEu2/Dqf9hf+g=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2022.06.0";
|
||||
version = "2022.06.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-rYWtq56Gjbw5zs2ZqZkNqIP7wEzVziN3VQQfoyF5fJk=";
|
||||
sha256 = "sha256-5zhj1EAFZ2XCeSfcFN+7gHrcPx/YrEZQ8QfcmLUboIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "0.21.4";
|
||||
version = "0.21.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "XKNX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY=";
|
||||
sha256 = "sha256-rtR77b4/cgDA6rf/Q+ecuKI5bl7N4YMim8TeQ7ovKhI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "birdfont";
|
||||
version = "2.30.0";
|
||||
version = "2.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE=";
|
||||
sha256 = "sha256-OnbLDKBxk1IGZZlSM/zK6xus6zmzV7OygfvHFBujHUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dsq";
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multiprocessio";
|
||||
repo = "dsq";
|
||||
rev = version;
|
||||
hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II=";
|
||||
hash = "sha256-jwJw56Z/Y0vnsybE/FfXXHtz0W0J80Q5rrRRoINbjkM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A=";
|
||||
vendorSha256 = "sha256-7KQDaDM151OFfTYRPOit4MAmwgEzvLOYFWCjXhVmFT0=";
|
||||
|
||||
ldflags = [ "-X" "main.Version=${version}" ];
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-d2S18cBkFJOIGFKrwj9U4bRvdPjrbuWfRUVug1JEw0s=";
|
||||
sha256 = "sha256-CkdiNXWhMYjqdxHSSB5qjEiD6cZF6NQfjCUMrLxz8/Q=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user