mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c86ce50258
56
.github/workflows/rebase-staging.yml
vendored
Normal file
56
.github/workflows/rebase-staging.yml
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
on:
|
||||
issue_comment:
|
||||
types:
|
||||
- created
|
||||
|
||||
# This action allows people with write access to the repo to rebase a PRs base branch from
|
||||
# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications.
|
||||
|
||||
jobs:
|
||||
rebase:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging')
|
||||
steps:
|
||||
- uses: scherermichael-oss/action-has-permission@1.0.6
|
||||
id: check-write-access
|
||||
with:
|
||||
required-permission: write
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: check base branch is master
|
||||
if: steps.check-write-access.outputs.has-permission
|
||||
run: |
|
||||
if [ "$(curl https://api.github.com/repos/NixOS/nixpkgs/pulls/${{ github.event.issue.number }} | jq -r '.base.ref')" != "master" ]; then
|
||||
echo "This action only works when the current base branch is master."
|
||||
exit 1
|
||||
fi
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
if: steps.check-write-access.outputs.has-permission
|
||||
- name: rebase pull request
|
||||
if: steps.check-write-access.outputs.has-permission
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PULL_REQUEST: ${{ github.event.issue.number }}
|
||||
run: |
|
||||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config --global user.name "github-actions[bot]"
|
||||
git fetch origin
|
||||
gh pr checkout "$PULL_REQUEST"
|
||||
git rebase \
|
||||
--onto="$(git merge-base origin/master origin/staging)" \
|
||||
"HEAD~$(git rev-list --count HEAD ^master)"
|
||||
git push --force
|
||||
curl \
|
||||
-X POST \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
-H "Authorization: token $GITHUB_TOKEN" \
|
||||
-d '{ "base": "staging" }' \
|
||||
"https://api.github.com/repos/NixOS/nixpkgs/pulls/$PULL_REQUEST"
|
||||
- uses: peter-evans/create-or-update-comment@v1
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: ${{ github.event.issue.number }}
|
||||
body: |
|
||||
[Failed to rebase on `staging`](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }})
|
||||
@ -26,5 +26,11 @@ in {
|
||||
if cfg.extraConfig != ""
|
||||
then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig
|
||||
else "${pkgs.throttled}/etc/lenovo_fix.conf";
|
||||
|
||||
# Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs.
|
||||
# See https://github.com/erpalma/throttled/issues/215
|
||||
boot.kernelParams =
|
||||
optional (versionAtLeast config.boot.kernelPackages.kernel.version "5.9")
|
||||
"msr.allow_writes=on";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
xcfg = config.services.xserver;
|
||||
dmcfg = xcfg.displayManager;
|
||||
cfg = dmcfg.sddm;
|
||||
@ -11,87 +9,86 @@ let
|
||||
|
||||
sddm = pkgs.libsForQt5.sddm;
|
||||
|
||||
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
|
||||
#!/bin/sh
|
||||
iniFmt = pkgs.formats.ini { };
|
||||
|
||||
xserverWrapper = pkgs.writeShellScript "xserver-wrapper" ''
|
||||
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
|
||||
exec systemd-cat -t xserver-wrapper ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@"
|
||||
'';
|
||||
|
||||
Xsetup = pkgs.writeScript "Xsetup" ''
|
||||
#!/bin/sh
|
||||
Xsetup = pkgs.writeShellScript "Xsetup" ''
|
||||
${cfg.setupScript}
|
||||
${dmcfg.setupCommands}
|
||||
'';
|
||||
|
||||
Xstop = pkgs.writeScript "Xstop" ''
|
||||
#!/bin/sh
|
||||
Xstop = pkgs.writeShellScript "Xstop" ''
|
||||
${cfg.stopScript}
|
||||
'';
|
||||
|
||||
cfgFile = pkgs.writeText "sddm.conf" ''
|
||||
[General]
|
||||
HaltCommand=/run/current-system/systemd/bin/systemctl poweroff
|
||||
RebootCommand=/run/current-system/systemd/bin/systemctl reboot
|
||||
${optionalString cfg.autoNumlock ''
|
||||
Numlock=on
|
||||
''}
|
||||
defaultConfig = {
|
||||
General = {
|
||||
HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff";
|
||||
RebootCommand = "/run/current-system/systemd/bin/systemctl reboot";
|
||||
Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none
|
||||
};
|
||||
|
||||
[Theme]
|
||||
Current=${cfg.theme}
|
||||
ThemeDir=/run/current-system/sw/share/sddm/themes
|
||||
FacesDir=/run/current-system/sw/share/sddm/faces
|
||||
Theme = {
|
||||
Current = cfg.theme;
|
||||
ThemeDir = "/run/current-system/sw/share/sddm/themes";
|
||||
FacesDir = "/run/current-system/sw/share/sddm/faces";
|
||||
};
|
||||
|
||||
[Users]
|
||||
MaximumUid=${toString config.ids.uids.nixbld}
|
||||
HideUsers=${concatStringsSep "," dmcfg.hiddenUsers}
|
||||
HideShells=/run/current-system/sw/bin/nologin
|
||||
Users = {
|
||||
MaximumUid = config.ids.uids.nixbld;
|
||||
HideUsers = concatStringsSep "," dmcfg.hiddenUsers;
|
||||
HideShells = "/run/current-system/sw/bin/nologin";
|
||||
};
|
||||
|
||||
[X11]
|
||||
MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)}
|
||||
ServerPath=${xserverWrapper}
|
||||
XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr
|
||||
SessionCommand=${dmcfg.sessionData.wrapper}
|
||||
SessionDir=${dmcfg.sessionData.desktops}/share/xsessions
|
||||
XauthPath=${pkgs.xorg.xauth}/bin/xauth
|
||||
DisplayCommand=${Xsetup}
|
||||
DisplayStopCommand=${Xstop}
|
||||
EnableHidpi=${boolToString cfg.enableHidpi}
|
||||
X11 = {
|
||||
MinimumVT = if xcfg.tty != null then xcfg.tty else 7;
|
||||
ServerPath = toString xserverWrapper;
|
||||
XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr";
|
||||
SessionCommand = toString dmcfg.sessionData.wrapper;
|
||||
SessionDir = "${dmcfg.sessionData.desktops}/share/xsessions";
|
||||
XauthPath = "${pkgs.xorg.xauth}/bin/xauth";
|
||||
DisplayCommand = toString Xsetup;
|
||||
DisplayStopCommand = toString Xstop;
|
||||
EnableHiDPI = cfg.enableHidpi;
|
||||
};
|
||||
|
||||
[Wayland]
|
||||
EnableHidpi=${boolToString cfg.enableHidpi}
|
||||
SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions
|
||||
Wayland = {
|
||||
EnableHiDPI = cfg.enableHidpi;
|
||||
SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions";
|
||||
};
|
||||
} // lib.optionalAttrs dmcfg.autoLogin.enable {
|
||||
Autologin = {
|
||||
User = dmcfg.autoLogin.user;
|
||||
Session = autoLoginSessionName;
|
||||
Relogin = cfg.autoLogin.relogin;
|
||||
};
|
||||
};
|
||||
|
||||
${optionalString dmcfg.autoLogin.enable ''
|
||||
[Autologin]
|
||||
User=${dmcfg.autoLogin.user}
|
||||
Session=${autoLoginSessionName}.desktop
|
||||
Relogin=${boolToString cfg.autoLogin.relogin}
|
||||
''}
|
||||
cfgFile =
|
||||
iniFmt.generate "sddm.conf" (lib.recursiveUpdate defaultConfig cfg.settings);
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
autoLoginSessionName = dmcfg.sessionData.autologinSession;
|
||||
autoLoginSessionName =
|
||||
"${dmcfg.sessionData.autologinSession}.desktop";
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
|
||||
(mkRemovedOptionModule
|
||||
[ "services" "xserver" "displayManager" "sddm" "themes" ]
|
||||
"Set the option `services.xserver.displayManager.sddm.package' instead.")
|
||||
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "enable" ] [
|
||||
"services"
|
||||
"xserver"
|
||||
"displayManager"
|
||||
"autoLogin"
|
||||
"enable"
|
||||
])
|
||||
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ] [
|
||||
"services"
|
||||
"xserver"
|
||||
"displayManager"
|
||||
"autoLogin"
|
||||
"user"
|
||||
])
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "sddm" "autoLogin" "enable" ]
|
||||
[ "services" "xserver" "displayManager" "autoLogin" "enable" ])
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ]
|
||||
[ "services" "xserver" "displayManager" "autoLogin" "user" ])
|
||||
(mkRemovedOptionModule
|
||||
[ "services" "xserver" "displayManager" "sddm" "extraConfig" ]
|
||||
"Set the option `services.xserver.displayManager.sddm.settings' instead.")
|
||||
];
|
||||
|
||||
options = {
|
||||
@ -110,22 +107,22 @@ in
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable automatic HiDPI mode.
|
||||
</para>
|
||||
<para>
|
||||
Versions up to 0.17 are broken so this only works from 0.18 onwards.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
settings = mkOption {
|
||||
type = iniFmt.type;
|
||||
default = { };
|
||||
example = ''
|
||||
[Autologin]
|
||||
User=john
|
||||
Session=plasma.desktop
|
||||
{
|
||||
Autologin = {
|
||||
User = "john";
|
||||
Session = "plasma.desktop";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Extra lines appended to the configuration of SDDM.
|
||||
Extra settings merged in and overwritting defaults in sddm.conf.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -168,28 +165,38 @@ in
|
||||
};
|
||||
|
||||
# Configuration for automatic login specific to SDDM
|
||||
autoLogin.relogin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If true automatic login will kick in again on session exit (logout), otherwise it
|
||||
will only log in automatically when the display-manager is started.
|
||||
'';
|
||||
autoLogin = {
|
||||
relogin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If true automatic login will kick in again on session exit (logout), otherwise it
|
||||
will only log in automatically when the display-manager is started.
|
||||
'';
|
||||
};
|
||||
|
||||
minimumUid = mkOption {
|
||||
type = types.ints.u16;
|
||||
default = 1000;
|
||||
description = ''
|
||||
Minimum user ID for auto-login user.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{ assertion = xcfg.enable;
|
||||
{
|
||||
assertion = xcfg.enable;
|
||||
message = ''
|
||||
SDDM requires services.xserver.enable to be true
|
||||
'';
|
||||
}
|
||||
{ assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null;
|
||||
{
|
||||
assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null;
|
||||
message = ''
|
||||
SDDM auto-login requires that services.xserver.displayManager.defaultSession is set.
|
||||
'';
|
||||
@ -230,7 +237,7 @@ in
|
||||
|
||||
sddm-autologin.text = ''
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_succeed_if.so uid >= 1000 quiet
|
||||
auth required pam_succeed_if.so uid >= ${toString cfg.autoLogin.minimumUid} quiet
|
||||
auth required pam_permit.so
|
||||
|
||||
account include sddm
|
||||
|
||||
@ -2,21 +2,18 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mopidy-tunein";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-TuneIn";
|
||||
sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj";
|
||||
sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mopidy
|
||||
];
|
||||
|
||||
# tests fail with "ValueError: Namespace Gst not available" in mopidy itself
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mopidy_tunein.tunein" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
|
||||
, libcanberra-gtk3, gnome3, wrapGAppsHook }:
|
||||
{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio,
|
||||
gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pavucontrol";
|
||||
@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Can be removed with the next version bump
|
||||
# https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20
|
||||
(fetchpatch {
|
||||
name = "streamwidget-fix-drop-down-wayland.patch";
|
||||
url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch";
|
||||
sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj";
|
||||
})];
|
||||
|
||||
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3
|
||||
gnome3.adwaita-icon-theme ];
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.26_fix";
|
||||
version = "1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8";
|
||||
sha256 = "1hg36pfzgdbhd5bkzi3cpn6v39q8xis2jk7w6qm615r587393pwd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -260,7 +260,7 @@ rec {
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip";
|
||||
sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";
|
||||
sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -27,3 +27,11 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/"
|
||||
VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable"
|
||||
VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL})
|
||||
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
|
||||
|
||||
VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable"
|
||||
VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL})
|
||||
sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix"
|
||||
|
||||
VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable"
|
||||
VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL})
|
||||
sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix"
|
||||
|
||||
@ -19,10 +19,18 @@ fi
|
||||
VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}')
|
||||
sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL})
|
||||
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL})
|
||||
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
|
||||
VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL})
|
||||
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
|
||||
VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL})
|
||||
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL})
|
||||
sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL})
|
||||
sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
@ -6,6 +6,8 @@ let
|
||||
plat = {
|
||||
x86_64-linux = "linux-x64";
|
||||
x86_64-darwin = "darwin";
|
||||
aarch64-linux = "linux-arm64";
|
||||
armv7l-linux = "linux-armhf";
|
||||
}.${system};
|
||||
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
@ -13,6 +15,8 @@ let
|
||||
sha256 = {
|
||||
x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c";
|
||||
x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r";
|
||||
aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8";
|
||||
armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -52,6 +56,6 @@ in
|
||||
downloadPage = "https://code.visualstudio.com/Updates";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ eadwu synthetica ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,18 +6,24 @@ let
|
||||
plat = {
|
||||
x86_64-linux = "linux-x64";
|
||||
x86_64-darwin = "darwin";
|
||||
aarch64-linux = "linux-arm64";
|
||||
armv7l-linux = "linux-armhf";
|
||||
}.${system};
|
||||
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb";
|
||||
x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv";
|
||||
x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b";
|
||||
x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd";
|
||||
aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal";
|
||||
armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
x86_64-linux = ".";
|
||||
x86_64-darwin = "";
|
||||
aarch64-linux = ".";
|
||||
armv7l-linux = ".";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -27,7 +33,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.51.1";
|
||||
version = "1.52.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
@ -55,6 +61,6 @@ in
|
||||
downloadPage = "https://github.com/VSCodium/vscodium/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ synthetica turion ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "7.37";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8";
|
||||
sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
@ -37,7 +37,7 @@ mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ womfoo sikmir ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp
|
||||
index 10e84d5..1e0abbe 100644
|
||||
index 37e9d3f..d4a065c 100644
|
||||
--- i/src/GUI/app.cpp
|
||||
+++ w/src/GUI/app.cpp
|
||||
@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
|
||||
installTranslator(gpxsee);
|
||||
@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
|
||||
installTranslator(gpxsee);
|
||||
|
||||
QTranslator *qt = new QTranslator(this);
|
||||
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
|
||||
+#if defined(Q_OS_WIN32)
|
||||
qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir());
|
||||
if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
|
||||
#else // Q_OS_WIN32 || Q_OS_MAC
|
||||
- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
|
||||
- QLibraryInfo::TranslationsPath));
|
||||
+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"));
|
||||
- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
|
||||
- QLibraryInfo::TranslationsPath)))
|
||||
+ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")))
|
||||
#endif // Q_OS_WIN32 || Q_OS_MAC
|
||||
installTranslator(qt);
|
||||
installTranslator(qt);
|
||||
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2020.11";
|
||||
version = "2020.12";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4";
|
||||
sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -47,6 +47,6 @@ in stdenv.mkDerivation rec {
|
||||
"An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
|
||||
platforms = intersectLists platforms.x86_64 platforms.linux;
|
||||
license = licenses.agpl3;
|
||||
maintainers = [ maintainers.contrun ];
|
||||
maintainers = with maintainers; [ contrun neonfuz];
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.2.4";
|
||||
version = "4.2.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -175,13 +175,12 @@ mkDerivation rec {
|
||||
ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
|
||||
mkdir -p $out/share/linphone
|
||||
ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
|
||||
mkdir $out/lib # prevent warning
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.linphone.org/";
|
||||
description = "Open source SIP phone for voice/video calls and instant messaging";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -38,6 +38,8 @@ let
|
||||
|
||||
ghq = callPackage ./ghq { };
|
||||
|
||||
ghr = callPackage ./ghr { };
|
||||
|
||||
git = appendToName "minimal" gitBase;
|
||||
|
||||
git-absorb = callPackage ./git-absorb {
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghr";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tcnksm";
|
||||
repo = "ghr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a";
|
||||
};
|
||||
|
||||
vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj";
|
||||
|
||||
# Tests require a Github API token, and networking
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/ghr --version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tcnksm/ghr";
|
||||
description = "Upload multiple artifacts to GitHub Release in parallel";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
@ -8,11 +8,11 @@ with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9";
|
||||
sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }:
|
||||
|
||||
with lib;
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoPackage
|
||||
, btrfs-progs
|
||||
, go-md2man
|
||||
, installShellFiles
|
||||
, util-linux
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "containerd";
|
||||
version = "1.4.3";
|
||||
# git commit for the above version's tag
|
||||
commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
@ -22,29 +26,32 @@ buildGoPackage rec {
|
||||
|
||||
buildInputs = [ btrfs-progs ];
|
||||
|
||||
buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ];
|
||||
buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ];
|
||||
|
||||
BUILDTAGS = []
|
||||
++ optional (btrfs-progs == null) "no_btrfs";
|
||||
BUILDTAGS = [ ]
|
||||
++ lib.optional (btrfs-progs == null) "no_btrfs";
|
||||
|
||||
buildPhase = ''
|
||||
cd go/src/${goPackagePath}
|
||||
patchShebangs .
|
||||
make binaries $buildFlags
|
||||
make binaries man $buildFlags
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
for b in bin/*; do
|
||||
install -Dm555 $b $out/$b
|
||||
done
|
||||
|
||||
make man
|
||||
install -Dm555 bin/* -t $out/bin
|
||||
installManPage man/*.[1-9]
|
||||
'';
|
||||
|
||||
# completion installed separately so it can be overridden in docker
|
||||
# can be moved to installPhase when docker uses containerd >= 1.4
|
||||
postInstall = ''
|
||||
installShellFiles --bash contrib/autocomplete/ctr
|
||||
installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) docker; };
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://containerd.io/";
|
||||
description = "A daemon to control runC";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -41,6 +41,8 @@ rec {
|
||||
rev = containerdRev;
|
||||
sha256 = containerdSha256;
|
||||
};
|
||||
# disable completion, can be removed when docker uses containerd >= 1.4
|
||||
postInstall = [];
|
||||
# This should be removed once Docker uses containerd >=1.4
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig;
|
||||
buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp;
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "2.210";
|
||||
version = "2.221";
|
||||
in
|
||||
fetchzip {
|
||||
name = "JetBrainsMono-${version}";
|
||||
|
||||
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
|
||||
|
||||
sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill";
|
||||
sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A typeface made for developers";
|
||||
homepage = "https://jetbrains.com/mono/";
|
||||
changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md";
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
|
||||
26
pkgs/data/fonts/meslo-lgs-nf/default.nix
Normal file
26
pkgs/data/fonts/meslo-lgs-nf/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meslo-lgs-nf";
|
||||
version = "2020-03-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k-media";
|
||||
rev = "32c7d40239c93507277f14522be90b5750f442c9";
|
||||
sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp $src/*.ttf $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Meslo Nerd Font patched for Powerlevel10k";
|
||||
homepage = "https://github.com/romkatv/powerlevel10k-media";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -26,15 +26,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Meson 0.55
|
||||
# https://gitlab.gnome.org/GNOME/iagno/-/issues/16
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch";
|
||||
sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -1,42 +1,28 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcg729";
|
||||
version = "1.0.4";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BelledonneCommunications";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
owner = "public";
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "05s0c5ps3a763y0v34wg5zghj0cdjnq4ch7g81848xxry7q90fwa";
|
||||
sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BelledonneCommunications/bcg729/commit/a5907daf1b111e4ad7aab4f558f57e2af1e37e55.patch";
|
||||
sha256 = "0445syfwj4w4chh8ak80rq77iqcr27924n1ld5snshk3d21nxd64";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BelledonneCommunications/bcg729/commit/697bf6653a8c7421f0e821ee8d42471246e6850f.patch";
|
||||
sha256 = "1h3gf5sj2sg5cs5iv1lcav3lkqmd5jf4agvjzz83l89wd5f5hp5l";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BelledonneCommunications/bcg729/commit/d63ce04a93711820d9a6985b1d11d8d91ed8e6b6.patch";
|
||||
sha256 = "1piwf63ci2gma6jd6b4adkvxirysvazf0vklb5pc6vx1g93nkgxs";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec";
|
||||
homepage = "https://linphone.org/technical-corner/bcg729";
|
||||
changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ c0bw3b ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bctoolbox";
|
||||
version = "4.4.13";
|
||||
version = "4.4.21";
|
||||
|
||||
nativeBuildInputs = [ cmake bcunit ];
|
||||
buildInputs = [ mbedtls ];
|
||||
@ -30,9 +30,7 @@ stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
description = "Utilities library for Linphone";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
|
||||
# Still using GPLv2 but as the rest of the Linphone projects have switched
|
||||
# to GPLv3, this might too, so check this when bumping the version number.
|
||||
license = licenses.gpl3Only;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ raskin jluttine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ library to manipulate VCard standard format";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/belcard";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belle-sip";
|
||||
version = "4.4.13";
|
||||
version = "4.4.21";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0";
|
||||
sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake antlr3_4 ];
|
||||
nativeBuildInputs = [ antlr3_4 cmake ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://linphone.org/technical-corner/belle-sip";
|
||||
description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -6,17 +6,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belr";
|
||||
# Using master branch for linphone-desktop caused a chain reaction that many
|
||||
# of its dependencies needed to use master branch too.
|
||||
version = "unstable-2020-03-09";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
owner = "public";
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5";
|
||||
sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v";
|
||||
rev = version;
|
||||
sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox ];
|
||||
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Belledonne Communications' language recognition library";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/belr";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzrtp";
|
||||
version = "4.4.0";
|
||||
version = "4.4.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "An opensource implementation of ZRTP keys exchange protocol";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
|
||||
# They have switched to GPLv3 on git HEAD so probably the next release will
|
||||
# be GPL3.
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.linphone.org/technical-corner/liblinphone";
|
||||
description = "Library for SIP calls and instant messaging";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, libtool
|
||||
, openssl
|
||||
, expat
|
||||
, pkg-config
|
||||
, check
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmesode";
|
||||
version = "0.9.3";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boothj5";
|
||||
owner = "profanity-im";
|
||||
repo = "libmesode";
|
||||
rev = version;
|
||||
sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0";
|
||||
sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-ssl-certificate-verification.diff";
|
||||
url = "https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1.diff";
|
||||
sha256 = "140jp7xzskik0sb6aqjsw7z477a124cxl7dkm80m2nyzjng4pzg5";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ openssl expat libtool check ];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client";
|
||||
longDescription = ''
|
||||
Reasons for forking:
|
||||
@ -39,9 +39,10 @@ stdenv.mkDerivation rec {
|
||||
Whilst Profanity will run against libstrophe, libmesode provides extra
|
||||
TLS functionality such as manual SSL certificate verification.
|
||||
'';
|
||||
homepage = "https://github.com/boothj5/libmesode/";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.devhell ];
|
||||
homepage = "https://github.com/profanity-im/libmesode/";
|
||||
license = with licenses; [ gpl3Only mit];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ devhell ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Real-Time Transport Protocol (RFC3550) stack";
|
||||
homepage = "https://linphone.org/technical-corner/ortp";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
28
pkgs/development/python-modules/pysychonaut/default.nix
Normal file
28
pkgs/development/python-modules/pysychonaut/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, requests, requests-cache, beautifulsoup4 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PySychonaut";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wgk445gmi0x7xmd8qvnyxy1ka0n72fr6nrhzdm29q6687dqyi7h";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py --replace "bs4" "beautifulsoup4"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ requests requests-cache beautifulsoup4 ];
|
||||
|
||||
# No tests available
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pysychonaut" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial python api for Erowid, PsychonautWiki and AskTheCaterpillar";
|
||||
homepage = "https://github.com/OpenJarbas/PySychonaut";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
22
pkgs/development/tools/misc/mdctags/default.nix
Normal file
22
pkgs/development/tools/misc/mdctags/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "mdctags";
|
||||
version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wsdjeg";
|
||||
repo = "mdctags.rs";
|
||||
rev = "0ed9736ea0c77e6ff5b560dda46f5ed0a983ed82";
|
||||
sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb";
|
||||
};
|
||||
|
||||
cargoSha256 = "01ap2w755vbr01nfqc5185mr2w9y32g0d4ahc3lw2x3m8qv0bh6x";
|
||||
|
||||
meta = {
|
||||
description = "tags for markdown file";
|
||||
homepage = "https://github.com/wsdjeg/mdctags.rs";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pacien ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage {
|
||||
buildGoModule rec {
|
||||
pname = "quicktemplate";
|
||||
version = "unstable-2019-07-08";
|
||||
goPackagePath = "github.com/valyala/quicktemplate";
|
||||
goDeps = ./deps.nix;
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valyala";
|
||||
repo = "quicktemplate";
|
||||
rev = "840e9171940bbc80bb1b925c880664cababae022";
|
||||
sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2";
|
||||
rev = "v${version}";
|
||||
sha256 = "mQhrQcKRDtcXha7FIwCIUwWfoPGIJ5YLbA4HdatIdn8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/valyala/quicktemplate";
|
||||
description = "Fast, powerful, yet easy to use template engine for Go";
|
||||
|
||||
12
pkgs/development/tools/quicktemplate/deps.nix
generated
12
pkgs/development/tools/quicktemplate/deps.nix
generated
@ -1,12 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/valyala/bytebufferpool";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/valyala/bytebufferpool";
|
||||
rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf";
|
||||
sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -1,18 +1,26 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage {
|
||||
buildGoModule rec {
|
||||
pname = "statik";
|
||||
version = "unstable-2019-07-31";
|
||||
goPackagePath = "github.com/rakyll/statik";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakyll";
|
||||
repo = "statik";
|
||||
rev = "925a23bda946b50bb0804894f340c5da2b95603b";
|
||||
sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri";
|
||||
rev = "v${version}";
|
||||
sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g=";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
# Avoid building example
|
||||
subPackages = [ "." "fs" ];
|
||||
# Tests are checking that the files embeded are preserving
|
||||
# their meta data like dates etc, but it assumes to be in 2048
|
||||
# which is not the case once entered the nix store
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rakyll/statik";
|
||||
description = "Embed files into a Go executable ";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = "mautrix-whatsapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv";
|
||||
sha256 = "sha256-RkMgzYu6r30uqUCtCS/FuvJQiTInRYWiWhlTtDQQh5g=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b";
|
||||
vendorSha256 = "sha256-p6TW5ACXjqCR5IAVleMEIWYW4SHI1ZRL5KJFZpPc7yU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -6,16 +6,17 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "calamares";
|
||||
version = "3.2.17.1";
|
||||
version = "3.2.35.1";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "156zpjyw8w4y23aa60mvg3d3mr0kzfq5jkl7ixgahq33zpc17ms8";
|
||||
sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev
|
||||
boost kparts.dev kpmcore.out kservice.dev
|
||||
libatasmart libxcb libyamlcpp parted polkit-qt python qtbase
|
||||
qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
|
||||
];
|
||||
@ -32,18 +33,14 @@ mkDerivation rec {
|
||||
|
||||
POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -e "s,/usr/bin/calamares,$out/bin/calamares," \
|
||||
-i calamares.desktop \
|
||||
-i com.github.calamares.calamares.policy
|
||||
|
||||
sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \
|
||||
-i src/modules/locale/timezonewidget/localeconst.h \
|
||||
-i src/modules/locale/SetTimezoneJob.cpp
|
||||
|
||||
sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \
|
||||
-i src/modules/locale/timezonewidget/localeconst.h
|
||||
|
||||
sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
|
||||
-i src/modules/keyboard/keyboardwidget/keyboardglobal.h
|
||||
|
||||
@ -56,8 +53,8 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Distribution-independent installer framework";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ manveru ];
|
||||
license = with licenses; [ gpl3Plus bsd2 ];
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, fixDarwinDylibNames
|
||||
, cmake
|
||||
, libjpeg
|
||||
, zlib
|
||||
@ -17,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -18,11 +18,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2020.12.26";
|
||||
version = "2020.12.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1kqfrci4qg6bx7ywzppidjqxsx1c4l5psmwqcylw66bs0s442fwy";
|
||||
sha256 = "1hcr3mf63csp6lfpqszl5ibb2jhyl180s6pvbb7771jg0kdvlbbb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qrcp";
|
||||
version = "0.6.4";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "claudiodangelis";
|
||||
repo = "qrcp";
|
||||
rev = version;
|
||||
sha256 = "08fjy9mskf6n1zldc63fjm5x617qqx987a58cjav03apzfwzvvhg";
|
||||
sha256 = "0rx0pzy7p3dklayr2lkmyfdc00x9v4pd5xnzydbjx12hncnkpw4l";
|
||||
};
|
||||
|
||||
vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa";
|
||||
|
||||
@ -15071,6 +15071,8 @@ in
|
||||
|
||||
mbedtls = callPackage ../development/libraries/mbedtls { };
|
||||
|
||||
mdctags = callPackage ../development/tools/misc/mdctags { };
|
||||
|
||||
mdds = callPackage ../development/libraries/mdds { };
|
||||
|
||||
mediastreamer = callPackage ../development/libraries/mediastreamer { };
|
||||
@ -19981,6 +19983,8 @@ in
|
||||
|
||||
meslo-lg = callPackage ../data/fonts/meslo-lg {};
|
||||
|
||||
meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {};
|
||||
|
||||
migmix = callPackage ../data/fonts/migmix {};
|
||||
|
||||
migu = callPackage ../data/fonts/migu {};
|
||||
|
||||
@ -5702,6 +5702,8 @@ in {
|
||||
inherit (pkgs) bash subversion apr aprutil expat neon openssl;
|
||||
};
|
||||
|
||||
pysychonaut = callPackage ../development/python-modules/pysychonaut { };
|
||||
|
||||
pytabix = callPackage ../development/python-modules/pytabix { };
|
||||
|
||||
pytado = callPackage ../development/python-modules/pytado { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user