colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #163232 from AndersonTorres/new-misc

Browse Source 
A bunch of small updates
This commit is contained in:
Anderson Torres 2022-03-13 11:38:49 -03:00 committed by GitHub
commit 96a57c02c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/nsxiv/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "nsxiv";
version = "28";
version = "29";
src = fetchFromGitHub {
owner = "nsxiv";
repo = pname;
rev = "v${version}";
hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A=";
hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE=";
};
buildInputs = [

2
pkgs/applications/window-managers/berry/default.nix
View File

@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://berrywm.org/";
description = "A healthy, bite-sized window manager";
longDescription = ''
berry is a healthy, bite-sized window manager written in C for unix
@ -69,7 +70,6 @@ stdenv.mkDerivation rec {
- Intuitively place new windows in unoccupied spaces.
- Virtual desktops.
'';
homepage = "https://berrywm.org/";
license = licenses.mit;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;

17
pkgs/applications/window-managers/icewm/default.nix
View File

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "icewm";
version = "2.9.4";
version = "2.9.6";
src = fetchFromGitHub {
owner = "ice-wm";
owner = "ice-wm";
repo = pname;
rev = version;
hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4=";
hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA=";
};
nativeBuildInputs = [
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
perl
pkg-config
];
buildInputs = [
expat
fontconfig
@ -108,11 +109,11 @@ stdenv.mkDerivation rec {
system. Application windows can be managed by keyboard and mouse. Windows
can be iconified to the taskbar, to the tray, to the desktop or be made
hidden. They are controllable by a quick switch window (Alt+Tab) and in a
window list. A handful of configurable focus models are
menu-selectable. Setups with multiple monitors are supported by RandR and
Xinerama. IceWM is very configurable, themeable and well documented. It
includes an optional external background wallpaper manager with
transparency support, a simple session manager and a system tray.
window list. A handful of configurable focus models are menu-selectable.
Setups with multiple monitors are supported by RandR and Xinerama. IceWM
is very configurable, themeable and well documented. It includes an
optional external background wallpaper manager with transparency support,
a simple session manager and a system tray.
'';
license = licenses.lgpl2Only;
maintainers = [ maintainers.AndersonTorres ];

11
pkgs/applications/window-managers/labwc/default.nix
View File

@ -21,20 +21,15 @@
stdenv.mkDerivation rec {
pname = "labwc";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "labwc";
repo = pname;
rev = version;
hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM=";
hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk=";
};
patches = [
# Required to fix the build with wlroots 0.15.1:
./relax-the-version-constraint-for-wlroots.patch
];
nativeBuildInputs = [
meson
ninja
@ -64,6 +59,6 @@ stdenv.mkDerivation rec {
description = "A Wayland stacking compositor, similar to Openbox";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
inherit (wayland.meta) platforms;
};
}

29
pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch
View File

@ -1,29 +0,0 @@
From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Feb 2022 21:17:05 +0100
Subject: [PATCH] build: Relax the version constraint for wlroots to accept
patch releases
Patch releases only contain backwards compatible changes (mainly bug
fixes) so we want to allow them. This fixes the build with the recently
released wlroots 0.15.1 and uses the same version constraints as other
projects that depend on wlroots (e.g., Sway).
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index f950b8e..1905dda 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ if git.found()
endif
add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
-wlroots_version = ['=0.15.0']
+wlroots_version = ['>=0.15.0', '<0.16.0']
wlroots_proj = subproject(
'wlroots',
default_options: ['default_library=static', 'examples=false'],
--
2.34.1

4
pkgs/development/libraries/cimg/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cimg";
version = "3.0.0";
version = "3.0.2";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg=";
hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk=";
};
outputs = [ "out" "doc" ];

5
pkgs/development/libraries/zchunk/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "zchunk";
version = "1.1.16";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zchunk";
repo = pname;
rev = version;
hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o=";
hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4=";
};
nativeBuildInputs = [
@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # does not find argp-standalone
};
}

15
pkgs/shells/tcsh/default.nix
View File

@ -7,20 +7,21 @@
stdenv.mkDerivation rec {
pname = "tcsh";
version = "6.23.02";
version = "6.24.00";
src = fetchurl {
urls = [
"https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"https://astron.com/pub/tcsh/${pname}-${version}.tar.gz"
"http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
"ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz"
"ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"
"ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
"ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
"ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"
"ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz"
];
hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus=";
hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA=";
};
buildInputs = [