Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
Dennis Gosnell
commit
e9305a371f
@ -1760,6 +1760,12 @@
|
||||
githubId = 28444296;
|
||||
name = "Benjamin Hougland";
|
||||
};
|
||||
bigzilla = {
|
||||
email = "m.billyzaelani@gmail.com";
|
||||
github = "bigzilla";
|
||||
githubId = 20436235;
|
||||
name = "Billy Zaelani Malik";
|
||||
};
|
||||
billewanick = {
|
||||
email = "bill@ewanick.com";
|
||||
github = "billewanick";
|
||||
@ -3613,6 +3619,12 @@
|
||||
githubId = 10198051;
|
||||
name = "Drew Risinger";
|
||||
};
|
||||
dritter = {
|
||||
email = "dritter03@googlemail.com";
|
||||
github = "dritter";
|
||||
githubId = 1544760;
|
||||
name = "Dominik Ritter";
|
||||
};
|
||||
drperceptron = {
|
||||
email = "92106371+drperceptron@users.noreply.github.com";
|
||||
github = "drperceptron";
|
||||
|
||||
@ -216,6 +216,13 @@
|
||||
<link xlink:href="options.html#opt-services.hadoop.hbase.enable">services.hadoop.hbase</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/edneville/please">Please</link>,
|
||||
a Sudo clone written in Rust. Available as
|
||||
<link linkend="opt-security.please.enable">security.please</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/messagebird/sachet/">Sachet</link>,
|
||||
|
||||
@ -79,6 +79,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable).
|
||||
|
||||
- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable)
|
||||
|
||||
- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable).
|
||||
|
||||
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
|
||||
|
||||
@ -263,6 +263,7 @@
|
||||
./security/pam.nix
|
||||
./security/pam_usb.nix
|
||||
./security/pam_mount.nix
|
||||
./security/please.nix
|
||||
./security/polkit.nix
|
||||
./security/rngd.nix
|
||||
./security/rtkit.nix
|
||||
|
||||
122
nixos/modules/security/please.nix
Normal file
122
nixos/modules/security/please.nix
Normal file
@ -0,0 +1,122 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.security.please;
|
||||
ini = pkgs.formats.ini { };
|
||||
in
|
||||
{
|
||||
options.security.please = {
|
||||
enable = mkEnableOption (mdDoc ''
|
||||
please, a Sudo clone which allows a users to execute a command or edit a
|
||||
file as another user
|
||||
'');
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.please;
|
||||
defaultText = literalExpression "pkgs.please";
|
||||
description = mdDoc ''
|
||||
Which package to use for {command}`please`.
|
||||
'';
|
||||
};
|
||||
|
||||
wheelNeedsPassword = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether users of the `wheel` group must provide a password to run
|
||||
commands or edit files with {command}`please` and
|
||||
{command}`pleaseedit` respectively.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = ini.type;
|
||||
default = { };
|
||||
example = {
|
||||
jim_run_any_as_root = {
|
||||
name = "jim";
|
||||
type = "run";
|
||||
target = "root";
|
||||
rule = ".*";
|
||||
require_pass = false;
|
||||
};
|
||||
jim_edit_etc_hosts_as_root = {
|
||||
name = "jim";
|
||||
type = "edit";
|
||||
target = "root";
|
||||
rule = "/etc/hosts";
|
||||
editmode = 644;
|
||||
require_pass = true;
|
||||
};
|
||||
};
|
||||
description = mdDoc ''
|
||||
Please configuration. Refer to
|
||||
<https://github.com/edneville/please/blob/master/please.ini.md> for
|
||||
details.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
security.wrappers =
|
||||
let
|
||||
owner = "root";
|
||||
group = "root";
|
||||
setuid = true;
|
||||
in
|
||||
{
|
||||
please = {
|
||||
source = "${cfg.package}/bin/please";
|
||||
inherit owner group setuid;
|
||||
};
|
||||
pleaseedit = {
|
||||
source = "${cfg.package}/bin/pleaseedit";
|
||||
inherit owner group setuid;
|
||||
};
|
||||
};
|
||||
|
||||
security.please.settings = rec {
|
||||
# The "wheel" group is allowed to do anything by default but this can be
|
||||
# overridden.
|
||||
wheel_run_as_any = {
|
||||
type = "run";
|
||||
group = true;
|
||||
name = "wheel";
|
||||
target = ".*";
|
||||
rule = ".*";
|
||||
require_pass = cfg.wheelNeedsPassword;
|
||||
};
|
||||
wheel_edit_as_any = wheel_run_as_any // { type = "edit"; };
|
||||
wheel_list_as_any = wheel_run_as_any // { type = "list"; };
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = [ cfg.package ];
|
||||
|
||||
etc."please.ini".source = ini.generate "please.ini"
|
||||
(cfg.settings // (rec {
|
||||
# The "root" user is allowed to do anything by default and this cannot
|
||||
# be overridden.
|
||||
root_run_as_any = {
|
||||
type = "run";
|
||||
name = "root";
|
||||
target = ".*";
|
||||
rule = ".*";
|
||||
require_pass = false;
|
||||
};
|
||||
root_edit_as_any = root_run_as_any // { type = "edit"; };
|
||||
root_list_as_any = root_run_as_any // { type = "list"; };
|
||||
}));
|
||||
};
|
||||
|
||||
security.pam.services.please = {
|
||||
sshAgentAuth = true;
|
||||
usshAuth = true;
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ azahi ];
|
||||
};
|
||||
}
|
||||
@ -175,22 +175,22 @@ def get_specialisations(profile: Optional[str], generation: int, _: Optional[str
|
||||
|
||||
def remove_old_entries(gens: List[SystemIdentifier]) -> None:
|
||||
rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")
|
||||
rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")
|
||||
rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$")
|
||||
known_paths = []
|
||||
for gen in gens:
|
||||
known_paths.append(copy_from_profile(*gen, "kernel", True))
|
||||
known_paths.append(copy_from_profile(*gen, "initrd", True))
|
||||
for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"):
|
||||
if rex_profile.match(path):
|
||||
prof = rex_profile.sub(r"\1", path)
|
||||
else:
|
||||
prof = None
|
||||
try:
|
||||
if rex_profile.match(path):
|
||||
prof = rex_profile.sub(r"\1", path)
|
||||
else:
|
||||
prof = "system"
|
||||
gen_number = int(rex_generation.sub(r"\1", path))
|
||||
if not (prof, gen_number) in gens:
|
||||
os.unlink(path)
|
||||
except ValueError:
|
||||
pass
|
||||
continue
|
||||
if not (prof, gen_number, None) in gens:
|
||||
os.unlink(path)
|
||||
for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"):
|
||||
if not path in known_paths and not os.path.isdir(path):
|
||||
os.unlink(path)
|
||||
|
||||
@ -117,7 +117,7 @@ in {
|
||||
ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
|
||||
ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {};
|
||||
certmgr = handleTest ./certmgr.nix {};
|
||||
cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
|
||||
cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {};
|
||||
charliecloud = handleTest ./charliecloud.nix {};
|
||||
chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {};
|
||||
cinnamon = handleTest ./cinnamon.nix {};
|
||||
@ -147,7 +147,7 @@ in {
|
||||
corerad = handleTest ./corerad.nix {};
|
||||
coturn = handleTest ./coturn.nix {};
|
||||
couchdb = handleTest ./couchdb.nix {};
|
||||
cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
|
||||
cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {};
|
||||
custom-ca = handleTest ./custom-ca.nix {};
|
||||
croc = handleTest ./croc.nix {};
|
||||
deluge = handleTest ./deluge.nix {};
|
||||
@ -160,8 +160,8 @@ in {
|
||||
dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {};
|
||||
dnsdist = handleTest ./dnsdist.nix {};
|
||||
doas = handleTest ./doas.nix {};
|
||||
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
|
||||
docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {};
|
||||
docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {};
|
||||
docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {};
|
||||
docker-registry = handleTest ./docker-registry.nix {};
|
||||
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
|
||||
docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
|
||||
@ -253,7 +253,7 @@ in {
|
||||
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
|
||||
invidious = handleTest ./invidious.nix {};
|
||||
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
|
||||
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
|
||||
odoo = handleTest ./odoo.nix {};
|
||||
# 9pnet_virtio used to mount /nix partition doesn't support
|
||||
# hibernation. This test happens to work on x86_64-linux but
|
||||
@ -491,13 +491,14 @@ in {
|
||||
plasma5 = handleTest ./plasma5.nix {};
|
||||
plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};
|
||||
plausible = handleTest ./plausible.nix {};
|
||||
please = handleTest ./please.nix {};
|
||||
pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {};
|
||||
plikd = handleTest ./plikd.nix {};
|
||||
plotinus = handleTest ./plotinus.nix {};
|
||||
podgrab = handleTest ./podgrab.nix {};
|
||||
podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {};
|
||||
podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {};
|
||||
podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {};
|
||||
podman = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/default.nix {};
|
||||
podman-dnsname = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/dnsname.nix {};
|
||||
podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {};
|
||||
polaris = handleTest ./polaris.nix {};
|
||||
pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};
|
||||
postfix = handleTest ./postfix.nix {};
|
||||
@ -631,8 +632,7 @@ in {
|
||||
tmate-ssh-server = handleTest ./tmate-ssh-server.nix { };
|
||||
tomcat = handleTest ./tomcat.nix {};
|
||||
tor = handleTest ./tor.nix {};
|
||||
# traefik test relies on docker-containers
|
||||
traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
|
||||
traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {};
|
||||
trafficserver = handleTest ./trafficserver.nix {};
|
||||
transmission = handleTest ./transmission.nix {};
|
||||
# tracee requires bpf
|
||||
|
||||
66
nixos/tests/please.nix
Normal file
66
nixos/tests/please.nix
Normal file
@ -0,0 +1,66 @@
|
||||
import ./make-test-python.nix ({ lib, ... }:
|
||||
{
|
||||
name = "please";
|
||||
meta.maintainers = with lib.maintainers; [ azahi ];
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
users.users = with lib; mkMerge [
|
||||
(listToAttrs (map
|
||||
(n: nameValuePair n { isNormalUser = true; })
|
||||
(genList (x: "user${toString x}") 6)))
|
||||
{
|
||||
user0.extraGroups = [ "wheel" ];
|
||||
}
|
||||
];
|
||||
|
||||
security.please = {
|
||||
enable = true;
|
||||
wheelNeedsPassword = false;
|
||||
settings = {
|
||||
user2_run_true_as_root = {
|
||||
name = "user2";
|
||||
target = "root";
|
||||
rule = "/run/current-system/sw/bin/true";
|
||||
require_pass = false;
|
||||
};
|
||||
user4_edit_etc_hosts_as_root = {
|
||||
name = "user4";
|
||||
type = "edit";
|
||||
target = "root";
|
||||
rule = "/etc/hosts";
|
||||
editmode = 644;
|
||||
require_pass = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
with subtest("root: can run anything by default"):
|
||||
machine.succeed('please true')
|
||||
with subtest("root: can edit anything by default"):
|
||||
machine.succeed('EDITOR=cat pleaseedit /etc/hosts')
|
||||
|
||||
with subtest("user0: can run as root because it's in the wheel group"):
|
||||
machine.succeed('su - user0 -c "please -u root true"')
|
||||
with subtest("user1: cannot run as root because it's not in the wheel group"):
|
||||
machine.fail('su - user1 -c "please -u root true"')
|
||||
|
||||
with subtest("user0: can edit as root"):
|
||||
machine.succeed('su - user0 -c "EDITOR=cat pleaseedit /etc/hosts"')
|
||||
with subtest("user1: cannot edit as root"):
|
||||
machine.fail('su - user1 -c "EDITOR=cat pleaseedit /etc/hosts"')
|
||||
|
||||
with subtest("user2: can run 'true' as root"):
|
||||
machine.succeed('su - user2 -c "please -u root true"')
|
||||
with subtest("user3: cannot run 'true' as root"):
|
||||
machine.fail('su - user3 -c "please -u root true"')
|
||||
|
||||
with subtest("user4: can edit /etc/hosts"):
|
||||
machine.succeed('su - user4 -c "EDITOR=cat pleaseedit /etc/hosts"')
|
||||
with subtest("user5: cannot edit /etc/hosts"):
|
||||
machine.fail('su - user5 -c "EDITOR=cat pleaseedit /etc/hosts"')
|
||||
'';
|
||||
})
|
||||
@ -70,15 +70,15 @@ let
|
||||
|
||||
# Save the file
|
||||
machine.send_key('ctrl-s')
|
||||
machine.wait_for_text('Save')
|
||||
machine.wait_for_text('(Save|Desktop|alice|Size)')
|
||||
machine.screenshot('save_window')
|
||||
machine.send_key('ret')
|
||||
|
||||
# (the default filename is the first line of the file)
|
||||
machine.wait_for_file(f'/home/alice/{test_string}')
|
||||
|
||||
machine.send_key('ctrl-q')
|
||||
machine.wait_until_fails('pgrep -x codium')
|
||||
# machine.send_key('ctrl-q')
|
||||
# machine.wait_until_fails('pgrep -x codium')
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
|
||||
, libX11, libXtst, libXfixes, libXcursor
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glib gtk3 gsettings-desktop-schemas
|
||||
libX11 libXtst libXfixes libXcursor
|
||||
xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wvkbd";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjsullivan5196";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h/hXHQfLiDkVKYZFsjyq2+w1Pnn3lR6H+r+fXYkP5ZY=";
|
||||
sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "carla";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI=";
|
||||
sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
67
pkgs/applications/audio/tagger/default.nix
Normal file
67
pkgs/applications/audio/tagger/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, jsoncpp
|
||||
, taglib
|
||||
, curl
|
||||
, curlpp
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, wrapGAppsHook4
|
||||
, desktop-file-utils
|
||||
, chromaprint # fpcalc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tagger";
|
||||
version = "2022.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlogozzo";
|
||||
repo = "NickvisionTagger";
|
||||
rev = version;
|
||||
hash = "sha256-dyp2XzTnDs08tTTbCnjWh061UXnH4Q0Gnt0jofgVm2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
jsoncpp
|
||||
taglib
|
||||
curl
|
||||
curlpp
|
||||
];
|
||||
|
||||
# Don't install compiled binary
|
||||
postPatch = ''
|
||||
sed -i '/fpcalc/d' meson.build
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [ chromaprint ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy-to-use music tag (metadata) editor";
|
||||
homepage = "https://github.com/nlogozzo/NickvisionTagger";
|
||||
mainProgram = "org.nickvision.tagger";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
|
||||
, lmdb, miniupnpc, readline }:
|
||||
, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masari";
|
||||
version = "0.1.4.0";
|
||||
version = "unstable-2022-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "masari-project";
|
||||
repo = "masari";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
|
||||
rev = "ff71f52220858b84a4403dab9a14339bcad57826";
|
||||
sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
|
||||
postPatch = ''
|
||||
# remove vendored libraries
|
||||
rm -r external/{miniupnpc,rapidjson}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config git ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
zeromq readline libsodium
|
||||
rapidjson cppzmq
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
|
||||
homepage = "https://www.getmasari.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
|
||||
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
|
||||
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
|
||||
, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon
|
||||
, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "lightdm-enso-os-greeter";
|
||||
@ -30,15 +30,15 @@ stdenv.mkDerivation {
|
||||
pcre
|
||||
libepoxy
|
||||
libgee
|
||||
libX11
|
||||
xorg.libX11
|
||||
lightdm
|
||||
libXdmcp
|
||||
xorg.libXdmcp
|
||||
gdk-pixbuf
|
||||
clutter-gtk
|
||||
libxklavier
|
||||
at-spi2-core
|
||||
libxkbcommon
|
||||
libpthreadstubs
|
||||
xorg.libpthreadstubs
|
||||
librsvg
|
||||
];
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@ let
|
||||
with on-the-fly code analysis, error prevention and
|
||||
automated refactorings for PHP and JavaScript code.
|
||||
'';
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ dritter ];
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libX11 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maiko";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libX11 ];
|
||||
buildInputs = [ xorg.libX11 ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \;
|
||||
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://interlisp.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
inherit (libX11.meta) platforms;
|
||||
inherit (xorg.libX11.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,11 +4,7 @@
|
||||
, stdenv
|
||||
, python3
|
||||
, libGL
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libxcb
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, AppKit
|
||||
, IOKit
|
||||
@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libxcb
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "501";
|
||||
version = "502";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM=";
|
||||
sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
, stdenv
|
||||
, withSixel ? false
|
||||
, libsixel
|
||||
, libX11
|
||||
, libXrandr
|
||||
, xorg
|
||||
, AppKit
|
||||
, withSki ? true
|
||||
}:
|
||||
@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optional stdenv.isLinux pkg-config;
|
||||
|
||||
buildInputs = lib.optional withSixel libsixel
|
||||
++ lib.optionals stdenv.isLinux [ libX11 libXrandr ]
|
||||
++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ])
|
||||
++ lib.optional stdenv.isDarwin AppKit;
|
||||
|
||||
buildNoDefaultFeatures = !withSki;
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bfcal";
|
||||
version = "1.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bitfehler";
|
||||
repo = "bfcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2z5ICVEZ55omwcoVWpac/HPwyKF9jDCYO78S9p21VMU=";
|
||||
sha256 = "sha256-5xyBU+0XUNFUGgvw7U8YE64zncw6SvPmbJhc1LY2u/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,15 +27,11 @@ stdenv.mkDerivation rec {
|
||||
qtbase
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
install bfcal $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quickly display a calendar";
|
||||
homepage = "https://git.sr.ht/~bitfehler/bfcal";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = qtbase.meta.platforms;
|
||||
maintainers = with maintainers; [ laalsaas ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "6.6.1";
|
||||
version = "6.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-jJMHliPTRqiI4Wx5N9qbSryoARcGBisSq6awXIaTk5g=";
|
||||
hash = "sha256-R1poU9qhqf1DYZJ9tkupJrPR99pn5nTpkS6vkMzrwCg=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
||||
|
||||
@ -4,12 +4,8 @@
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libxcb
|
||||
, xorg
|
||||
, libGL
|
||||
, libX11
|
||||
, openssl
|
||||
, AppKit
|
||||
, ApplicationServices
|
||||
@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
fontconfig
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libxcb
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/inlyne \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL libX11 ]}
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.23";
|
||||
version = "1.2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU=";
|
||||
sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From ad3f083de2dca2b2c5189430d33a78acfbd9d694 Mon Sep 17 00:00:00 2001
|
||||
From: Lana Black <lanablack@amok.cc>
|
||||
Date: Wed, 8 Jun 2022 12:42:31 +0000
|
||||
Subject: [PATCH] Disable autostart.
|
||||
|
||||
---
|
||||
app/settings/universalsettings.cpp | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp
|
||||
index c95371db..4efd3ffe 100644
|
||||
--- a/app/settings/universalsettings.cpp
|
||||
+++ b/app/settings/universalsettings.cpp
|
||||
@@ -74,17 +74,6 @@ UniversalSettings::~UniversalSettings()
|
||||
|
||||
void UniversalSettings::load()
|
||||
{
|
||||
- //! check if user has set the autostart option
|
||||
- bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false);
|
||||
-
|
||||
- if (!autostartUserSet && !autostart()) {
|
||||
- //! the first time the application is running and autostart is not set, autostart is enabled
|
||||
- //! and from now own it will not be recreated in the beginning
|
||||
-
|
||||
- setAutostart(true);
|
||||
- m_universalGroup.writeEntry("userConfiguredAutostart", true);
|
||||
- }
|
||||
-
|
||||
//! init screen scales
|
||||
m_screenScalesGroup = m_universalGroup.group("ScreenScales");
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From a162c54ed1fcc39434edf8666c72c305d05e79e6 Mon Sep 17 00:00:00 2001
|
||||
From: diffumist <git@diffumist.me>
|
||||
Date: Mon, 4 Oct 2021 16:58:37 +0800
|
||||
Subject: [PATCH] close user config autostart
|
||||
|
||||
---
|
||||
app/settings/universalsettings.cpp | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp
|
||||
index e0010542..82b9e785 100644
|
||||
--- a/app/settings/universalsettings.cpp
|
||||
+++ b/app/settings/universalsettings.cpp
|
||||
@@ -77,9 +77,6 @@ void UniversalSettings::load()
|
||||
//! check if user has set the autostart option
|
||||
bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false);
|
||||
|
||||
- if (!autostartUserSet && !autostart()) {
|
||||
- setAutostart(true);
|
||||
- }
|
||||
|
||||
//! init screen scales
|
||||
m_screenScalesGroup = m_universalGroup.group("ScreenScales");
|
||||
--
|
||||
2.33.0
|
||||
@ -1,24 +1,27 @@
|
||||
{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl
|
||||
, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }:
|
||||
{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab
|
||||
, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff, wayland }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "latte-dock";
|
||||
version = "0.10.4";
|
||||
version = "unstable-2022-09-06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "XRop+MNcbeCcbnL2LM1i67QvMudW3CjWYEPLkT/qbGM=";
|
||||
name = "${pname}-${version}.tar.xz";
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "plasma";
|
||||
repo = "latte-dock";
|
||||
rev = "cd36798a61a37652eb549d7dfcdf06d2028eddc4";
|
||||
sha256 = "sha256-X2PzI2XJje4DpPh7gTtYnMIwerR1IDY53HImvEtFmF4=";
|
||||
};
|
||||
|
||||
buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
|
||||
buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem
|
||||
qtx11extras kcrash knewstuff ];
|
||||
|
||||
patches = [
|
||||
./0001-close-user-autostart.patch
|
||||
./0001-Disable-autostart.patch
|
||||
];
|
||||
|
||||
fixupPhase = ''
|
||||
mkdir -p $out/etc/xdg/autostart
|
||||
cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart
|
||||
@ -26,7 +29,7 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dock-style app launcher based on Plasma frameworks";
|
||||
homepage = "https://github.com/psifidotos/Latte-Dock";
|
||||
homepage = "https://invent.kde.org/plasma/latte-dock";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ysndr ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juruen";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-khQ4Q2y/MJdz5EpfTSrLBROCX2QP2+3PXRO+x+FaXro=";
|
||||
sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";
|
||||
vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libX11
|
||||
, libXft
|
||||
, libXinerama
|
||||
, xorg
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
|
||||
postFixup = ''
|
||||
patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch
|
||||
patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, ninja, git, pandoc, pkg-config
|
||||
, libGL, libGLU, libXxf86vm, freeimage
|
||||
, libGL, libGLU, freeimage
|
||||
, catch2, fmt, glew, miniz, tinyxml-2, xorg
|
||||
, qtbase, wrapQtAppsHook
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
|
||||
buildInputs = [
|
||||
libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
|
||||
libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
|
||||
xorg.libSM
|
||||
];
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
mainProgram = "wn";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, curl, db, libgeotiff
|
||||
, libXpm, libXt, motif, pcre
|
||||
, xorg, motif, pcre
|
||||
, perl, proj, rastermagick, shapelib
|
||||
}:
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
curl db libgeotiff
|
||||
libXpm libXt motif pcre
|
||||
xorg.libXpm xorg.libXt motif pcre
|
||||
perl proj rastermagick shapelib
|
||||
];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# at https://www.x.org/releases/individual/.
|
||||
# That is why this expression is not inside pkgs.xorg
|
||||
|
||||
{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfontsel";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
buildInputs = [ libX11 libXaw ];
|
||||
buildInputs = [ xorg.libX11 xorg.libXaw ];
|
||||
|
||||
# Without this, it gets Xmu as a dependency, but without rpath entry
|
||||
NIX_LDFLAGS = "-lXmu";
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "107.0.5304.29",
|
||||
"sha256": "1gid36r4hdl3wg2dbdvp847vnzggd2jga4i3pl5mdnvd3f1z0jpd",
|
||||
"sha256bin64": "039b1yc5x5xgfj8sbc843lpizgmrkppcnmdzqq36zgihhj4mqkrg",
|
||||
"version": "107.0.5304.36",
|
||||
"sha256": "1jr5jncc44jqryhg90zc7pnp590qwqdvbc9nkd28418vs0dx98r4",
|
||||
"sha256bin64": "0lczdihl955vcabr8f46ncglgis4ci8rnjga7dv7wxs4vlyxkhv8",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-09-14",
|
||||
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "108.0.5343.2",
|
||||
"sha256": "1xg982z01zrv2lfr5qygn4391906m1z3ksi7k1l0i86g777f0ahg",
|
||||
"sha256bin64": "0pgk3hsw1dxd6z63gpgx5ivjq49lyk608rkidp8i0acmwrvf0fqm",
|
||||
"version": "108.0.5355.0",
|
||||
"sha256": "185mj5sm6q2ahf0im52vkys9pcf0zxx849yrnghix3k487z959na",
|
||||
"sha256bin64": "11gns3f7k1qj3asy5skrc8z3pb6var8lbqqra47c9gs1jby60d6l",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-10-05",
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.37.0";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snyk";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Abp5JetsMqIXZK8BxNa22OBFCxquoLoy3npv6XxCWGo=";
|
||||
sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uWPnBqT6lZSRClw2RyxHEOzue1Azj9VpPaulMA3qlug=";
|
||||
vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XZASej26Mn4tq9c4nvjQNhQZWtu3L6jIgMNhyYyh5IE=";
|
||||
sha256 = "sha256-g6OwUCUR/F4v62yt3cCnAcys0tYYYrYVHC8vZZF5OQ4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.12";
|
||||
version = "1.23.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU=";
|
||||
sha256 = "sha256-Te31+geLT2hzyDfSGkCoXS0pXC1gbIJmpfC0DNDecAI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeseal";
|
||||
version = "0.18.5";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami-labs";
|
||||
repo = "sealed-secrets";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ij+NNaAq3woHze7o14WT3cqKYLD99dU8C6TUsdG2U54=";
|
||||
sha256 = "sha256-CQlyAgnEWeAfOn6xXeDFEGuSnaGZpGewg1tYYDCw8qE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Iry8ZE/HwZEnro7p36KTdy3phydA+fjM4EFg8DneSuA=";
|
||||
vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ=";
|
||||
|
||||
subPackages = [ "cmd/kubeseal" ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname ;
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
tags = lib.optionals enableGateway ["gateway"];
|
||||
vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng=";
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w=";
|
||||
sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -479,13 +479,13 @@
|
||||
"version": "1.29.0"
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=",
|
||||
"hash": "sha256-3JB82wbZ6mosFJZ96rGOnv/f1VFhHk6WEfm2u6sop2E=",
|
||||
"owner": "gridscale",
|
||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.15.0",
|
||||
"rev": "v1.16.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.15.0"
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
|
||||
@ -669,13 +669,13 @@
|
||||
"version": "0.7.0"
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=",
|
||||
"hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=",
|
||||
"owner": "linode",
|
||||
"provider-source-address": "registry.terraform.io/linode/linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v1.29.3",
|
||||
"rev": "v1.29.4",
|
||||
"vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=",
|
||||
"version": "1.29.3"
|
||||
"version": "1.29.4"
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
|
||||
@ -777,13 +777,13 @@
|
||||
"version": "0.6.12"
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-2JYRvlpHqEU5VPVhZlBkMYD88L7vMjELFWDY9eJYkK8=",
|
||||
"hash": "sha256-Sm5GwfILRCg0/gTNJtrDrWZY+uBXvuTYtrrtTnugP9Q=",
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.4.4",
|
||||
"vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=",
|
||||
"version": "3.4.4"
|
||||
"rev": "v3.5.0",
|
||||
"vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=",
|
||||
"version": "3.5.0"
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=",
|
||||
@ -1012,13 +1012,13 @@
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"selectel": {
|
||||
"hash": "sha256-27Sdez4coJ4Enc1zTg4lr1SzlW3r6wCjciC5ID8vo0w=",
|
||||
"hash": "sha256-2PwqVzwl8UIO+334lp9zkwkr2zAdI8S/rO+6iqTLu+I=",
|
||||
"owner": "selectel",
|
||||
"provider-source-address": "registry.terraform.io/selectel/selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v3.8.4",
|
||||
"vendorHash": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=",
|
||||
"version": "3.8.4"
|
||||
"rev": "v3.8.5",
|
||||
"vendorHash": "sha256-/7YQa84hOrOAGQSW1kVE27aM2253IB4pvA0ASAJe8VQ=",
|
||||
"version": "3.8.5"
|
||||
},
|
||||
"sentry": {
|
||||
"hash": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=",
|
||||
|
||||
@ -21,19 +21,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
sha256 = "sha256-QDGoA22olhafL2geLf1Jxriqc4++3yxGN/ZnNyEAqjA=";
|
||||
sha256 = "sha256-Q9KCzzBM0BzdmBUs8vJ4DR0e5XAHoAxrTpMvsKnuIAQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
src = finalAttrs.src;
|
||||
sha256 = "sha256-21v/4VAgolk/12mj7CTu8d5CKMCovE1FQuGyMar8idY=";
|
||||
sha256 = "sha256-GxRuN5ufzSB/XOb6TWLlvgg7KBNgZ+oJpOowR9Ze9OQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.53.1";
|
||||
version = "8.54.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-nohChte0jtqIlDulxUi+S04unR4xqeg8DCuYfHwMzP4=";
|
||||
sha256 = "sha256-wvuBGBWM0tTXyrruYqifn+fl7NnIwmLhm9ePqspukaU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -29,15 +29,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.6.7";
|
||||
version = "unstable-2022-09-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
owner = "Librem5";
|
||||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
# https://source.puri.sm/Librem5/chatty/-/tree/247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4
|
||||
rev = "247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-W4w/00mRgjfyQmLQ81/EAN+80qk7kDkBmMPJnOU+AIc=";
|
||||
hash = "sha256-9hgQC0vLmmJJxrBWTdTIrJbSSwLS23uVoJri2ieCj4E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -87,7 +88,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
# Requires upgrade to libsoup3
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = version;
|
||||
hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY=";
|
||||
hash = "sha256-A9ZgHliLb4v/3W5tm5zD0WN8mRmxLE/MUSTBXGvBCCM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ii";
|
||||
version = "1.9";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc=";
|
||||
sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "2.9.34";
|
||||
version = "2.9.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg=";
|
||||
sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8=";
|
||||
vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, enableSpellcheck ? true
|
||||
|
||||
# Arguments to include external libraries
|
||||
, enableLibSM ? true, libSM
|
||||
, enableLibSM ? true, xorg
|
||||
, enableGnuTLS ? true, gnutls
|
||||
, enableEnchant ? enableSpellcheck, enchant
|
||||
, enableDbus ? true, dbus, dbus-glib
|
||||
@ -76,7 +76,7 @@ let
|
||||
{ flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
|
||||
{ flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; }
|
||||
{ flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; }
|
||||
{ flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; }
|
||||
{ flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; }
|
||||
{ flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; }
|
||||
{ flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; }
|
||||
{ flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, notmuch }:
|
||||
|
||||
let
|
||||
version = "9";
|
||||
version = "10";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "notmuch-addrlookup";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
owner = "aperezdc";
|
||||
repo = "notmuch-addrlookup-c";
|
||||
rev ="v${version}";
|
||||
sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc";
|
||||
sha256 = "sha256-Z59MAptJw95azdK0auOuUyxBrX4PtXwnRNPkhjgI6Ro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -61,12 +61,12 @@ let
|
||||
in
|
||||
python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pname = "paperless-ngx";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc=";
|
||||
hash = "sha256-fafjVXRfzFrINzI/Ivfm1VY4YpemHkHwThBP54XoXM4=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp,
|
||||
pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }:
|
||||
pkg-config, soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false,
|
||||
Cocoa, WebKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cubicsdr";
|
||||
@ -14,7 +15,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ];
|
||||
buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ]
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ];
|
||||
|
||||
cmakeFlags = [ "-DUSE_HAMLIB=ON" ]
|
||||
++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
|
||||
@ -24,6 +27,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Software Defined Radio application";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lasandell ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "angsd";
|
||||
version = "0.938";
|
||||
version = "0.940";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ANGSD";
|
||||
repo = "angsd";
|
||||
sha256 = "sha256-hNELuPim2caJCzJ63fQ7kIB0ZZnXcC8JIbk4dFcCs2U=";
|
||||
sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
|
||||
rev = "${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abc-verifier";
|
||||
version = "2022.07.27";
|
||||
version = "unstable-2022-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "abc";
|
||||
rev = "7cc11f7f0c49d4ce7e0ed88950d1c4c8abb1cba4";
|
||||
hash = "sha256-6m8XpSYWT0uMpYHXm3ExnH7RMg923YqZAJPTBeFXMzg=";
|
||||
rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684";
|
||||
hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -16,12 +16,7 @@
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libGL
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libXxf86vm
|
||||
, libxcb
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, xdg-utils
|
||||
@ -41,12 +36,12 @@ let
|
||||
fontconfig
|
||||
freetype
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libXxf86vm
|
||||
libxcb
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXxf86vm
|
||||
xorg.libxcb
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libxkbcommon
|
||||
wayland
|
||||
|
||||
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
fcitx
|
||||
ibus
|
||||
] ++ lib.optionals (stdenv.system != "aarch64-linux") [
|
||||
# FIXME Currently broken on aarch64-linux
|
||||
uim
|
||||
];
|
||||
|
||||
@ -118,5 +120,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ vrthra ramkromberg atemu ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-Ic2AsPFdRk3XdTVGbPBByxcHRAGGQfYoQm9GlgmSvA4=";
|
||||
sha256 = "sha256-YgW0Q1s3V9WvhYQJlAszD7DdEbfggV5w1uMKXhDrn0s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "x86_64";
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c=";
|
||||
x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8=";
|
||||
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }:
|
||||
{ lib, stdenv, fetchFromGitHub, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherry";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fonttosfnt mkfontdir ];
|
||||
nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ];
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs make.sh
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }:
|
||||
{ lib, stdenv, fetchurl, xorg, libfaketime }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clearlyU";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ];
|
||||
nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ];
|
||||
|
||||
buildPhase = ''
|
||||
# convert bdf fonts to otb
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libfaketime
|
||||
, fonttosfnt, mkfontscale
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
|
||||
|
||||
buildPhase = ''
|
||||
faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, unzip
|
||||
, bdftopcf, mkfontscale, fonttosfnt
|
||||
, bdftopcf, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ unzip bdftopcf mkfontscale fonttosfnt ];
|
||||
[ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, libfaketime
|
||||
, fonttosfnt, mkfontscale
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
|
||||
|
||||
unpackPhase = ''
|
||||
tar -xzf $src --strip-components=1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub
|
||||
, mkfontscale, bdf2psf, bdftopcf
|
||||
, fonttosfnt, libfaketime
|
||||
, xorg, bdf2psf, bdftopcf
|
||||
, libfaketime
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ mkfontscale bdf2psf bdftopcf
|
||||
fonttosfnt libfaketime
|
||||
[ xorg.mkfontscale bdf2psf bdftopcf
|
||||
xorg.fonttosfnt libfaketime
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip, mkfontscale }:
|
||||
{ lib, stdenv, fetchzip, xorg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "profont";
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ mkfontscale ];
|
||||
nativeBuildInputs = [ xorg.mkfontscale ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/fonts/misc"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }:
|
||||
{ lib, stdenv, fetchFromGitHub, libfaketime, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "siji-${version}";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
|
||||
|
||||
buildPhase = ''
|
||||
# compress pcf fonts
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, mkfontscale }:
|
||||
{ lib, fetchurl, xorg }:
|
||||
|
||||
let
|
||||
pname = "spleen";
|
||||
@ -17,7 +17,7 @@ in fetchurl {
|
||||
install -m644 fonts.alias-spleen $d/fonts.alias
|
||||
|
||||
# create fonts.dir so NixOS xorg module adds to fp
|
||||
${mkfontscale}/bin/mkfontdir "$d"
|
||||
${xorg.mkfontscale}/bin/mkfontdir "$d"
|
||||
'';
|
||||
sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fontforge, mkfontscale }:
|
||||
{ lib, stdenv, fetchurl, fontforge, xorg }:
|
||||
|
||||
let
|
||||
version = "1.11";
|
||||
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fontforge mkfontscale ];
|
||||
nativeBuildInputs = [ fontforge xorg.mkfontscale ];
|
||||
|
||||
unpackPhase = ''
|
||||
tar -xzf $src --strip-components=1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, mkfontscale, lib, stdenv }:
|
||||
{ fetchFromGitHub, xorg, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tamzen-font";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mkfontscale ];
|
||||
nativeBuildInputs = [ xorg.mkfontscale ];
|
||||
|
||||
installPhase = ''
|
||||
install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, python3
|
||||
, bdftopcf, mkfontscale
|
||||
, bdftopcf, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[ python3 bdftopcf mkfontscale ];
|
||||
[ python3 bdftopcf xorg.mkfontscale ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3
|
||||
, bdftopcf, mkfontscale
|
||||
, libfaketime, fonttosfnt
|
||||
, bdftopcf, xorg
|
||||
, libfaketime,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ python3 bdftopcf mkfontscale
|
||||
libfaketime fonttosfnt
|
||||
[ python3 bdftopcf xorg.mkfontscale
|
||||
libfaketime xorg.fonttosfnt
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, bdftopcf
|
||||
, libfaketime, fonttosfnt, mkfontscale
|
||||
, libfaketime, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -24,8 +24,8 @@ stdenv.mkDerivation {
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs =
|
||||
[ bdftopcf libfaketime fonttosfnt
|
||||
mkfontscale
|
||||
[ bdftopcf libfaketime xorg.fonttosfnt
|
||||
xorg.mkfontscale
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, perl, kbd, bdftopcf
|
||||
, libfaketime, fonttosfnt, mkfontscale
|
||||
, libfaketime, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs =
|
||||
[ bdftopcf libfaketime
|
||||
fonttosfnt mkfontscale
|
||||
xorg.fonttosfnt xorg.mkfontscale
|
||||
] ++ lib.optionals stdenv.isLinux [ perl kbd ];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, mkfontscale
|
||||
, libfaketime, fonttosfnt
|
||||
{ lib, stdenv, fetchurl, xorg
|
||||
, libfaketime
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, perl
|
||||
, bdftopcf, bdf2psf, mkfontdir
|
||||
, fonttosfnt
|
||||
, bdftopcf, bdf2psf, xorg
|
||||
, targetsDat ? null
|
||||
, variantsDat ? null
|
||||
}:
|
||||
@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# remove for version >1.3
|
||||
patches = [ ./determinism.patch ];
|
||||
|
||||
nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ];
|
||||
nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ];
|
||||
|
||||
# configure sizes, encodings and variants
|
||||
preConfigure =
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, vala
|
||||
, meson
|
||||
@ -11,7 +12,8 @@
|
||||
, wrapGAppsHook
|
||||
, itstool
|
||||
, gnupg
|
||||
, libsoup
|
||||
, desktop-file-utils
|
||||
, libsoup_3
|
||||
, gnome
|
||||
, gpgme
|
||||
, python3
|
||||
@ -27,11 +29,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seahorse";
|
||||
version = "42.0";
|
||||
version = "43.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA=";
|
||||
hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
openssh
|
||||
gnupg
|
||||
desktop-file-utils
|
||||
gcr
|
||||
# error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories
|
||||
# TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset
|
||||
@ -60,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
gpgme
|
||||
libsecret
|
||||
avahi
|
||||
libsoup
|
||||
libsoup_3
|
||||
p11-kit
|
||||
openldap
|
||||
libpwquality
|
||||
@ -70,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/
|
||||
patchShebangs build-aux/gpg_check_version.py
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "closure-compiler";
|
||||
version = "20220905";
|
||||
version = "20221004";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
|
||||
sha256 = "sha256-+1f6ILeoMO+6a+uL3y95PAbcyr2KXh0yMQfzsUcCg0E=";
|
||||
sha256 = "sha256-r2m5nfNWg5aGJBRLVZwmgilpgc4epLWY4qx34pRIi6Q=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -72,18 +72,27 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.20";
|
||||
version = "0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-0oDF6wLcWlDG2hWFjIL+oQmICQl/H6YAwDzgTiuF298=";
|
||||
hash = "sha256-us4GiulqkzcwD2iuNXB5eTd3iqgUdvj9Nd2p/9TJerQ=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ pkg-config bison flex ];
|
||||
buildInputs = [ tcl readline libffi python3 protobuf zlib ];
|
||||
buildInputs = [
|
||||
tcl
|
||||
readline
|
||||
libffi
|
||||
protobuf
|
||||
zlib
|
||||
(python3.withPackages (pp: with pp; [
|
||||
click
|
||||
]))
|
||||
];
|
||||
|
||||
makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
|
||||
|
||||
|
||||
@ -1,6 +1,15 @@
|
||||
{ pkgs }:
|
||||
|
||||
with pkgs;
|
||||
{ __splicedPackages
|
||||
, callPackage
|
||||
, config
|
||||
, darwin
|
||||
, db
|
||||
, lib
|
||||
, libffiBoot
|
||||
, newScope
|
||||
, pythonPackagesExtensions
|
||||
, splicePackages
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
(let
|
||||
|
||||
@ -79,11 +88,11 @@ with pkgs;
|
||||
extra = _: {};
|
||||
optionalExtensions = cond: as: if cond then as else [];
|
||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]);
|
||||
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pythonPackagesExtensions ++ [ overrides ]);
|
||||
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
|
||||
in lib.makeScopeWithSplicing
|
||||
pkgs.splicePackages
|
||||
pkgs.newScope
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
@ -150,7 +159,7 @@ with pkgs;
|
||||
in {
|
||||
|
||||
python27 = callPackage ./cpython/2.7 {
|
||||
self = python27;
|
||||
self = __splicedPackages.python27;
|
||||
sourceVersion = {
|
||||
major = "2";
|
||||
minor = "7";
|
||||
@ -163,7 +172,7 @@ in {
|
||||
};
|
||||
|
||||
python37 = callPackage ./cpython {
|
||||
self = python37;
|
||||
self = __splicedPackages.python37;
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "7";
|
||||
@ -176,7 +185,7 @@ in {
|
||||
};
|
||||
|
||||
python38 = callPackage ./cpython {
|
||||
self = python38;
|
||||
self = __splicedPackages.python38;
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
@ -189,19 +198,19 @@ in {
|
||||
};
|
||||
|
||||
python39 = callPackage ./cpython ({
|
||||
self = python39;
|
||||
self = __splicedPackages.python39;
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
} // sources.python39);
|
||||
|
||||
python310 = callPackage ./cpython ({
|
||||
self = python310;
|
||||
self = __splicedPackages.python310;
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
} // sources.python310);
|
||||
|
||||
python311 = callPackage ./cpython {
|
||||
self = python311;
|
||||
self = __splicedPackages.python311;
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "11";
|
||||
@ -215,7 +224,7 @@ in {
|
||||
|
||||
# Minimal versions of Python (built without optional dependencies)
|
||||
python3Minimal = (callPackage ./cpython ({
|
||||
self = python3Minimal;
|
||||
self = __splicedPackages.python3Minimal;
|
||||
inherit passthruFun;
|
||||
pythonAttr = "python3Minimal";
|
||||
# strip down that python version as much as possible
|
||||
@ -226,7 +235,7 @@ in {
|
||||
sqlite = null;
|
||||
configd = null;
|
||||
tzdata = null;
|
||||
libffi = pkgs.libffiBoot; # without test suite
|
||||
libffi = libffiBoot; # without test suite
|
||||
stripConfig = true;
|
||||
stripIdlelib = true;
|
||||
stripTests = true;
|
||||
@ -244,7 +253,7 @@ in {
|
||||
});
|
||||
|
||||
pypy27 = callPackage ./pypy {
|
||||
self = pypy27;
|
||||
self = __splicedPackages.pypy27;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
@ -253,14 +262,14 @@ in {
|
||||
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
|
||||
pythonVersion = "2.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
python = __splicedPackages.python27;
|
||||
inherit passthruFun;
|
||||
inherit (darwin) libunwind;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
pypy38 = callPackage ./pypy {
|
||||
self = pypy38;
|
||||
self = __splicedPackages.pypy38;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
@ -269,20 +278,20 @@ in {
|
||||
sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY=";
|
||||
pythonVersion = "3.8";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
python = __splicedPackages.python27;
|
||||
inherit passthruFun;
|
||||
inherit (darwin) libunwind;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
pypy37 = pypy38.override {
|
||||
self = pythonInterpreters.pypy37;
|
||||
pypy37 = __splicedPackages.pypy38.override {
|
||||
self = __splicedPackages.pythonInterpreters.pypy37;
|
||||
pythonVersion = "3.7";
|
||||
sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc=";
|
||||
};
|
||||
|
||||
pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
|
||||
# Not included at top-level
|
||||
self = pythonInterpreters.pypy27_prebuilt;
|
||||
self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
@ -295,7 +304,7 @@ in {
|
||||
|
||||
pypy38_prebuilt = callPackage ./pypy/prebuilt.nix {
|
||||
# Not included at top-level
|
||||
self = pythonInterpreters.pypy38_prebuilt;
|
||||
self = __splicedPackages.pythonInterpreters.pypy38_prebuilt;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postgresql-jdbc";
|
||||
version = "42.2.20";
|
||||
version = "42.5.0";
|
||||
|
||||
src = fetchMavenArtifact {
|
||||
artifactId = "postgresql";
|
||||
groupId = "org.postgresql";
|
||||
sha256 = "0kjilsrz9shymfki48kg1q84la1870ixlh2lnfw347x8mqw2k2vh";
|
||||
sha256 = "sha256-pNGLWrGuuShaixezZfQk8mhEUinKv45BIRXbYVK33uM=";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysofa";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg=";
|
||||
sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation (rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
|
||||
homepage = "https://www.oracle.com/database/technologies/related/berkeleydb.html";
|
||||
description = "Berkeley DB";
|
||||
license = license;
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcr";
|
||||
version = "3.92.0";
|
||||
version = "4.0.0";
|
||||
|
||||
outputs = [ "out" "bin" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "iWq/jh2w9A6ygHPzZPNqcjhayKv4zRNisQFul3If9Rg=";
|
||||
sha256 = "xFhVkk8O57q0Pi3Ti/r9KsgVxumGQ0HAFh4XEXPc7Hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,10 +10,7 @@
|
||||
, gobject-introspection
|
||||
, grail
|
||||
, gtk3
|
||||
, libX11
|
||||
, libXext
|
||||
, libXi
|
||||
, libXtst
|
||||
, xorg
|
||||
, pango
|
||||
, xorgserver
|
||||
}:
|
||||
@ -38,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
|
||||
buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
|
||||
gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
|
||||
gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "22.5.3";
|
||||
version = "22.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
sha256 = "sha256-oWwES0XKjhVGPVsPo4t9WWorm+4J6lMPa+/pSY7r6I0=";
|
||||
sha256 = "sha256-f9b0+BWUlekMM0huPdJ5Ms4tYr/ipgfLiQ310FQKAXA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -3,8 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, imlib2
|
||||
, libX11
|
||||
, libXext
|
||||
, xorg
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, zlib
|
||||
@ -32,8 +31,8 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
(imlib2.override { inherit x11Support; })
|
||||
] ++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXext
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
@ -2,22 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcdr";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
|
||||
hash = "sha256-VmYknWE0ZrmqHph+pBCcBDZYZuknfYD2zZZj6GuOzdQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with icu 68
|
||||
# Remove in next release
|
||||
(fetchpatch {
|
||||
name = "libcdr-fix-icu-68";
|
||||
url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894";
|
||||
sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k";
|
||||
})
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
|
||||
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ fetchurl
|
||||
{ fetchFromGitLab
|
||||
, lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, gtk-doc
|
||||
, pkg-config
|
||||
, intltool
|
||||
, gettext
|
||||
@ -21,12 +23,26 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "libgsf";
|
||||
rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-6RP2DJWcDQ8dkKtcPxAkRsS7jSvvLoDNZHXiDJwR8Eg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix cross-compilation
|
||||
substituteInPlace configure.ac \
|
||||
--replace "AC_PATH_PROG(PKG_CONFIG, pkg-config, no)" \
|
||||
"PKG_PROG_PKG_CONFIG"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gtk-doc
|
||||
pkg-config
|
||||
intltool
|
||||
libintl
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnats";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats.c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NtZjAXwp1JraoWsB750itKv1b+cfLwbr4XuxgIuZ+8A=";
|
||||
sha256 = "sha256-Mbmd1bhFnc4feC0bnOa5mD15DxvY4Sgftx3Ep/7Cdp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cctools
|
||||
, autoSignDarwinBinariesHook
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,7 +19,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
|
||||
nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ]
|
||||
++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://liquidsdr.org/";
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
|
||||
sha256 = "sha256-9HJZFsIs9RSWnvsVw8IHIz1kc5OD99QpVgOLePbK6Mg=";
|
||||
sha256 = "sha256-/oL+hBYIJmrBWlwRGCFtoAxVTVAG4odaisN1Kx5q3Hk=";
|
||||
};
|
||||
pname = "libosip2";
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, wxGTK32
|
||||
, Cocoa
|
||||
, enableXWin ? false
|
||||
, libX11
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optional enableWX wxGTK32
|
||||
++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
|
||||
++ lib.optional enableXWin libX11;
|
||||
++ lib.optional enableXWin xorg.libX11;
|
||||
|
||||
passthru = {
|
||||
inherit (xorg) libX11;
|
||||
inherit
|
||||
enableWX
|
||||
enableXWin
|
||||
libX11
|
||||
;
|
||||
};
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipopt";
|
||||
version = "3.14.9";
|
||||
version = "3.14.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Ipopt";
|
||||
rev = "releases/${version}";
|
||||
sha256 = "sha256-mlRr1BjkWiJZSgpxQIc0k1tXGewJkHwxf6xe0edUHaY=";
|
||||
sha256 = "sha256-4SHmqalrGeqp1nBx2BQLRnRWEYw5lJk5Yao67GQw3qM=";
|
||||
};
|
||||
|
||||
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
|
||||
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||
, libpng, ffmpeg_4, xcbutilrenderutil, seatd
|
||||
, libcap, mesa, xorg
|
||||
, libpng, ffmpeg_4, seatd
|
||||
|
||||
, enableXWayland ? true, xwayland ? null
|
||||
}:
|
||||
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg_4 xcbutilrenderutil seatd
|
||||
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
|
||||
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland
|
||||
;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
|
||||
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||
, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang
|
||||
,libcap, mesa, xorg
|
||||
, libpng, ffmpeg_4, seatd, vulkan-loader, glslang
|
||||
, nixosTests
|
||||
|
||||
, enableXWayland ? true, xwayland ? null
|
||||
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader
|
||||
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
|
||||
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland
|
||||
;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.118";
|
||||
version = "0.6.119";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nUhVHVjhrZm+Y/kIF3D85orm/EECug2xYSpcItYCThU=";
|
||||
sha256 = "sha256-IYFVju7OcCxdFJKWK6TiXPt4p16oiTuBi51gfpi9tAE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, lndir, newlib, msp430GccSupport }:
|
||||
{ stdenvNoCC, xorg, newlib, msp430GccSupport }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "msp430-${newlib.name}";
|
||||
@ -10,9 +10,9 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
buildCommand = ''
|
||||
mkdir $out
|
||||
${lndir}/bin/lndir -silent $newlib $out
|
||||
${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
|
||||
${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
|
||||
${xorg.lndir}/bin/lndir -silent $newlib $out
|
||||
${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
|
||||
${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user