pyrox.dev
Merge pull request #55519 from FlorianFranzen/staging
Staging
authored by
Matthew Bauer
and committed by
GitHub
57cb5fe1
64edccb4
+5
lib/licenses.nix
+5
lib/licenses.nix
+32
nixos/doc/manual/release-notes/rl-1903.xml
+32
nixos/doc/manual/release-notes/rl-1903.xml
···
23
23
The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
24
24
</para>
25
25
</listitem>
26
+
<listitem>
27
+
<para>
28
+
Added the Pantheon desktop environment.
29
+
It can be enabled through <varname>services.xserver.desktopManager.pantheon.enable</varname>.
30
+
</para>
31
+
<note>
32
+
<para>
33
+
<varname>services.xserver.desktopManager.pantheon</varname> default enables lightdm
34
+
as a display manager and using Pantheon's greeter.
35
+
</para>
36
+
<para>
37
+
This is because of limitations with the screenlocking implementation, whereas the
38
+
screenlocker would be non-functional without it.
39
+
</para>
40
+
<para>
41
+
Because of that it is recommended to retain this precaution, however if you'd like to change this set:
42
+
</para>
43
+
<itemizedlist>
44
+
<listitem>
45
+
<para>
46
+
<option>services.xserver.displayManager.lightdm.enable</option>
47
+
</para>
48
+
</listitem>
49
+
<listitem>
50
+
<para>
51
+
<option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
52
+
</para>
53
+
</listitem>
54
+
</itemizedlist>
55
+
<para>to <literal>false</literal> and enable your preferred display manager.</para>
56
+
</note>
57
+
</listitem>
26
58
</itemizedlist>
27
59
</section>
28
60
+3
nixos/modules/module-list.nix
+3
nixos/modules/module-list.nix
···
242
242
./services/desktops/bamf.nix
243
243
./services/desktops/dleyna-renderer.nix
244
244
./services/desktops/dleyna-server.nix
245
+
./services/desktops/pantheon/contractor.nix
246
+
./services/desktops/pantheon/files.nix
245
247
./services/desktops/flatpak.nix
246
248
./services/desktops/geoclue2.nix
247
249
./services/desktops/gsignond.nix
···
267
269
./services/desktops/gnome3/tracker-miners.nix
268
270
./services/desktops/profile-sync-daemon.nix
269
271
./services/desktops/telepathy.nix
272
+
./services/desktops/tumbler.nix
270
273
./services/desktops/zeitgeist.nix
271
274
./services/development/bloop.nix
272
275
./services/development/hoogle.nix
+39
nixos/modules/services/desktops/pantheon/contractor.nix
+39
nixos/modules/services/desktops/pantheon/contractor.nix
···
1
+
# Contractor
2
+
3
+
{ config, pkgs, lib, ... }:
4
+
5
+
with lib;
6
+
7
+
{
8
+
9
+
###### interface
10
+
11
+
options = {
12
+
13
+
services.pantheon.contractor = {
14
+
15
+
enable = mkEnableOption "contractor, a desktop-wide extension service used by pantheon";
16
+
17
+
};
18
+
19
+
};
20
+
21
+
22
+
###### implementation
23
+
24
+
config = mkIf config.services.pantheon.contractor.enable {
25
+
26
+
environment.systemPackages = with pkgs.pantheon; [
27
+
contractor
28
+
extra-elementary-contracts
29
+
];
30
+
31
+
services.dbus.packages = [ pkgs.pantheon.contractor ];
32
+
33
+
environment.pathsToLink = [
34
+
"/share/contractor"
35
+
];
36
+
37
+
};
38
+
39
+
}
+36
nixos/modules/services/desktops/pantheon/files.nix
+36
nixos/modules/services/desktops/pantheon/files.nix
···
1
+
# pantheon files daemon.
2
+
3
+
{ config, pkgs, lib, ... }:
4
+
5
+
with lib;
6
+
7
+
{
8
+
9
+
###### interface
10
+
11
+
options = {
12
+
13
+
services.pantheon.files = {
14
+
15
+
enable = mkEnableOption "pantheon files daemon";
16
+
17
+
};
18
+
19
+
};
20
+
21
+
22
+
###### implementation
23
+
24
+
config = mkIf config.services.pantheon.files.enable {
25
+
26
+
environment.systemPackages = [
27
+
pkgs.pantheon.elementary-files
28
+
];
29
+
30
+
services.dbus.packages = [
31
+
pkgs.pantheon.elementary-files
32
+
];
33
+
34
+
};
35
+
36
+
}
+50
nixos/modules/services/desktops/tumbler.nix
+50
nixos/modules/services/desktops/tumbler.nix
···
1
+
# Tumbler
2
+
3
+
{ config, pkgs, lib, ... }:
4
+
5
+
with lib;
6
+
7
+
let
8
+
9
+
cfg = config.services.tumbler;
10
+
tumbler = cfg.package;
11
+
12
+
in
13
+
14
+
{
15
+
16
+
###### interface
17
+
18
+
options = {
19
+
20
+
services.tumbler = {
21
+
22
+
enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
23
+
24
+
package = mkOption {
25
+
type = types.package;
26
+
default = pkgs.xfce4-13.tumbler;
27
+
description = "Which tumbler package to use";
28
+
example = pkgs.xfce4-12.tumbler;
29
+
};
30
+
31
+
};
32
+
33
+
};
34
+
35
+
36
+
###### implementation
37
+
38
+
config = mkIf cfg.enable {
39
+
40
+
environment.systemPackages = [
41
+
tumbler
42
+
];
43
+
44
+
services.dbus.packages = [
45
+
tumbler
46
+
];
47
+
48
+
};
49
+
50
+
}
+1
-1
nixos/modules/services/misc/home-assistant.nix
+1
-1
nixos/modules/services/misc/home-assistant.nix
···
53
53
# If you are changing this, please update the description in applyDefaultConfig
54
54
defaultConfig = {
55
55
homeassistant.time_zone = config.time.timeZone;
56
-
http.server_port = (toString cfg.port);
56
+
http.server_port = cfg.port;
57
57
} // optionalAttrs (cfg.lovelaceConfig != null) {
58
58
lovelace.mode = "yaml";
59
59
};
+1
-1
nixos/modules/services/x11/desktop-managers/default.nix
+1
-1
nixos/modules/services/x11/desktop-managers/default.nix
+195
nixos/modules/services/x11/desktop-managers/pantheon.nix
+195
nixos/modules/services/x11/desktop-managers/pantheon.nix
···
1
+
{ config, lib, pkgs, ... }:
2
+
3
+
with lib;
4
+
5
+
let
6
+
7
+
cfg = config.services.xserver.desktopManager.pantheon;
8
+
9
+
nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
10
+
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
11
+
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
12
+
};
13
+
14
+
in
15
+
16
+
{
17
+
options = {
18
+
19
+
services.xserver.desktopManager.pantheon = {
20
+
enable = mkOption {
21
+
type = types.bool;
22
+
default = false;
23
+
description = "Enable the pantheon desktop manager";
24
+
};
25
+
26
+
sessionPath = mkOption {
27
+
default = [];
28
+
example = literalExample "[ pkgs.gnome3.gpaste ]";
29
+
description = ''
30
+
Additional list of packages to be added to the session search path.
31
+
Useful for GSettings-conditional autostart.
32
+
33
+
Note that this should be a last resort; patching the package is preferred (see GPaste).
34
+
'';
35
+
apply = list: list ++
36
+
[
37
+
pkgs.pantheon.pantheon-agent-geoclue2
38
+
];
39
+
};
40
+
41
+
extraGSettingsOverrides = mkOption {
42
+
default = "";
43
+
type = types.lines;
44
+
description = "Additional gsettings overrides.";
45
+
};
46
+
47
+
extraGSettingsOverridePackages = mkOption {
48
+
default = [];
49
+
type = types.listOf types.path;
50
+
description = "List of packages for which gsettings are overridden.";
51
+
};
52
+
53
+
debug = mkEnableOption "gnome-session debug messages";
54
+
55
+
};
56
+
57
+
environment.pantheon.excludePackages = mkOption {
58
+
default = [];
59
+
example = literalExample "[ pkgs.pantheon.elementary-camera ]";
60
+
type = types.listOf types.package;
61
+
description = "Which packages pantheon should exclude from the default environment";
62
+
};
63
+
64
+
};
65
+
66
+
67
+
config = mkIf cfg.enable {
68
+
69
+
services.xserver.displayManager.extraSessionFilePackages = [ pkgs.pantheon.elementary-session-settings ];
70
+
71
+
# Ensure lightdm is used when Pantheon is enabled
72
+
# Without it screen locking will be nonfunctional because of the use of lightlocker
73
+
services.xserver.displayManager.lightdm.enable = mkDefault true;
74
+
services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
75
+
76
+
# If not set manually Pantheon session cannot be started
77
+
# Known issue of https://github.com/NixOS/nixpkgs/pull/43992
78
+
services.xserver.desktopManager.default = mkForce "pantheon";
79
+
80
+
services.xserver.displayManager.sessionCommands = ''
81
+
if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
82
+
${concatMapStrings (p: ''
83
+
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
84
+
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
85
+
fi
86
+
87
+
if [ -d "${p}/lib/girepository-1.0" ]; then
88
+
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
89
+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
90
+
fi
91
+
'') cfg.sessionPath}
92
+
93
+
# Makes qt applications look less alien
94
+
export QT_QPA_PLATFORMTHEME=gtk3
95
+
export QT_STYLE_OVERRIDE=adwaita
96
+
fi
97
+
'';
98
+
99
+
hardware.bluetooth.enable = mkDefault true;
100
+
hardware.pulseaudio.enable = mkDefault true;
101
+
security.polkit.enable = true;
102
+
services.accounts-daemon.enable = true;
103
+
services.bamf.enable = true;
104
+
services.colord.enable = mkDefault true;
105
+
services.pantheon.files.enable = mkDefault true;
106
+
services.tumbler.enable = mkDefault true;
107
+
services.dbus.packages = mkMerge [
108
+
([ pkgs.pantheon.switchboard-plug-power ])
109
+
(mkIf config.services.printing.enable ([pkgs.system-config-printer]) )
110
+
];
111
+
services.pantheon.contractor.enable = true;
112
+
services.geoclue2.enable = mkDefault true;
113
+
# pantheon has pantheon-agent-geoclue2
114
+
services.geoclue2.enableDemoAgent = false;
115
+
services.gnome3.at-spi2-core.enable = true;
116
+
services.gnome3.evolution-data-server.enable = true;
117
+
services.gnome3.file-roller.enable = true;
118
+
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
119
+
services.gnome3.gnome-keyring.enable = true;
120
+
services.gnome3.gvfs.enable = true;
121
+
services.gnome3.rygel.enable = true;
122
+
services.gsignond.enable = true;
123
+
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
124
+
services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
125
+
services.udisks2.enable = true;
126
+
services.upower.enable = config.powerManagement.enable;
127
+
services.xserver.libinput.enable = mkDefault true;
128
+
services.xserver.updateDbusEnvironment = true;
129
+
services.zeitgeist.enable = true;
130
+
131
+
networking.networkmanager.enable = mkDefault true;
132
+
networking.networkmanager.basePackages =
133
+
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
134
+
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
135
+
networkmanager-openconnect networkmanager-fortisslvpn
136
+
networkmanager-iodine networkmanager-l2tp; };
137
+
138
+
# Override GSettings schemas
139
+
environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
140
+
141
+
environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
142
+
143
+
environment.variables.GIO_EXTRA_MODULES = [
144
+
"${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
145
+
"${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
146
+
"${pkgs.gnome3.gvfs}/lib/gio/modules"
147
+
];
148
+
149
+
environment.pathsToLink = [
150
+
# FIXME: modules should link subdirs of `/share` rather than relying on this
151
+
"/share"
152
+
];
153
+
154
+
environment.systemPackages = pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
155
+
++ (pkgs.gnome3.removePackagesByName pkgs.pantheon.apps config.environment.pantheon.excludePackages)
156
+
++ (with pkgs.gnome3;
157
+
[
158
+
adwaita-icon-theme
159
+
dconf
160
+
epiphany
161
+
evince
162
+
geary
163
+
gnome-bluetooth
164
+
gnome-font-viewer
165
+
gnome-power-manager
166
+
])
167
+
++ (with pkgs;
168
+
[
169
+
adwaita-qt
170
+
desktop-file-utils
171
+
glib
172
+
glib-networking
173
+
gnome-menus
174
+
gtk3.out
175
+
hicolor-icon-theme
176
+
lightlocker
177
+
plank
178
+
qgnomeplatform
179
+
shared-mime-info
180
+
sound-theme-freedesktop
181
+
xdg-user-dirs
182
+
]);
183
+
184
+
fonts.fonts = with pkgs; [
185
+
opensans-ttf
186
+
roboto-mono
187
+
];
188
+
fonts.fontconfig.defaultFonts = {
189
+
monospace = [ "Roboto Mono" ];
190
+
sansSerif = [ "Open Sans" ];
191
+
};
192
+
193
+
};
194
+
195
+
}
+47
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+47
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
···
1
+
{ config, lib, pkgs, ... }:
2
+
3
+
with lib;
4
+
5
+
let
6
+
7
+
dmcfg = config.services.xserver.displayManager;
8
+
ldmcfg = dmcfg.lightdm;
9
+
cfg = ldmcfg.greeters.pantheon;
10
+
11
+
xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
12
+
path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
13
+
name = "io.elementary.greeter.desktop";
14
+
}];
15
+
16
+
in
17
+
{
18
+
options = {
19
+
20
+
services.xserver.displayManager.lightdm.greeters.pantheon = {
21
+
22
+
enable = mkOption {
23
+
type = types.bool;
24
+
default = false;
25
+
description = ''
26
+
Whether to enable elementary-greeter as the lightdm greeter.
27
+
'';
28
+
};
29
+
30
+
};
31
+
32
+
};
33
+
34
+
config = mkIf (ldmcfg.enable && cfg.enable) {
35
+
36
+
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
37
+
38
+
services.xserver.displayManager.lightdm.greeter = mkDefault {
39
+
package = xgreeters;
40
+
name = "io.elementary.greeter";
41
+
};
42
+
43
+
environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf";
44
+
environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist";
45
+
46
+
};
47
+
}
+1
nixos/modules/services/x11/display-managers/lightdm.nix
+1
nixos/modules/services/x11/display-managers/lightdm.nix
+1
nixos/release-combined.nix
+1
nixos/release-combined.nix
···
68
68
(all nixos.tests.firefox)
69
69
(all nixos.tests.firewall)
70
70
(except ["aarch64-linux"] nixos.tests.gnome3)
71
+
(except ["aarch64-linux"] nixos.tests.pantheon)
71
72
nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
72
73
(except ["aarch64-linux"] nixos.tests.installer.lvm)
73
74
(except ["aarch64-linux"] nixos.tests.installer.luksroot)
+1
nixos/tests/all-tests.nix
+1
nixos/tests/all-tests.nix
···
168
168
ostree = handleTest ./ostree.nix {};
169
169
pam-oath-login = handleTest ./pam-oath-login.nix {};
170
170
pam-u2f = handleTest ./pam-u2f.nix {};
171
+
pantheon = handleTest ./pantheon.nix {};
171
172
peerflix = handleTest ./peerflix.nix {};
172
173
pgjwt = handleTest ./pgjwt.nix {};
173
174
pgmanage = handleTest ./pgmanage.nix {};
+55
nixos/tests/pantheon.nix
+55
nixos/tests/pantheon.nix
···
1
+
import ./make-test.nix ({ pkgs, ...} :
2
+
3
+
{
4
+
name = "pantheon";
5
+
meta = with pkgs.stdenv.lib.maintainers; {
6
+
maintainers = [ worldofpeace ];
7
+
};
8
+
9
+
machine = { ... }:
10
+
11
+
{
12
+
imports = [ ./common/user-account.nix ];
13
+
14
+
services.xserver.enable = true;
15
+
services.xserver.desktopManager.pantheon.enable = true;
16
+
17
+
virtualisation.memorySize = 1024;
18
+
};
19
+
20
+
enableOCR = true;
21
+
22
+
testScript = { nodes, ... }: let
23
+
user = nodes.machine.config.users.users.alice;
24
+
in ''
25
+
startAll;
26
+
27
+
# Wait for display manager to start
28
+
$machine->waitForText(qr/${user.description}/);
29
+
$machine->screenshot("lightdm");
30
+
31
+
# Log in
32
+
$machine->sendChars("${user.password}\n");
33
+
$machine->waitForFile("/home/alice/.Xauthority");
34
+
$machine->succeed("xauth merge ~alice/.Xauthority");
35
+
36
+
# Check if "pantheon-shell" components actually start
37
+
$machine->waitUntilSucceeds("pgrep gala");
38
+
$machine->waitForWindow(qr/gala/);
39
+
$machine->waitUntilSucceeds("pgrep wingpanel");
40
+
$machine->waitForWindow("wingpanel");
41
+
$machine->waitUntilSucceeds("pgrep plank");
42
+
$machine->waitForWindow(qr/plank/);
43
+
44
+
# Check that logging in has given the user ownership of devices.
45
+
$machine->succeed("getfacl /dev/snd/timer | grep -q alice");
46
+
47
+
# Open elementary terminal
48
+
$machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'");
49
+
$machine->waitForWindow(qr/io.elementary.terminal/);
50
+
51
+
# Take a screenshot of the desktop
52
+
$machine->sleep(20);
53
+
$machine->screenshot("screen");
54
+
'';
55
+
})
+2
-2
pkgs/applications/audio/fluidsynth/default.nix
+2
-2
pkgs/applications/audio/fluidsynth/default.nix
···
11
11
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
12
12
};
13
13
"2" = {
14
-
fluidsynthVersion = "2.0.2";
15
-
sha256 = "02vs5sfsyh1dl7wlcvgs4w3x0qcmsl7vi000qgp99ynwh3wjb274";
14
+
fluidsynthVersion = "2.0.3";
15
+
sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78";
16
16
};
17
17
};
18
18
in
+4
-4
pkgs/applications/audio/vocal/default.nix
+4
-4
pkgs/applications/audio/vocal/default.nix
···
1
-
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk
1
+
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
2
2
, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
3
3
4
4
stdenv.mkDerivation rec {
···
20
20
libxml2
21
21
ninja
22
22
pkgconfig
23
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
23
+
pantheon.vala
24
24
wrapGAppsHook
25
25
];
26
26
27
27
buildInputs = with gst_all_1; [
28
28
clutter-gst
29
29
clutter-gtk
30
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
30
+
pantheon.elementary-icon-theme
31
31
gnome3.libgee
32
-
granite
32
+
pantheon.granite
33
33
gst-plugins-base
34
34
gst-plugins-good
35
35
gstreamer
+6
-6
pkgs/applications/editors/quilter/default.nix
+6
-6
pkgs/applications/editors/quilter/default.nix
···
1
-
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3
2
-
, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
3
-
, discount, gobject-introspection, wrapGAppsHook }:
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3
2
+
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
3
+
, gnome3, discount, gobject-introspection, wrapGAppsHook }:
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "quilter";
···
22
22
ninja
23
23
pkgconfig
24
24
python3
25
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
25
+
pantheon.vala
26
26
wrapGAppsHook
27
27
];
28
28
29
29
buildInputs = [
30
30
discount
31
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
31
+
pantheon.elementary-icon-theme
32
+
pantheon.granite
32
33
gnome3.libgee
33
-
granite
34
34
gtk3
35
35
gtksourceview
36
36
gtkspell3
+1
-1
pkgs/applications/editors/standardnotes/default.nix
+1
-1
pkgs/applications/editors/standardnotes/default.nix
···
29
29
installPhase = ''
30
30
mkdir -p $out/{bin,share}
31
31
cp $src $out/share/standardNotes.AppImage
32
-
echo "#!/bin/sh" > $out/bin/standardnotes
32
+
echo "#!${stdenv.shell}" > $out/bin/standardnotes
33
33
echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes
34
34
chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage
35
35
'';
+1
-1
pkgs/applications/editors/sublime/3/common.nix
+1
-1
pkgs/applications/editors/sublime/3/common.nix
+1
-1
pkgs/applications/graphics/alchemy/default.nix
+1
-1
pkgs/applications/graphics/alchemy/default.nix
+2
-2
pkgs/applications/graphics/inkscape/default.nix
+2
-2
pkgs/applications/graphics/inkscape/default.nix
···
11
11
in
12
12
13
13
stdenv.mkDerivation rec {
14
-
name = "inkscape-0.92.3";
14
+
name = "inkscape-0.92.4";
15
15
16
16
src = fetchurl {
17
17
url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
18
-
sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
18
+
sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p";
19
19
};
20
20
21
21
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
+1
-1
pkgs/applications/graphics/swingsane/default.nix
+1
-1
pkgs/applications/graphics/swingsane/default.nix
+1
-1
pkgs/applications/graphics/wings/default.nix
+1
-1
pkgs/applications/graphics/wings/default.nix
+1
-1
pkgs/applications/graphics/zgrviewer/default.nix
+1
-1
pkgs/applications/graphics/zgrviewer/default.nix
···
16
16
17
17
cp -r target/* "$out/share/java/zvtm/"
18
18
19
-
echo '#!/bin/sh' > "$out/bin/zgrviewer"
19
+
echo '#!${stdenv.shell}' > "$out/bin/zgrviewer"
20
20
echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
21
21
chmod a+x "$out/bin/zgrviewer"
22
22
'';
+1
-1
pkgs/applications/kde/fetch.sh
+1
-1
pkgs/applications/kde/fetch.sh
+860
-860
pkgs/applications/kde/srcs.nix
+860
-860
pkgs/applications/kde/srcs.nix
···
3
3
4
4
{
5
5
akonadi = {
6
-
version = "18.12.0";
6
+
version = "18.12.1";
7
7
src = fetchurl {
8
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-18.12.0.tar.xz";
9
-
sha256 = "1c3frrfkcpr01684c1fkrwxbnzb7ipvwncm0jf5nb4d0waiv8q08";
10
-
name = "akonadi-18.12.0.tar.xz";
8
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz";
9
+
sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx";
10
+
name = "akonadi-18.12.1.tar.xz";
11
11
};
12
12
};
13
13
akonadi-calendar = {
14
-
version = "18.12.0";
14
+
version = "18.12.1";
15
15
src = fetchurl {
16
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-18.12.0.tar.xz";
17
-
sha256 = "0amp79x3jwib7f0a8ksv96prb1mhfhpp475k09ryz7c054lmj1ys";
18
-
name = "akonadi-calendar-18.12.0.tar.xz";
16
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz";
17
+
sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri";
18
+
name = "akonadi-calendar-18.12.1.tar.xz";
19
19
};
20
20
};
21
21
akonadi-calendar-tools = {
22
-
version = "18.12.0";
22
+
version = "18.12.1";
23
23
src = fetchurl {
24
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-tools-18.12.0.tar.xz";
25
-
sha256 = "0w2ng8lfy3cib49c0warqh0k43q17bfmkq3g4rjkwri9cqdqrahp";
26
-
name = "akonadi-calendar-tools-18.12.0.tar.xz";
24
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz";
25
+
sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl";
26
+
name = "akonadi-calendar-tools-18.12.1.tar.xz";
27
27
};
28
28
};
29
29
akonadiconsole = {
30
-
version = "18.12.0";
30
+
version = "18.12.1";
31
31
src = fetchurl {
32
-
url = "${mirror}/stable/applications/18.12.0/src/akonadiconsole-18.12.0.tar.xz";
33
-
sha256 = "1qg889g1a1c5iwvwdwz8ygkj59v46yfk5cwpkf8q1jldjdxkrib5";
34
-
name = "akonadiconsole-18.12.0.tar.xz";
32
+
url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz";
33
+
sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk";
34
+
name = "akonadiconsole-18.12.1.tar.xz";
35
35
};
36
36
};
37
37
akonadi-contacts = {
38
-
version = "18.12.0";
38
+
version = "18.12.1";
39
39
src = fetchurl {
40
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-contacts-18.12.0.tar.xz";
41
-
sha256 = "0cn50nyrahb6pzshd35pc0issgiwg0r7j96xkmaxdigg9agjz9rn";
42
-
name = "akonadi-contacts-18.12.0.tar.xz";
40
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz";
41
+
sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq";
42
+
name = "akonadi-contacts-18.12.1.tar.xz";
43
43
};
44
44
};
45
45
akonadi-import-wizard = {
46
-
version = "18.12.0";
46
+
version = "18.12.1";
47
47
src = fetchurl {
48
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-import-wizard-18.12.0.tar.xz";
49
-
sha256 = "1s477z6vb9qqz4q8bwprznn11fjjq0a6xfdmif6x0z30qrddllfd";
50
-
name = "akonadi-import-wizard-18.12.0.tar.xz";
48
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz";
49
+
sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j";
50
+
name = "akonadi-import-wizard-18.12.1.tar.xz";
51
51
};
52
52
};
53
53
akonadi-mime = {
54
-
version = "18.12.0";
54
+
version = "18.12.1";
55
55
src = fetchurl {
56
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-mime-18.12.0.tar.xz";
57
-
sha256 = "1w974gn81gyrp3m5r2l8jx7xrq610mhmmn005wqfl7ac1n3s65ln";
58
-
name = "akonadi-mime-18.12.0.tar.xz";
56
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz";
57
+
sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk";
58
+
name = "akonadi-mime-18.12.1.tar.xz";
59
59
};
60
60
};
61
61
akonadi-notes = {
62
-
version = "18.12.0";
62
+
version = "18.12.1";
63
63
src = fetchurl {
64
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-notes-18.12.0.tar.xz";
65
-
sha256 = "0b233nw7jcr4dnlfnnymwrm9my47a4mdmdbp9qsp2rmlzwddplvw";
66
-
name = "akonadi-notes-18.12.0.tar.xz";
64
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz";
65
+
sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4";
66
+
name = "akonadi-notes-18.12.1.tar.xz";
67
67
};
68
68
};
69
69
akonadi-search = {
70
-
version = "18.12.0";
70
+
version = "18.12.1";
71
71
src = fetchurl {
72
-
url = "${mirror}/stable/applications/18.12.0/src/akonadi-search-18.12.0.tar.xz";
73
-
sha256 = "1kg8q5jkzcc4vndc8l2q7hvkjkdw2v5500pjw8pszwifzmi5klln";
74
-
name = "akonadi-search-18.12.0.tar.xz";
72
+
url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz";
73
+
sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6";
74
+
name = "akonadi-search-18.12.1.tar.xz";
75
75
};
76
76
};
77
77
akregator = {
78
-
version = "18.12.0";
78
+
version = "18.12.1";
79
79
src = fetchurl {
80
-
url = "${mirror}/stable/applications/18.12.0/src/akregator-18.12.0.tar.xz";
81
-
sha256 = "03968pcpvggn19721x89wn7d1n757xdk22f4rvxqq4d6qqh2myhd";
82
-
name = "akregator-18.12.0.tar.xz";
80
+
url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz";
81
+
sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9";
82
+
name = "akregator-18.12.1.tar.xz";
83
83
};
84
84
};
85
85
analitza = {
86
-
version = "18.12.0";
86
+
version = "18.12.1";
87
87
src = fetchurl {
88
-
url = "${mirror}/stable/applications/18.12.0/src/analitza-18.12.0.tar.xz";
89
-
sha256 = "0g8iz69cq2gc0qsraaqji8h7z1wcqq1baic4x7158q3xkrc7hg1f";
90
-
name = "analitza-18.12.0.tar.xz";
88
+
url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz";
89
+
sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv";
90
+
name = "analitza-18.12.1.tar.xz";
91
91
};
92
92
};
93
93
ark = {
94
-
version = "18.12.0";
94
+
version = "18.12.1";
95
95
src = fetchurl {
96
-
url = "${mirror}/stable/applications/18.12.0/src/ark-18.12.0.tar.xz";
97
-
sha256 = "16nmi8a9j4s00m4dnh4l7kcz1vjaqpcq1ilr0iv6wglpn3sycl1g";
98
-
name = "ark-18.12.0.tar.xz";
96
+
url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz";
97
+
sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86";
98
+
name = "ark-18.12.1.tar.xz";
99
99
};
100
100
};
101
101
artikulate = {
102
-
version = "18.12.0";
102
+
version = "18.12.1";
103
103
src = fetchurl {
104
-
url = "${mirror}/stable/applications/18.12.0/src/artikulate-18.12.0.tar.xz";
105
-
sha256 = "187qwl9adrggbkf6dyw12pmmxxxbjcp2swxbyvmqx10dca2pgbgn";
106
-
name = "artikulate-18.12.0.tar.xz";
104
+
url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz";
105
+
sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1";
106
+
name = "artikulate-18.12.1.tar.xz";
107
107
};
108
108
};
109
109
audiocd-kio = {
110
-
version = "18.12.0";
110
+
version = "18.12.1";
111
111
src = fetchurl {
112
-
url = "${mirror}/stable/applications/18.12.0/src/audiocd-kio-18.12.0.tar.xz";
113
-
sha256 = "044ksczgc5k6ai1inmxqpibvcigjvxbqpf6n6irgl1jgavmxdpim";
114
-
name = "audiocd-kio-18.12.0.tar.xz";
112
+
url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz";
113
+
sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p";
114
+
name = "audiocd-kio-18.12.1.tar.xz";
115
115
};
116
116
};
117
117
baloo-widgets = {
118
-
version = "18.12.0";
118
+
version = "18.12.1";
119
119
src = fetchurl {
120
-
url = "${mirror}/stable/applications/18.12.0/src/baloo-widgets-18.12.0.tar.xz";
121
-
sha256 = "1sq70l529dg2ww8pcksnbbmgh1wi1baj69adakqiacxi5v893clg";
122
-
name = "baloo-widgets-18.12.0.tar.xz";
120
+
url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz";
121
+
sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3";
122
+
name = "baloo-widgets-18.12.1.tar.xz";
123
123
};
124
124
};
125
125
blinken = {
126
-
version = "18.12.0";
126
+
version = "18.12.1";
127
127
src = fetchurl {
128
-
url = "${mirror}/stable/applications/18.12.0/src/blinken-18.12.0.tar.xz";
129
-
sha256 = "1dnp14g20a7gqy3zcysa7pxrj38zqxhgpyd4nxpdj6lzjgh2p7hx";
130
-
name = "blinken-18.12.0.tar.xz";
128
+
url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz";
129
+
sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2";
130
+
name = "blinken-18.12.1.tar.xz";
131
131
};
132
132
};
133
133
bomber = {
134
-
version = "18.12.0";
134
+
version = "18.12.1";
135
135
src = fetchurl {
136
-
url = "${mirror}/stable/applications/18.12.0/src/bomber-18.12.0.tar.xz";
137
-
sha256 = "1vjvajbra1m4zjbijn1nxj5x66hyv8q65874b3ajshb3lmv7rklj";
138
-
name = "bomber-18.12.0.tar.xz";
136
+
url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz";
137
+
sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d";
138
+
name = "bomber-18.12.1.tar.xz";
139
139
};
140
140
};
141
141
bovo = {
142
-
version = "18.12.0";
142
+
version = "18.12.1";
143
143
src = fetchurl {
144
-
url = "${mirror}/stable/applications/18.12.0/src/bovo-18.12.0.tar.xz";
145
-
sha256 = "1fslwk3zbxi16b1m7w7rbf8bgdhflnqrd6k90lpbwvlnxy6839iw";
146
-
name = "bovo-18.12.0.tar.xz";
144
+
url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz";
145
+
sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp";
146
+
name = "bovo-18.12.1.tar.xz";
147
147
};
148
148
};
149
149
calendarsupport = {
150
-
version = "18.12.0";
150
+
version = "18.12.1";
151
151
src = fetchurl {
152
-
url = "${mirror}/stable/applications/18.12.0/src/calendarsupport-18.12.0.tar.xz";
153
-
sha256 = "180qzjlx0y4cfasmrf06ah8jdckbym1wrbmqlpyzjfy55mkwyf40";
154
-
name = "calendarsupport-18.12.0.tar.xz";
152
+
url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz";
153
+
sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p";
154
+
name = "calendarsupport-18.12.1.tar.xz";
155
155
};
156
156
};
157
157
cantor = {
158
-
version = "18.12.0";
158
+
version = "18.12.1";
159
159
src = fetchurl {
160
-
url = "${mirror}/stable/applications/18.12.0/src/cantor-18.12.0.tar.xz";
161
-
sha256 = "0isddvdd8gvaasigyj3njyl7ckcqc8ciqp82awlland3avll6rby";
162
-
name = "cantor-18.12.0.tar.xz";
160
+
url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz";
161
+
sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc";
162
+
name = "cantor-18.12.1.tar.xz";
163
163
};
164
164
};
165
165
cervisia = {
166
-
version = "18.12.0";
166
+
version = "18.12.1";
167
167
src = fetchurl {
168
-
url = "${mirror}/stable/applications/18.12.0/src/cervisia-18.12.0.tar.xz";
169
-
sha256 = "1r55zjfvlh5by9cv6pzcsbz71igbjr1pvyiyjkdhc36sbaiv0r3x";
170
-
name = "cervisia-18.12.0.tar.xz";
168
+
url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz";
169
+
sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7";
170
+
name = "cervisia-18.12.1.tar.xz";
171
171
};
172
172
};
173
173
dolphin = {
174
-
version = "18.12.0";
174
+
version = "18.12.1";
175
175
src = fetchurl {
176
-
url = "${mirror}/stable/applications/18.12.0/src/dolphin-18.12.0.tar.xz";
177
-
sha256 = "10mzdk9i5x4kmsrpamm5q9ihy8ymii9w3iaccd7fgw4yy11qlzw3";
178
-
name = "dolphin-18.12.0.tar.xz";
176
+
url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz";
177
+
sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq";
178
+
name = "dolphin-18.12.1.tar.xz";
179
179
};
180
180
};
181
181
dolphin-plugins = {
182
-
version = "18.12.0";
182
+
version = "18.12.1";
183
183
src = fetchurl {
184
-
url = "${mirror}/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz";
185
-
sha256 = "07pkslxhawl03030zjy889zjbym13d94nllg9fxvmd3402y2djiw";
186
-
name = "dolphin-plugins-18.12.0.tar.xz";
184
+
url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz";
185
+
sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8";
186
+
name = "dolphin-plugins-18.12.1.tar.xz";
187
187
};
188
188
};
189
189
dragon = {
190
-
version = "18.12.0";
190
+
version = "18.12.1";
191
191
src = fetchurl {
192
-
url = "${mirror}/stable/applications/18.12.0/src/dragon-18.12.0.tar.xz";
193
-
sha256 = "0j3d8a97ymh9lm6al0vv3abxalfw3wnf689i3mzkg7bdqkaaxz24";
194
-
name = "dragon-18.12.0.tar.xz";
192
+
url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz";
193
+
sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm";
194
+
name = "dragon-18.12.1.tar.xz";
195
195
};
196
196
};
197
197
eventviews = {
198
-
version = "18.12.0";
198
+
version = "18.12.1";
199
199
src = fetchurl {
200
-
url = "${mirror}/stable/applications/18.12.0/src/eventviews-18.12.0.tar.xz";
201
-
sha256 = "0r3y3z8zzzs1154wqi16kwb7vjijphscsnna76hpxcllw23cnb7v";
202
-
name = "eventviews-18.12.0.tar.xz";
200
+
url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz";
201
+
sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1";
202
+
name = "eventviews-18.12.1.tar.xz";
203
203
};
204
204
};
205
205
ffmpegthumbs = {
206
-
version = "18.12.0";
206
+
version = "18.12.1";
207
207
src = fetchurl {
208
-
url = "${mirror}/stable/applications/18.12.0/src/ffmpegthumbs-18.12.0.tar.xz";
209
-
sha256 = "0wwrhj6xblz96g1rpqds4m0savp9n08w1xlwlhrm9xq81kajpw5x";
210
-
name = "ffmpegthumbs-18.12.0.tar.xz";
208
+
url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz";
209
+
sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki";
210
+
name = "ffmpegthumbs-18.12.1.tar.xz";
211
211
};
212
212
};
213
213
filelight = {
214
-
version = "18.12.0";
214
+
version = "18.12.1";
215
215
src = fetchurl {
216
-
url = "${mirror}/stable/applications/18.12.0/src/filelight-18.12.0.tar.xz";
217
-
sha256 = "1vayrsgs5q1ky34kx5a8fi198b57478w68641xwhxmzwllssd9sx";
218
-
name = "filelight-18.12.0.tar.xz";
216
+
url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz";
217
+
sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f";
218
+
name = "filelight-18.12.1.tar.xz";
219
219
};
220
220
};
221
221
granatier = {
222
-
version = "18.12.0";
222
+
version = "18.12.1";
223
223
src = fetchurl {
224
-
url = "${mirror}/stable/applications/18.12.0/src/granatier-18.12.0.tar.xz";
225
-
sha256 = "145z4h7vwmg2zlvncp5dijm06m1d0z20hlmlz2zd69nfvs8w1lmz";
226
-
name = "granatier-18.12.0.tar.xz";
224
+
url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz";
225
+
sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn";
226
+
name = "granatier-18.12.1.tar.xz";
227
227
};
228
228
};
229
229
grantlee-editor = {
230
-
version = "18.12.0";
230
+
version = "18.12.1";
231
231
src = fetchurl {
232
-
url = "${mirror}/stable/applications/18.12.0/src/grantlee-editor-18.12.0.tar.xz";
233
-
sha256 = "0h5hcsnkh8gkqcnn620zs4kni5k8cpr65nbkkxybgxjf3kljapin";
234
-
name = "grantlee-editor-18.12.0.tar.xz";
232
+
url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz";
233
+
sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4";
234
+
name = "grantlee-editor-18.12.1.tar.xz";
235
235
};
236
236
};
237
237
grantleetheme = {
238
-
version = "18.12.0";
238
+
version = "18.12.1";
239
239
src = fetchurl {
240
-
url = "${mirror}/stable/applications/18.12.0/src/grantleetheme-18.12.0.tar.xz";
241
-
sha256 = "1k5q30viyvwx4c8nl5gxk2sqxd9l703n6fnxw5dz5q7hzsxykzzx";
242
-
name = "grantleetheme-18.12.0.tar.xz";
240
+
url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz";
241
+
sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc";
242
+
name = "grantleetheme-18.12.1.tar.xz";
243
243
};
244
244
};
245
245
gwenview = {
246
-
version = "18.12.0";
246
+
version = "18.12.1";
247
247
src = fetchurl {
248
-
url = "${mirror}/stable/applications/18.12.0/src/gwenview-18.12.0.tar.xz";
249
-
sha256 = "1p9g6q5bfaxbk60k91wbjhbv0wwzin5ai3hyasl7rg3c6hisp2rf";
250
-
name = "gwenview-18.12.0.tar.xz";
248
+
url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz";
249
+
sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm";
250
+
name = "gwenview-18.12.1.tar.xz";
251
251
};
252
252
};
253
253
incidenceeditor = {
254
-
version = "18.12.0";
254
+
version = "18.12.1";
255
255
src = fetchurl {
256
-
url = "${mirror}/stable/applications/18.12.0/src/incidenceeditor-18.12.0.tar.xz";
257
-
sha256 = "0f313zw1n4dgaianmxnmd5d5bqad40izli20ab08lqhv9d03sdkh";
258
-
name = "incidenceeditor-18.12.0.tar.xz";
256
+
url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz";
257
+
sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz";
258
+
name = "incidenceeditor-18.12.1.tar.xz";
259
259
};
260
260
};
261
261
juk = {
262
-
version = "18.12.0";
262
+
version = "18.12.1";
263
263
src = fetchurl {
264
-
url = "${mirror}/stable/applications/18.12.0/src/juk-18.12.0.tar.xz";
265
-
sha256 = "1jsxvcqpj87n6yv2v0a7rvmg832ayrk0fknmch04gc8bkb7w52az";
266
-
name = "juk-18.12.0.tar.xz";
264
+
url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz";
265
+
sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n";
266
+
name = "juk-18.12.1.tar.xz";
267
267
};
268
268
};
269
269
k3b = {
270
-
version = "18.12.0";
270
+
version = "18.12.1";
271
271
src = fetchurl {
272
-
url = "${mirror}/stable/applications/18.12.0/src/k3b-18.12.0.tar.xz";
273
-
sha256 = "1fmy94cda1nsqv5g4w3bnypx9c8ngrndbzf6l7l2pv5q889p73x1";
274
-
name = "k3b-18.12.0.tar.xz";
272
+
url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz";
273
+
sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s";
274
+
name = "k3b-18.12.1.tar.xz";
275
275
};
276
276
};
277
277
kaccounts-integration = {
278
-
version = "18.12.0";
278
+
version = "18.12.1";
279
279
src = fetchurl {
280
-
url = "${mirror}/stable/applications/18.12.0/src/kaccounts-integration-18.12.0.tar.xz";
281
-
sha256 = "1wyjd7iv0z8q9adbgnkvwmz4zrhrz3wgkz0lp52i8j0511xby93r";
282
-
name = "kaccounts-integration-18.12.0.tar.xz";
280
+
url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz";
281
+
sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz";
282
+
name = "kaccounts-integration-18.12.1.tar.xz";
283
283
};
284
284
};
285
285
kaccounts-providers = {
286
-
version = "18.12.0";
286
+
version = "18.12.1";
287
287
src = fetchurl {
288
-
url = "${mirror}/stable/applications/18.12.0/src/kaccounts-providers-18.12.0.tar.xz";
289
-
sha256 = "03kjjshbxgj1mj8vv60rbssn3kdf3gx9kqmgsbbwybxg46277w1r";
290
-
name = "kaccounts-providers-18.12.0.tar.xz";
288
+
url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz";
289
+
sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi";
290
+
name = "kaccounts-providers-18.12.1.tar.xz";
291
291
};
292
292
};
293
293
kaddressbook = {
294
-
version = "18.12.0";
294
+
version = "18.12.1";
295
295
src = fetchurl {
296
-
url = "${mirror}/stable/applications/18.12.0/src/kaddressbook-18.12.0.tar.xz";
297
-
sha256 = "0dfmwn6swa6m11ih52aj2r8zfma6jffy8gsqhaph4xg4ba58nmpj";
298
-
name = "kaddressbook-18.12.0.tar.xz";
296
+
url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz";
297
+
sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak";
298
+
name = "kaddressbook-18.12.1.tar.xz";
299
299
};
300
300
};
301
301
kajongg = {
302
-
version = "18.12.0";
302
+
version = "18.12.1";
303
303
src = fetchurl {
304
-
url = "${mirror}/stable/applications/18.12.0/src/kajongg-18.12.0.tar.xz";
305
-
sha256 = "0k9nxcr2fpkrmckzc5fxani4l304fxj7kp80y2nrv1p5cagn2x7l";
306
-
name = "kajongg-18.12.0.tar.xz";
304
+
url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz";
305
+
sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a";
306
+
name = "kajongg-18.12.1.tar.xz";
307
307
};
308
308
};
309
309
kalarm = {
310
-
version = "18.12.0";
310
+
version = "18.12.1";
311
311
src = fetchurl {
312
-
url = "${mirror}/stable/applications/18.12.0/src/kalarm-18.12.0.tar.xz";
313
-
sha256 = "1cmk6l8450sz3rfdk25p9dn26zcbhcrdwz9v242cpsndyvnl13i2";
314
-
name = "kalarm-18.12.0.tar.xz";
312
+
url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz";
313
+
sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil";
314
+
name = "kalarm-18.12.1.tar.xz";
315
315
};
316
316
};
317
317
kalarmcal = {
318
-
version = "18.12.0";
318
+
version = "18.12.1";
319
319
src = fetchurl {
320
-
url = "${mirror}/stable/applications/18.12.0/src/kalarmcal-18.12.0.tar.xz";
321
-
sha256 = "0l90yxfkjwybff80z7zhgx4sbw7xz8nx0acg56avgrkh3230fv3i";
322
-
name = "kalarmcal-18.12.0.tar.xz";
320
+
url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz";
321
+
sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7";
322
+
name = "kalarmcal-18.12.1.tar.xz";
323
323
};
324
324
};
325
325
kalgebra = {
326
-
version = "18.12.0";
326
+
version = "18.12.1";
327
327
src = fetchurl {
328
-
url = "${mirror}/stable/applications/18.12.0/src/kalgebra-18.12.0.tar.xz";
329
-
sha256 = "0hc3k4zm50n39nvw6fki6997vzz56fwjkn61q48fkbzd4jvcfqni";
330
-
name = "kalgebra-18.12.0.tar.xz";
328
+
url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz";
329
+
sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4";
330
+
name = "kalgebra-18.12.1.tar.xz";
331
331
};
332
332
};
333
333
kalzium = {
334
-
version = "18.12.0";
334
+
version = "18.12.1";
335
335
src = fetchurl {
336
-
url = "${mirror}/stable/applications/18.12.0/src/kalzium-18.12.0.tar.xz";
337
-
sha256 = "0j3a3r1j4vc0ssdw60lvgkdwmh02zz07xakdgxr5jrys4fix23ci";
338
-
name = "kalzium-18.12.0.tar.xz";
336
+
url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz";
337
+
sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7";
338
+
name = "kalzium-18.12.1.tar.xz";
339
339
};
340
340
};
341
341
kamera = {
342
-
version = "18.12.0";
342
+
version = "18.12.1";
343
343
src = fetchurl {
344
-
url = "${mirror}/stable/applications/18.12.0/src/kamera-18.12.0.tar.xz";
345
-
sha256 = "098gg2v8bina5famp2bk0x8dakzz66zd0dxh8vjczjycvzac6hzd";
346
-
name = "kamera-18.12.0.tar.xz";
344
+
url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz";
345
+
sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj";
346
+
name = "kamera-18.12.1.tar.xz";
347
347
};
348
348
};
349
349
kamoso = {
350
-
version = "18.12.0";
350
+
version = "18.12.1";
351
351
src = fetchurl {
352
-
url = "${mirror}/stable/applications/18.12.0/src/kamoso-18.12.0.tar.xz";
353
-
sha256 = "0f4hvbw216xmyavgakvydplcspqcyv1v9bv0pqvwdk1swk1jp0r3";
354
-
name = "kamoso-18.12.0.tar.xz";
352
+
url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz";
353
+
sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p";
354
+
name = "kamoso-18.12.1.tar.xz";
355
355
};
356
356
};
357
357
kanagram = {
358
-
version = "18.12.0";
358
+
version = "18.12.1";
359
359
src = fetchurl {
360
-
url = "${mirror}/stable/applications/18.12.0/src/kanagram-18.12.0.tar.xz";
361
-
sha256 = "1xbb04i06qrffb6pxk05ksn8h1n08r9pyaf9nkhrymgv90l62739";
362
-
name = "kanagram-18.12.0.tar.xz";
360
+
url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz";
361
+
sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx";
362
+
name = "kanagram-18.12.1.tar.xz";
363
363
};
364
364
};
365
365
kapman = {
366
-
version = "18.12.0";
366
+
version = "18.12.1";
367
367
src = fetchurl {
368
-
url = "${mirror}/stable/applications/18.12.0/src/kapman-18.12.0.tar.xz";
369
-
sha256 = "0shq8bjfixjx9gqid27cgiybx0anwgbm69gsrvlczmragswcqxwi";
370
-
name = "kapman-18.12.0.tar.xz";
368
+
url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz";
369
+
sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj";
370
+
name = "kapman-18.12.1.tar.xz";
371
371
};
372
372
};
373
373
kapptemplate = {
374
-
version = "18.12.0";
374
+
version = "18.12.1";
375
375
src = fetchurl {
376
-
url = "${mirror}/stable/applications/18.12.0/src/kapptemplate-18.12.0.tar.xz";
377
-
sha256 = "18q7lxkfim41lhzqwvv4ir2c45fhf9pxxajfwibg9a462b1jxk4a";
378
-
name = "kapptemplate-18.12.0.tar.xz";
376
+
url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz";
377
+
sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa";
378
+
name = "kapptemplate-18.12.1.tar.xz";
379
379
};
380
380
};
381
381
kate = {
382
-
version = "18.12.0";
382
+
version = "18.12.1";
383
383
src = fetchurl {
384
-
url = "${mirror}/stable/applications/18.12.0/src/kate-18.12.0.tar.xz";
385
-
sha256 = "15k66vipm1lqcmk73a44niz1279rkab3g23p9jqyvvbw41j1368l";
386
-
name = "kate-18.12.0.tar.xz";
384
+
url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz";
385
+
sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7";
386
+
name = "kate-18.12.1.tar.xz";
387
387
};
388
388
};
389
389
katomic = {
390
-
version = "18.12.0";
390
+
version = "18.12.1";
391
391
src = fetchurl {
392
-
url = "${mirror}/stable/applications/18.12.0/src/katomic-18.12.0.tar.xz";
393
-
sha256 = "183pgb7pphzmi3lgza4lm5crzf9rs6l2d6fl1xwzvvb3ik77ccqz";
394
-
name = "katomic-18.12.0.tar.xz";
392
+
url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz";
393
+
sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6";
394
+
name = "katomic-18.12.1.tar.xz";
395
395
};
396
396
};
397
397
kbackup = {
398
-
version = "18.12.0";
398
+
version = "18.12.1";
399
399
src = fetchurl {
400
-
url = "${mirror}/stable/applications/18.12.0/src/kbackup-18.12.0.tar.xz";
401
-
sha256 = "1qwrgrrd408y7ipqfhajqfwcicn7pb32akvbls3rby17b2nwn16x";
402
-
name = "kbackup-18.12.0.tar.xz";
400
+
url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz";
401
+
sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw";
402
+
name = "kbackup-18.12.1.tar.xz";
403
403
};
404
404
};
405
405
kblackbox = {
406
-
version = "18.12.0";
406
+
version = "18.12.1";
407
407
src = fetchurl {
408
-
url = "${mirror}/stable/applications/18.12.0/src/kblackbox-18.12.0.tar.xz";
409
-
sha256 = "0hx5bd97k1k4hdyal6g7r7y1xk70sf0779vxfqnin1dpzhgnq2dq";
410
-
name = "kblackbox-18.12.0.tar.xz";
408
+
url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz";
409
+
sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p";
410
+
name = "kblackbox-18.12.1.tar.xz";
411
411
};
412
412
};
413
413
kblocks = {
414
-
version = "18.12.0";
414
+
version = "18.12.1";
415
415
src = fetchurl {
416
-
url = "${mirror}/stable/applications/18.12.0/src/kblocks-18.12.0.tar.xz";
417
-
sha256 = "0f0mapx67gxiy5s9k60qhgc9sfr21hwy62wzdiw4ssbxfhhqv7fa";
418
-
name = "kblocks-18.12.0.tar.xz";
416
+
url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz";
417
+
sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa";
418
+
name = "kblocks-18.12.1.tar.xz";
419
419
};
420
420
};
421
421
kblog = {
422
-
version = "18.12.0";
422
+
version = "18.12.1";
423
423
src = fetchurl {
424
-
url = "${mirror}/stable/applications/18.12.0/src/kblog-18.12.0.tar.xz";
425
-
sha256 = "1slrwablxhsjzl3vj714rzm7rp59vnd9d0ri0k7yvc1ykc4aj8v6";
426
-
name = "kblog-18.12.0.tar.xz";
424
+
url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz";
425
+
sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x";
426
+
name = "kblog-18.12.1.tar.xz";
427
427
};
428
428
};
429
429
kbounce = {
430
-
version = "18.12.0";
430
+
version = "18.12.1";
431
431
src = fetchurl {
432
-
url = "${mirror}/stable/applications/18.12.0/src/kbounce-18.12.0.tar.xz";
433
-
sha256 = "1r5rhlra9p89wn4mmjn81v7lgh78k53xfzhr0sz08dhg7qk2rb48";
434
-
name = "kbounce-18.12.0.tar.xz";
432
+
url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz";
433
+
sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355";
434
+
name = "kbounce-18.12.1.tar.xz";
435
435
};
436
436
};
437
437
kbreakout = {
438
-
version = "18.12.0";
438
+
version = "18.12.1";
439
439
src = fetchurl {
440
-
url = "${mirror}/stable/applications/18.12.0/src/kbreakout-18.12.0.tar.xz";
441
-
sha256 = "0bw84bl2r9am69zv0ik1rhqwcjzazfzwnwjg0zqzzwlyhww0ya5f";
442
-
name = "kbreakout-18.12.0.tar.xz";
440
+
url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz";
441
+
sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq";
442
+
name = "kbreakout-18.12.1.tar.xz";
443
443
};
444
444
};
445
445
kbruch = {
446
-
version = "18.12.0";
446
+
version = "18.12.1";
447
447
src = fetchurl {
448
-
url = "${mirror}/stable/applications/18.12.0/src/kbruch-18.12.0.tar.xz";
449
-
sha256 = "156varmig28a3swk099k2c2l0hn8kbr1khz5cd9c9wdy46ln6w8n";
450
-
name = "kbruch-18.12.0.tar.xz";
448
+
url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz";
449
+
sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh";
450
+
name = "kbruch-18.12.1.tar.xz";
451
451
};
452
452
};
453
453
kcachegrind = {
454
-
version = "18.12.0";
454
+
version = "18.12.1";
455
455
src = fetchurl {
456
-
url = "${mirror}/stable/applications/18.12.0/src/kcachegrind-18.12.0.tar.xz";
457
-
sha256 = "1jvpn2ly2pn9pnv6zx7i8z0zn91lb2kf6q9linqmpag47qbg0p7y";
458
-
name = "kcachegrind-18.12.0.tar.xz";
456
+
url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz";
457
+
sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29";
458
+
name = "kcachegrind-18.12.1.tar.xz";
459
459
};
460
460
};
461
461
kcalc = {
462
-
version = "18.12.0";
462
+
version = "18.12.1";
463
463
src = fetchurl {
464
-
url = "${mirror}/stable/applications/18.12.0/src/kcalc-18.12.0.tar.xz";
465
-
sha256 = "15wdyv5sgnd9amar41k14mgyz8p4d1aba0kw7gphzl7c9gms0y70";
466
-
name = "kcalc-18.12.0.tar.xz";
464
+
url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz";
465
+
sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93";
466
+
name = "kcalc-18.12.1.tar.xz";
467
467
};
468
468
};
469
469
kcalcore = {
470
-
version = "18.12.0";
470
+
version = "18.12.1";
471
471
src = fetchurl {
472
-
url = "${mirror}/stable/applications/18.12.0/src/kcalcore-18.12.0.tar.xz";
473
-
sha256 = "04y7bdrdcbz98waydi9r5hw25mdzy8a0pzzdsmp2ky2lj4shph4h";
474
-
name = "kcalcore-18.12.0.tar.xz";
472
+
url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz";
473
+
sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki";
474
+
name = "kcalcore-18.12.1.tar.xz";
475
475
};
476
476
};
477
477
kcalutils = {
478
-
version = "18.12.0";
478
+
version = "18.12.1";
479
479
src = fetchurl {
480
-
url = "${mirror}/stable/applications/18.12.0/src/kcalutils-18.12.0.tar.xz";
481
-
sha256 = "1w10np6g02f3hh3bn3zksbj335mrzy0a5wg4lk2hny06rakk0hh0";
482
-
name = "kcalutils-18.12.0.tar.xz";
480
+
url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz";
481
+
sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp";
482
+
name = "kcalutils-18.12.1.tar.xz";
483
483
};
484
484
};
485
485
kcharselect = {
486
-
version = "18.12.0";
486
+
version = "18.12.1";
487
487
src = fetchurl {
488
-
url = "${mirror}/stable/applications/18.12.0/src/kcharselect-18.12.0.tar.xz";
489
-
sha256 = "0s4yqylc5jhgl7s3cs8gf8bb4r7n8nhxhl502sbnamss11lx7gqw";
490
-
name = "kcharselect-18.12.0.tar.xz";
488
+
url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz";
489
+
sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6";
490
+
name = "kcharselect-18.12.1.tar.xz";
491
491
};
492
492
};
493
493
kcolorchooser = {
494
-
version = "18.12.0";
494
+
version = "18.12.1";
495
495
src = fetchurl {
496
-
url = "${mirror}/stable/applications/18.12.0/src/kcolorchooser-18.12.0.tar.xz";
497
-
sha256 = "0za9isapgmbafmn5v6fwdw1vaafszwnia1iim9k4ga7bs9aakfhb";
498
-
name = "kcolorchooser-18.12.0.tar.xz";
496
+
url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz";
497
+
sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn";
498
+
name = "kcolorchooser-18.12.1.tar.xz";
499
499
};
500
500
};
501
501
kcontacts = {
502
-
version = "18.12.0";
502
+
version = "18.12.1";
503
503
src = fetchurl {
504
-
url = "${mirror}/stable/applications/18.12.0/src/kcontacts-18.12.0.tar.xz";
505
-
sha256 = "1drp0rzhjbb9nqqjl9cmwpyqk8dgvnaw42rmn0cwla8l8qas5xs5";
506
-
name = "kcontacts-18.12.0.tar.xz";
504
+
url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz";
505
+
sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba";
506
+
name = "kcontacts-18.12.1.tar.xz";
507
507
};
508
508
};
509
509
kcron = {
510
-
version = "18.12.0";
510
+
version = "18.12.1";
511
511
src = fetchurl {
512
-
url = "${mirror}/stable/applications/18.12.0/src/kcron-18.12.0.tar.xz";
513
-
sha256 = "02fxsnka3d3456j99nsrgvkxpjd677xl0z7hmqwsr0zx3bx0krk7";
514
-
name = "kcron-18.12.0.tar.xz";
512
+
url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz";
513
+
sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn";
514
+
name = "kcron-18.12.1.tar.xz";
515
515
};
516
516
};
517
517
kdav = {
518
-
version = "18.12.0";
518
+
version = "18.12.1";
519
519
src = fetchurl {
520
-
url = "${mirror}/stable/applications/18.12.0/src/kdav-18.12.0.tar.xz";
521
-
sha256 = "0fbw65yiskygbhhagsc48yrhdslg951fd13b6mzwf2ab55fw6vmf";
522
-
name = "kdav-18.12.0.tar.xz";
520
+
url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz";
521
+
sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77";
522
+
name = "kdav-18.12.1.tar.xz";
523
523
};
524
524
};
525
525
kdebugsettings = {
526
-
version = "18.12.0";
526
+
version = "18.12.1";
527
527
src = fetchurl {
528
-
url = "${mirror}/stable/applications/18.12.0/src/kdebugsettings-18.12.0.tar.xz";
529
-
sha256 = "1gdrc1x5bavdi6ljqv5wh1hwvys1r2v00xi555dfyijjryr7kd27";
530
-
name = "kdebugsettings-18.12.0.tar.xz";
528
+
url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz";
529
+
sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3";
530
+
name = "kdebugsettings-18.12.1.tar.xz";
531
531
};
532
532
};
533
533
kde-dev-scripts = {
534
-
version = "18.12.0";
534
+
version = "18.12.1";
535
535
src = fetchurl {
536
-
url = "${mirror}/stable/applications/18.12.0/src/kde-dev-scripts-18.12.0.tar.xz";
537
-
sha256 = "03wmki422lw1r5i51gh17ha3w2gpdjv4ix7bndjakwq315iivlxi";
538
-
name = "kde-dev-scripts-18.12.0.tar.xz";
536
+
url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz";
537
+
sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3";
538
+
name = "kde-dev-scripts-18.12.1.tar.xz";
539
539
};
540
540
};
541
541
kde-dev-utils = {
542
-
version = "18.12.0";
542
+
version = "18.12.1";
543
543
src = fetchurl {
544
-
url = "${mirror}/stable/applications/18.12.0/src/kde-dev-utils-18.12.0.tar.xz";
545
-
sha256 = "0x2ji7jd12b1blww2jz0709yl79pb3slglx7mp4yyfi66c5ngl1q";
546
-
name = "kde-dev-utils-18.12.0.tar.xz";
544
+
url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz";
545
+
sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj";
546
+
name = "kde-dev-utils-18.12.1.tar.xz";
547
547
};
548
548
};
549
549
kdeedu-data = {
550
-
version = "18.12.0";
550
+
version = "18.12.1";
551
551
src = fetchurl {
552
-
url = "${mirror}/stable/applications/18.12.0/src/kdeedu-data-18.12.0.tar.xz";
553
-
sha256 = "1p3rjsdhf4hy9468515vkbihkj69s2gpz6fxk3rqvi03ksmpdi5x";
554
-
name = "kdeedu-data-18.12.0.tar.xz";
552
+
url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz";
553
+
sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq";
554
+
name = "kdeedu-data-18.12.1.tar.xz";
555
555
};
556
556
};
557
557
kdegraphics-mobipocket = {
558
-
version = "18.12.0";
558
+
version = "18.12.1";
559
559
src = fetchurl {
560
-
url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-mobipocket-18.12.0.tar.xz";
561
-
sha256 = "05gxnbrl4p1s6mccvp0482as4r41rhqsrfd84v57sqyd93mgzsji";
562
-
name = "kdegraphics-mobipocket-18.12.0.tar.xz";
560
+
url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz";
561
+
sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq";
562
+
name = "kdegraphics-mobipocket-18.12.1.tar.xz";
563
563
};
564
564
};
565
565
kdegraphics-thumbnailers = {
566
-
version = "18.12.0";
566
+
version = "18.12.1";
567
567
src = fetchurl {
568
-
url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-thumbnailers-18.12.0.tar.xz";
569
-
sha256 = "096acsz560k238sfa54nyjydx5wlc0b92khi4ahmvaqmllzjc9p4";
570
-
name = "kdegraphics-thumbnailers-18.12.0.tar.xz";
568
+
url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz";
569
+
sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj";
570
+
name = "kdegraphics-thumbnailers-18.12.1.tar.xz";
571
571
};
572
572
};
573
573
kdenetwork-filesharing = {
574
-
version = "18.12.0";
574
+
version = "18.12.1";
575
575
src = fetchurl {
576
-
url = "${mirror}/stable/applications/18.12.0/src/kdenetwork-filesharing-18.12.0.tar.xz";
577
-
sha256 = "183f8fir8rx7jr35gyj074k852s51gjsd2q7hp1bgkj7g5avql4i";
578
-
name = "kdenetwork-filesharing-18.12.0.tar.xz";
576
+
url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz";
577
+
sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4";
578
+
name = "kdenetwork-filesharing-18.12.1.tar.xz";
579
579
};
580
580
};
581
581
kdenlive = {
582
-
version = "18.12.0";
582
+
version = "18.12.1";
583
583
src = fetchurl {
584
-
url = "${mirror}/stable/applications/18.12.0/src/kdenlive-18.12.0.tar.xz";
585
-
sha256 = "0jknpfs7gql527pbj0nb1bxvhxpbk0gnyjx4g6wdhlmk87w2g0wp";
586
-
name = "kdenlive-18.12.0.tar.xz";
584
+
url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz";
585
+
sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf";
586
+
name = "kdenlive-18.12.1.tar.xz";
587
587
};
588
588
};
589
589
kdepim-addons = {
590
-
version = "18.12.0";
590
+
version = "18.12.1";
591
591
src = fetchurl {
592
-
url = "${mirror}/stable/applications/18.12.0/src/kdepim-addons-18.12.0.tar.xz";
593
-
sha256 = "0dbys45cn00xism83x2j1ypidg5dp8zv29wx18a4bga4y8mfnrkp";
594
-
name = "kdepim-addons-18.12.0.tar.xz";
592
+
url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz";
593
+
sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp";
594
+
name = "kdepim-addons-18.12.1.tar.xz";
595
595
};
596
596
};
597
597
kdepim-apps-libs = {
598
-
version = "18.12.0";
598
+
version = "18.12.1";
599
599
src = fetchurl {
600
-
url = "${mirror}/stable/applications/18.12.0/src/kdepim-apps-libs-18.12.0.tar.xz";
601
-
sha256 = "18y3n602b6v1jyl18lvqalasf2v795ln31nn79ih1z4y49j1s67x";
602
-
name = "kdepim-apps-libs-18.12.0.tar.xz";
600
+
url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz";
601
+
sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i";
602
+
name = "kdepim-apps-libs-18.12.1.tar.xz";
603
603
};
604
604
};
605
605
kdepim-runtime = {
606
-
version = "18.12.0";
606
+
version = "18.12.1";
607
607
src = fetchurl {
608
-
url = "${mirror}/stable/applications/18.12.0/src/kdepim-runtime-18.12.0.tar.xz";
609
-
sha256 = "0vmwgbbnwipi62aciy52pdd4ygrgx3l87i5g5nspkb03wlb5jl51";
610
-
name = "kdepim-runtime-18.12.0.tar.xz";
608
+
url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz";
609
+
sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc";
610
+
name = "kdepim-runtime-18.12.1.tar.xz";
611
611
};
612
612
};
613
613
kdesdk-kioslaves = {
614
-
version = "18.12.0";
614
+
version = "18.12.1";
615
615
src = fetchurl {
616
-
url = "${mirror}/stable/applications/18.12.0/src/kdesdk-kioslaves-18.12.0.tar.xz";
617
-
sha256 = "0ca9cwxv836jl9crqik9s1v3dgk5z9jhvzxvbcvrbalvs1cyxg8b";
618
-
name = "kdesdk-kioslaves-18.12.0.tar.xz";
616
+
url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz";
617
+
sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69";
618
+
name = "kdesdk-kioslaves-18.12.1.tar.xz";
619
619
};
620
620
};
621
621
kdesdk-thumbnailers = {
622
-
version = "18.12.0";
622
+
version = "18.12.1";
623
623
src = fetchurl {
624
-
url = "${mirror}/stable/applications/18.12.0/src/kdesdk-thumbnailers-18.12.0.tar.xz";
625
-
sha256 = "1q57c5i7pnrpd7g1dwrahac9lji9ljqyb60qkj9qx3v3fnr11v7f";
626
-
name = "kdesdk-thumbnailers-18.12.0.tar.xz";
624
+
url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz";
625
+
sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb";
626
+
name = "kdesdk-thumbnailers-18.12.1.tar.xz";
627
627
};
628
628
};
629
629
kdf = {
630
-
version = "18.12.0";
630
+
version = "18.12.1";
631
631
src = fetchurl {
632
-
url = "${mirror}/stable/applications/18.12.0/src/kdf-18.12.0.tar.xz";
633
-
sha256 = "1ds4z4adyaazmhbybq2f361qq02a8l73a9g2hwcrh95w0dcisyvp";
634
-
name = "kdf-18.12.0.tar.xz";
632
+
url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz";
633
+
sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11";
634
+
name = "kdf-18.12.1.tar.xz";
635
635
};
636
636
};
637
637
kdialog = {
638
-
version = "18.12.0";
638
+
version = "18.12.1";
639
639
src = fetchurl {
640
-
url = "${mirror}/stable/applications/18.12.0/src/kdialog-18.12.0.tar.xz";
641
-
sha256 = "04v2s3wlaihcm4c64kzcxmxs9niw6ghid0vdl4pw8h0ks1s8xz0g";
642
-
name = "kdialog-18.12.0.tar.xz";
640
+
url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz";
641
+
sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2";
642
+
name = "kdialog-18.12.1.tar.xz";
643
643
};
644
644
};
645
645
kdiamond = {
646
-
version = "18.12.0";
646
+
version = "18.12.1";
647
647
src = fetchurl {
648
-
url = "${mirror}/stable/applications/18.12.0/src/kdiamond-18.12.0.tar.xz";
649
-
sha256 = "0c11v3c7hxllg15h8mq18jl5lqprwwpnz04rjjggwzz8c4iz2kjs";
650
-
name = "kdiamond-18.12.0.tar.xz";
648
+
url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz";
649
+
sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4";
650
+
name = "kdiamond-18.12.1.tar.xz";
651
651
};
652
652
};
653
653
keditbookmarks = {
654
-
version = "18.12.0";
654
+
version = "18.12.1";
655
655
src = fetchurl {
656
-
url = "${mirror}/stable/applications/18.12.0/src/keditbookmarks-18.12.0.tar.xz";
657
-
sha256 = "1ia69amq6dfidfgxq297xa10f3812spibb00wsv9dj4cp36y89mm";
658
-
name = "keditbookmarks-18.12.0.tar.xz";
656
+
url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz";
657
+
sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1";
658
+
name = "keditbookmarks-18.12.1.tar.xz";
659
659
};
660
660
};
661
661
kfind = {
662
-
version = "18.12.0";
662
+
version = "18.12.1";
663
663
src = fetchurl {
664
-
url = "${mirror}/stable/applications/18.12.0/src/kfind-18.12.0.tar.xz";
665
-
sha256 = "0km2f88pw9ynqbxsl3pwfkk120ni0by2rsaldqp2h3a26kyc5gzk";
666
-
name = "kfind-18.12.0.tar.xz";
664
+
url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz";
665
+
sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b";
666
+
name = "kfind-18.12.1.tar.xz";
667
667
};
668
668
};
669
669
kfloppy = {
670
-
version = "18.12.0";
670
+
version = "18.12.1";
671
671
src = fetchurl {
672
-
url = "${mirror}/stable/applications/18.12.0/src/kfloppy-18.12.0.tar.xz";
673
-
sha256 = "0ng0d18dnnrdp9xccald0jn8hl40v2kshgmy8pnr4agl20aagh61";
674
-
name = "kfloppy-18.12.0.tar.xz";
672
+
url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz";
673
+
sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq";
674
+
name = "kfloppy-18.12.1.tar.xz";
675
675
};
676
676
};
677
677
kfourinline = {
678
-
version = "18.12.0";
678
+
version = "18.12.1";
679
679
src = fetchurl {
680
-
url = "${mirror}/stable/applications/18.12.0/src/kfourinline-18.12.0.tar.xz";
681
-
sha256 = "01wjqyg7aw2wi7nrrqri3znb545hr1qcanzibjiakhb2pbx5db3z";
682
-
name = "kfourinline-18.12.0.tar.xz";
680
+
url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz";
681
+
sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g";
682
+
name = "kfourinline-18.12.1.tar.xz";
683
683
};
684
684
};
685
685
kgeography = {
686
-
version = "18.12.0";
686
+
version = "18.12.1";
687
687
src = fetchurl {
688
-
url = "${mirror}/stable/applications/18.12.0/src/kgeography-18.12.0.tar.xz";
689
-
sha256 = "1fa2333xmxswlfjzl7d3ssl7s2hgwszhqxkdyi9db9lqxq0m3ckv";
690
-
name = "kgeography-18.12.0.tar.xz";
688
+
url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz";
689
+
sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf";
690
+
name = "kgeography-18.12.1.tar.xz";
691
691
};
692
692
};
693
693
kget = {
694
-
version = "18.12.0";
694
+
version = "18.12.1";
695
695
src = fetchurl {
696
-
url = "${mirror}/stable/applications/18.12.0/src/kget-18.12.0.tar.xz";
697
-
sha256 = "1f3ahslqcicgkhgdpdrvy9ydlsl1hwnnym7fw2v2k07h5mprw8hp";
698
-
name = "kget-18.12.0.tar.xz";
696
+
url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz";
697
+
sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb";
698
+
name = "kget-18.12.1.tar.xz";
699
699
};
700
700
};
701
701
kgoldrunner = {
702
-
version = "18.12.0";
702
+
version = "18.12.1";
703
703
src = fetchurl {
704
-
url = "${mirror}/stable/applications/18.12.0/src/kgoldrunner-18.12.0.tar.xz";
705
-
sha256 = "0cmcjmfhair649nbfx74qdmsf67lx4j53qkj0xsr7bijv52pi4br";
706
-
name = "kgoldrunner-18.12.0.tar.xz";
704
+
url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz";
705
+
sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba";
706
+
name = "kgoldrunner-18.12.1.tar.xz";
707
707
};
708
708
};
709
709
kgpg = {
710
-
version = "18.12.0";
710
+
version = "18.12.1";
711
711
src = fetchurl {
712
-
url = "${mirror}/stable/applications/18.12.0/src/kgpg-18.12.0.tar.xz";
713
-
sha256 = "1hlcpgfcwpiyf1xfy62mris60cnws1mcgpni5nvvwdzdi4scad3g";
714
-
name = "kgpg-18.12.0.tar.xz";
712
+
url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz";
713
+
sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y";
714
+
name = "kgpg-18.12.1.tar.xz";
715
715
};
716
716
};
717
717
khangman = {
718
-
version = "18.12.0";
718
+
version = "18.12.1";
719
719
src = fetchurl {
720
-
url = "${mirror}/stable/applications/18.12.0/src/khangman-18.12.0.tar.xz";
721
-
sha256 = "0y05jjacnw2h70hjn5jbpnmcj53xgcx8304s39aa8zc1ry9jvsqq";
722
-
name = "khangman-18.12.0.tar.xz";
720
+
url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz";
721
+
sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q";
722
+
name = "khangman-18.12.1.tar.xz";
723
723
};
724
724
};
725
725
khelpcenter = {
726
-
version = "18.12.0";
726
+
version = "18.12.1";
727
727
src = fetchurl {
728
-
url = "${mirror}/stable/applications/18.12.0/src/khelpcenter-18.12.0.tar.xz";
729
-
sha256 = "0cwxf6m3f6md4y51zpscxh89p9p9jzzsfslxh04y92p9g0l1qvwm";
730
-
name = "khelpcenter-18.12.0.tar.xz";
728
+
url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz";
729
+
sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y";
730
+
name = "khelpcenter-18.12.1.tar.xz";
731
731
};
732
732
};
733
733
kidentitymanagement = {
734
-
version = "18.12.0";
734
+
version = "18.12.1";
735
735
src = fetchurl {
736
-
url = "${mirror}/stable/applications/18.12.0/src/kidentitymanagement-18.12.0.tar.xz";
737
-
sha256 = "1i0amb9m2vc00zaawv2wdyw7gzwz8lfw4bvz0mlnad4nrcmkvjyk";
738
-
name = "kidentitymanagement-18.12.0.tar.xz";
736
+
url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz";
737
+
sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq";
738
+
name = "kidentitymanagement-18.12.1.tar.xz";
739
739
};
740
740
};
741
741
kig = {
742
-
version = "18.12.0";
742
+
version = "18.12.1";
743
743
src = fetchurl {
744
-
url = "${mirror}/stable/applications/18.12.0/src/kig-18.12.0.tar.xz";
745
-
sha256 = "0zq7z4jj8bsmhjggjh7byjv74ry6caps9pviwqqcsrdrl5357kzi";
746
-
name = "kig-18.12.0.tar.xz";
744
+
url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz";
745
+
sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc";
746
+
name = "kig-18.12.1.tar.xz";
747
747
};
748
748
};
749
749
kigo = {
750
-
version = "18.12.0";
750
+
version = "18.12.1";
751
751
src = fetchurl {
752
-
url = "${mirror}/stable/applications/18.12.0/src/kigo-18.12.0.tar.xz";
753
-
sha256 = "03kl5hn8b2qbbv436rd8slqwr5w4034wz7vvm9z9cmjbpxavls2q";
754
-
name = "kigo-18.12.0.tar.xz";
752
+
url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz";
753
+
sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2";
754
+
name = "kigo-18.12.1.tar.xz";
755
755
};
756
756
};
757
757
killbots = {
758
-
version = "18.12.0";
758
+
version = "18.12.1";
759
759
src = fetchurl {
760
-
url = "${mirror}/stable/applications/18.12.0/src/killbots-18.12.0.tar.xz";
761
-
sha256 = "0w8xl73ir9a3zxvsj3027gdlh7mskns3f0bk4mspirwg761zn1hf";
762
-
name = "killbots-18.12.0.tar.xz";
760
+
url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz";
761
+
sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43";
762
+
name = "killbots-18.12.1.tar.xz";
763
763
};
764
764
};
765
765
kimagemapeditor = {
766
-
version = "18.12.0";
766
+
version = "18.12.1";
767
767
src = fetchurl {
768
-
url = "${mirror}/stable/applications/18.12.0/src/kimagemapeditor-18.12.0.tar.xz";
769
-
sha256 = "0l17biqkq8jkc2vnnw51a6g13y29rnsfn9dx3afv88bdf2a52x1m";
770
-
name = "kimagemapeditor-18.12.0.tar.xz";
768
+
url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz";
769
+
sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4";
770
+
name = "kimagemapeditor-18.12.1.tar.xz";
771
771
};
772
772
};
773
773
kimap = {
774
-
version = "18.12.0";
774
+
version = "18.12.1";
775
775
src = fetchurl {
776
-
url = "${mirror}/stable/applications/18.12.0/src/kimap-18.12.0.tar.xz";
777
-
sha256 = "04m6sd36k6w4iiqanxy49v06am11p5xcb253gk99pyfrssb596m5";
778
-
name = "kimap-18.12.0.tar.xz";
776
+
url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz";
777
+
sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm";
778
+
name = "kimap-18.12.1.tar.xz";
779
779
};
780
780
};
781
781
kio-extras = {
782
-
version = "18.12.0";
782
+
version = "18.12.1";
783
783
src = fetchurl {
784
-
url = "${mirror}/stable/applications/18.12.0/src/kio-extras-18.12.0.tar.xz";
785
-
sha256 = "1sbl7m8c4fy63389bv19ck89nzxjpf0l2855sc81fzy3zig89b65";
786
-
name = "kio-extras-18.12.0.tar.xz";
784
+
url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz";
785
+
sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3";
786
+
name = "kio-extras-18.12.1.tar.xz";
787
787
};
788
788
};
789
789
kirigami-gallery = {
790
-
version = "18.12.0";
790
+
version = "18.12.1";
791
791
src = fetchurl {
792
-
url = "${mirror}/stable/applications/18.12.0/src/kirigami-gallery-18.12.0.tar.xz";
793
-
sha256 = "008ixa0kvqjjk98aq9mcapxd8d8svkjpz04v4ka64zwks8qyzdrk";
794
-
name = "kirigami-gallery-18.12.0.tar.xz";
792
+
url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz";
793
+
sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0";
794
+
name = "kirigami-gallery-18.12.1.tar.xz";
795
795
};
796
796
};
797
797
kiriki = {
798
-
version = "18.12.0";
798
+
version = "18.12.1";
799
799
src = fetchurl {
800
-
url = "${mirror}/stable/applications/18.12.0/src/kiriki-18.12.0.tar.xz";
801
-
sha256 = "098gsl6pj8bdm29qa1w6pnyg7m25m0m2f97f7cwgqi1h4asyz9h8";
802
-
name = "kiriki-18.12.0.tar.xz";
800
+
url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz";
801
+
sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz";
802
+
name = "kiriki-18.12.1.tar.xz";
803
803
};
804
804
};
805
805
kiten = {
806
-
version = "18.12.0";
806
+
version = "18.12.1";
807
807
src = fetchurl {
808
-
url = "${mirror}/stable/applications/18.12.0/src/kiten-18.12.0.tar.xz";
809
-
sha256 = "1lkaicfc5z59g6gvcgmkdwpfl2i622s26w3pf1w0cmlw1hnspblc";
810
-
name = "kiten-18.12.0.tar.xz";
808
+
url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz";
809
+
sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947";
810
+
name = "kiten-18.12.1.tar.xz";
811
811
};
812
812
};
813
813
kitinerary = {
814
-
version = "18.12.0";
814
+
version = "18.12.1";
815
815
src = fetchurl {
816
-
url = "${mirror}/stable/applications/18.12.0/src/kitinerary-18.12.0.tar.xz";
817
-
sha256 = "0q4fhfckvzlcza7r2gddygfn7f3dfj4kl82m644givb4394hjapd";
818
-
name = "kitinerary-18.12.0.tar.xz";
816
+
url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz";
817
+
sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws";
818
+
name = "kitinerary-18.12.1.tar.xz";
819
819
};
820
820
};
821
821
kjumpingcube = {
822
-
version = "18.12.0";
822
+
version = "18.12.1";
823
823
src = fetchurl {
824
-
url = "${mirror}/stable/applications/18.12.0/src/kjumpingcube-18.12.0.tar.xz";
825
-
sha256 = "0j022vr1dj06s21cwxhsiv8xb1000l2yz2jz128rnkpr63b8darr";
826
-
name = "kjumpingcube-18.12.0.tar.xz";
824
+
url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz";
825
+
sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih";
826
+
name = "kjumpingcube-18.12.1.tar.xz";
827
827
};
828
828
};
829
829
kldap = {
830
-
version = "18.12.0";
830
+
version = "18.12.1";
831
831
src = fetchurl {
832
-
url = "${mirror}/stable/applications/18.12.0/src/kldap-18.12.0.tar.xz";
833
-
sha256 = "0359vzfhscqlha2vyaygqpai7qi924ircw290prwrmhn9jqzms5x";
834
-
name = "kldap-18.12.0.tar.xz";
832
+
url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz";
833
+
sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn";
834
+
name = "kldap-18.12.1.tar.xz";
835
835
};
836
836
};
837
837
kleopatra = {
838
-
version = "18.12.0";
838
+
version = "18.12.1";
839
839
src = fetchurl {
840
-
url = "${mirror}/stable/applications/18.12.0/src/kleopatra-18.12.0.tar.xz";
841
-
sha256 = "1j1s7dmg5wadfd8z76i5l81drii0sjdynahkcm8jdz3gvrsd773k";
842
-
name = "kleopatra-18.12.0.tar.xz";
840
+
url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz";
841
+
sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj";
842
+
name = "kleopatra-18.12.1.tar.xz";
843
843
};
844
844
};
845
845
klettres = {
846
-
version = "18.12.0";
846
+
version = "18.12.1";
847
847
src = fetchurl {
848
-
url = "${mirror}/stable/applications/18.12.0/src/klettres-18.12.0.tar.xz";
849
-
sha256 = "0gyd7vnm6mq7wy398h9nrny611pc6v4kksmdbhhsrkagvj4rvywq";
850
-
name = "klettres-18.12.0.tar.xz";
848
+
url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz";
849
+
sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk";
850
+
name = "klettres-18.12.1.tar.xz";
851
851
};
852
852
};
853
853
klickety = {
854
-
version = "18.12.0";
854
+
version = "18.12.1";
855
855
src = fetchurl {
856
-
url = "${mirror}/stable/applications/18.12.0/src/klickety-18.12.0.tar.xz";
857
-
sha256 = "083w9lj6h6yxxk6vgmf72651vb423gakppbi7z7ii5i546miilyn";
858
-
name = "klickety-18.12.0.tar.xz";
856
+
url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz";
857
+
sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy";
858
+
name = "klickety-18.12.1.tar.xz";
859
859
};
860
860
};
861
861
klines = {
862
-
version = "18.12.0";
862
+
version = "18.12.1";
863
863
src = fetchurl {
864
-
url = "${mirror}/stable/applications/18.12.0/src/klines-18.12.0.tar.xz";
865
-
sha256 = "1v05ssjrb6x81c5nj9c8dpfqj9wr2m4mz9c883pnc5pjbc33fh0x";
866
-
name = "klines-18.12.0.tar.xz";
864
+
url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz";
865
+
sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf";
866
+
name = "klines-18.12.1.tar.xz";
867
867
};
868
868
};
869
869
kmag = {
870
-
version = "18.12.0";
870
+
version = "18.12.1";
871
871
src = fetchurl {
872
-
url = "${mirror}/stable/applications/18.12.0/src/kmag-18.12.0.tar.xz";
873
-
sha256 = "0micbc4wqi23jc2bpf1kjzy8xafqkd8gp70hg83id7mlncq12pm7";
874
-
name = "kmag-18.12.0.tar.xz";
872
+
url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz";
873
+
sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw";
874
+
name = "kmag-18.12.1.tar.xz";
875
875
};
876
876
};
877
877
kmahjongg = {
878
-
version = "18.12.0";
878
+
version = "18.12.1";
879
879
src = fetchurl {
880
-
url = "${mirror}/stable/applications/18.12.0/src/kmahjongg-18.12.0.tar.xz";
881
-
sha256 = "1zv4dljkj1i4hxmy1cnyzpnipvdh6dmp6msmivgbsaz7yra1zqlx";
882
-
name = "kmahjongg-18.12.0.tar.xz";
880
+
url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz";
881
+
sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd";
882
+
name = "kmahjongg-18.12.1.tar.xz";
883
883
};
884
884
};
885
885
kmail = {
886
-
version = "18.12.0";
886
+
version = "18.12.1";
887
887
src = fetchurl {
888
-
url = "${mirror}/stable/applications/18.12.0/src/kmail-18.12.0.tar.xz";
889
-
sha256 = "0ivzl7cpjcavqybbd5jfd9gk7qfvnfrly8gi20lwg97s07cih42x";
890
-
name = "kmail-18.12.0.tar.xz";
888
+
url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz";
889
+
sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7";
890
+
name = "kmail-18.12.1.tar.xz";
891
891
};
892
892
};
893
893
kmail-account-wizard = {
894
-
version = "18.12.0";
894
+
version = "18.12.1";
895
895
src = fetchurl {
896
-
url = "${mirror}/stable/applications/18.12.0/src/kmail-account-wizard-18.12.0.tar.xz";
897
-
sha256 = "04q3yrbarqqw5wd8waaacd4kb409y8k6rbwk0lsrr4gvs7b5h4jg";
898
-
name = "kmail-account-wizard-18.12.0.tar.xz";
896
+
url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz";
897
+
sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3";
898
+
name = "kmail-account-wizard-18.12.1.tar.xz";
899
899
};
900
900
};
901
901
kmailtransport = {
902
-
version = "18.12.0";
902
+
version = "18.12.1";
903
903
src = fetchurl {
904
-
url = "${mirror}/stable/applications/18.12.0/src/kmailtransport-18.12.0.tar.xz";
905
-
sha256 = "0i3rgw4pf143jnkxnds84j8yg7smhgf2c5qkc1vk37i05vg81r76";
906
-
name = "kmailtransport-18.12.0.tar.xz";
904
+
url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz";
905
+
sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm";
906
+
name = "kmailtransport-18.12.1.tar.xz";
907
907
};
908
908
};
909
909
kmbox = {
910
-
version = "18.12.0";
910
+
version = "18.12.1";
911
911
src = fetchurl {
912
-
url = "${mirror}/stable/applications/18.12.0/src/kmbox-18.12.0.tar.xz";
913
-
sha256 = "03krrgzbvvhn0xcmbhx4whk347pxr26gqhnxh7mg82w5pzx7y6gm";
914
-
name = "kmbox-18.12.0.tar.xz";
912
+
url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz";
913
+
sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf";
914
+
name = "kmbox-18.12.1.tar.xz";
915
915
};
916
916
};
917
917
kmime = {
918
-
version = "18.12.0";
918
+
version = "18.12.1";
919
919
src = fetchurl {
920
-
url = "${mirror}/stable/applications/18.12.0/src/kmime-18.12.0.tar.xz";
921
-
sha256 = "0kh1v62xxca6i6g48xznqrxfw4wfwqcbv338m0ybqr06w0kgcfr2";
922
-
name = "kmime-18.12.0.tar.xz";
920
+
url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz";
921
+
sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2";
922
+
name = "kmime-18.12.1.tar.xz";
923
923
};
924
924
};
925
925
kmines = {
926
-
version = "18.12.0";
926
+
version = "18.12.1";
927
927
src = fetchurl {
928
-
url = "${mirror}/stable/applications/18.12.0/src/kmines-18.12.0.tar.xz";
929
-
sha256 = "0lgzh1pa9g807jdq16k0a9n2akqgad0vgpx1zms6ldnaqvr7mm6w";
930
-
name = "kmines-18.12.0.tar.xz";
928
+
url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz";
929
+
sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi";
930
+
name = "kmines-18.12.1.tar.xz";
931
931
};
932
932
};
933
933
kmix = {
934
-
version = "18.12.0";
934
+
version = "18.12.1";
935
935
src = fetchurl {
936
-
url = "${mirror}/stable/applications/18.12.0/src/kmix-18.12.0.tar.xz";
937
-
sha256 = "09m1d62w912ly6r8874b6ccimwdf6i9p2fyfb3pa5axc8d01lca9";
938
-
name = "kmix-18.12.0.tar.xz";
936
+
url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz";
937
+
sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73";
938
+
name = "kmix-18.12.1.tar.xz";
939
939
};
940
940
};
941
941
kmousetool = {
942
-
version = "18.12.0";
942
+
version = "18.12.1";
943
943
src = fetchurl {
944
-
url = "${mirror}/stable/applications/18.12.0/src/kmousetool-18.12.0.tar.xz";
945
-
sha256 = "00nwk11w7ljn22bfh06l109gw8yhl9vccgwimqhyplq0p8c3cnb0";
946
-
name = "kmousetool-18.12.0.tar.xz";
944
+
url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz";
945
+
sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x";
946
+
name = "kmousetool-18.12.1.tar.xz";
947
947
};
948
948
};
949
949
kmouth = {
950
-
version = "18.12.0";
950
+
version = "18.12.1";
951
951
src = fetchurl {
952
-
url = "${mirror}/stable/applications/18.12.0/src/kmouth-18.12.0.tar.xz";
953
-
sha256 = "0ig1wxaxwjj6qv7k2djdzhlnbbx74yk5f1sk42qx6csprl2bgp39";
954
-
name = "kmouth-18.12.0.tar.xz";
952
+
url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz";
953
+
sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5";
954
+
name = "kmouth-18.12.1.tar.xz";
955
955
};
956
956
};
957
957
kmplot = {
958
-
version = "18.12.0";
958
+
version = "18.12.1";
959
959
src = fetchurl {
960
-
url = "${mirror}/stable/applications/18.12.0/src/kmplot-18.12.0.tar.xz";
961
-
sha256 = "1mn7qrqwhwna9znprhb6fb2h127lcgjkx6m9csi8g11kklj95zi0";
962
-
name = "kmplot-18.12.0.tar.xz";
960
+
url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz";
961
+
sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf";
962
+
name = "kmplot-18.12.1.tar.xz";
963
963
};
964
964
};
965
965
knavalbattle = {
966
-
version = "18.12.0";
966
+
version = "18.12.1";
967
967
src = fetchurl {
968
-
url = "${mirror}/stable/applications/18.12.0/src/knavalbattle-18.12.0.tar.xz";
969
-
sha256 = "16v4q2hn4d2d8iqj9mim0y8azx4nraja9a6fhym2h5nzqsz253gk";
970
-
name = "knavalbattle-18.12.0.tar.xz";
968
+
url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz";
969
+
sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8";
970
+
name = "knavalbattle-18.12.1.tar.xz";
971
971
};
972
972
};
973
973
knetwalk = {
974
-
version = "18.12.0";
974
+
version = "18.12.1";
975
975
src = fetchurl {
976
-
url = "${mirror}/stable/applications/18.12.0/src/knetwalk-18.12.0.tar.xz";
977
-
sha256 = "1pgk7wnll793hmjmc0r416vvrgpicyyf88g459a5ybmj28hi5xqi";
978
-
name = "knetwalk-18.12.0.tar.xz";
976
+
url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz";
977
+
sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c";
978
+
name = "knetwalk-18.12.1.tar.xz";
979
979
};
980
980
};
981
981
knights = {
982
-
version = "18.12.0";
982
+
version = "18.12.1";
983
983
src = fetchurl {
984
-
url = "${mirror}/stable/applications/18.12.0/src/knights-18.12.0.tar.xz";
985
-
sha256 = "10p994q5rycs3p5yn6r0gn8fjj3m8gsrx2gdvzdavizbsp5xv0qb";
986
-
name = "knights-18.12.0.tar.xz";
984
+
url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz";
985
+
sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2";
986
+
name = "knights-18.12.1.tar.xz";
987
987
};
988
988
};
989
989
knotes = {
990
-
version = "18.12.0";
990
+
version = "18.12.1";
991
991
src = fetchurl {
992
-
url = "${mirror}/stable/applications/18.12.0/src/knotes-18.12.0.tar.xz";
993
-
sha256 = "1r0p5k66gadglm329dcmr6x93wr56z32r03v8zd2r4ffbvp2hvqr";
994
-
name = "knotes-18.12.0.tar.xz";
992
+
url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz";
993
+
sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz";
994
+
name = "knotes-18.12.1.tar.xz";
995
995
};
996
996
};
997
997
kolf = {
998
-
version = "18.12.0";
998
+
version = "18.12.1";
999
999
src = fetchurl {
1000
-
url = "${mirror}/stable/applications/18.12.0/src/kolf-18.12.0.tar.xz";
1001
-
sha256 = "0j5scf9ynq71z5pcbiqm13a3asz62man5nirjxr9fcj4mb1zirfk";
1002
-
name = "kolf-18.12.0.tar.xz";
1000
+
url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz";
1001
+
sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i";
1002
+
name = "kolf-18.12.1.tar.xz";
1003
1003
};
1004
1004
};
1005
1005
kollision = {
1006
-
version = "18.12.0";
1006
+
version = "18.12.1";
1007
1007
src = fetchurl {
1008
-
url = "${mirror}/stable/applications/18.12.0/src/kollision-18.12.0.tar.xz";
1009
-
sha256 = "1zifm52q8yc2l5mqrc7wnddz9a0r1yz4dnk85c9dj2cndk8jz05p";
1010
-
name = "kollision-18.12.0.tar.xz";
1008
+
url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz";
1009
+
sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl";
1010
+
name = "kollision-18.12.1.tar.xz";
1011
1011
};
1012
1012
};
1013
1013
kolourpaint = {
1014
-
version = "18.12.0";
1014
+
version = "18.12.1";
1015
1015
src = fetchurl {
1016
-
url = "${mirror}/stable/applications/18.12.0/src/kolourpaint-18.12.0.tar.xz";
1017
-
sha256 = "1m0j0bdcrhhk8k1imnz7xm33yi8dcbsx432866ikh31l68i44wgc";
1018
-
name = "kolourpaint-18.12.0.tar.xz";
1016
+
url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz";
1017
+
sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd";
1018
+
name = "kolourpaint-18.12.1.tar.xz";
1019
1019
};
1020
1020
};
1021
1021
kompare = {
1022
-
version = "18.12.0";
1022
+
version = "18.12.1";
1023
1023
src = fetchurl {
1024
-
url = "${mirror}/stable/applications/18.12.0/src/kompare-18.12.0.tar.xz";
1025
-
sha256 = "02f4laclz3vhgbyzfxhi3f79k62z27fwa5qhdwwsvbn1xlgzbpx4";
1026
-
name = "kompare-18.12.0.tar.xz";
1024
+
url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz";
1025
+
sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9";
1026
+
name = "kompare-18.12.1.tar.xz";
1027
1027
};
1028
1028
};
1029
1029
konqueror = {
1030
-
version = "18.12.0";
1030
+
version = "18.12.1";
1031
1031
src = fetchurl {
1032
-
url = "${mirror}/stable/applications/18.12.0/src/konqueror-18.12.0.tar.xz";
1033
-
sha256 = "0yzldqi0i1hiw33ppiccn8vpvy5ygf2vf4m3awfcj2376bzz7d4r";
1034
-
name = "konqueror-18.12.0.tar.xz";
1032
+
url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz";
1033
+
sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy";
1034
+
name = "konqueror-18.12.1.tar.xz";
1035
1035
};
1036
1036
};
1037
1037
konquest = {
1038
-
version = "18.12.0";
1038
+
version = "18.12.1";
1039
1039
src = fetchurl {
1040
-
url = "${mirror}/stable/applications/18.12.0/src/konquest-18.12.0.tar.xz";
1041
-
sha256 = "1w7r1a7ilakz9k0f1z4jrfsjscf9z8l18rdfry5b1h8zz70j5j0z";
1042
-
name = "konquest-18.12.0.tar.xz";
1040
+
url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz";
1041
+
sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483";
1042
+
name = "konquest-18.12.1.tar.xz";
1043
1043
};
1044
1044
};
1045
1045
konsole = {
1046
-
version = "18.12.0";
1046
+
version = "18.12.1";
1047
1047
src = fetchurl {
1048
-
url = "${mirror}/stable/applications/18.12.0/src/konsole-18.12.0.tar.xz";
1049
-
sha256 = "04qmldzfb0qjwddz56nv20gffi8z6vhm0vsvqd59q5nhkj9shnr3";
1050
-
name = "konsole-18.12.0.tar.xz";
1048
+
url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz";
1049
+
sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg";
1050
+
name = "konsole-18.12.1.tar.xz";
1051
1051
};
1052
1052
};
1053
1053
kontact = {
1054
-
version = "18.12.0";
1054
+
version = "18.12.1";
1055
1055
src = fetchurl {
1056
-
url = "${mirror}/stable/applications/18.12.0/src/kontact-18.12.0.tar.xz";
1057
-
sha256 = "0i9hj2rrwa5vzzh7p586d7vkzgk69inq3c7bvvjr6lhy0xrcy9cb";
1058
-
name = "kontact-18.12.0.tar.xz";
1056
+
url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz";
1057
+
sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag";
1058
+
name = "kontact-18.12.1.tar.xz";
1059
1059
};
1060
1060
};
1061
1061
kontactinterface = {
1062
-
version = "18.12.0";
1062
+
version = "18.12.1";
1063
1063
src = fetchurl {
1064
-
url = "${mirror}/stable/applications/18.12.0/src/kontactinterface-18.12.0.tar.xz";
1065
-
sha256 = "05kx0jrxh13f42az6p9kj90wyqjl3ansqni9pa06fd1klq0ssncz";
1066
-
name = "kontactinterface-18.12.0.tar.xz";
1064
+
url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz";
1065
+
sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61";
1066
+
name = "kontactinterface-18.12.1.tar.xz";
1067
1067
};
1068
1068
};
1069
1069
kopete = {
1070
-
version = "18.12.0";
1070
+
version = "18.12.1";
1071
1071
src = fetchurl {
1072
-
url = "${mirror}/stable/applications/18.12.0/src/kopete-18.12.0.tar.xz";
1073
-
sha256 = "1xzriv2zqpf7vzny2k7qn39slx0b6cls8414c757ppd9ai4yh32a";
1074
-
name = "kopete-18.12.0.tar.xz";
1072
+
url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz";
1073
+
sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs";
1074
+
name = "kopete-18.12.1.tar.xz";
1075
1075
};
1076
1076
};
1077
1077
korganizer = {
1078
-
version = "18.12.0";
1078
+
version = "18.12.1";
1079
1079
src = fetchurl {
1080
-
url = "${mirror}/stable/applications/18.12.0/src/korganizer-18.12.0.tar.xz";
1081
-
sha256 = "0pk8psl90xmb06y0h87ar35kbqr9pjl31l05h01ig32w1vr0rw8c";
1082
-
name = "korganizer-18.12.0.tar.xz";
1080
+
url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz";
1081
+
sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg";
1082
+
name = "korganizer-18.12.1.tar.xz";
1083
1083
};
1084
1084
};
1085
1085
kpat = {
1086
-
version = "18.12.0";
1086
+
version = "18.12.1";
1087
1087
src = fetchurl {
1088
-
url = "${mirror}/stable/applications/18.12.0/src/kpat-18.12.0.tar.xz";
1089
-
sha256 = "18q0pa4aijjkgjcg3v1v7ap2nvyavqsgh4s672v74jrxijd353gw";
1090
-
name = "kpat-18.12.0.tar.xz";
1088
+
url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz";
1089
+
sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a";
1090
+
name = "kpat-18.12.1.tar.xz";
1091
1091
};
1092
1092
};
1093
1093
kpimtextedit = {
1094
-
version = "18.12.0";
1094
+
version = "18.12.1";
1095
1095
src = fetchurl {
1096
-
url = "${mirror}/stable/applications/18.12.0/src/kpimtextedit-18.12.0.tar.xz";
1097
-
sha256 = "0fg3cfh6v2hkhca9yb2kcvc9rq7f94a2wxkyi6cx88r3k3plh212";
1098
-
name = "kpimtextedit-18.12.0.tar.xz";
1096
+
url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz";
1097
+
sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb";
1098
+
name = "kpimtextedit-18.12.1.tar.xz";
1099
1099
};
1100
1100
};
1101
1101
kpkpass = {
1102
-
version = "18.12.0";
1102
+
version = "18.12.1";
1103
1103
src = fetchurl {
1104
-
url = "${mirror}/stable/applications/18.12.0/src/kpkpass-18.12.0.tar.xz";
1105
-
sha256 = "07rmjzgkww405f0f16w3fgd5kwz335xbl9gjlc1lkh6lhddmbjc6";
1106
-
name = "kpkpass-18.12.0.tar.xz";
1104
+
url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz";
1105
+
sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx";
1106
+
name = "kpkpass-18.12.1.tar.xz";
1107
1107
};
1108
1108
};
1109
1109
kqtquickcharts = {
1110
-
version = "18.12.0";
1110
+
version = "18.12.1";
1111
1111
src = fetchurl {
1112
-
url = "${mirror}/stable/applications/18.12.0/src/kqtquickcharts-18.12.0.tar.xz";
1113
-
sha256 = "01vdg2l48521pgkkx7h1vkgbrjl7gpzzinldk3aa7ki0997rff6h";
1114
-
name = "kqtquickcharts-18.12.0.tar.xz";
1112
+
url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz";
1113
+
sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl";
1114
+
name = "kqtquickcharts-18.12.1.tar.xz";
1115
1115
};
1116
1116
};
1117
1117
krdc = {
1118
-
version = "18.12.0";
1118
+
version = "18.12.1";
1119
1119
src = fetchurl {
1120
-
url = "${mirror}/stable/applications/18.12.0/src/krdc-18.12.0.tar.xz";
1121
-
sha256 = "0yvk15grdk82flf7s9zsfgfhrmcy9wvcjhgdqjng2m9hd9sviix4";
1122
-
name = "krdc-18.12.0.tar.xz";
1120
+
url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz";
1121
+
sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx";
1122
+
name = "krdc-18.12.1.tar.xz";
1123
1123
};
1124
1124
};
1125
1125
kreversi = {
1126
-
version = "18.12.0";
1126
+
version = "18.12.1";
1127
1127
src = fetchurl {
1128
-
url = "${mirror}/stable/applications/18.12.0/src/kreversi-18.12.0.tar.xz";
1129
-
sha256 = "04mpkpa8lar7l8blrgkz9n5xzq0br15qxxginh3hgp9vcp83njpb";
1130
-
name = "kreversi-18.12.0.tar.xz";
1128
+
url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz";
1129
+
sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4";
1130
+
name = "kreversi-18.12.1.tar.xz";
1131
1131
};
1132
1132
};
1133
1133
krfb = {
1134
-
version = "18.12.0";
1134
+
version = "18.12.1";
1135
1135
src = fetchurl {
1136
-
url = "${mirror}/stable/applications/18.12.0/src/krfb-18.12.0.tar.xz";
1137
-
sha256 = "107z3bwq5xb2l4p88qpv9zibjzbgdbhf3d13bp220vnpwkwaxhpm";
1138
-
name = "krfb-18.12.0.tar.xz";
1136
+
url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz";
1137
+
sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4";
1138
+
name = "krfb-18.12.1.tar.xz";
1139
1139
};
1140
1140
};
1141
1141
kross-interpreters = {
1142
-
version = "18.12.0";
1142
+
version = "18.12.1";
1143
1143
src = fetchurl {
1144
-
url = "${mirror}/stable/applications/18.12.0/src/kross-interpreters-18.12.0.tar.xz";
1145
-
sha256 = "1xr7cb3v40lm2wh78vhzxw3v34g52ngrd1baf4g4yi00y85y42bf";
1146
-
name = "kross-interpreters-18.12.0.tar.xz";
1144
+
url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz";
1145
+
sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src";
1146
+
name = "kross-interpreters-18.12.1.tar.xz";
1147
1147
};
1148
1148
};
1149
1149
kruler = {
1150
-
version = "18.12.0";
1150
+
version = "18.12.1";
1151
1151
src = fetchurl {
1152
-
url = "${mirror}/stable/applications/18.12.0/src/kruler-18.12.0.tar.xz";
1153
-
sha256 = "0ms875n8rr19lvvbmq7jjbbgd4l4p4k8fqxhay7wil2mgdpkd087";
1154
-
name = "kruler-18.12.0.tar.xz";
1152
+
url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz";
1153
+
sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6";
1154
+
name = "kruler-18.12.1.tar.xz";
1155
1155
};
1156
1156
};
1157
1157
kshisen = {
1158
-
version = "18.12.0";
1158
+
version = "18.12.1";
1159
1159
src = fetchurl {
1160
-
url = "${mirror}/stable/applications/18.12.0/src/kshisen-18.12.0.tar.xz";
1161
-
sha256 = "0bd9wbn343glgsf6qnyqqdhqrkw61lywgnjslsmc4bb1parka8ww";
1162
-
name = "kshisen-18.12.0.tar.xz";
1160
+
url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz";
1161
+
sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x";
1162
+
name = "kshisen-18.12.1.tar.xz";
1163
1163
};
1164
1164
};
1165
1165
ksirk = {
1166
-
version = "18.12.0";
1166
+
version = "18.12.1";
1167
1167
src = fetchurl {
1168
-
url = "${mirror}/stable/applications/18.12.0/src/ksirk-18.12.0.tar.xz";
1169
-
sha256 = "1nm8y05im0h6vdkdqlbh21ci68dalan7qmjiiwamrzc5dsvh9lwi";
1170
-
name = "ksirk-18.12.0.tar.xz";
1168
+
url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz";
1169
+
sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf";
1170
+
name = "ksirk-18.12.1.tar.xz";
1171
1171
};
1172
1172
};
1173
1173
ksmtp = {
1174
-
version = "18.12.0";
1174
+
version = "18.12.1";
1175
1175
src = fetchurl {
1176
-
url = "${mirror}/stable/applications/18.12.0/src/ksmtp-18.12.0.tar.xz";
1177
-
sha256 = "1caqqml7q41rk49mxq0wj439h87ln827jvxsbiv11qphkp6041y4";
1178
-
name = "ksmtp-18.12.0.tar.xz";
1176
+
url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz";
1177
+
sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas";
1178
+
name = "ksmtp-18.12.1.tar.xz";
1179
1179
};
1180
1180
};
1181
1181
ksnakeduel = {
1182
-
version = "18.12.0";
1182
+
version = "18.12.1";
1183
1183
src = fetchurl {
1184
-
url = "${mirror}/stable/applications/18.12.0/src/ksnakeduel-18.12.0.tar.xz";
1185
-
sha256 = "06acl0bc87fcixkj67l4n4csa060lnaqkh8p3s7r3zccsy660ya4";
1186
-
name = "ksnakeduel-18.12.0.tar.xz";
1184
+
url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz";
1185
+
sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql";
1186
+
name = "ksnakeduel-18.12.1.tar.xz";
1187
1187
};
1188
1188
};
1189
1189
kspaceduel = {
1190
-
version = "18.12.0";
1190
+
version = "18.12.1";
1191
1191
src = fetchurl {
1192
-
url = "${mirror}/stable/applications/18.12.0/src/kspaceduel-18.12.0.tar.xz";
1193
-
sha256 = "08dbmwbjqy8d0xidxipadndi0lxm1n2h0dxksjk8imsprz5r4j2l";
1194
-
name = "kspaceduel-18.12.0.tar.xz";
1192
+
url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz";
1193
+
sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw";
1194
+
name = "kspaceduel-18.12.1.tar.xz";
1195
1195
};
1196
1196
};
1197
1197
ksquares = {
1198
-
version = "18.12.0";
1198
+
version = "18.12.1";
1199
1199
src = fetchurl {
1200
-
url = "${mirror}/stable/applications/18.12.0/src/ksquares-18.12.0.tar.xz";
1201
-
sha256 = "0a6kf3arxvakd7mcr6xxasls8gmgc16gsnm0bjvviaxfc9f3wx8x";
1202
-
name = "ksquares-18.12.0.tar.xz";
1200
+
url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz";
1201
+
sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb";
1202
+
name = "ksquares-18.12.1.tar.xz";
1203
1203
};
1204
1204
};
1205
1205
ksudoku = {
1206
-
version = "18.12.0";
1206
+
version = "18.12.1";
1207
1207
src = fetchurl {
1208
-
url = "${mirror}/stable/applications/18.12.0/src/ksudoku-18.12.0.tar.xz";
1209
-
sha256 = "1bm4lx5w4d3drgydqz2wxi3gh2778q8nl3k6ac4pm4iq8amgmgi6";
1210
-
name = "ksudoku-18.12.0.tar.xz";
1208
+
url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz";
1209
+
sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs";
1210
+
name = "ksudoku-18.12.1.tar.xz";
1211
1211
};
1212
1212
};
1213
1213
ksystemlog = {
1214
-
version = "18.12.0";
1214
+
version = "18.12.1";
1215
1215
src = fetchurl {
1216
-
url = "${mirror}/stable/applications/18.12.0/src/ksystemlog-18.12.0.tar.xz";
1217
-
sha256 = "0gh83ih9y0ydhm4g2drbcjkqh58g5a1flg1zqxr7rak8kf1pchnm";
1218
-
name = "ksystemlog-18.12.0.tar.xz";
1216
+
url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz";
1217
+
sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c";
1218
+
name = "ksystemlog-18.12.1.tar.xz";
1219
1219
};
1220
1220
};
1221
1221
kteatime = {
1222
-
version = "18.12.0";
1222
+
version = "18.12.1";
1223
1223
src = fetchurl {
1224
-
url = "${mirror}/stable/applications/18.12.0/src/kteatime-18.12.0.tar.xz";
1225
-
sha256 = "1p4a3kahsjgfw9f6mw16bzz1bzk1jnssgvhzqh9ragqyp5qpn3s3";
1226
-
name = "kteatime-18.12.0.tar.xz";
1224
+
url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz";
1225
+
sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg";
1226
+
name = "kteatime-18.12.1.tar.xz";
1227
1227
};
1228
1228
};
1229
1229
ktimer = {
1230
-
version = "18.12.0";
1230
+
version = "18.12.1";
1231
1231
src = fetchurl {
1232
-
url = "${mirror}/stable/applications/18.12.0/src/ktimer-18.12.0.tar.xz";
1233
-
sha256 = "1lv64bk64k7nb2y9qahc45cg3n51qrb4ahk5l9mrbj9q5yvm1acs";
1234
-
name = "ktimer-18.12.0.tar.xz";
1232
+
url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz";
1233
+
sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf";
1234
+
name = "ktimer-18.12.1.tar.xz";
1235
1235
};
1236
1236
};
1237
1237
ktnef = {
1238
-
version = "18.12.0";
1238
+
version = "18.12.1";
1239
1239
src = fetchurl {
1240
-
url = "${mirror}/stable/applications/18.12.0/src/ktnef-18.12.0.tar.xz";
1241
-
sha256 = "1ca9gga65h9kygfcsr1yvy50ccq3587scml36p740iwrxms8lrcb";
1242
-
name = "ktnef-18.12.0.tar.xz";
1240
+
url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz";
1241
+
sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69";
1242
+
name = "ktnef-18.12.1.tar.xz";
1243
1243
};
1244
1244
};
1245
1245
ktouch = {
1246
-
version = "18.12.0";
1246
+
version = "18.12.1";
1247
1247
src = fetchurl {
1248
-
url = "${mirror}/stable/applications/18.12.0/src/ktouch-18.12.0.tar.xz";
1249
-
sha256 = "1221xagypm1j56lx2g4845wrw0w01f2s4x8r3jwr32wzxvi8bxs3";
1250
-
name = "ktouch-18.12.0.tar.xz";
1248
+
url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz";
1249
+
sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5";
1250
+
name = "ktouch-18.12.1.tar.xz";
1251
1251
};
1252
1252
};
1253
1253
ktp-accounts-kcm = {
1254
-
version = "18.12.0";
1254
+
version = "18.12.1";
1255
1255
src = fetchurl {
1256
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-accounts-kcm-18.12.0.tar.xz";
1257
-
sha256 = "0bx97zalwk78340klgh87rb5fadma8flg6q0bg436j01dsld0s0p";
1258
-
name = "ktp-accounts-kcm-18.12.0.tar.xz";
1256
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz";
1257
+
sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn";
1258
+
name = "ktp-accounts-kcm-18.12.1.tar.xz";
1259
1259
};
1260
1260
};
1261
1261
ktp-approver = {
1262
-
version = "18.12.0";
1262
+
version = "18.12.1";
1263
1263
src = fetchurl {
1264
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-approver-18.12.0.tar.xz";
1265
-
sha256 = "1cvixdcws126x7wll57dv6w78p3fb06lgd411i9jf7n02sx3l09q";
1266
-
name = "ktp-approver-18.12.0.tar.xz";
1264
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz";
1265
+
sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah";
1266
+
name = "ktp-approver-18.12.1.tar.xz";
1267
1267
};
1268
1268
};
1269
1269
ktp-auth-handler = {
1270
-
version = "18.12.0";
1270
+
version = "18.12.1";
1271
1271
src = fetchurl {
1272
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-auth-handler-18.12.0.tar.xz";
1273
-
sha256 = "0zfdq7q1v48vcaj4raz5r6l400xhz7ngjylg3kd7jabarljjv2gs";
1274
-
name = "ktp-auth-handler-18.12.0.tar.xz";
1272
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz";
1273
+
sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28";
1274
+
name = "ktp-auth-handler-18.12.1.tar.xz";
1275
1275
};
1276
1276
};
1277
1277
ktp-call-ui = {
1278
-
version = "18.12.0";
1278
+
version = "18.12.1";
1279
1279
src = fetchurl {
1280
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-call-ui-18.12.0.tar.xz";
1281
-
sha256 = "1q9z6g0djk7mszy48bwrw4mvja15xkcg6x88391sw1lvanps9hmk";
1282
-
name = "ktp-call-ui-18.12.0.tar.xz";
1280
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz";
1281
+
sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3";
1282
+
name = "ktp-call-ui-18.12.1.tar.xz";
1283
1283
};
1284
1284
};
1285
1285
ktp-common-internals = {
1286
-
version = "18.12.0";
1286
+
version = "18.12.1";
1287
1287
src = fetchurl {
1288
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-common-internals-18.12.0.tar.xz";
1289
-
sha256 = "00smq4q4m8hvvfaz0b9iyxxz3dl15qs0is6zbkh4scvxxp54n056";
1290
-
name = "ktp-common-internals-18.12.0.tar.xz";
1288
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz";
1289
+
sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp";
1290
+
name = "ktp-common-internals-18.12.1.tar.xz";
1291
1291
};
1292
1292
};
1293
1293
ktp-contact-list = {
1294
-
version = "18.12.0";
1294
+
version = "18.12.1";
1295
1295
src = fetchurl {
1296
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-list-18.12.0.tar.xz";
1297
-
sha256 = "0kyllg9f0kj1w00jhk2khmsfdqqixnz8s74jvg5fjw8bbibjbn3y";
1298
-
name = "ktp-contact-list-18.12.0.tar.xz";
1296
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz";
1297
+
sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw";
1298
+
name = "ktp-contact-list-18.12.1.tar.xz";
1299
1299
};
1300
1300
};
1301
1301
ktp-contact-runner = {
1302
-
version = "18.12.0";
1302
+
version = "18.12.1";
1303
1303
src = fetchurl {
1304
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-runner-18.12.0.tar.xz";
1305
-
sha256 = "1hpapg3fnmwsgai7jb9kbh5f71hp8qfzphgczcmf6h5151g2l6jj";
1306
-
name = "ktp-contact-runner-18.12.0.tar.xz";
1304
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz";
1305
+
sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34";
1306
+
name = "ktp-contact-runner-18.12.1.tar.xz";
1307
1307
};
1308
1308
};
1309
1309
ktp-desktop-applets = {
1310
-
version = "18.12.0";
1310
+
version = "18.12.1";
1311
1311
src = fetchurl {
1312
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-desktop-applets-18.12.0.tar.xz";
1313
-
sha256 = "1dfcjjmbplgx7b45q9vklq8kvc0ajclzy6cmyq3maj577747h5xz";
1314
-
name = "ktp-desktop-applets-18.12.0.tar.xz";
1312
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz";
1313
+
sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn";
1314
+
name = "ktp-desktop-applets-18.12.1.tar.xz";
1315
1315
};
1316
1316
};
1317
1317
ktp-filetransfer-handler = {
1318
-
version = "18.12.0";
1318
+
version = "18.12.1";
1319
1319
src = fetchurl {
1320
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-filetransfer-handler-18.12.0.tar.xz";
1321
-
sha256 = "1dzrzv6nmv6ighiqq8hi9crasnqdbqimg3qdssyryxrqs64m9h29";
1322
-
name = "ktp-filetransfer-handler-18.12.0.tar.xz";
1320
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz";
1321
+
sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx";
1322
+
name = "ktp-filetransfer-handler-18.12.1.tar.xz";
1323
1323
};
1324
1324
};
1325
1325
ktp-kded-module = {
1326
-
version = "18.12.0";
1326
+
version = "18.12.1";
1327
1327
src = fetchurl {
1328
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-kded-module-18.12.0.tar.xz";
1329
-
sha256 = "0720yayzz4rwrmplwjpq6bfb86k0jhmxc5k25yqj9fg7n6w2qsx3";
1330
-
name = "ktp-kded-module-18.12.0.tar.xz";
1328
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz";
1329
+
sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs";
1330
+
name = "ktp-kded-module-18.12.1.tar.xz";
1331
1331
};
1332
1332
};
1333
1333
ktp-send-file = {
1334
-
version = "18.12.0";
1334
+
version = "18.12.1";
1335
1335
src = fetchurl {
1336
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-send-file-18.12.0.tar.xz";
1337
-
sha256 = "0jfy8qqm6n5pm2s24pbvxmmcibxxq71gggg4xf0miqkhdvx5b9kw";
1338
-
name = "ktp-send-file-18.12.0.tar.xz";
1336
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz";
1337
+
sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163";
1338
+
name = "ktp-send-file-18.12.1.tar.xz";
1339
1339
};
1340
1340
};
1341
1341
ktp-text-ui = {
1342
-
version = "18.12.0";
1342
+
version = "18.12.1";
1343
1343
src = fetchurl {
1344
-
url = "${mirror}/stable/applications/18.12.0/src/ktp-text-ui-18.12.0.tar.xz";
1345
-
sha256 = "14ln91srqfkk0fgp197wvlqxgagw23x4h94j1v1m51pia0v6226b";
1346
-
name = "ktp-text-ui-18.12.0.tar.xz";
1344
+
url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz";
1345
+
sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy";
1346
+
name = "ktp-text-ui-18.12.1.tar.xz";
1347
1347
};
1348
1348
};
1349
1349
ktuberling = {
1350
-
version = "18.12.0";
1350
+
version = "18.12.1";
1351
1351
src = fetchurl {
1352
-
url = "${mirror}/stable/applications/18.12.0/src/ktuberling-18.12.0.tar.xz";
1353
-
sha256 = "0ms20qffd5mwlrxbd8ajb0lx3ny7mhlx25n59w2paq2x313qcsfk";
1354
-
name = "ktuberling-18.12.0.tar.xz";
1352
+
url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz";
1353
+
sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk";
1354
+
name = "ktuberling-18.12.1.tar.xz";
1355
1355
};
1356
1356
};
1357
1357
kturtle = {
1358
-
version = "18.12.0";
1358
+
version = "18.12.1";
1359
1359
src = fetchurl {
1360
-
url = "${mirror}/stable/applications/18.12.0/src/kturtle-18.12.0.tar.xz";
1361
-
sha256 = "0ik44282gc6rmzsg6xv4fvpx1yzb4y4gv7jmslxgwi6rwc1q0m5v";
1362
-
name = "kturtle-18.12.0.tar.xz";
1360
+
url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz";
1361
+
sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1";
1362
+
name = "kturtle-18.12.1.tar.xz";
1363
1363
};
1364
1364
};
1365
1365
kubrick = {
1366
-
version = "18.12.0";
1366
+
version = "18.12.1";
1367
1367
src = fetchurl {
1368
-
url = "${mirror}/stable/applications/18.12.0/src/kubrick-18.12.0.tar.xz";
1369
-
sha256 = "0h4jx41wawbifdx7mzqbsx9nfrn2r9rkb01y0d63f5s2835hs2yc";
1370
-
name = "kubrick-18.12.0.tar.xz";
1368
+
url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz";
1369
+
sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll";
1370
+
name = "kubrick-18.12.1.tar.xz";
1371
1371
};
1372
1372
};
1373
1373
kwalletmanager = {
1374
-
version = "18.12.0";
1374
+
version = "18.12.1";
1375
1375
src = fetchurl {
1376
-
url = "${mirror}/stable/applications/18.12.0/src/kwalletmanager-18.12.0.tar.xz";
1377
-
sha256 = "0znbrp1hk7jky9y3p9bc47sqn8mqd54x5j8kw52sg9v4428aag09";
1378
-
name = "kwalletmanager-18.12.0.tar.xz";
1376
+
url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz";
1377
+
sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn";
1378
+
name = "kwalletmanager-18.12.1.tar.xz";
1379
1379
};
1380
1380
};
1381
1381
kwave = {
1382
-
version = "18.12.0";
1382
+
version = "18.12.1";
1383
1383
src = fetchurl {
1384
-
url = "${mirror}/stable/applications/18.12.0/src/kwave-18.12.0.tar.xz";
1385
-
sha256 = "00h5i0iax9hd79pw71wvv4p75rv6z61zpfg2s4n6zqjx8c312rhh";
1386
-
name = "kwave-18.12.0.tar.xz";
1384
+
url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz";
1385
+
sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3";
1386
+
name = "kwave-18.12.1.tar.xz";
1387
1387
};
1388
1388
};
1389
1389
kwordquiz = {
1390
-
version = "18.12.0";
1390
+
version = "18.12.1";
1391
1391
src = fetchurl {
1392
-
url = "${mirror}/stable/applications/18.12.0/src/kwordquiz-18.12.0.tar.xz";
1393
-
sha256 = "0a0i7khsvn68rxwwm3q5h4ymf6j3bdm3sc3q3z74rj3n0s03dnww";
1394
-
name = "kwordquiz-18.12.0.tar.xz";
1392
+
url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz";
1393
+
sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf";
1394
+
name = "kwordquiz-18.12.1.tar.xz";
1395
1395
};
1396
1396
};
1397
1397
libgravatar = {
1398
-
version = "18.12.0";
1398
+
version = "18.12.1";
1399
1399
src = fetchurl {
1400
-
url = "${mirror}/stable/applications/18.12.0/src/libgravatar-18.12.0.tar.xz";
1401
-
sha256 = "077qkpsg2v77mzg2q5jw7fr6sss07x5998f9x65pqgqlc9b6h494";
1402
-
name = "libgravatar-18.12.0.tar.xz";
1400
+
url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz";
1401
+
sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6";
1402
+
name = "libgravatar-18.12.1.tar.xz";
1403
1403
};
1404
1404
};
1405
1405
libkcddb = {
1406
-
version = "18.12.0";
1406
+
version = "18.12.1";
1407
1407
src = fetchurl {
1408
-
url = "${mirror}/stable/applications/18.12.0/src/libkcddb-18.12.0.tar.xz";
1409
-
sha256 = "15dmbb5cvr9rcaspizrc2laxkwhfrsnlczdns0biq3lysajblwfa";
1410
-
name = "libkcddb-18.12.0.tar.xz";
1408
+
url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz";
1409
+
sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155";
1410
+
name = "libkcddb-18.12.1.tar.xz";
1411
1411
};
1412
1412
};
1413
1413
libkcompactdisc = {
1414
-
version = "18.12.0";
1414
+
version = "18.12.1";
1415
1415
src = fetchurl {
1416
-
url = "${mirror}/stable/applications/18.12.0/src/libkcompactdisc-18.12.0.tar.xz";
1417
-
sha256 = "1jrw16hbp8fn48l70gqxpiy6iwpisk087sixvs3cbn94dmczgpka";
1418
-
name = "libkcompactdisc-18.12.0.tar.xz";
1416
+
url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz";
1417
+
sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac";
1418
+
name = "libkcompactdisc-18.12.1.tar.xz";
1419
1419
};
1420
1420
};
1421
1421
libkdcraw = {
1422
-
version = "18.12.0";
1422
+
version = "18.12.1";
1423
1423
src = fetchurl {
1424
-
url = "${mirror}/stable/applications/18.12.0/src/libkdcraw-18.12.0.tar.xz";
1425
-
sha256 = "0n3b5blda31gf38hyplpb29mp6aa187adgqqyijzhnvvm1mfwa5z";
1426
-
name = "libkdcraw-18.12.0.tar.xz";
1424
+
url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz";
1425
+
sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c";
1426
+
name = "libkdcraw-18.12.1.tar.xz";
1427
1427
};
1428
1428
};
1429
1429
libkdegames = {
1430
-
version = "18.12.0";
1430
+
version = "18.12.1";
1431
1431
src = fetchurl {
1432
-
url = "${mirror}/stable/applications/18.12.0/src/libkdegames-18.12.0.tar.xz";
1433
-
sha256 = "01i00n4cjpq1srag5ca8siw6rjc1gwhdzfib6cg3xf9my5sl0hbv";
1434
-
name = "libkdegames-18.12.0.tar.xz";
1432
+
url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz";
1433
+
sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65";
1434
+
name = "libkdegames-18.12.1.tar.xz";
1435
1435
};
1436
1436
};
1437
1437
libkdepim = {
1438
-
version = "18.12.0";
1438
+
version = "18.12.1";
1439
1439
src = fetchurl {
1440
-
url = "${mirror}/stable/applications/18.12.0/src/libkdepim-18.12.0.tar.xz";
1441
-
sha256 = "188jf33dihrrq0zzmdddg6sx4ck2lp5gj1br4xfsqgrc1qf9z5hd";
1442
-
name = "libkdepim-18.12.0.tar.xz";
1440
+
url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz";
1441
+
sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp";
1442
+
name = "libkdepim-18.12.1.tar.xz";
1443
1443
};
1444
1444
};
1445
1445
libkeduvocdocument = {
1446
-
version = "18.12.0";
1446
+
version = "18.12.1";
1447
1447
src = fetchurl {
1448
-
url = "${mirror}/stable/applications/18.12.0/src/libkeduvocdocument-18.12.0.tar.xz";
1449
-
sha256 = "1fa6pgpcarqabc18bph4lijsx1paf1a1arisrlf5mgkivg2yvy2k";
1450
-
name = "libkeduvocdocument-18.12.0.tar.xz";
1448
+
url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz";
1449
+
sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w";
1450
+
name = "libkeduvocdocument-18.12.1.tar.xz";
1451
1451
};
1452
1452
};
1453
1453
libkexiv2 = {
1454
-
version = "18.12.0";
1454
+
version = "18.12.1";
1455
1455
src = fetchurl {
1456
-
url = "${mirror}/stable/applications/18.12.0/src/libkexiv2-18.12.0.tar.xz";
1457
-
sha256 = "1x3pxcii60kn8c1bmgrra9h4ahblwwp5vjd6p2wg2f4jkpmjz1ha";
1458
-
name = "libkexiv2-18.12.0.tar.xz";
1456
+
url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz";
1457
+
sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3";
1458
+
name = "libkexiv2-18.12.1.tar.xz";
1459
1459
};
1460
1460
};
1461
1461
libkgapi = {
1462
-
version = "18.12.0";
1462
+
version = "18.12.1";
1463
1463
src = fetchurl {
1464
-
url = "${mirror}/stable/applications/18.12.0/src/libkgapi-18.12.0.tar.xz";
1465
-
sha256 = "0d79p7f6gmb8vjbp2nmc5rz9rabj08np96jbqf4wzgcjcxxi64kp";
1466
-
name = "libkgapi-18.12.0.tar.xz";
1464
+
url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz";
1465
+
sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3";
1466
+
name = "libkgapi-18.12.1.tar.xz";
1467
1467
};
1468
1468
};
1469
1469
libkgeomap = {
1470
-
version = "18.12.0";
1470
+
version = "18.12.1";
1471
1471
src = fetchurl {
1472
-
url = "${mirror}/stable/applications/18.12.0/src/libkgeomap-18.12.0.tar.xz";
1473
-
sha256 = "1pmicj4p3d17i7nj6alns8a24ay0xrs852d1x1xrcdkv7h7y5hvi";
1474
-
name = "libkgeomap-18.12.0.tar.xz";
1472
+
url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz";
1473
+
sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz";
1474
+
name = "libkgeomap-18.12.1.tar.xz";
1475
1475
};
1476
1476
};
1477
1477
libkipi = {
1478
-
version = "18.12.0";
1478
+
version = "18.12.1";
1479
1479
src = fetchurl {
1480
-
url = "${mirror}/stable/applications/18.12.0/src/libkipi-18.12.0.tar.xz";
1481
-
sha256 = "0cfn09x7splycpqwz0fy52lnkpc9dsq6i2j2q3r4fjgpblj9m86h";
1482
-
name = "libkipi-18.12.0.tar.xz";
1480
+
url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz";
1481
+
sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv";
1482
+
name = "libkipi-18.12.1.tar.xz";
1483
1483
};
1484
1484
};
1485
1485
libkleo = {
1486
-
version = "18.12.0";
1486
+
version = "18.12.1";
1487
1487
src = fetchurl {
1488
-
url = "${mirror}/stable/applications/18.12.0/src/libkleo-18.12.0.tar.xz";
1489
-
sha256 = "14iy3wis79rfri7najbyvx94ym2aa7si8h35rx4977flhc80nzin";
1490
-
name = "libkleo-18.12.0.tar.xz";
1488
+
url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz";
1489
+
sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x";
1490
+
name = "libkleo-18.12.1.tar.xz";
1491
1491
};
1492
1492
};
1493
1493
libkmahjongg = {
1494
-
version = "18.12.0";
1494
+
version = "18.12.1";
1495
1495
src = fetchurl {
1496
-
url = "${mirror}/stable/applications/18.12.0/src/libkmahjongg-18.12.0.tar.xz";
1497
-
sha256 = "12pki8hkcv8ihcwwdnhpcz21h4676zra5qwf56aa5cj5qpdgf4gx";
1498
-
name = "libkmahjongg-18.12.0.tar.xz";
1496
+
url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz";
1497
+
sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv";
1498
+
name = "libkmahjongg-18.12.1.tar.xz";
1499
1499
};
1500
1500
};
1501
1501
libkomparediff2 = {
1502
-
version = "18.12.0";
1502
+
version = "18.12.1";
1503
1503
src = fetchurl {
1504
-
url = "${mirror}/stable/applications/18.12.0/src/libkomparediff2-18.12.0.tar.xz";
1505
-
sha256 = "0xbccawxqk29f2qvr6hcbpan4fhahzksg7bl7jnv8xsv01lbm3rs";
1506
-
name = "libkomparediff2-18.12.0.tar.xz";
1504
+
url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz";
1505
+
sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn";
1506
+
name = "libkomparediff2-18.12.1.tar.xz";
1507
1507
};
1508
1508
};
1509
1509
libksane = {
1510
-
version = "18.12.0";
1510
+
version = "18.12.1";
1511
1511
src = fetchurl {
1512
-
url = "${mirror}/stable/applications/18.12.0/src/libksane-18.12.0.tar.xz";
1513
-
sha256 = "1vdxyik47fij9mm1fs6p9bn0n56wsajzqd5am03nrwkwanva25xj";
1514
-
name = "libksane-18.12.0.tar.xz";
1512
+
url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz";
1513
+
sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8";
1514
+
name = "libksane-18.12.1.tar.xz";
1515
1515
};
1516
1516
};
1517
1517
libksieve = {
1518
-
version = "18.12.0";
1518
+
version = "18.12.1";
1519
1519
src = fetchurl {
1520
-
url = "${mirror}/stable/applications/18.12.0/src/libksieve-18.12.0.tar.xz";
1521
-
sha256 = "1hwasycmfnjzqyxfh0kir1jhx002qci6dclv4cysv1ww33wsyskp";
1522
-
name = "libksieve-18.12.0.tar.xz";
1520
+
url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz";
1521
+
sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1";
1522
+
name = "libksieve-18.12.1.tar.xz";
1523
1523
};
1524
1524
};
1525
1525
lokalize = {
1526
-
version = "18.12.0";
1526
+
version = "18.12.1";
1527
1527
src = fetchurl {
1528
-
url = "${mirror}/stable/applications/18.12.0/src/lokalize-18.12.0.tar.xz";
1529
-
sha256 = "07rnx40836xncndqbcvpircvgnaywmwzbkfl16665ciphxrilm6q";
1530
-
name = "lokalize-18.12.0.tar.xz";
1528
+
url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz";
1529
+
sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g";
1530
+
name = "lokalize-18.12.1.tar.xz";
1531
1531
};
1532
1532
};
1533
1533
lskat = {
1534
-
version = "18.12.0";
1534
+
version = "18.12.1";
1535
1535
src = fetchurl {
1536
-
url = "${mirror}/stable/applications/18.12.0/src/lskat-18.12.0.tar.xz";
1537
-
sha256 = "1cw9z22gvyd9d44sg1qxir923q1ilmmqdgzzrh8wrb5p3m0mn0nz";
1538
-
name = "lskat-18.12.0.tar.xz";
1536
+
url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz";
1537
+
sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm";
1538
+
name = "lskat-18.12.1.tar.xz";
1539
1539
};
1540
1540
};
1541
1541
mailcommon = {
1542
-
version = "18.12.0";
1542
+
version = "18.12.1";
1543
1543
src = fetchurl {
1544
-
url = "${mirror}/stable/applications/18.12.0/src/mailcommon-18.12.0.tar.xz";
1545
-
sha256 = "0aigxd6pkw9xwy8q1kx9vqp17vljrzwv8skq6qmh9fvkjiampw84";
1546
-
name = "mailcommon-18.12.0.tar.xz";
1544
+
url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz";
1545
+
sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2";
1546
+
name = "mailcommon-18.12.1.tar.xz";
1547
1547
};
1548
1548
};
1549
1549
mailimporter = {
1550
-
version = "18.12.0";
1550
+
version = "18.12.1";
1551
1551
src = fetchurl {
1552
-
url = "${mirror}/stable/applications/18.12.0/src/mailimporter-18.12.0.tar.xz";
1553
-
sha256 = "06nsn7vfgrvfgrmx4qyy21rq4a8bj5vxi4hrfd7377pd1sx58qvi";
1554
-
name = "mailimporter-18.12.0.tar.xz";
1552
+
url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz";
1553
+
sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98";
1554
+
name = "mailimporter-18.12.1.tar.xz";
1555
1555
};
1556
1556
};
1557
1557
marble = {
1558
-
version = "18.12.0";
1558
+
version = "18.12.1";
1559
1559
src = fetchurl {
1560
-
url = "${mirror}/stable/applications/18.12.0/src/marble-18.12.0.tar.xz";
1561
-
sha256 = "0ljzv2ygpqwz4a387ja280p7cd47bkjv7m40c3yn2yijiladyffv";
1562
-
name = "marble-18.12.0.tar.xz";
1560
+
url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz";
1561
+
sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy";
1562
+
name = "marble-18.12.1.tar.xz";
1563
1563
};
1564
1564
};
1565
1565
mbox-importer = {
1566
-
version = "18.12.0";
1566
+
version = "18.12.1";
1567
1567
src = fetchurl {
1568
-
url = "${mirror}/stable/applications/18.12.0/src/mbox-importer-18.12.0.tar.xz";
1569
-
sha256 = "08rfgf5zcp6vhd78rj2yikmzrgddhdn7cykw9pqfgmhy0nci14sm";
1570
-
name = "mbox-importer-18.12.0.tar.xz";
1568
+
url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz";
1569
+
sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n";
1570
+
name = "mbox-importer-18.12.1.tar.xz";
1571
1571
};
1572
1572
};
1573
1573
messagelib = {
1574
-
version = "18.12.0";
1574
+
version = "18.12.1";
1575
1575
src = fetchurl {
1576
-
url = "${mirror}/stable/applications/18.12.0/src/messagelib-18.12.0.tar.xz";
1577
-
sha256 = "189bn6lblqq4vr1a2pk99pj3y3xh5q8xxdrg2hrdcc10wmjk9knv";
1578
-
name = "messagelib-18.12.0.tar.xz";
1576
+
url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz";
1577
+
sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8";
1578
+
name = "messagelib-18.12.1.tar.xz";
1579
1579
};
1580
1580
};
1581
1581
minuet = {
1582
-
version = "18.12.0";
1582
+
version = "18.12.1";
1583
1583
src = fetchurl {
1584
-
url = "${mirror}/stable/applications/18.12.0/src/minuet-18.12.0.tar.xz";
1585
-
sha256 = "1hma6r3z7k382gpd0wccxdbss1a17gvkb5fvdaii5xm7c9ca63r7";
1586
-
name = "minuet-18.12.0.tar.xz";
1584
+
url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz";
1585
+
sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz";
1586
+
name = "minuet-18.12.1.tar.xz";
1587
1587
};
1588
1588
};
1589
1589
okular = {
1590
-
version = "18.12.0";
1590
+
version = "18.12.1";
1591
1591
src = fetchurl {
1592
-
url = "${mirror}/stable/applications/18.12.0/src/okular-18.12.0.tar.xz";
1593
-
sha256 = "184r6lqsyx1x63zjirn709w0pd81hyh4f5j6m37m5hr6dg8l6mli";
1594
-
name = "okular-18.12.0.tar.xz";
1592
+
url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz";
1593
+
sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl";
1594
+
name = "okular-18.12.1.tar.xz";
1595
1595
};
1596
1596
};
1597
1597
palapeli = {
1598
-
version = "18.12.0";
1598
+
version = "18.12.1";
1599
1599
src = fetchurl {
1600
-
url = "${mirror}/stable/applications/18.12.0/src/palapeli-18.12.0.tar.xz";
1601
-
sha256 = "09fbsw0id1p81zvd7kfimjx81m3zz36kdvd40jwbsffrqi682iww";
1602
-
name = "palapeli-18.12.0.tar.xz";
1600
+
url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz";
1601
+
sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd";
1602
+
name = "palapeli-18.12.1.tar.xz";
1603
1603
};
1604
1604
};
1605
1605
parley = {
1606
-
version = "18.12.0";
1606
+
version = "18.12.1";
1607
1607
src = fetchurl {
1608
-
url = "${mirror}/stable/applications/18.12.0/src/parley-18.12.0.tar.xz";
1609
-
sha256 = "1mnp835g1b7vwz5gnzl78x3s80sw1ps4gsddg4ywrdkjr5b099gk";
1610
-
name = "parley-18.12.0.tar.xz";
1608
+
url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz";
1609
+
sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z";
1610
+
name = "parley-18.12.1.tar.xz";
1611
1611
};
1612
1612
};
1613
1613
picmi = {
1614
-
version = "18.12.0";
1614
+
version = "18.12.1";
1615
1615
src = fetchurl {
1616
-
url = "${mirror}/stable/applications/18.12.0/src/picmi-18.12.0.tar.xz";
1617
-
sha256 = "0y6fnh8629zj98ih4cwgy31gknpc6ipn4aqxcjg8hfic8jxnppyp";
1618
-
name = "picmi-18.12.0.tar.xz";
1616
+
url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz";
1617
+
sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v";
1618
+
name = "picmi-18.12.1.tar.xz";
1619
1619
};
1620
1620
};
1621
1621
pimcommon = {
1622
-
version = "18.12.0";
1622
+
version = "18.12.1";
1623
1623
src = fetchurl {
1624
-
url = "${mirror}/stable/applications/18.12.0/src/pimcommon-18.12.0.tar.xz";
1625
-
sha256 = "1rchq4clw6r08vm6cw9kw52bn7z1nfjmp2lmi0sq3pjfqlxif2zc";
1626
-
name = "pimcommon-18.12.0.tar.xz";
1624
+
url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz";
1625
+
sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z";
1626
+
name = "pimcommon-18.12.1.tar.xz";
1627
1627
};
1628
1628
};
1629
1629
pim-data-exporter = {
1630
-
version = "18.12.0";
1630
+
version = "18.12.1";
1631
1631
src = fetchurl {
1632
-
url = "${mirror}/stable/applications/18.12.0/src/pim-data-exporter-18.12.0.tar.xz";
1633
-
sha256 = "0ywxcd02crwjrqx8ikkc4rgx1z93zvzqadqg3sjh636iz8svv5jc";
1634
-
name = "pim-data-exporter-18.12.0.tar.xz";
1632
+
url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz";
1633
+
sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb";
1634
+
name = "pim-data-exporter-18.12.1.tar.xz";
1635
1635
};
1636
1636
};
1637
1637
pim-sieve-editor = {
1638
-
version = "18.12.0";
1638
+
version = "18.12.1";
1639
1639
src = fetchurl {
1640
-
url = "${mirror}/stable/applications/18.12.0/src/pim-sieve-editor-18.12.0.tar.xz";
1641
-
sha256 = "144frbny1pq1viam527b96fxalc9iv5ppqrrvpndqsvjrlsrll45";
1642
-
name = "pim-sieve-editor-18.12.0.tar.xz";
1640
+
url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz";
1641
+
sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67";
1642
+
name = "pim-sieve-editor-18.12.1.tar.xz";
1643
1643
};
1644
1644
};
1645
1645
poxml = {
1646
-
version = "18.12.0";
1646
+
version = "18.12.1";
1647
1647
src = fetchurl {
1648
-
url = "${mirror}/stable/applications/18.12.0/src/poxml-18.12.0.tar.xz";
1649
-
sha256 = "1gnk9rzpa6rgff9xhawizx8cgsw84jqkpkr8aa2ki8zs4s6n9zl6";
1650
-
name = "poxml-18.12.0.tar.xz";
1648
+
url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz";
1649
+
sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb";
1650
+
name = "poxml-18.12.1.tar.xz";
1651
1651
};
1652
1652
};
1653
1653
print-manager = {
1654
-
version = "18.12.0";
1654
+
version = "18.12.1";
1655
1655
src = fetchurl {
1656
-
url = "${mirror}/stable/applications/18.12.0/src/print-manager-18.12.0.tar.xz";
1657
-
sha256 = "03jgjj7xfc57bsq3nx3l836pmpqywlchqis9109k5cpygqvgqkr5";
1658
-
name = "print-manager-18.12.0.tar.xz";
1656
+
url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz";
1657
+
sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr";
1658
+
name = "print-manager-18.12.1.tar.xz";
1659
1659
};
1660
1660
};
1661
1661
rocs = {
1662
-
version = "18.12.0";
1662
+
version = "18.12.1";
1663
1663
src = fetchurl {
1664
-
url = "${mirror}/stable/applications/18.12.0/src/rocs-18.12.0.tar.xz";
1665
-
sha256 = "1gg0xg732wb9vzf1c69r5cqqhayxygv2brvbk3gvq6b201hv1q90";
1666
-
name = "rocs-18.12.0.tar.xz";
1664
+
url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz";
1665
+
sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9";
1666
+
name = "rocs-18.12.1.tar.xz";
1667
1667
};
1668
1668
};
1669
1669
signon-kwallet-extension = {
1670
-
version = "18.12.0";
1670
+
version = "18.12.1";
1671
1671
src = fetchurl {
1672
-
url = "${mirror}/stable/applications/18.12.0/src/signon-kwallet-extension-18.12.0.tar.xz";
1673
-
sha256 = "0izmwyv1bw4iqgyhjrsq85xg7m5bp1v9khy5fxh1mhvh52w9zq8s";
1674
-
name = "signon-kwallet-extension-18.12.0.tar.xz";
1672
+
url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz";
1673
+
sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n";
1674
+
name = "signon-kwallet-extension-18.12.1.tar.xz";
1675
1675
};
1676
1676
};
1677
1677
spectacle = {
1678
-
version = "18.12.0";
1678
+
version = "18.12.1";
1679
1679
src = fetchurl {
1680
-
url = "${mirror}/stable/applications/18.12.0/src/spectacle-18.12.0.tar.xz";
1681
-
sha256 = "0nnsv0y28pxxhvf3r76nqgmn0ncixhr8d783mm3i3a3yz1z8a45c";
1682
-
name = "spectacle-18.12.0.tar.xz";
1680
+
url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz";
1681
+
sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9";
1682
+
name = "spectacle-18.12.1.tar.xz";
1683
1683
};
1684
1684
};
1685
1685
step = {
1686
-
version = "18.12.0";
1686
+
version = "18.12.1";
1687
1687
src = fetchurl {
1688
-
url = "${mirror}/stable/applications/18.12.0/src/step-18.12.0.tar.xz";
1689
-
sha256 = "0gqcwvv2xb321zx7y4bg28haqpzz5h8r7cxn6z4x5qnj6ijkx0zr";
1690
-
name = "step-18.12.0.tar.xz";
1688
+
url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz";
1689
+
sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4";
1690
+
name = "step-18.12.1.tar.xz";
1691
1691
};
1692
1692
};
1693
1693
svgpart = {
1694
-
version = "18.12.0";
1694
+
version = "18.12.1";
1695
1695
src = fetchurl {
1696
-
url = "${mirror}/stable/applications/18.12.0/src/svgpart-18.12.0.tar.xz";
1697
-
sha256 = "1nqbbzndbyj9ikgw7fhy52621swb5blzycd5qn9if9ymsi524217";
1698
-
name = "svgpart-18.12.0.tar.xz";
1696
+
url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz";
1697
+
sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s";
1698
+
name = "svgpart-18.12.1.tar.xz";
1699
1699
};
1700
1700
};
1701
1701
sweeper = {
1702
-
version = "18.12.0";
1702
+
version = "18.12.1";
1703
1703
src = fetchurl {
1704
-
url = "${mirror}/stable/applications/18.12.0/src/sweeper-18.12.0.tar.xz";
1705
-
sha256 = "0pq991zxdg1816j8dbhc3vjxj84plif17zpvp3smiscr4n6x209h";
1706
-
name = "sweeper-18.12.0.tar.xz";
1704
+
url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz";
1705
+
sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4";
1706
+
name = "sweeper-18.12.1.tar.xz";
1707
1707
};
1708
1708
};
1709
1709
umbrello = {
1710
-
version = "18.12.0";
1710
+
version = "18.12.1";
1711
1711
src = fetchurl {
1712
-
url = "${mirror}/stable/applications/18.12.0/src/umbrello-18.12.0.tar.xz";
1713
-
sha256 = "15r5wv0k1dwfxp4l2mc4886s17ck390a2mpy1l08jvg93w1cbm3f";
1714
-
name = "umbrello-18.12.0.tar.xz";
1712
+
url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz";
1713
+
sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r";
1714
+
name = "umbrello-18.12.1.tar.xz";
1715
1715
};
1716
1716
};
1717
1717
zeroconf-ioslave = {
1718
-
version = "18.12.0";
1718
+
version = "18.12.1";
1719
1719
src = fetchurl {
1720
-
url = "${mirror}/stable/applications/18.12.0/src/zeroconf-ioslave-18.12.0.tar.xz";
1721
-
sha256 = "1qvmsr88kl1gq3wrn5g4wf4ka24pbbhdy54c8n25bhxd8pv0rd07";
1722
-
name = "zeroconf-ioslave-18.12.0.tar.xz";
1720
+
url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz";
1721
+
sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp";
1722
+
name = "zeroconf-ioslave-18.12.1.tar.xz";
1723
1723
};
1724
1724
};
1725
1725
}
+1
-1
pkgs/applications/misc/curabydagoma/default.nix
+1
-1
pkgs/applications/misc/curabydagoma/default.nix
+1
-1
pkgs/applications/misc/freemind/default.nix
+1
-1
pkgs/applications/misc/freemind/default.nix
+1
-1
pkgs/applications/misc/hello-unfree/default.nix
+1
-1
pkgs/applications/misc/hello-unfree/default.nix
+1
-1
pkgs/applications/misc/jbidwatcher/default.nix
+1
-1
pkgs/applications/misc/jbidwatcher/default.nix
···
21
21
22
22
installPhase = ''
23
23
mkdir -p "$out/bin"
24
-
echo > "$out/bin/${pname}" "#!/bin/sh"
24
+
echo > "$out/bin/${pname}" "#!${stdenv.shell}"
25
25
echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
26
26
chmod +x "$out/bin/${pname}"
27
27
install -D -m644 ${src} ${jarfile}
+3
-3
pkgs/applications/misc/multibootusb/default.nix
+3
-3
pkgs/applications/misc/multibootusb/default.nix
···
1
-
{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:
1
+
{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:
2
2
python36Packages.buildPythonApplication rec {
3
3
pname = "multibootusb";
4
4
name = "${pname}-${version}";
···
40
40
41
41
mkdir "$out/bin"
42
42
cat > "$out/bin/${pname}" <<EOF
43
-
#!/bin/sh
43
+
#!${stdenv.shell}
44
44
cd "$share"
45
45
export PYTHONPATH="$PYTHONPATH:$share"
46
46
export PATH="$PATH:${parted}/bin:${procps}/bin"
···
50
50
chmod +x "$out/bin/${pname}"
51
51
'';
52
52
53
-
meta = with lib; {
53
+
meta = with stdenv.lib; {
54
54
description = "Multiboot USB creator for Linux live disks";
55
55
homepage = http://multibootusb.org/;
56
56
license = licenses.gpl2;
+5
-5
pkgs/applications/misc/notejot/default.nix
+5
-5
pkgs/applications/misc/notejot/default.nix
···
1
-
{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite
2
-
, gtk3, gnome3, gtksourceview, json-glib, gobject-introspection, wrapGAppsHook }:
1
+
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon
2
+
, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "notejot";
···
20
20
ninja
21
21
pkgconfig
22
22
python3
23
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
23
+
pantheon.vala
24
24
wrapGAppsHook
25
25
];
26
26
27
27
buildInputs = [
28
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
28
+
pantheon.elementary-icon-theme
29
+
pantheon.granite
29
30
gnome3.libgee
30
-
granite
31
31
gtk3
32
32
gtksourceview
33
33
json-glib
+2
-2
pkgs/applications/misc/openjump/default.nix
+2
-2
pkgs/applications/misc/openjump/default.nix
+9
-9
pkgs/applications/misc/regextester/default.nix
+9
-9
pkgs/applications/misc/regextester/default.nix
···
4
4
, libxml2
5
5
, pkgconfig
6
6
, glib
7
-
, granite
8
7
, gtk3
9
8
, gnome3
10
9
, meson
11
10
, ninja
12
11
, gobject-introspection
13
12
, gsettings-desktop-schemas
14
-
, vala_0_40
13
+
, pantheon
15
14
, wrapGAppsHook }:
16
15
17
16
stdenv.mkDerivation rec {
···
26
25
};
27
26
28
27
nativeBuildInputs = [
29
-
pkgconfig
30
-
meson
31
-
ninja
28
+
pantheon.vala
32
29
gettext
33
30
gobject-introspection
34
31
libxml2
35
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
32
+
meson
33
+
ninja
34
+
pkgconfig
36
35
wrapGAppsHook
37
36
];
37
+
38
38
buildInputs = [
39
+
pantheon.elementary-icon-theme
40
+
pantheon.granite
39
41
glib
40
-
granite
41
-
gtk3
42
-
gnome3.defaultIconTheme
43
42
gnome3.libgee
44
43
gsettings-desktop-schemas
44
+
gtk3
45
45
];
46
46
47
47
postInstall = ''
+4
-4
pkgs/applications/misc/sequeler/default.nix
+4
-4
pkgs/applications/misc/sequeler/default.nix
···
1
1
{ stdenv, fetchFromGitHub
2
-
, meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
3
-
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }:
2
+
, meson, ninja, pkgconfig, pantheon, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
3
+
, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }:
4
4
5
5
6
6
let
···
20
20
sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p";
21
21
};
22
22
23
-
nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
23
+
nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
24
24
25
-
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ];
25
+
buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ];
26
26
27
27
postPatch = ''
28
28
chmod +x build-aux/meson_post_install.py
+2
-2
pkgs/applications/misc/st/default.nix
+2
-2
pkgs/applications/misc/st/default.nix
···
4
4
with stdenv.lib;
5
5
6
6
stdenv.mkDerivation rec {
7
-
name = "st-0.8.1";
7
+
name = "st-0.8.2";
8
8
9
9
src = fetchurl {
10
10
url = "https://dl.suckless.org/st/${name}.tar.gz";
11
-
sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
11
+
sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf";
12
12
};
13
13
14
14
inherit patches;
+1
-1
pkgs/applications/misc/thinking-rock/default.nix
+1
-1
pkgs/applications/misc/thinking-rock/default.nix
+4
-5
pkgs/applications/misc/tootle/default.nix
+4
-5
pkgs/applications/misc/tootle/default.nix
···
1
1
{ stdenv, fetchFromGitHub
2
2
, meson, ninja, pkgconfig, python3
3
-
, gnome3, vala_0_40, gobject-introspection, wrapGAppsHook
4
-
, gtk3, granite
5
-
, json-glib, glib, glib-networking, hicolor-icon-theme
3
+
, gnome3, pantheon, gobject-introspection, wrapGAppsHook
4
+
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
6
5
}:
7
6
8
7
let
···
24
23
ninja
25
24
pkgconfig
26
25
python3
27
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
26
+
pantheon.vala
28
27
wrapGAppsHook
29
28
];
30
29
buildInputs = [
31
-
gtk3 granite json-glib glib glib-networking hicolor-icon-theme
30
+
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
32
31
gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
33
32
];
34
33
+3
-3
pkgs/applications/networking/ftp/taxi/default.nix
+3
-3
pkgs/applications/networking/ftp/taxi/default.nix
···
1
-
{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
2
2
, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
3
3
4
4
stdenv.mkDerivation rec {
···
15
15
};
16
16
17
17
nativeBuildInputs = [
18
+
pantheon.vala
18
19
gobject-introspection
19
20
meson
20
21
ninja
21
22
pkgconfig
22
23
python3
23
-
vala
24
24
wrapGAppsHook
25
25
];
26
26
27
27
buildInputs = [
28
+
pantheon.granite
28
29
gnome3.libgee
29
-
granite
30
30
gtk3
31
31
libsecret
32
32
libsoup
+1
-1
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+1
-1
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+1
-1
pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+1
-1
pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+9
-11
pkgs/applications/networking/transporter/default.nix
+9
-11
pkgs/applications/networking/transporter/default.nix
···
3
3
, meson
4
4
, ninja
5
5
, pkgconfig
6
-
, granite
7
-
, vala_0_40
6
+
, gtk3
8
7
, python3
8
+
, pantheon
9
9
, gnome3
10
10
, libxml2
11
11
, gettext
···
31
31
nativeBuildInputs = [
32
32
appstream-glib
33
33
desktop-file-utils
34
+
pantheon.vala
34
35
gettext
35
36
gobject-introspection # For setup hook
36
37
libxml2
37
38
meson
38
39
ninja
39
40
pkgconfig
40
-
vala_0_40
41
41
python3
42
42
wrapGAppsHook
43
43
];
44
44
45
-
buildInputs = with gnome3; [
46
-
defaultIconTheme # If I omit this there's no icons in KDE
47
-
glib
48
-
granite
49
-
gsettings-desktop-schemas
45
+
buildInputs = [
46
+
pantheon.elementary-icon-theme
47
+
gnome3.libgee
48
+
pantheon.granite
50
49
gtk3
51
-
libgee
52
50
magic-wormhole
53
51
];
54
52
···
59
57
'';
60
58
61
59
postPatch = ''
62
-
chmod +x ./meson/post_install.py
63
-
patchShebangs ./meson/post_install.py
60
+
chmod +x meson/post_install.py
61
+
patchShebangs meson/post_install.py
64
62
'';
65
63
66
64
meta = with stdenv.lib; {
+1
-1
pkgs/applications/networking/weather/meteo/default.nix
+1
-1
pkgs/applications/networking/weather/meteo/default.nix
···
1
-
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3
1
+
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
2
2
, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
3
3
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
4
4
+4
-4
pkgs/applications/office/aesop/default.nix
+4
-4
pkgs/applications/office/aesop/default.nix
···
1
-
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, python3, gtk3
2
2
, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobject-introspection, wrapGAppsHook }:
3
3
4
4
stdenv.mkDerivation rec {
···
21
21
ninja
22
22
pkgconfig
23
23
python3
24
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
24
+
pantheon.vala
25
25
wrapGAppsHook
26
26
];
27
27
28
28
buildInputs = [
29
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
29
+
pantheon.elementary-icon-theme
30
30
gnome3.libgee
31
-
granite
31
+
pantheon.granite
32
32
gtk3
33
33
json-glib
34
34
libsoup
+6
-6
pkgs/applications/office/bookworm/default.nix
+6
-6
pkgs/applications/office/bookworm/default.nix
···
1
-
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pantheon, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
2
2
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
3
3
4
4
stdenv.mkDerivation rec {
···
20
20
ninja
21
21
pkgconfig
22
22
python3
23
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
23
+
pantheon.vala
24
24
wrapGAppsHook
25
25
];
26
26
27
-
buildInputs = with gnome3; [
27
+
buildInputs = [
28
+
pantheon.elementary-icon-theme
29
+
pantheon.granite
28
30
glib
29
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
30
-
granite
31
+
gnome3.libgee
31
32
gtk3
32
33
html2text
33
-
libgee
34
34
poppler
35
35
python2
36
36
sqlite
+8
-9
pkgs/applications/office/spice-up/default.nix
+8
-9
pkgs/applications/office/spice-up/default.nix
···
4
4
, libxml2
5
5
, pkgconfig
6
6
, gtk3
7
-
, granite
8
7
, gnome3
9
8
, gobject-introspection
10
9
, json-glib
···
13
12
, libgudev
14
13
, libevdev
15
14
, libsoup
16
-
, vala_0_40
15
+
, pantheon
17
16
, wrapGAppsHook }:
18
17
19
18
stdenv.mkDerivation rec {
···
30
29
USER = "nix-build-user";
31
30
32
31
nativeBuildInputs = [
33
-
pkgconfig
34
-
wrapGAppsHook
35
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
36
32
cmake
37
-
ninja
38
33
gettext
34
+
gobject-introspection # For setup hook
39
35
libxml2
40
-
gobject-introspection # For setup hook
36
+
ninja
37
+
pkgconfig
38
+
pantheon.vala
39
+
wrapGAppsHook
41
40
];
42
41
buildInputs = [
43
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
42
+
pantheon.elementary-icon-theme
43
+
pantheon.granite
44
44
gnome3.libgee
45
-
granite
46
45
gtk3
47
46
json-glib
48
47
libevdev
+5
-5
pkgs/applications/office/trilium/default.nix
+5
-5
pkgs/applications/office/trilium/default.nix
···
1
-
{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
1
+
{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }:
2
2
3
3
let
4
4
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
···
32
32
nativeBuildInputs = [
33
33
autoPatchelfHook
34
34
makeWrapper
35
+
wrapGAppsHook
35
36
];
36
37
37
-
buildInputs = atomEnv.packages;
38
+
buildInputs = [ atomEnv.packages gtk3 ];
38
39
39
40
installPhase = ''
40
41
mkdir -p $out/bin
···
48
49
cp ${desktopItem}/share/applications/* $out/share/applications
49
50
'';
50
51
51
-
52
-
# This "shouldn't" be needed, remove when possible :)
52
+
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
53
53
preFixup = ''
54
-
wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}"
54
+
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
55
55
'';
56
56
57
57
dontStrip = true;
+1
-1
pkgs/applications/science/logic/hol_light/default.nix
+1
-1
pkgs/applications/science/logic/hol_light/default.nix
+1
-1
pkgs/applications/science/logic/iprover/default.nix
+1
-1
pkgs/applications/science/logic/iprover/default.nix
···
19
19
20
20
mkdir -p "$out/share/${name}"
21
21
cp *.p "$out/share/${name}"
22
-
echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
22
+
echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
23
23
chmod a+x "$out"/bin/iprover
24
24
'';
25
25
+6
-8
pkgs/applications/science/math/nasc/default.nix
+6
-8
pkgs/applications/science/math/nasc/default.nix
···
1
1
{ stdenv
2
2
, fetchFromGitHub
3
-
, fetchpatch
4
3
, pkgconfig
5
4
, gtk3
6
-
, granite
5
+
, pantheon
7
6
, gnome3
8
7
, cmake
9
-
, vala_0_40
10
8
, libqalculate
11
9
, gobject-introspection
12
10
, wrapGAppsHook }:
···
28
26
'';
29
27
30
28
nativeBuildInputs = [
31
-
pkgconfig
32
-
wrapGAppsHook
33
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
34
29
cmake
30
+
pantheon.vala
35
31
gobject-introspection # for setup-hook
32
+
pkgconfig
33
+
wrapGAppsHook
36
34
];
37
35
38
36
buildInputs = [
39
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
37
+
pantheon.elementary-icon-theme
40
38
gnome3.gtksourceview
41
39
gnome3.libgee
42
40
gnome3.libsoup
43
-
granite
41
+
pantheon.granite
44
42
gtk3
45
43
libqalculate
46
44
];
+14
pkgs/applications/science/math/sage/sage-src.nix
+14
pkgs/applications/science/math/sage/sage-src.nix
···
91
91
rev = "cd62d45bcef93fb4f7ed62609a46135e6de07051";
92
92
sha256 = "08l2b9w0rn1zrha6188j72f7737xs126gkgmydjd31baa6367np2";
93
93
})
94
+
95
+
# https://trac.sagemath.org/ticket/26949
96
+
(fetchpatch {
97
+
name = "sphinx-1.8.3-dependency.patch";
98
+
url = "https://git.sagemath.org/sage.git/patch?id=d305eda0fedc73fdbe0447b5d6d2b520b8d112c4";
99
+
sha256 = "1x3q5j8lq35vlj893gj5gq9fhzs60szm9r9rx6ri79yiy9apabph";
100
+
})
101
+
# https://trac.sagemath.org/ticket/26451
102
+
(fetchpatch {
103
+
name = "sphinx-1.8.3.patch";
104
+
url = "https://git.sagemath.org/sage.git/patch?id2=0cb494282d7b4cea50aba7f4d100e7932a4c00b1&id=62b989d5ee1d9646db85ea56053cd22e9ffde5ab";
105
+
sha256 = "1n5c61mvhalcr2wbp66wzsynwwk59aakvx3xqa5zw9nlkx3rd0h1";
106
+
})
107
+
94
108
];
95
109
96
110
patches = nixPatches ++ packageUpgradePatches;
+3
-11
pkgs/applications/science/math/sage/sagenb.nix
+3
-11
pkgs/applications/science/math/sage/sagenb.nix
···
18
18
19
19
buildPythonPackage rec {
20
20
pname = "sagenb";
21
-
version = "2018-06-26"; # not 1.0.1 because of new flask syntax
21
+
version = "1.1.2";
22
22
23
23
src = fetchFromGitHub {
24
24
owner = "sagemath";
25
25
repo = "sagenb";
26
-
rev = "b360a0172e15501fb0163d02dce713a561fee2af";
27
-
sha256 = "12anydw0v9w23rbc0a94bqmjhjdir9h820c5zdhipw9ccdcc2jlf";
26
+
rev = version;
27
+
sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs";
28
28
};
29
29
30
30
propagatedBuildInputs = [
···
38
38
39
39
# tests depend on sage
40
40
doCheck = false;
41
-
42
-
patches = [
43
-
# work with latest flask-babel
44
-
(fetchpatch {
45
-
url = "https://github.com/sagemath/sagenb/commit/ba065eca63dd34a383e4c7ba7561430a90fcd087.patch";
46
-
sha256 = "1lamzsrgymdd618imrasjp6ivhw2aynh83gkybsd7pm1rzjcq4x8";
47
-
})
48
-
];
49
41
50
42
meta = with stdenv.lib; {
51
43
description = "Sage Notebook";
+5
-1
pkgs/applications/version-management/smartgithg/default.nix
+5
-1
pkgs/applications/version-management/smartgithg/default.nix
···
1
1
{ stdenv, fetchurl, lib, makeWrapper
2
+
, substituteAll
2
3
, jre
3
4
, gtk2, glib
4
5
, libXtst
···
21
22
buildCommand = let
22
23
pkg_path = "$out/${name}";
23
24
bin_path = "$out/bin";
24
-
install_freedesktop_items = ./install_freedesktop_items.sh;
25
+
install_freedesktop_items = substituteAll {
26
+
inherit (stdenv) shell;
27
+
src = ./install_freedesktop_items.sh;
28
+
};
25
29
runtime_paths = lib.makeBinPath [
26
30
jre
27
31
#git mercurial subversion # the paths are requested in configuration
+1
-1
pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
+1
-1
pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
+3
-3
pkgs/applications/virtualization/xen/generic.nix
+3
-3
pkgs/applications/virtualization/xen/generic.nix
···
86
86
87
87
# Fake git: just print what it wants and die
88
88
cat > fake-bin/wget << EOF
89
-
#!/bin/sh -e
89
+
#!${stdenv.shell} -e
90
90
echo ===== FAKE WGET: Not fetching \$*
91
91
[ -e \$3 ]
92
92
EOF
93
93
94
94
# Fake git: just print what it wants and die
95
95
cat > fake-bin/git << EOF
96
-
#!/bin/sh
96
+
#!${stdenv.shell}
97
97
echo ===== FAKE GIT: Not cloning \$*
98
98
[ -e \$3 ]
99
99
EOF
···
109
109
# (prefetched stuff has lots of files)
110
110
find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g'
111
111
find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \
112
-
| xargs sed -i 's@/bin/bash@/bin/sh@g'
112
+
| xargs sed -i 's@/bin/bash@${stdenv.shell}@g'
113
113
114
114
# Get prefetched stuff
115
115
${withXenfiles (name: x: ''
+9
-5
pkgs/build-support/cc-wrapper/default.nix
+9
-5
pkgs/build-support/cc-wrapper/default.nix
···
13
13
, extraPackages ? [], extraBuildCommands ? ""
14
14
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
15
15
, buildPackages ? {}
16
+
, libcxx ? null
16
17
}:
17
18
18
19
with stdenvNoCC.lib;
···
44
45
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
45
46
coreutils_bin = if nativeTools then "" else getBin coreutils;
46
47
47
-
default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
48
-
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
48
+
default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then
49
+
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
50
+
else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then
51
+
"-isystem ${libcxx}/include/c++/v1"
52
+
else "";
49
53
50
54
# The "infix salt" is a arbitrary string added in the middle of env vars
51
55
# defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
···
256
260
257
261
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
258
262
echo "$ccCFlags" > $out/nix-support/cc-cflags
259
-
''
260
-
261
-
+ optionalString propagateDoc ''
263
+
'' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) ''
264
+
echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags
265
+
'' + optionalString propagateDoc ''
262
266
##
263
267
## Man page and info support
264
268
##
+10
-3
pkgs/build-support/docker/default.nix
+10
-3
pkgs/build-support/docker/default.nix
···
22
22
referencesByPopularity,
23
23
writeScript,
24
24
writeText,
25
-
closureInfo
25
+
closureInfo,
26
+
substituteAll
26
27
}:
27
28
28
29
# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
···
279
280
# of room for extension
280
281
maxLayers ? 24
281
282
}:
283
+
let
284
+
storePathToLayer = substituteAll
285
+
{ inherit (stdenv) shell;
286
+
src = ./store-path-to-layer.sh;
287
+
};
288
+
in
282
289
runCommand "${name}-granular-docker-layers" {
283
290
inherit maxLayers;
284
291
paths = referencesByPopularity closure;
···
298
305
# following head and tail call lines, double-check that your
299
306
# code behaves properly when the number of layers equals:
300
307
# maxLayers-1, maxLayers, and maxLayers+1
301
-
head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${./store-path-to-layer.sh}
308
+
head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${storePathToLayer}
302
309
if [ $(cat $paths | wc -l) -ge $maxLayers ]; then
303
-
tail -n+$maxLayers $paths | xargs ${./store-path-to-layer.sh} $maxLayers
310
+
tail -n+$maxLayers $paths | xargs ${storePathToLayer} $maxLayers
304
311
fi
305
312
306
313
echo "Finished building layer '$name'"
+8
-1
pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
+8
-1
pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
···
23
23
for fn in "$@"; do
24
24
if [ -L "$fn" ]; then continue; fi
25
25
echo "$fn: fixing dylib"
26
-
install_name_tool -id "$fn" "${flags[@]}" "$fn"
26
+
int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)
27
+
result=$?
28
+
if [ "$result" -ne 0 ] &&
29
+
! grep "shared library stub file and can't be changed" <<< "$out"
30
+
then
31
+
echo "$int_out" >&2
32
+
exit "$result"
33
+
fi
27
34
done
28
35
}
29
36
+26
-2
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+26
-2
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
···
36
36
done
37
37
38
38
if [[ -z "$dontWrapGApps" ]]; then
39
+
targetDirsThatExist=()
40
+
targetDirsRealPath=()
41
+
42
+
# wrap binaries
39
43
targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
40
44
for targetDir in "${targetDirs[@]}"; do
41
45
if [[ -d "${targetDir}" ]]; then
42
-
find -L "${targetDir}" -type f -executable -print0 \
46
+
targetDirsThatExist+=("${targetDir}")
47
+
targetDirsRealPath+=("$(realpath "${targetDir}")/")
48
+
find "${targetDir}" -type f -executable -print0 \
43
49
| while IFS= read -r -d '' file; do
44
-
echo "Wrapping program ${file}"
50
+
echo "Wrapping program '${file}'"
45
51
wrapProgram "${file}" "${gappsWrapperArgs[@]}"
46
52
done
47
53
fi
48
54
done
55
+
56
+
# wrap links to binaries that point outside targetDirs
57
+
# Note: links to binaries within targetDirs do not need
58
+
# to be wrapped as the binaries have already been wrapped
59
+
if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then
60
+
find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 \
61
+
| while IFS= read -r -d '' linkPath; do
62
+
linkPathReal=$(realpath "${linkPath}")
63
+
for targetPath in "${targetDirsRealPath[@]}"; do
64
+
if [[ "$linkPathReal" == "$targetPath"* ]]; then
65
+
echo "Not wrapping link: '$linkPath' (already wrapped)"
66
+
continue 2
67
+
fi
68
+
done
69
+
echo "Wrapping link: '$linkPath'"
70
+
wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
71
+
done
72
+
fi
49
73
fi
50
74
}
51
75
+1
-1
pkgs/build-support/vm/default.nix
+1
-1
pkgs/build-support/vm/default.nix
-38
pkgs/data/icons/elementary-icon-theme/default.nix
-38
pkgs/data/icons/elementary-icon-theme/default.nix
···
1
-
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
name = "elementary-icon-theme-${version}";
5
-
version = "5.0.2";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "elementary";
9
-
repo = "icons";
10
-
rev = version;
11
-
sha256 = "12j582f0kggv2lp935r75xg7q26zpl0f05s11xcs4qxazhj1ly2r";
12
-
};
13
-
14
-
nativeBuildInputs = [ meson ninja python3 gtk3 ];
15
-
16
-
# Disable installing gimp and inkscape palette files
17
-
mesonFlags = [
18
-
"-Dpalettes=false"
19
-
];
20
-
21
-
postPatch = ''
22
-
chmod +x meson/symlink.py
23
-
patchShebangs .
24
-
sed -i volumeicon/meson.build -e "s,'/','$out',"
25
-
'';
26
-
27
-
postFixup = ''
28
-
gtk-update-icon-cache $out/share/icons/elementary
29
-
'';
30
-
31
-
meta = with stdenv.lib; {
32
-
description = "Icons from the Elementary Project";
33
-
homepage = https://github.com/elementary/icons;
34
-
license = licenses.gpl3;
35
-
platforms = platforms.all;
36
-
maintainers = with maintainers; [ simonvandel ];
37
-
};
38
-
}
+2
-2
pkgs/data/icons/faba-icon-theme/default.nix
+2
-2
pkgs/data/icons/faba-icon-theme/default.nix
···
1
-
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }:
1
+
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "${package-name}-${version}";
···
12
12
sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
13
13
};
14
14
15
-
nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ];
15
+
nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ];
16
16
17
17
postPatch = ''
18
18
patchShebangs meson/post_install.py
-2
pkgs/data/misc/geolite-legacy/builder.sh
-2
pkgs/data/misc/geolite-legacy/builder.sh
+2
-2
pkgs/desktops/deepin/deepin-wm/default.nix
+2
-2
pkgs/desktops/deepin/deepin-wm/default.nix
···
1
1
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
2
-
bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3,
2
+
bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3,
3
3
deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
4
4
hicolor-icon-theme, deepin }:
5
5
···
28
28
gnome3.libgee
29
29
bamf
30
30
clutter-gtk
31
-
granite
31
+
pantheon.granite
32
32
libcanberra-gtk3
33
33
libwnck3
34
34
deepin-mutter
+5
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+5
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
···
19
19
src = ./fix-paths.patch;
20
20
inherit tzdata;
21
21
})
22
+
./hardcode-gsettings.patch
22
23
];
23
24
24
25
nativeBuildInputs = [
···
40
41
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
41
42
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
42
43
];
44
+
45
+
postPatch = ''
46
+
substituteInPlace src/libedataserver/e-source-registry.c --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
47
+
'';
43
48
44
49
45
50
passthru = {
+36
pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
+36
pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
···
1
+
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
2
+
index 9c166dbaf..ef368f8d4 100644
3
+
--- a/src/libedataserver/e-source-registry.c
4
+
+++ b/src/libedataserver/e-source-registry.c
5
+
@@ -116,6 +116,8 @@ struct _ESourceRegistryPrivate {
6
+
GHashTable *sources;
7
+
GMutex sources_lock;
8
+
9
+
+ GSettingsSchemaSource *schema_source;
10
+
+ GSettingsSchema *schema;
11
+
GSettings *settings;
12
+
13
+
gboolean initialized;
14
+
@@ -1339,7 +1341,11 @@ source_registry_dispose (GObject *object)
15
+
if (priv->settings != NULL) {
16
+
g_signal_handlers_disconnect_by_data (priv->settings, object);
17
+
g_object_unref (priv->settings);
18
+
+ g_settings_schema_unref (priv->schema);
19
+
+ g_settings_schema_source_unref (priv->schema_source);
20
+
priv->settings = NULL;
21
+
+ priv->schema = NULL;
22
+
+ priv->schema_source = NULL;
23
+
}
24
+
25
+
/* Chain up to parent's finalize() method. */
26
+
@@ -1743,7 +1749,9 @@ e_source_registry_init (ESourceRegistry *registry)
27
+
28
+
g_mutex_init (®istry->priv->sources_lock);
29
+
30
+
- registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA);
31
+
+ GSettingsSchemaSource *schema_source = registry->priv->schema_source = g_settings_schema_source_new_from_directory ("@ESD_GSETTINGS_PATH@", g_settings_schema_source_get_default (), TRUE, NULL);
32
+
+ registry->priv->schema = g_settings_schema_source_lookup (schema_source, GSETTINGS_SCHEMA, FALSE);
33
+
+ registry->priv->settings = g_settings_new_full (registry->priv->schema, NULL, NULL);
34
+
35
+
g_signal_connect (
36
+
registry->priv->settings, "changed",
+2
-2
pkgs/desktops/gnustep/base/default.nix
+2
-2
pkgs/desktops/gnustep/base/default.nix
···
11
11
, pkgconfig, portaudio
12
12
}:
13
13
let
14
-
version = "1.25.1";
14
+
version = "1.26.0";
15
15
in
16
16
gsmakeDerivation {
17
17
name = "gnustep-base-${version}";
18
18
src = fetchurl {
19
19
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz";
20
-
sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj";
20
+
sha256 = "0ws16rwqx0qvqpyjsxbdylfpkgjr19nqc9i3b30wywqcqrkc12zn";
21
21
};
22
22
nativeBuildInputs = [ pkgconfig ];
23
23
propagatedBuildInputs = [
+58
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+58
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig
2
+
, meson, ninja, vala, desktop-file-utils, libxml2
3
+
, gtk3, python3, granite, libgee, gobject-introspection
4
+
, elementary-icon-theme, appstream, wrapGAppsHook }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "calculator";
8
+
version = "1.5.1";
9
+
10
+
name = "elementary-${pname}-${version}";
11
+
12
+
src = fetchFromGitHub {
13
+
owner = "elementary";
14
+
repo = pname;
15
+
rev = version;
16
+
sha256 = "0vc27kjmfkly2jkqjiyzlybxyjqhwal3xrxca5b4abfgb379yswa";
17
+
};
18
+
19
+
passthru = {
20
+
updateScript = pantheon.updateScript {
21
+
repoName = pname;
22
+
attrPath = "elementary-${pname}";
23
+
};
24
+
};
25
+
26
+
nativeBuildInputs = [
27
+
appstream
28
+
desktop-file-utils
29
+
gobject-introspection
30
+
libxml2
31
+
meson
32
+
ninja
33
+
pkgconfig
34
+
python3
35
+
vala
36
+
wrapGAppsHook
37
+
];
38
+
39
+
buildInputs = [
40
+
elementary-icon-theme
41
+
granite
42
+
gtk3
43
+
libgee
44
+
];
45
+
46
+
postPatch = ''
47
+
chmod +x meson/post_install.py
48
+
patchShebangs meson/post_install.py
49
+
'';
50
+
51
+
meta = with stdenv.lib; {
52
+
homepage = https://github.com/elementary/calculator;
53
+
description = "Calculator app designed for elementary OS";
54
+
license = licenses.gpl3Plus;
55
+
platforms = platforms.linux;
56
+
maintainers = pantheon.maintainers;
57
+
};
58
+
}
+66
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+66
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
2
+
, ninja, vala, desktop-file-utils, gtk3, granite, libgee
3
+
, geoclue2, libchamplain, clutter, folks, geocode-glib, python3
4
+
, libnotify, libical, evolution-data-server, appstream-glib
5
+
, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
6
+
7
+
stdenv.mkDerivation rec {
8
+
pname = "calendar";
9
+
version = "4.2.3";
10
+
11
+
name = "elementary-${pname}-${version}";
12
+
13
+
src = fetchFromGitHub {
14
+
owner = "elementary";
15
+
repo = pname;
16
+
rev = version;
17
+
sha256 = "100wy8lkp4nrxj57ywyx44ckm3k7n8h5l6av92hr5pyx8fxn9m48";
18
+
};
19
+
20
+
passthru = {
21
+
updateScript = pantheon.updateScript {
22
+
repoName = pname;
23
+
attrPath = "elementary-${pname}";
24
+
};
25
+
};
26
+
27
+
nativeBuildInputs = [
28
+
appstream-glib
29
+
desktop-file-utils
30
+
gobject-introspection
31
+
meson
32
+
ninja
33
+
pkgconfig
34
+
python3
35
+
vala
36
+
wrapGAppsHook
37
+
];
38
+
39
+
buildInputs = [
40
+
clutter
41
+
elementary-icon-theme
42
+
evolution-data-server
43
+
folks
44
+
geoclue2
45
+
geocode-glib
46
+
granite
47
+
gtk3
48
+
libchamplain
49
+
libgee
50
+
libical
51
+
libnotify
52
+
];
53
+
54
+
postPatch = ''
55
+
chmod +x meson/post_install.py
56
+
patchShebangs meson/post_install.py
57
+
'';
58
+
59
+
meta = with stdenv.lib; {
60
+
description = "Desktop calendar app designed for elementary OS";
61
+
homepage = https://github.com/elementary/calendar;
62
+
license = licenses.gpl3Plus;
63
+
platforms = platforms.linux;
64
+
maintainers = pantheon.maintainers;
65
+
};
66
+
}
+64
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+64
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
2
+
, desktop-file-utils, python3, gettext, libxml2, gtk3, granite, libgee, gst_all_1
3
+
, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "camera";
7
+
version = "1.0.3";
8
+
9
+
name = "elementary-${pname}-${version}";
10
+
11
+
src = fetchFromGitHub {
12
+
owner = "elementary";
13
+
repo = pname;
14
+
rev = version;
15
+
sha256 = "05rjymflhwbkw8yc57rgi9n7lrhf4dpvfvlifdnazyqn9iiaxc46";
16
+
};
17
+
18
+
passthru = {
19
+
updateScript = pantheon.updateScript {
20
+
repoName = pname;
21
+
attrPath = "elementary-${pname}";
22
+
};
23
+
};
24
+
25
+
nativeBuildInputs = [
26
+
appstream
27
+
desktop-file-utils
28
+
gettext
29
+
libxml2
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
python3
34
+
vala
35
+
wrapGAppsHook
36
+
];
37
+
38
+
buildInputs = [
39
+
clutter-gst
40
+
clutter-gtk
41
+
elementary-icon-theme
42
+
granite
43
+
gst_all_1.gst-plugins-bad
44
+
gst_all_1.gst-plugins-base
45
+
gst_all_1.gst-plugins-good
46
+
gst_all_1.gstreamer
47
+
gtk3
48
+
libcanberra
49
+
libgee
50
+
];
51
+
52
+
postPatch = ''
53
+
chmod +x meson/post_install.py
54
+
patchShebangs meson/post_install.py
55
+
'';
56
+
57
+
meta = with stdenv.lib; {
58
+
description = "Camera app designed for elementary OS";
59
+
homepage = https://github.com/elementary/camera;
60
+
license = licenses.gpl2Plus;
61
+
platforms = platforms.linux;
62
+
maintainers = pantheon.maintainers;
63
+
};
64
+
}
+80
pkgs/desktops/pantheon/apps/elementary-code/default.nix
+80
pkgs/desktops/pantheon/apps/elementary-code/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, substituteAll
2
+
, python3, glibcLocales, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme
3
+
, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup
4
+
, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "code";
8
+
version = "3.0.2";
9
+
10
+
name = "elementary-${pname}-${version}";
11
+
12
+
src = fetchFromGitHub {
13
+
owner = "elementary";
14
+
repo = pname;
15
+
rev = version;
16
+
sha256 = "0zmm4a7galrs9phiplf6cygwq3rplghv7r8g47mi4nlndgxqyssg";
17
+
};
18
+
19
+
passthru = {
20
+
updateScript = pantheon.updateScript {
21
+
repoName = pname;
22
+
attrPath = "elementary-${pname}";
23
+
};
24
+
};
25
+
26
+
nativeBuildInputs = [
27
+
appstream
28
+
desktop-file-utils
29
+
glibcLocales
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
python3
34
+
vala
35
+
wrapGAppsHook
36
+
];
37
+
38
+
buildInputs = [
39
+
ctags
40
+
elementary-icon-theme
41
+
editorconfig-core-c
42
+
granite
43
+
gtk3
44
+
gtksourceview3
45
+
gtkspell3
46
+
libgee
47
+
libgit2-glib
48
+
libpeas
49
+
libsoup
50
+
vte
51
+
webkitgtk
52
+
zeitgeist
53
+
];
54
+
55
+
# See: https://github.com/elementary/code/pull/626
56
+
LIBRARY_PATH = stdenv.lib.makeLibraryPath [ editorconfig-core-c ];
57
+
58
+
# install script fails with UnicodeDecodeError because of printing a fancy elipsis character
59
+
LC_ALL = "en_US.UTF-8";
60
+
61
+
# ctags needed in path by outline plugin
62
+
preFixup = ''
63
+
gappsWrapperArgs+=(
64
+
--prefix PATH : "${stdenv.lib.makeBinPath [ ctags ]}"
65
+
)
66
+
'';
67
+
68
+
postPatch = ''
69
+
chmod +x meson/post_install.py
70
+
patchShebangs meson/post_install.py
71
+
'';
72
+
73
+
meta = with stdenv.lib; {
74
+
description = "Code editor designed for elementary OS";
75
+
homepage = https://github.com/elementary/code;
76
+
license = licenses.gpl3Plus;
77
+
platforms = platforms.linux;
78
+
maintainers = pantheon.maintainers;
79
+
};
80
+
}
+76
pkgs/desktops/pantheon/apps/elementary-files/default.nix
+76
pkgs/desktops/pantheon/apps/elementary-files/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala
2
+
, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify
3
+
, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking
4
+
, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "files";
8
+
version = "4.1.4";
9
+
10
+
name = "elementary-${pname}-${version}";
11
+
12
+
src = fetchFromGitHub {
13
+
owner = "elementary";
14
+
repo = pname;
15
+
rev = version;
16
+
sha256 = "0nlmg3izbi4yh2sd69hh8avg76pipxn11l9a39xgqm55lvidlqmn";
17
+
};
18
+
19
+
passthru = {
20
+
updateScript = pantheon.updateScript {
21
+
repoName = pname;
22
+
attrPath = "elementary-${pname}";
23
+
};
24
+
};
25
+
26
+
nativeBuildInputs = [
27
+
desktop-file-utils
28
+
gettext
29
+
glib-networking
30
+
gobject-introspection
31
+
meson
32
+
ninja
33
+
pkgconfig
34
+
python3
35
+
vala
36
+
wrapGAppsHook
37
+
];
38
+
39
+
buildInputs = [
40
+
bamf
41
+
elementary-icon-theme
42
+
granite
43
+
gtk3
44
+
libcanberra
45
+
libdbusmenu-gtk3
46
+
libgee
47
+
libnotify
48
+
libunity
49
+
pango
50
+
plank
51
+
sqlite
52
+
zeitgeist
53
+
];
54
+
55
+
patches = [ ./hardcode-gsettings.patch ];
56
+
57
+
postPatch = ''
58
+
chmod +x meson/post_install.py
59
+
patchShebangs meson/post_install.py
60
+
61
+
substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
62
+
'';
63
+
64
+
# xdg.mime will create this
65
+
postInstall = ''
66
+
rm $out/share/applications/mimeinfo.cache
67
+
'';
68
+
69
+
meta = with stdenv.lib; {
70
+
description = "File browser designed for elementary OS";
71
+
homepage = https://github.com/elementary/files;
72
+
license = licenses.lgpl3;
73
+
platforms = platforms.linux;
74
+
maintainers = pantheon.maintainers;
75
+
};
76
+
}
+22
pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
+22
pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
···
1
+
diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala
2
+
index cb7c3c49..8b1899d1 100644
3
+
--- a/filechooser-module/FileChooserDialog.vala
4
+
+++ b/filechooser-module/FileChooserDialog.vala
5
+
@@ -57,10 +57,15 @@ public class CustomFileChooserDialog : Object {
6
+
chooser_dialog.deletable = false;
7
+
chooser_dialog.local_only = false;
8
+
9
+
- var settings = new Settings ("io.elementary.files.preferences");
10
+
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
11
+
+ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false);
12
+
+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
13
+
+
14
+
+ var settings = new Settings.full (preferences_schema, null, null);
15
+
+
16
+
is_single_click = settings.get_boolean ("single-click");
17
+
18
+
- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
19
+
+ var chooser_settings = new Settings.full (chooser_schema, null, null);
20
+
21
+
assign_container_box ();
22
+
remove_gtk_widgets ();
+78
pkgs/desktops/pantheon/apps/elementary-music/default.nix
+78
pkgs/desktops/pantheon/apps/elementary-music/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
2
+
, ninja, vala, desktop-file-utils, libxml2, gtk3, granite
3
+
, python3, libgee, clutter-gtk, json-glib, libgda, libgpod
4
+
, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib
5
+
, libdbusmenu, libsignon-glib, libaccounts-glib
6
+
, elementary-icon-theme, wrapGAppsHook }:
7
+
8
+
stdenv.mkDerivation rec {
9
+
pname = "music";
10
+
version = "5.0.2";
11
+
12
+
name = "elementary-${pname}-${version}";
13
+
14
+
src = fetchFromGitHub {
15
+
owner = "elementary";
16
+
repo = pname;
17
+
rev = version;
18
+
sha256 = "06mpikzdm01r9j7g15b7fgi4lcnp8cc0wmj17dfli5nmncxghx89";
19
+
};
20
+
21
+
passthru = {
22
+
updateScript = pantheon.updateScript {
23
+
repoName = pname;
24
+
attrPath = "elementary-${pname}";
25
+
};
26
+
};
27
+
28
+
nativeBuildInputs = [
29
+
desktop-file-utils
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
python3
34
+
vala
35
+
wrapGAppsHook
36
+
];
37
+
38
+
buildInputs = with gst_all_1; [
39
+
clutter-gtk
40
+
elementary-icon-theme
41
+
granite
42
+
gst-plugins-bad
43
+
gst-plugins-base
44
+
gst-plugins-good
45
+
gst-plugins-ugly
46
+
gstreamer
47
+
gtk3
48
+
json-glib
49
+
libaccounts-glib
50
+
libdbusmenu
51
+
libgda
52
+
libgee
53
+
libgpod
54
+
libsignon-glib
55
+
libnotify
56
+
libpeas
57
+
libsoup
58
+
taglib
59
+
zeitgeist
60
+
];
61
+
62
+
mesonFlags = [
63
+
"-Dplugins=lastfm,audioplayer,cdrom,ipod"
64
+
];
65
+
66
+
postPatch = ''
67
+
chmod +x meson/post_install.py
68
+
patchShebangs meson/post_install.py
69
+
'';
70
+
71
+
meta = with stdenv.lib; {
72
+
description = "Music player and library designed for elementary OS";
73
+
homepage = https://github.com/elementary/music;
74
+
license = licenses.lgpl2Plus;
75
+
platforms = platforms.linux;
76
+
maintainers = pantheon.maintainers;
77
+
};
78
+
}
+81
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+81
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
2
+
, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2
3
+
, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
4
+
, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "photos";
8
+
version = "2.6.2";
9
+
10
+
name = "elementary-${pname}-${version}";
11
+
12
+
src = fetchFromGitHub {
13
+
owner = "elementary";
14
+
repo = pname;
15
+
rev = version;
16
+
sha256 = "166a1jb85n67z6ffm5i0xzap407rv0r511lzh0gidkap1qy6pnmi";
17
+
};
18
+
19
+
passthru = {
20
+
updateScript = pantheon.updateScript {
21
+
repoName = pname;
22
+
attrPath = "elementary-${pname}";
23
+
};
24
+
};
25
+
26
+
nativeBuildInputs = [
27
+
appstream
28
+
desktop-file-utils
29
+
gobject-introspection
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
python3
34
+
vala
35
+
wrapGAppsHook
36
+
];
37
+
38
+
buildInputs = with gst_all_1; [
39
+
elementary-icon-theme
40
+
geocode-glib
41
+
gexiv2
42
+
granite
43
+
gst-plugins-bad
44
+
gst-plugins-base
45
+
gst-plugins-good
46
+
gst-plugins-ugly
47
+
gstreamer
48
+
gtk3
49
+
json-glib
50
+
libaccounts-glib
51
+
libexif
52
+
libgee
53
+
libgphoto2
54
+
libgudev
55
+
libraw
56
+
libsoup
57
+
libunity
58
+
libwebp
59
+
librest
60
+
scour
61
+
sqlite
62
+
webkitgtk
63
+
];
64
+
65
+
mesonFlags = [
66
+
"-Dplugins=false"
67
+
];
68
+
69
+
postPatch = ''
70
+
chmod +x meson/post_install.py
71
+
patchShebangs meson/post_install.py
72
+
'';
73
+
74
+
meta = with stdenv.lib; {
75
+
description = "Photo viewer and organizer designed for elementary OS";
76
+
homepage = https://github.com/elementary/photos;
77
+
license = licenses.lgpl21Plus;
78
+
platforms = platforms.linux;
79
+
maintainers = pantheon.maintainers;
80
+
};
81
+
}
+67
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+67
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage
2
+
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
3
+
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
let
6
+
7
+
redacted-script = callPackage ./redacted-script.nix {};
8
+
9
+
in
10
+
11
+
stdenv.mkDerivation rec {
12
+
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
13
+
version = "1.6.1";
14
+
15
+
name = "elementary-${pname}-${version}";
16
+
17
+
src = fetchFromGitHub {
18
+
owner = "elementary";
19
+
repo = "screenshot";
20
+
rev = version;
21
+
sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g";
22
+
};
23
+
24
+
passthru = {
25
+
updateScript = pantheon.updateScript {
26
+
repoName = "screenshot";
27
+
attrPath = "elementary-${pname}";
28
+
};
29
+
};
30
+
31
+
nativeBuildInputs = [
32
+
desktop-file-utils
33
+
gobject-introspection
34
+
meson
35
+
ninja
36
+
pkgconfig
37
+
python3
38
+
vala
39
+
wrapGAppsHook
40
+
];
41
+
42
+
buildInputs = [
43
+
elementary-icon-theme
44
+
granite
45
+
gtk3
46
+
libcanberra
47
+
libgee
48
+
];
49
+
50
+
postPatch = ''
51
+
chmod +x meson/post_install.py
52
+
patchShebangs meson/post_install.py
53
+
'';
54
+
55
+
postInstall = ''
56
+
mkdir -p $out/share/fonts/truetype
57
+
cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
58
+
'';
59
+
60
+
meta = with stdenv.lib; {
61
+
description = "Screenshot tool designed for elementary OS";
62
+
homepage = https://github.com/elementary/screenshot;
63
+
license = licenses.lgpl3;
64
+
platforms = platforms.linux;
65
+
maintainers = pantheon.maintainers;
66
+
};
67
+
}
+28
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
+28
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
name = "elementary-redacted-script-${version}";
5
+
version = "5.1.0";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "elementary";
9
+
repo = "fonts";
10
+
rev = version;
11
+
sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2";
12
+
};
13
+
14
+
dontConfigure = true;
15
+
16
+
installPhase = ''
17
+
mkdir -p $out/share/fonts/truetype/redacted-elementary
18
+
cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
19
+
'';
20
+
21
+
meta = with stdenv.lib; {
22
+
description = "Redacted Script Font for elementary";
23
+
homepage = https://github.com/elementary/fonts;
24
+
license = licenses.ofl;
25
+
maintainers = pantheon.maintainers;
26
+
platforms = platforms.linux;
27
+
};
28
+
}
+66
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+66
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
2
+
, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee
3
+
, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "terminal";
7
+
version = "5.3.3";
8
+
9
+
name = "elementary-${pname}-${version}";
10
+
11
+
src = fetchFromGitHub {
12
+
owner = "elementary";
13
+
repo = pname;
14
+
rev = version;
15
+
sha256 = "1rhqfq5dn913g551ribycid4k8add2lanxkkqpv6zzdgvah26ni8";
16
+
};
17
+
18
+
passthru = {
19
+
updateScript = pantheon.updateScript {
20
+
repoName = pname;
21
+
attrPath = "elementary-${pname}";
22
+
};
23
+
};
24
+
25
+
nativeBuildInputs = [
26
+
appstream
27
+
desktop-file-utils
28
+
gobject-introspection
29
+
libxml2
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
python3
34
+
vala
35
+
wrapGAppsHook
36
+
];
37
+
38
+
buildInputs = [
39
+
elementary-icon-theme
40
+
granite
41
+
gtk3
42
+
libgee
43
+
libnotify
44
+
vte
45
+
];
46
+
47
+
# See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80
48
+
mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ];
49
+
50
+
postPatch = ''
51
+
chmod +x meson/post_install.py
52
+
patchShebangs meson/post_install.py
53
+
'';
54
+
55
+
meta = with stdenv.lib; {
56
+
description = "Terminal emulator designed for elementary OS";
57
+
longDescription = ''
58
+
A super lightweight, beautiful, and simple terminal. Comes with sane defaults, browser-class tabs, sudo paste protection,
59
+
smart copy/paste, and little to no configuration.
60
+
'';
61
+
homepage = https://github.com/elementary/terminal;
62
+
license = licenses.lgpl3;
63
+
platforms = platforms.linux;
64
+
maintainers = pantheon.maintainers;
65
+
};
66
+
}
+63
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+63
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
2
+
, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1
3
+
, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "videos";
7
+
version = "2.6.3";
8
+
9
+
name = "elementary-${pname}-${version}";
10
+
11
+
src = fetchFromGitHub {
12
+
owner = "elementary";
13
+
repo = pname;
14
+
rev = version;
15
+
sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
16
+
};
17
+
18
+
passthru = {
19
+
updateScript = pantheon.updateScript {
20
+
repoName = pname;
21
+
attrPath = "elementary-${pname}";
22
+
};
23
+
};
24
+
25
+
nativeBuildInputs = [
26
+
desktop-file-utils
27
+
gobject-introspection
28
+
meson
29
+
ninja
30
+
pkgconfig
31
+
python3
32
+
vala
33
+
wrapGAppsHook
34
+
];
35
+
36
+
buildInputs = with gst_all_1; [
37
+
clutter-gst
38
+
clutter-gtk
39
+
elementary-icon-theme
40
+
granite
41
+
gst-libav
42
+
gst-plugins-bad
43
+
gst-plugins-base
44
+
gst-plugins-good
45
+
gst-plugins-ugly
46
+
gstreamer
47
+
gtk3
48
+
libgee
49
+
];
50
+
51
+
postPatch = ''
52
+
chmod +x meson/post_install.py
53
+
patchShebangs meson/post_install.py
54
+
'';
55
+
56
+
meta = with stdenv.lib; {
57
+
description = "Video player and library app designed for elementary OS";
58
+
homepage = https://github.com/elementary/videos;
59
+
license = licenses.gpl3Plus;
60
+
platforms = platforms.linux;
61
+
maintainers = pantheon.maintainers;
62
+
};
63
+
}
-29
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
-29
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
···
1
-
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, vte_290, libnotify, gettext, wrapGAppsHook, gobject-introspection }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
majorVersion = "0.4";
5
-
minorVersion = "3";
6
-
name = "pantheon-terminal-${majorVersion}.${minorVersion}";
7
-
src = fetchurl {
8
-
url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz";
9
-
sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
10
-
};
11
-
12
-
nativeBuildInputs = [
13
-
perl cmake vala_0_38 pkgconfig wrapGAppsHook
14
-
# For setup hook
15
-
gobject-introspection
16
-
];
17
-
buildInputs = with gnome3; [
18
-
glib gtk3 granite libnotify gettext vte_290 libgee
19
-
gsettings-desktop-schemas defaultIconTheme
20
-
];
21
-
meta = {
22
-
description = "Elementary OS's terminal";
23
-
longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS.";
24
-
homepage = https://launchpad.net/pantheon-terminal;
25
-
license = stdenv.lib.licenses.gpl3;
26
-
platforms = stdenv.lib.platforms.linux;
27
-
maintainers = [ stdenv.lib.maintainers.vozz ];
28
-
};
29
-
}
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-a11y";
6
+
version = "2.1.3";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Universal Access Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-a11y;
41
+
license = licenses.lgpl3Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+54
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+54
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-about";
6
+
version = "2.5.2";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "11diwz2aj45yqkxdija8ny0sgm0wl2905gl3799cdl12ss9ffndp";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
patches = [
37
+
(substituteAll {
38
+
src = ./lspci-path.patch;
39
+
inherit pciutils;
40
+
})
41
+
./remove-update-button.patch
42
+
];
43
+
44
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
45
+
46
+
meta = with stdenv.lib; {
47
+
description = "Switchboard About Plug";
48
+
homepage = https://github.com/elementary/witchboard-plug-about;
49
+
license = licenses.gpl3Plus;
50
+
platforms = platforms.linux;
51
+
maintainers = pantheon.maintainers;
52
+
};
53
+
54
+
}
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
···
1
+
diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala
2
+
index a3e449c..a95fe93 100644
3
+
--- a/src/Views/HardwareView.vala
4
+
+++ b/src/Views/HardwareView.vala
5
+
@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid {
6
+
7
+
// Graphics
8
+
try {
9
+
- Process.spawn_command_line_sync ("lspci", out graphics);
10
+
+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics);
11
+
12
+
if ("VGA" in graphics) { //VGA-keyword indicates graphics-line
13
+
string[] lines = graphics.split("\n");
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-applications";
6
+
version = "2.1.5";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1c4agff456625kycacpsww7c9jsnsg1rqps96r7cvn9zq371b5ir";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Applications Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-applications;
41
+
license = licenses.gpl2Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+47
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+47
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
2
+
, granite, gtk3, bluez, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-bluetooth";
6
+
version = "2.2.1";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
bluez
31
+
granite
32
+
gtk3
33
+
libgee
34
+
switchboard
35
+
];
36
+
37
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
38
+
39
+
meta = with stdenv.lib; {
40
+
description = "Switchboard Bluetooth Plug";
41
+
homepage = https://github.com/elementary/switchboard-plug-bluetooth;
42
+
license = licenses.gpl3Plus;
43
+
platforms = platforms.linux;
44
+
maintainers = pantheon.maintainers;
45
+
};
46
+
47
+
}
+12
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
+12
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
···
1
+
diff --git a/src/DateTime1.vala b/src/DateTime1.vala
2
+
index 5a80fbd..2e1f948 100644
3
+
--- a/src/DateTime1.vala
4
+
+++ b/src/DateTime1.vala
5
+
@@ -38,6 +38,6 @@ public class DateTime.Settings : Granite.Services.Settings {
6
+
public string clock_format { get; set; }
7
+
8
+
public Settings () {
9
+
- base ("io.elementary.desktop.wingpanel.datetime");
10
+
+ base ("io.elementary.granite");
11
+
}
12
+
}
+55
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+55
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig
2
+
, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-datetime";
6
+
version = "2.1.5";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1iz8skf5dw76a07ljc8v8lw2x2nrmq8j6sggm227cmxy60gadsdv";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
libxml2
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
granite
32
+
gtk3
33
+
libgee
34
+
switchboard
35
+
];
36
+
37
+
patches = [
38
+
(substituteAll {
39
+
src = ./timezone.patch;
40
+
tzdata = "${tzdata}/share/zoneinfo/zone.tab";
41
+
})
42
+
# Use "clock-format" GSettings key that's been moved to granite
43
+
./clock-format.patch
44
+
];
45
+
46
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
47
+
48
+
meta = with stdenv.lib; {
49
+
description = "Switchboard Date & Time Plug";
50
+
homepage = https://github.com/elementary/switchboard-plug-datetime;
51
+
license = licenses.gpl3Plus;
52
+
platforms = platforms.linux;
53
+
maintainers = pantheon.maintainers;
54
+
};
55
+
}
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
···
1
+
diff --git a/src/Parser.vala b/src/Parser.vala
2
+
index faccb64..432a362 100644
3
+
--- a/src/Parser.vala
4
+
+++ b/src/Parser.vala
5
+
@@ -28,7 +28,7 @@ public class DateTime.Parser : GLib.Object {
6
+
return parser;
7
+
}
8
+
private Parser () {
9
+
- var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab");
10
+
+ var file = File.new_for_path ("@tzdata@");
11
+
if (!file.query_exists ()) {
12
+
critical ("/usr/share/zoneinfo/zone.tab doesn't exist !");
13
+
return;
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-display";
6
+
version = "2.1.6";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Displays Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-display;
41
+
license = licenses.lgpl2Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+57
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+57
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee
2
+
, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-keyboard";
6
+
version = "2.3.4";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1997hnhlcp2jmf3z70na42vl1b7i5vxhp7k5ga5sl68dv0g4126y";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
libxml2
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
granite
32
+
gtk3
33
+
libgee
34
+
libgnomekbd
35
+
libxklavier
36
+
switchboard
37
+
];
38
+
39
+
patches = [
40
+
(substituteAll {
41
+
src = ./xkb.patch;
42
+
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
43
+
})
44
+
];
45
+
46
+
LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libgnomekbd ];
47
+
48
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
49
+
50
+
meta = with stdenv.lib; {
51
+
description = "Switchboard Keyboard Plug";
52
+
homepage = https://github.com/elementary/switchboard-plug-keyboard;
53
+
license = licenses.gpl2Plus;
54
+
platforms = platforms.linux;
55
+
maintainers = pantheon.maintainers;
56
+
};
57
+
}
+22
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
+22
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
···
1
+
diff --git a/src/Layout/Handler.vala b/src/Layout/Handler.vala
2
+
index 297314b..b36509a 100644
3
+
--- a/src/Layout/Handler.vala
4
+
+++ b/src/Layout/Handler.vala
5
+
@@ -29,7 +29,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object {
6
+
}
7
+
8
+
private void parse_layouts () {
9
+
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
10
+
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
11
+
if (doc == null) {
12
+
critical ("'evdev.xml' not found or permissions missing\n");
13
+
return;
14
+
@@ -76,7 +76,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object {
15
+
public HashTable<string, string> get_variants_for_language (string language) {
16
+
var returned_table = new HashTable<string, string> (str_hash, str_equal);
17
+
returned_table.set ("", _("Default"));
18
+
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
19
+
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
20
+
if (doc == null) {
21
+
critical ("'evdev.xml' not found or permissions incorrect\n");
22
+
return returned_table;
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja
2
+
, pkgconfig, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-mouse-touchpad";
6
+
version = "2.1.4";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1zh5472ab01bckrc1py5bqqsal9i9pbgx6i8ap2d4yzhc8sirjrf";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Mouse & Touchpad Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad;
41
+
license = licenses.gpl2Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+55
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+55
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala
2
+
, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-network";
6
+
version = "2.1.4";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
networkmanager
34
+
networkmanagerapplet
35
+
switchboard
36
+
];
37
+
38
+
patches = [
39
+
(substituteAll {
40
+
src = ./nma.patch;
41
+
networkmanagerapplet = "${networkmanagerapplet}";
42
+
})
43
+
];
44
+
45
+
46
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
47
+
48
+
meta = with stdenv.lib; {
49
+
description = "Switchboard Networking Plug";
50
+
homepage = https://github.com/elementary/switchboard-plug-network;
51
+
license = licenses.lgpl21Plus;
52
+
platforms = platforms.linux;
53
+
maintainers = pantheon.maintainers;
54
+
};
55
+
}
+43
pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
+43
pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
···
1
+
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
2
+
index 19fd514..bc800d9 100644
3
+
--- a/src/Widgets/SettingsButton.vala
4
+
+++ b/src/Widgets/SettingsButton.vala
5
+
@@ -23,7 +23,7 @@
6
+
label = _("Edit Connections…");
7
+
clicked.connect (() => {
8
+
try {
9
+
- var appinfo = AppInfo.create_from_commandline ("nm-connection-editor", null, AppInfoCreateFlags.NONE);
10
+
+ var appinfo = AppInfo.create_from_commandline ("@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE);
11
+
appinfo.launch (null, null);
12
+
} catch (Error e) {
13
+
warning ("%s", e.message);
14
+
@@ -61,13 +61,13 @@
15
+
label = title;
16
+
clicked.connect (() => {
17
+
edit_connection_uuid (connection.get_uuid ());
18
+
- });
19
+
+ });
20
+
}
21
+
22
+
private void edit_connection_uuid (string uuid) {
23
+
try {
24
+
var appinfo = AppInfo.create_from_commandline (
25
+
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
26
+
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
27
+
);
28
+
29
+
appinfo.launch (null, null);
30
+
diff --git a/src/Widgets/VPN/VPNPage.vala b/src/Widgets/VPN/VPNPage.vala
31
+
index 23c3ae9..c71984c 100644
32
+
--- a/src/Widgets/VPN/VPNPage.vala
33
+
+++ b/src/Widgets/VPN/VPNPage.vala
34
+
@@ -86,8 +86,7 @@ namespace Network {
35
+
add_button.tooltip_text = _("Add VPN Connection…");
36
+
add_button.clicked.connect (() => {
37
+
add_button.sensitive = false;
38
+
- var command = new Granite.Services.SimpleCommand ("/usr/bin",
39
+
- "nm-connection-editor --create --type=vpn");
40
+
+ var command = new Granite.Services.SimpleCommand ("@networkmanagerapplet@", "bin/nm-connection-editor --create --type=vpn");
41
+
command.done.connect ((exit) => {
42
+
if (exit != 0) {
43
+
var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor."));
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-notifications";
6
+
version = "2.1.5";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "0p0aj3bbjrh6x8wajqqb5yqm2iqfnj7kp16zf4hdr4siw0sx5p8n";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Notifications Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-notifications;
41
+
license = licenses.gpl2Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+56
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+56
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
2
+
, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib
3
+
, librest, webkitgtk, libsoup, switchboard, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard-plug-onlineaccounts";
7
+
version = "2.0.1";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "03h8ii8zz59fpp4fwlvyx3m3550096fn7a6w612b1rbj3dqhlmh9";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
granite
32
+
gtk3
33
+
json-glib
34
+
libaccounts-glib
35
+
libgee
36
+
libsignon-glib
37
+
libsoup
38
+
librest
39
+
switchboard
40
+
webkitgtk
41
+
];
42
+
43
+
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
44
+
PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
45
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
46
+
47
+
48
+
meta = with stdenv.lib; {
49
+
description = "Switchboard Online Accounts Plug";
50
+
homepage = https://github.com/elementary/switchboard-plug-onlineaccounts;
51
+
license = licenses.lgpl2Plus;
52
+
platforms = platforms.linux;
53
+
maintainers = pantheon.maintainers;
54
+
};
55
+
56
+
}
+26
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
+26
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
···
1
+
diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala
2
+
index 3e02089..7ce7041 100644
3
+
--- a/set-wallpaper-contract/set-wallpaper.vala
4
+
+++ b/set-wallpaper-contract/set-wallpaper.vala
5
+
@@ -38,7 +38,7 @@ namespace SetWallpaperContractor {
6
+
</transition>
7
+
""";
8
+
9
+
- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
10
+
+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
11
+
12
+
private int delay_value = 60;
13
+
14
+
diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
15
+
index 4be14fa..aa8832f 100644
16
+
--- a/src/Views/Wallpaper.vala
17
+
+++ b/src/Views/Wallpaper.vala
18
+
@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid {
19
+
FileAttribute.THUMBNAIL_IS_VALID
20
+
};
21
+
22
+
- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
23
+
+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
24
+
25
+
public Switchboard.Plug plug { get; construct set; }
26
+
private GLib.Settings settings;
+63
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+63
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
2
+
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
3
+
, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard-plug-pantheon-shell";
7
+
version = "2.8.0";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0yy821hl26jfd9hyigqi7nmaf30iww0lhg9qzcwlfzsvvfwnxagi";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gettext
24
+
gobject-introspection
25
+
meson
26
+
ninja
27
+
pkgconfig
28
+
vala
29
+
];
30
+
31
+
buildInputs = [
32
+
bamf
33
+
gexiv2
34
+
gnome-desktop
35
+
elementary-settings-daemon
36
+
granite
37
+
gtk3
38
+
libgee
39
+
plank
40
+
switchboard
41
+
];
42
+
43
+
patches = [
44
+
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
45
+
./hardcode-gsettings.patch
46
+
];
47
+
48
+
postPatch = ''
49
+
substituteInPlace src/Views/Appearance.vala --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas
50
+
substituteInPlace src/Views/Appearance.vala --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas
51
+
'';
52
+
53
+
54
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
55
+
56
+
meta = with stdenv.lib; {
57
+
description = "Switchboard Desktop Plug";
58
+
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;
59
+
license = licenses.gpl3Plus;
60
+
platforms = platforms.linux;
61
+
maintainers = pantheon.maintainers;
62
+
};
63
+
}
+23
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
+23
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
···
1
+
diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
2
+
index 721d458..17e1c58 100644
3
+
--- a/src/Views/Appearance.vala
4
+
+++ b/src/Views/Appearance.vala
5
+
@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid {
6
+
attach (text_size_label, 0, 2);
7
+
attach (text_size_modebutton, 1, 2);
8
+
9
+
- var animations_settings = new Settings (ANIMATIONS_SCHEMA);
10
+
+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
11
+
+ SettingsSchema animations_schema = gala_schema_source.lookup (ANIMATIONS_SCHEMA, false);
12
+
+
13
+
+ var animations_settings = new Settings.full (animations_schema, null, null);
14
+
animations_settings.bind (ANIMATIONS_KEY, animations_switch, "active", SettingsBindFlags.DEFAULT);
15
+
16
+
- var panel_settings = new Settings (PANEL_SCHEMA);
17
+
+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
18
+
+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false);
19
+
+
20
+
+ var panel_settings = new Settings.full (panel_schema, null, null);
21
+
panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT);
22
+
23
+
var interface_settings = new Settings (INTERFACE_SCHEMA);
+64
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+64
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
2
+
, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon
3
+
, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard-plug-power";
7
+
version = "2.3.5";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1wcxz4jxyv8kms9gxpwvrb356h10qvcwmdjzjzl2bvj5yl1rfcs9";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
dbus
32
+
granite
33
+
gtk3
34
+
libgee
35
+
polkit
36
+
switchboard
37
+
];
38
+
39
+
patches = [
40
+
(substituteAll {
41
+
src = ./dpms-helper-exec.patch;
42
+
elementary_dpms_helper = "${elementary-dpms-helper}";
43
+
})
44
+
./hardcode-gsettings.patch
45
+
];
46
+
47
+
postPatch = ''
48
+
substituteInPlace src/MainView.vala --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas
49
+
substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
50
+
'';
51
+
52
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
53
+
PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "share/dbus-1/system-services";
54
+
PKG_CONFIG_DBUS_1_SYSCONFDIR = "etc";
55
+
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions";
56
+
57
+
meta = with stdenv.lib; {
58
+
description = "Switchboard Power Plug";
59
+
homepage = https://github.com/elementary/switchboard-plug-power;
60
+
license = licenses.gpl2Plus;
61
+
platforms = platforms.linux;
62
+
maintainers = pantheon.maintainers;
63
+
};
64
+
}
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch
+13
pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch
···
1
+
diff --git a/src/MainView.vala b/src/MainView.vala
2
+
index 1654e68..175f220 100644
3
+
--- a/src/MainView.vala
4
+
+++ b/src/MainView.vala
5
+
@@ -317,7 +317,7 @@ public class Power.MainView : Gtk.Grid {
6
+
7
+
private static void run_dpms_helper () {
8
+
try {
9
+
- string[] argv = { "io.elementary.dpms-helper" };
10
+
+ string[] argv = { "@elementary_dpms_helper@/bin/io.elementary.dpms-helper" };
11
+
Process.spawn_async (null, argv, Environ.get (),
12
+
SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL | SpawnFlags.STDOUT_TO_DEV_NULL,
13
+
null, null);
+20
pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
+20
pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
···
1
+
diff --git a/src/MainView.vala b/src/MainView.vala
2
+
index 1654e68..ad8fed9 100644
3
+
--- a/src/MainView.vala
4
+
+++ b/src/MainView.vala
5
+
@@ -46,8 +46,13 @@ public class Power.MainView : Gtk.Grid {
6
+
7
+
var label_size = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
8
+
9
+
- settings = new GLib.Settings ("org.gnome.settings-daemon.plugins.power");
10
+
- elementary_dpms_settings = new GLib.Settings ("io.elementary.dpms");
11
+
+ SettingsSchemaSource gsd_sss = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS_PATH@", null, true);
12
+
+ SettingsSchema gsd_schema = gsd_sss.lookup ("org.gnome.settings-daemon.plugins.power", false);
13
+
+ settings = new GLib.Settings.full (gsd_schema, null, null);
14
+
+
15
+
+ SettingsSchemaSource dpms_sss = new SettingsSchemaSource.from_directory ("@DPMS_HELPER_GSETTINGS_PATH@", null, true);
16
+
+ SettingsSchema elementary_dpms_schema = dpms_sss.lookup ("io.elementary.dpms", false);
17
+
+ elementary_dpms_settings = new GLib.Settings.full (elementary_dpms_schema, null, null);
18
+
19
+
battery = new Battery ();
20
+
power_supply = new PowerSupply ();
+47
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+47
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-printers";
6
+
version = "2.1.6";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "05pkf3whh51gd9d0h2h4clgf7r3mvzl4ybas7834vhy19dzcbzmc";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
cups
31
+
granite
32
+
gtk3
33
+
libgee
34
+
switchboard
35
+
];
36
+
37
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
38
+
39
+
meta = with stdenv.lib; {
40
+
description = "Switchboard Printers Plug";
41
+
homepage = https://github.com/elementary/switchboard-plug-printers;
42
+
license = licenses.lgpl3Plus;
43
+
platforms = platforms.linux;
44
+
maintainers = pantheon.maintainers;
45
+
};
46
+
47
+
}
+62
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+62
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja
2
+
, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist
3
+
, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard-plug-security-privacy";
7
+
version = "2.2.0";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0f1idh36hlgmdva5jn0xnj2b6gbic0asnj3b7j283gyziibm3pxa";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
python3
28
+
vala
29
+
];
30
+
31
+
buildInputs = [
32
+
granite
33
+
gtk3
34
+
libgee
35
+
polkit
36
+
switchboard
37
+
zeitgeist
38
+
];
39
+
40
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
41
+
42
+
patches = [
43
+
./hardcode-gsettings.patch
44
+
];
45
+
46
+
postPatch = ''
47
+
chmod +x meson/post_install.py
48
+
patchShebangs meson/post_install.py
49
+
50
+
substituteInPlace src/Views/LockPanel.vala --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas
51
+
substituteInPlace src/Views/FirewallPanel.vala --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
52
+
'';
53
+
54
+
meta = with stdenv.lib; {
55
+
description = "Switchboard Security & Privacy Plug";
56
+
homepage = https://github.com/elementary/switchboard-plug-security-privacy;
57
+
license = licenses.lgpl3Plus;
58
+
platforms = platforms.linux;
59
+
maintainers = pantheon.maintainers;
60
+
};
61
+
62
+
}
+36
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
+36
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
···
1
+
diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
2
+
index 994c4d1..5702de2 100644
3
+
--- a/src/Views/FirewallPanel.vala
4
+
+++ b/src/Views/FirewallPanel.vala
5
+
@@ -49,10 +49,13 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
6
+
}
7
+
8
+
construct {
9
+
- settings = new Settings ("io.elementary.switchboard.security-privacy");
10
+
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
11
+
+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false);
12
+
+ settings = new Settings.full (security_privacy_schema, null, null);
13
+
+
14
+
disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> ();
15
+
load_disabled_rules ();
16
+
-
17
+
+
18
+
status_switch.notify["active"].connect (() => {
19
+
if (loading == false) {
20
+
view.sensitive = status_switch.active;
21
+
diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala
22
+
index 081cf10..42f6118 100644
23
+
--- a/src/Views/LockPanel.vala
24
+
+++ b/src/Views/LockPanel.vala
25
+
@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage {
26
+
}
27
+
28
+
construct {
29
+
- locker = new Settings ("apps.light-locker");
30
+
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@LIGHTLOCKER_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
31
+
+ SettingsSchema locker_schema = sss.lookup ("apps.light-locker", false);
32
+
+
33
+
+ locker = new Settings.full (locker_schema, null, null);
34
+
35
+
var lock_suspend_label = new Gtk.Label (_("Lock on sleep:"));
36
+
var lock_suspend_switch = new Gtk.Switch ();
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+45
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "switchboard-plug-sharing";
6
+
version = "2.1.3";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1yi6aga9i18wwn22zwmfbhsk16f92fka837is5r8xghqb7a50hyh";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
];
28
+
29
+
buildInputs = [
30
+
granite
31
+
gtk3
32
+
libgee
33
+
switchboard
34
+
];
35
+
36
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "Switchboard Sharing Plug";
40
+
homepage = https://github.com/elementary/switchboard-plug-sharing;
41
+
license = licenses.gpl2Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+49
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+49
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
2
+
, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3
3
+
, switchboard, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard-plug-sound";
7
+
version = "2.1.3";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0dvxmjziifffa2rm7h43ca5grhlcpih3rgik50mz808mqfxr4l1q";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
granite
32
+
gtk3
33
+
libcanberra
34
+
libcanberra-gtk3
35
+
libgee
36
+
pulseaudio
37
+
switchboard
38
+
];
39
+
40
+
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
41
+
42
+
meta = with stdenv.lib; {
43
+
description = "Switchboard Sound Plug";
44
+
homepage = https://github.com/elementary/switchboard-plug-sound;
45
+
license = licenses.lgpl2Plus;
46
+
platforms = platforms.linux;
47
+
maintainers = pantheon.maintainers;
48
+
};
49
+
}
+56
pkgs/desktops/pantheon/apps/switchboard/default.nix
+56
pkgs/desktops/pantheon/apps/switchboard/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja
2
+
, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity
3
+
, elementary-icon-theme, wrapGAppsHook, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "switchboard";
7
+
version = "2.3.6";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0lsrn636b0f9a58jbid6mlhgrf8ajnh7phwmhgxz55sz7k7qa58g";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gettext
24
+
gobject-introspection
25
+
meson
26
+
ninja
27
+
pkgconfig
28
+
python3
29
+
vala
30
+
wrapGAppsHook
31
+
];
32
+
33
+
buildInputs = [
34
+
clutter-gtk
35
+
elementary-icon-theme
36
+
granite
37
+
gtk3
38
+
libgee
39
+
libunity
40
+
];
41
+
42
+
patches = [ ./plugs-path-env.patch ];
43
+
44
+
postPatch = ''
45
+
chmod +x meson/post_install.py
46
+
patchShebangs meson/post_install.py
47
+
'';
48
+
49
+
meta = with stdenv.lib; {
50
+
description = "Extensible System Settings app for Pantheon";
51
+
homepage = https://github.com/elementary/switchboard;
52
+
license = licenses.lgpl21Plus;
53
+
platforms = platforms.linux;
54
+
maintainers = pantheon.maintainers;
55
+
};
56
+
}
+25
pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
+25
pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
···
1
+
diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala
2
+
index 75d0eaf..c227908 100644
3
+
--- a/lib/PlugsManager.vala
4
+
+++ b/lib/PlugsManager.vala
5
+
@@ -34,10 +34,18 @@ public class Switchboard.PlugsManager : GLib.Object {
6
+
private Gee.LinkedList<Switchboard.Plug> plugs;
7
+
8
+
public signal void plug_added (Switchboard.Plug plug);
9
+
-
10
+
+
11
+
private PlugsManager () {
12
+
plugs = new Gee.LinkedList<Switchboard.Plug> ();
13
+
- var base_folder = File.new_for_path (Build.PLUGS_DIR);
14
+
+
15
+
+ var plugs_path = Environment.get_variable("SWITCHBOARD_PLUGS_PATH");
16
+
+ if (plugs_path != null) {
17
+
+ debug ("SWITCHBOARD_PLUGS_PATH set to %s", plugs_path);
18
+
+ } else {
19
+
+ critical ("SWITCHBOARD_PLUGS_PATH not set");
20
+
+ }
21
+
+
22
+
+ var base_folder = File.new_for_path (plugs_path);
23
+
find_plugins (base_folder);
24
+
}
25
+
+19
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+19
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
···
1
+
{ stdenv, makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }:
2
+
3
+
let
4
+
selectedPlugs = if plugs == null then switchboardPlugs else plugs;
5
+
in
6
+
symlinkJoin {
7
+
name = "${switchboard.name}-with-plugs";
8
+
9
+
paths = [ switchboard ] ++ selectedPlugs;
10
+
11
+
buildInputs = [ makeWrapper ];
12
+
13
+
postBuild = ''
14
+
wrapProgram $out/bin/io.elementary.switchboard \
15
+
--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
16
+
'';
17
+
18
+
inherit (switchboard) meta;
19
+
}
+35
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+35
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "stylesheet";
5
+
version = "5.2.1";
6
+
7
+
name = "elementary-gtk-theme-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "03l8m87f7z25svxk0hhcqnn4qnnqvasr5qwzq3s87lx25gwjml29";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-gtk-theme";
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
meson
25
+
ninja
26
+
];
27
+
28
+
meta = with stdenv.lib; {
29
+
description = "GTK theme designed to be smooth, attractive, fast, and usable";
30
+
homepage = https://github.com/elementary/stylesheet;
31
+
license = licenses.gpl3;
32
+
platforms = platforms.linux;
33
+
maintainers = pantheon.maintainers;
34
+
};
35
+
}
+55
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+55
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "icons";
5
+
version = "5.0.2";
6
+
7
+
name = "elementary-icon-theme-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "12j582f0kggv2lp935r75xg7q26zpl0f05s11xcs4qxazhj1ly2r";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-icon-theme";
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
meson
25
+
ninja
26
+
python3
27
+
];
28
+
29
+
buildInputs = [ gtk3 ];
30
+
31
+
propagatedBuildInputs = [ hicolor-icon-theme ];
32
+
33
+
mesonFlags = [
34
+
"-Dvolume_icons=false" # Tries to install some icons to /
35
+
"-Dpalettes=false" # Don't install gimp and inkscape palette files
36
+
];
37
+
38
+
postPatch = ''
39
+
chmod +x meson/symlink.py
40
+
patchShebangs meson/symlink.py
41
+
'';
42
+
43
+
postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
44
+
45
+
meta = with stdenv.lib; {
46
+
description = "Named, vector icons for elementary OS";
47
+
longDescription = ''
48
+
An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon.
49
+
'';
50
+
homepage = https://github.com/elementary/icons;
51
+
license = licenses.gpl3;
52
+
platforms = platforms.linux;
53
+
maintainers = pantheon.maintainers;
54
+
};
55
+
}
+36
pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+36
pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "sound-theme";
5
+
version = "1.0";
6
+
7
+
name = "elementary-${pname}-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-${pname}";
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
];
28
+
29
+
meta = with stdenv.lib; {
30
+
description = "A set of system sounds for elementary";
31
+
homepage = https://github.com/elementary/sound-theme;
32
+
license = licenses.unlicense;
33
+
platforms = platforms.linux;
34
+
maintainers = pantheon.maintainers;
35
+
};
36
+
}
+38
pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+38
pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "wallpapers";
5
+
version = "5.3";
6
+
7
+
name = "elementary-${pname}-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-${pname}";
20
+
};
21
+
};
22
+
23
+
dontBuild = true;
24
+
25
+
installPhase = ''
26
+
mkdir -p $out/share/backgrounds/elementary
27
+
cp -av *.jpg $out/share/backgrounds/elementary
28
+
'';
29
+
30
+
meta = with stdenv.lib; {
31
+
description = "Collection of wallpapers for elementary";
32
+
homepage = https://github.com/elementary/wallpapers;
33
+
license = licenses.publicDomain;
34
+
platforms = platforms.linux;
35
+
maintainers = pantheon.maintainers;
36
+
};
37
+
}
38
+
+222
pkgs/desktops/pantheon/default.nix
+222
pkgs/desktops/pantheon/default.nix
···
1
+
{ pkgs, lib, gnome3 }:
2
+
3
+
4
+
lib.makeScope pkgs.newScope (self: with self; {
5
+
6
+
apps = [
7
+
elementary-calculator elementary-calendar
8
+
elementary-camera elementary-code elementary-files
9
+
elementary-music elementary-photos elementary-screenshot-tool
10
+
elementary-terminal elementary-videos switchboard-with-plugs
11
+
];
12
+
13
+
artwork = [
14
+
elementary-gtk-theme
15
+
elementary-icon-theme
16
+
elementary-sound-theme
17
+
elementary-wallpapers
18
+
];
19
+
20
+
desktop = [
21
+
elementary-session-settings
22
+
elementary-shortcut-overlay
23
+
gala
24
+
wingpanel-with-indicators
25
+
];
26
+
27
+
services = [
28
+
cerbere
29
+
elementary-capnet-assist
30
+
elementary-settings-daemon
31
+
elementary-dpms-helper
32
+
pantheon-agent-geoclue2
33
+
pantheon-agent-polkit
34
+
];
35
+
36
+
switchboardPlugs = [
37
+
switchboard-plug-a11y switchboard-plug-about
38
+
switchboard-plug-applications switchboard-plug-bluetooth
39
+
switchboard-plug-datetime switchboard-plug-display
40
+
switchboard-plug-keyboard switchboard-plug-mouse-touchpad
41
+
switchboard-plug-network switchboard-plug-notifications
42
+
switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell
43
+
switchboard-plug-power switchboard-plug-printers
44
+
switchboard-plug-security-privacy switchboard-plug-sharing
45
+
switchboard-plug-sound
46
+
];
47
+
48
+
wingpanelIndicators = [
49
+
wingpanel-applications-menu wingpanel-indicator-bluetooth
50
+
wingpanel-indicator-datetime wingpanel-indicator-keyboard
51
+
wingpanel-indicator-network wingpanel-indicator-nightlight
52
+
wingpanel-indicator-notifications wingpanel-indicator-power
53
+
wingpanel-indicator-session wingpanel-indicator-sound
54
+
];
55
+
56
+
updateScript = callPackage ./update.nix { };
57
+
58
+
maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
59
+
60
+
mutter = pkgs.gnome3.mutter328;
61
+
vala = pkgs.vala_0_40;
62
+
63
+
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
64
+
65
+
#### APPS
66
+
67
+
elementary-calculator = callPackage ./apps/elementary-calculator { };
68
+
69
+
elementary-calendar = callPackage ./apps/elementary-calendar { };
70
+
71
+
elementary-camera = callPackage ./apps/elementary-camera { };
72
+
73
+
elementary-code = callPackage ./apps/elementary-code { };
74
+
75
+
elementary-files = callPackage ./apps/elementary-files { };
76
+
77
+
elementary-music = callPackage ./apps/elementary-music { };
78
+
79
+
elementary-photos = callPackage ./apps/elementary-photos { };
80
+
81
+
elementary-screenshot-tool = callPackage ./apps/elementary-screenshot-tool { };
82
+
83
+
elementary-terminal = callPackage ./apps/elementary-terminal { };
84
+
85
+
elementary-videos = callPackage ./apps/elementary-videos { };
86
+
87
+
#### DESKTOP
88
+
89
+
elementary-default-settings = callPackage ./desktop/elementary-default-settings { };
90
+
91
+
elementary-greeter = callPackage ./desktop/elementary-greeter {
92
+
inherit (gnome3) gnome-desktop;
93
+
};
94
+
95
+
elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
96
+
97
+
elementary-session-settings = callPackage ./desktop/elementary-session-settings {
98
+
inherit (gnome3) gnome-session gnome-keyring;
99
+
};
100
+
101
+
elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
102
+
103
+
extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts {
104
+
inherit (gnome3) file-roller gnome-bluetooth;
105
+
};
106
+
107
+
gala = callPackage ./desktop/gala {
108
+
inherit (gnome3) gnome-desktop;
109
+
};
110
+
111
+
wingpanel = callPackage ./desktop/wingpanel { };
112
+
113
+
wingpanel-with-indicators = callPackage ./desktop/wingpanel/wrapper.nix {
114
+
indicators = null;
115
+
};
116
+
117
+
#### LIBRARIES
118
+
119
+
granite = callPackage ./granite { };
120
+
121
+
#### SERVICES
122
+
123
+
cerbere = callPackage ./services/cerbere { };
124
+
125
+
contractor = callPackage ./services/contractor { };
126
+
127
+
elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { };
128
+
129
+
elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { };
130
+
131
+
# We're using ubuntu and elementary's patchset due to reasons
132
+
# explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614
133
+
# Take note of "I am holding off on "fixing" this bug for as long as possible."
134
+
elementary-settings-daemon = callPackage ./services/elementary-settings-daemon {
135
+
inherit (gnome3) libgweather;
136
+
};
137
+
138
+
pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { };
139
+
140
+
pantheon-agent-polkit = callPackage ./services/pantheon-agent-polkit { };
141
+
142
+
#### WINGPANEL INDICATORS
143
+
144
+
wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { };
145
+
146
+
wingpanel-indicator-bluetooth = callPackage ./desktop/wingpanel-indicators/bluetooth { };
147
+
148
+
wingpanel-indicator-datetime = callPackage ./desktop/wingpanel-indicators/datetime { };
149
+
150
+
wingpanel-indicator-keyboard = callPackage ./desktop/wingpanel-indicators/keyboard { };
151
+
152
+
wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network {
153
+
inherit (gnome3) networkmanagerapplet;
154
+
};
155
+
156
+
wingpanel-indicator-nightlight = callPackage ./desktop/wingpanel-indicators/nightlight { };
157
+
158
+
wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { };
159
+
160
+
wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { };
161
+
162
+
wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { };
163
+
164
+
wingpanel-indicator-sound = callPackage ./desktop/wingpanel-indicators/sound { };
165
+
166
+
#### SWITCHBOARD
167
+
168
+
switchboard = callPackage ./apps/switchboard { };
169
+
170
+
switchboard-with-plugs = callPackage ./apps/switchboard/wrapper.nix {
171
+
plugs = null;
172
+
};
173
+
174
+
switchboard-plug-a11y = callPackage ./apps/switchboard-plugs/a11y { };
175
+
176
+
switchboard-plug-about = callPackage ./apps/switchboard-plugs/about { };
177
+
178
+
switchboard-plug-applications = callPackage ./apps/switchboard-plugs/applications { };
179
+
180
+
switchboard-plug-bluetooth = callPackage ./apps/switchboard-plugs/bluetooth { };
181
+
182
+
switchboard-plug-datetime = callPackage ./apps/switchboard-plugs/datetime { };
183
+
184
+
switchboard-plug-display = callPackage ./apps/switchboard-plugs/display { };
185
+
186
+
switchboard-plug-keyboard = callPackage ./apps/switchboard-plugs/keyboard { };
187
+
188
+
switchboard-plug-mouse-touchpad = callPackage ./apps/switchboard-plugs/mouse-touchpad { };
189
+
190
+
switchboard-plug-network = callPackage ./apps/switchboard-plugs/network {
191
+
inherit (gnome3) networkmanagerapplet;
192
+
};
193
+
194
+
switchboard-plug-notifications = callPackage ./apps/switchboard-plugs/notifications { };
195
+
196
+
switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { };
197
+
198
+
switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell {
199
+
inherit (gnome3) gnome-desktop;
200
+
};
201
+
202
+
switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { };
203
+
204
+
switchboard-plug-printers = callPackage ./apps/switchboard-plugs/printers { };
205
+
206
+
switchboard-plug-security-privacy = callPackage ./apps/switchboard-plugs/security-privacy { };
207
+
208
+
switchboard-plug-sharing = callPackage ./apps/switchboard-plugs/sharing { };
209
+
210
+
switchboard-plug-sound = callPackage ./apps/switchboard-plugs/sound { };
211
+
212
+
### ARTWORK
213
+
214
+
elementary-gtk-theme = callPackage ./artwork/elementary-gtk-theme { };
215
+
216
+
elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };
217
+
218
+
elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };
219
+
220
+
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
221
+
222
+
})
+25
pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
+25
pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
···
1
+
diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override
2
+
index 6452c30..899972d 100644
3
+
--- a/debian/elementary-default-settings.gsettings-override
4
+
+++ b/debian/elementary-default-settings.gsettings-override
5
+
@@ -1,5 +1,5 @@
6
+
[net.launchpad.plank.dock.settings]
7
+
-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
8
+
+dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.gnome.Geary.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
9
+
hide-delay=250
10
+
hide-mode='window-dodge'
11
+
show-dock-item=false
12
+
@@ -8,13 +8,6 @@ theme='Gtk+'
13
+
[org.freedesktop.ibus.general.hotkey]
14
+
triggers=['<Control>space']
15
+
16
+
-[org.gnome.desktop.background]
17
+
-draw-background=true
18
+
-picture-options='zoom'
19
+
-picture-uri='file:///usr/share/backgrounds/elementaryos-default'
20
+
-primary-color='#000000'
21
+
-show-desktop-icons=false
22
+
-
23
+
[org.gnome.desktop.datetime]
24
+
automatic-timezone=true
25
+
+60
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+60
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
···
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pantheon }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "default-settings";
5
+
version = "5.0";
6
+
7
+
name = "elementary-${pname}-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-${pname}";
20
+
};
21
+
};
22
+
23
+
patches = [
24
+
# See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release)
25
+
(fetchpatch {
26
+
url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch";
27
+
sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l";
28
+
})
29
+
# See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release)
30
+
(fetchpatch {
31
+
url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch";
32
+
sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x";
33
+
})
34
+
./correct-override.patch
35
+
];
36
+
37
+
dontBuild = true;
38
+
39
+
installPhase = ''
40
+
mkdir -p $out/etc/gtk-3.0
41
+
cp -av settings.ini $out/etc/gtk-3.0
42
+
43
+
mkdir -p $out/share/glib-2.0/schemas
44
+
cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override
45
+
46
+
mkdir $out/etc/wingpanel.d
47
+
cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist
48
+
49
+
mkdir -p $out/share/elementary/config/plank/dock1
50
+
cp -avr ${./launchers} $out/share/elementary/config/plank/dock1/launchers
51
+
'';
52
+
53
+
meta = with stdenv.lib; {
54
+
description = "Default settings and configuration files for elementary";
55
+
homepage = https://github.com/elementary/default-settings;
56
+
license = licenses.gpl2Plus;
57
+
platforms = platforms.linux;
58
+
maintainers = pantheon.maintainers;
59
+
};
60
+
}
+6
pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist
+6
pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem
+25
pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
+25
pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch
···
1
+
From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001
2
+
From: worldofpeace <worldofpeace@users.noreply.github.com>
3
+
Date: Tue, 17 Jul 2018 07:04:18 -0400
4
+
Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install
5
+
6
+
---
7
+
data/meson.build | 2 +-
8
+
1 file changed, 1 insertion(+), 1 deletion(-)
9
+
10
+
diff --git a/data/meson.build b/data/meson.build
11
+
index 7621b03..7c08eaf 100644
12
+
--- a/data/meson.build
13
+
+++ b/data/meson.build
14
+
@@ -20,7 +20,7 @@ i18n.merge_file (
15
+
16
+
install_data(
17
+
meson.project_name() + '.conf',
18
+
- install_dir: join_paths(get_option('sysconfdir'), 'lightdm')
19
+
+ install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm')
20
+
)
21
+
22
+
install_data(
23
+
--
24
+
2.17.1
25
+
+103
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+103
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson
2
+
, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon
3
+
, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators
4
+
, elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx
5
+
, clutter-gtk, libGL, dbus, wrapGAppsHook }:
6
+
7
+
stdenv.mkDerivation rec {
8
+
pname = "greeter";
9
+
version = "3.3.1";
10
+
11
+
name = "elementary-${pname}-${version}";
12
+
13
+
src = fetchFromGitHub {
14
+
owner = "elementary";
15
+
repo = pname;
16
+
rev = version;
17
+
sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc";
18
+
};
19
+
20
+
passthru = {
21
+
updateScript = pantheon.updateScript {
22
+
repoName = pname;
23
+
attrPath = "elementary-${pname}";
24
+
};
25
+
};
26
+
27
+
nativeBuildInputs = [
28
+
desktop-file-utils
29
+
gobject-introspection
30
+
meson
31
+
ninja
32
+
pkgconfig
33
+
vala
34
+
wrapGAppsHook
35
+
];
36
+
37
+
buildInputs = [
38
+
clutter-gtk
39
+
elementary-icon-theme
40
+
elementary-gtk-theme
41
+
elementary-settings-daemon
42
+
gnome-desktop
43
+
granite
44
+
gtk3
45
+
libgee
46
+
libGL
47
+
lightdm
48
+
mutter
49
+
wingpanel-with-indicators
50
+
];
51
+
52
+
patches = [
53
+
(substituteAll {
54
+
src = ./gsd.patch;
55
+
elementary-settings-daemon = "${elementary-settings-daemon}/libexec";
56
+
})
57
+
(substituteAll {
58
+
src = ./numlockx.patch;
59
+
inherit numlockx;
60
+
})
61
+
./01-sysconfdir-install.patch
62
+
];
63
+
64
+
mesonFlags = [
65
+
# A hook does this but after wrapGAppsHook so the files never get wrapped.
66
+
"--sbindir=${placeholder "out"}/bin"
67
+
# baked into the program for discovery of the greeter configuration
68
+
"--sysconfdir=/etc"
69
+
];
70
+
71
+
preFixup = ''
72
+
gappsWrapperArgs+=(
73
+
# GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here
74
+
--prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc"
75
+
76
+
# dbus-launch needed in path
77
+
--prefix PATH : "${dbus}/bin"
78
+
79
+
# for `wingpanel -g`
80
+
--prefix PATH : "${wingpanel-with-indicators}/bin"
81
+
82
+
# TODO: they should be using meson for this
83
+
# See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451
84
+
--prefix PATH : "$out/bin"
85
+
)
86
+
'';
87
+
88
+
postFixup = ''
89
+
substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
90
+
--replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
91
+
92
+
substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \
93
+
--replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
94
+
'';
95
+
96
+
meta = with stdenv.lib; {
97
+
description = "LightDM Greeter for Pantheon";
98
+
homepage = https://github.com/elementary/greeter;
99
+
license = licenses.gpl3Plus;
100
+
platforms = platforms.linux;
101
+
maintainers = pantheon.maintainers;
102
+
};
103
+
}
+13
pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
+13
pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
···
1
+
diff --git a/src/meson.build b/src/meson.build
2
+
index 2450c1a..a908d11 100644
3
+
--- a/src/meson.build
4
+
+++ b/src/meson.build
5
+
@@ -1,7 +1,7 @@
6
+
conf_data = configuration_data()
7
+
conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
8
+
conf_data.set('GETTEXT_PACKAGE', meson.project_name())
9
+
-conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
10
+
+conf_data.set('GSD_DIR', '@elementary-settings-daemon@')
11
+
conf_data.set('VERSION', meson.project_version())
12
+
config_header = configure_file (
13
+
input: 'config.vala.in',
+13
pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
+13
pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch
···
1
+
diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
2
+
index 11aa4c0..ae7bf7e 100644
3
+
--- a/src/PantheonGreeter.vala
4
+
+++ b/src/PantheonGreeter.vala
5
+
@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window {
6
+
warning (e.message);
7
+
}
8
+
if (activate_numlock) {
9
+
- Granite.Services.System.execute_command ("/usr/bin/numlockx on");
10
+
+ Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on");
11
+
}
12
+
13
+
var screensaver_timeout = 60;
+44
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+44
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
···
1
+
{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank
2
+
, extraGSettingsOverrides ? ""
3
+
, extraGSettingsOverridePackages ? []
4
+
}:
5
+
6
+
let
7
+
8
+
gsettingsOverridePackages = [
9
+
gala
10
+
epiphany
11
+
elementary-settings-daemon
12
+
gnome3.mutter
13
+
gtk3
14
+
plank
15
+
] ++ extraGSettingsOverridePackages;
16
+
17
+
in
18
+
19
+
with stdenv.lib;
20
+
21
+
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
22
+
runCommand "elementary-gsettings-desktop-schemas" {}
23
+
''
24
+
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
25
+
cp -rf ${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
26
+
27
+
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages}
28
+
29
+
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
30
+
cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \
31
+
$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
32
+
33
+
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
34
+
[org.gnome.desktop.background]
35
+
draw-background=true
36
+
picture-options='zoom'
37
+
picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
38
+
primary-color='#000000'
39
+
40
+
${extraGSettingsOverrides}
41
+
EOF
42
+
43
+
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
44
+
''
+39
pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+39
pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "print";
5
+
version = "0.1.3";
6
+
7
+
name = "elementary-print-shim-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-${pname}-shim";
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
];
29
+
30
+
buildInputs = [ gtk3 ];
31
+
32
+
meta = with stdenv.lib; {
33
+
description = "Simple shim for printing support via Contractor";
34
+
homepage = https://github.com/elementary/print;
35
+
license = licenses.gpl3Plus;
36
+
platforms = platforms.linux;
37
+
maintainers = pantheon.maintainers;
38
+
};
39
+
}
+8
pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
+8
pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop
+107
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+107
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
···
1
+
{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon }:
2
+
3
+
let
4
+
5
+
#
6
+
# ─── ENSURES PLANK GETS ELEMENTARY'S DEFAULT DOCKITEMS ────────────────────────────
7
+
#
8
+
9
+
#
10
+
# Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems.
11
+
#
12
+
# That is not possible within nixos, but we can achieve this easily with a simple script that copies
13
+
# them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session
14
+
# which is most appropriate for installing files into $HOME.
15
+
#
16
+
17
+
dockitems-script = writeScript "dockitems-script" ''
18
+
#!${stdenv.shell}
19
+
20
+
elementary_default_settings="${elementary-default-settings}"
21
+
dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/*
22
+
23
+
if [ ! -d "$HOME/.config/plank/dock1" ]; then
24
+
echo "Instantiating default Plank Dockitems..."
25
+
26
+
mkdir -p $HOME/.config/plank/dock1/launchers
27
+
cp -r --no-preserve=mode,ownership $dock_items $HOME/.config/plank/dock1/launchers/
28
+
else
29
+
echo "Plank Dockitems already instantiated"
30
+
fi
31
+
'';
32
+
33
+
dockitemAutostart = substituteAll {
34
+
src = ./default-elementary-dockitems.desktop;
35
+
script = "${dockitems-script}";
36
+
};
37
+
38
+
executable = writeShellScriptBin "pantheon" ''
39
+
export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS
40
+
export XDG_DATA_DIRS=${placeholder "out"}/share:$XDG_DATA_DIRS
41
+
exec ${gnome-session}/bin/gnome-session --session=pantheon "$@"
42
+
'';
43
+
44
+
in
45
+
46
+
stdenv.mkDerivation rec {
47
+
pname = "session-settings";
48
+
version = "5.0.3";
49
+
50
+
name = "elementary-${pname}-${version}";
51
+
52
+
src = fetchFromGitHub {
53
+
owner = "elementary";
54
+
repo = pname;
55
+
rev = version;
56
+
sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k";
57
+
};
58
+
59
+
passthru = {
60
+
updateScript = pantheon.updateScript {
61
+
repoName = pname;
62
+
attrPath = "elementary-${pname}";
63
+
};
64
+
};
65
+
66
+
dontBuild = true;
67
+
68
+
installPhase = ''
69
+
mkdir -p $out/share
70
+
cp -avr applications $out/share/
71
+
72
+
mkdir -p $out/etc/xdg/autostart
73
+
cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart
74
+
cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart
75
+
cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart
76
+
77
+
cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
78
+
79
+
mkdir -p $out/share/gnome-session/sessions
80
+
cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions
81
+
82
+
mkdir -p $out/share/xsessions
83
+
cp -av xsessions/pantheon.desktop $out/share/xsessions
84
+
'';
85
+
86
+
postFixup = ''
87
+
substituteInPlace $out/share/xsessions/pantheon.desktop \
88
+
--replace "gnome-session --session=pantheon" "${executable}/bin/pantheon" \
89
+
--replace "wingpanel" "${wingpanel}/bin/wingpanel"
90
+
91
+
for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
92
+
93
+
for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
94
+
do
95
+
echo "Patching OnlyShowIn to Pantheon in: $autostart"
96
+
sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart
97
+
done
98
+
'';
99
+
100
+
meta = with stdenv.lib; {
101
+
description = "Session settings for elementary";
102
+
homepage = https://github.com/elementary/session-settings;
103
+
license = licenses.lgpl3;
104
+
platforms = platforms.linux;
105
+
maintainers = pantheon.maintainers;
106
+
};
107
+
}
+50
pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+50
pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils
2
+
, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "shortcut-overlay";
6
+
version = "1.0.1";
7
+
8
+
name = "elementary-${pname}-${version}";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "elementary";
12
+
repo = pname;
13
+
rev = version;
14
+
sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4";
15
+
};
16
+
17
+
passthru = {
18
+
updateScript = pantheon.updateScript {
19
+
repoName = pname;
20
+
attrPath = "elementary-${pname}";
21
+
};
22
+
};
23
+
24
+
nativeBuildInputs = [
25
+
desktop-file-utils
26
+
gobject-introspection
27
+
libxml2
28
+
meson
29
+
ninja
30
+
pkgconfig
31
+
vala
32
+
wrapGAppsHook
33
+
];
34
+
35
+
buildInputs = [
36
+
elementary-icon-theme
37
+
glib
38
+
granite
39
+
gtk3
40
+
libgee
41
+
];
42
+
43
+
meta = with stdenv.lib; {
44
+
description = "A native OS-wide shortcut overlay to be launched by Gala";
45
+
homepage = https://github.com/elementary/shortcut-overlay;
46
+
license = licenses.gpl3Plus;
47
+
platforms = platforms.linux;
48
+
maintainers = pantheon.maintainers;
49
+
};
50
+
}
+39
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+39
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
···
1
+
{ stdenv, substituteAll, fetchFromGitHub, file-roller, gnome-bluetooth }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "extra-elementary-contracts";
5
+
version = "2018-08-21";
6
+
7
+
name = "${pname}-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "worldofpeace";
11
+
repo = pname;
12
+
rev = "a05dfb00695854163805b666185e3e9f31b6eb83";
13
+
sha256 = "0fkaf2w4xg0n9faj74rgzy7gvd3yz112l058b157a3pr39vpci7g";
14
+
};
15
+
16
+
patches = [
17
+
(substituteAll {
18
+
src = ./exec-path.patch;
19
+
file_roller = "${file-roller}";
20
+
gnome_bluetooth = "${gnome-bluetooth}";
21
+
})
22
+
];
23
+
24
+
dontBuild = true;
25
+
26
+
installPhase = ''
27
+
mkdir -p $out/share/contractor
28
+
29
+
cp *.contract $out/share/contractor/
30
+
'';
31
+
32
+
meta = with stdenv.lib; {
33
+
description = "Extra contractor files for elementary";
34
+
homepage = https://github.com/worldofpeace/extra-elementary-contracts;
35
+
license = licenses.gpl2;
36
+
maintainers = with maintainers; [ worldofpeace ];
37
+
platforms = platforms.linux;
38
+
};
39
+
}
+34
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
+34
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
···
1
+
diff --git a/file-roller-compress.contract b/file-roller-compress.contract
2
+
index 8de5396..de7e939 100644
3
+
--- a/file-roller-compress.contract
4
+
+++ b/file-roller-compress.contract
5
+
@@ -3,6 +3,6 @@ Name=Compress
6
+
Icon=add-files-to-archive
7
+
Description=Create a compressed archive with the selected objects
8
+
MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket;
9
+
-Exec=file-roller --add %U
10
+
+Exec=@file_roller@/bin/file-roller --add %U
11
+
Gettext-Domain=file-roller
12
+
13
+
diff --git a/file-roller-extract-here.contract b/file-roller-extract-here.contract
14
+
index 184a6f2..345f4e7 100644
15
+
--- a/file-roller-extract-here.contract
16
+
+++ b/file-roller-extract-here.contract
17
+
@@ -3,5 +3,5 @@ Name=Extract Here
18
+
Icon=extract-archive
19
+
Description=Extract the contents of the archives in the archive folder and quit the program
20
+
MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
21
+
-Exec=file-roller --extract-here %U
22
+
+Exec=@file_roller@/bin/file-roller --extract-here %U
23
+
Gettext-Domain=file-roller
24
+
diff --git a/gnome-bluetooth.contract b/gnome-bluetooth.contract
25
+
index 745dbbe..8cc0102 100644
26
+
--- a/gnome-bluetooth.contract
27
+
+++ b/gnome-bluetooth.contract
28
+
@@ -3,5 +3,5 @@ Name=Send files via Bluetooth
29
+
Icon=bluetooth
30
+
Description=Send files to device...
31
+
MimeType=!inode;
32
+
-Exec=bluetooth-sendto %F
33
+
+Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F
34
+
Gettext-Domain=gnome-bluetooth2
+66
pkgs/desktops/pantheon/desktop/gala/default.nix
+66
pkgs/desktops/pantheon/desktop/gala/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
2
+
, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra
3
+
, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection
4
+
, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "gala";
8
+
version = "unstable-2018-12-16";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "elementary";
12
+
repo = pname;
13
+
rev = "7f1e392e03000df0bd47e7832bb3adab81f39ae5";
14
+
sha256 = "1syqq0xfyg5nbnnmy0wp5d66k1bvq9qn27lvr37abxxqig9acpc8";
15
+
};
16
+
17
+
passthru = {
18
+
updateScript = pantheon.updateScript {
19
+
repoName = pname;
20
+
versionPolicy = "master";
21
+
};
22
+
};
23
+
24
+
nativeBuildInputs = [
25
+
desktop-file-utils
26
+
gettext
27
+
gobject-introspection
28
+
libxml2
29
+
meson
30
+
ninja
31
+
pkgconfig
32
+
python3
33
+
vala
34
+
wrapGAppsHook
35
+
];
36
+
37
+
buildInputs = [
38
+
bamf
39
+
clutter
40
+
elementary-icon-theme
41
+
gnome-desktop
42
+
elementary-settings-daemon
43
+
granite
44
+
gtk3
45
+
libcanberra
46
+
libcanberra-gtk3
47
+
libgee
48
+
mutter
49
+
plank
50
+
];
51
+
52
+
patches = [ ./plugins-dir.patch ];
53
+
54
+
postPatch = ''
55
+
chmod +x build-aux/meson/post_install.py
56
+
patchShebangs build-aux/meson/post_install.py
57
+
'';
58
+
59
+
meta = with stdenv.lib; {
60
+
description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon";
61
+
homepage = https://github.com/elementary/gala;
62
+
license = licenses.gpl3Plus;
63
+
platforms = platforms.linux;
64
+
maintainers = pantheon.maintainers;
65
+
};
66
+
}
+22
pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
+22
pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
···
1
+
diff --git a/meson.build b/meson.build
2
+
index 6b20a60..205699b 100644
3
+
--- a/meson.build
4
+
+++ b/meson.build
5
+
@@ -38,7 +38,7 @@ conf.set_quoted('PACKAGE_VERSION', gala_version)
6
+
conf.set_quoted('DATADIR', data_dir)
7
+
conf.set_quoted('PKGDATADIR', pkgdata_dir)
8
+
conf.set_quoted('PKGLIBDIR', pkglib_dir)
9
+
-conf.set_quoted('PLUGINSDIR', plugins_dir)
10
+
+conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins')
11
+
conf.set_quoted('RELEASE_NAME', 'Window Manager.')
12
+
conf.set_quoted('VERSION', gala_version)
13
+
conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development'))
14
+
@@ -83,7 +83,7 @@ add_project_arguments([
15
+
'-DDATADIR="@0@"'.format(data_dir),
16
+
'-DPKGDATADIR="@0@"'.format(pkgdata_dir),
17
+
'-DPKGLIBDIR="@0@"'.format(pkglib_dir),
18
+
- '-DPLUGINDIR="@0@"'.format(plugins_dir),
19
+
+ '-DPLUGINDIR="@0@"'.format('/run/current-system/sw/lib/gala/plugins'),
20
+
'-DSCHEMA="org.pantheon.desktop.gala"',
21
+
'-DRESOURCEPATH="/org/pantheon/desktop/gala"',
22
+
+56
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+56
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
2
+
, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2
3
+
, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-bluetooth";
7
+
version = "2.1.2";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
libxml2
25
+
meson
26
+
ninja
27
+
pkgconfig
28
+
python3
29
+
vala
30
+
wrapGAppsHook
31
+
];
32
+
33
+
buildInputs = [
34
+
elementary-icon-theme
35
+
granite
36
+
gtk3
37
+
libgee
38
+
libnotify
39
+
wingpanel
40
+
];
41
+
42
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
43
+
44
+
postPatch = ''
45
+
chmod +x meson/post_install.py
46
+
patchShebangs meson/post_install.py
47
+
'';
48
+
49
+
meta = with stdenv.lib; {
50
+
description = "Bluetooth Indicator for Wingpanel";
51
+
homepage = https://github.com/elementary/wingpanel-indicator-bluetooth;
52
+
license = licenses.lgpl21Plus;
53
+
platforms = platforms.linux;
54
+
maintainers = pantheon.maintainers;
55
+
};
56
+
}
+13
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch
+13
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch
···
1
+
diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala
2
+
index 76443ca..d86bd44 100644
3
+
--- a/src/Widgets/calendar/Calendar.vala
4
+
+++ b/src/Widgets/calendar/Calendar.vala
5
+
@@ -19,7 +19,7 @@
6
+
7
+
namespace DateTime.Widgets {
8
+
public class Calendar : Gtk.Box {
9
+
- private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar";
10
+
+ private const string CALENDAR_EXEC = "@elementary-calendar@";
11
+
12
+
ControlHeader heading;
13
+
CalendarView cal;
+71
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+71
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
···
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3
2
+
, ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server
3
+
, libical, libgee, libxml2, libsoup, gobject-introspection
4
+
, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "wingpanel-indicator-datetime";
8
+
version = "2.1.3";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "elementary";
12
+
repo = pname;
13
+
rev = version;
14
+
sha256 = "1y7a4xjwl3bpls56ys6g3s6mh5b3qbjm2vw7b6n2i4x7a63c4cbh";
15
+
};
16
+
17
+
passthru = {
18
+
updateScript = pantheon.updateScript {
19
+
repoName = pname;
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
gobject-introspection
25
+
libxml2
26
+
meson
27
+
ninja
28
+
pkgconfig
29
+
python3
30
+
vala
31
+
wrapGAppsHook
32
+
];
33
+
34
+
buildInputs = [
35
+
elementary-icon-theme
36
+
evolution-data-server
37
+
granite
38
+
gtk3
39
+
libgee
40
+
libical
41
+
libsoup
42
+
wingpanel
43
+
];
44
+
45
+
patches = [
46
+
(substituteAll {
47
+
src = ./calendar-exec.patch;
48
+
elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar";
49
+
})
50
+
# Use "clock-format" GSettings key that's been moved to granite
51
+
(fetchpatch {
52
+
url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch";
53
+
sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880";
54
+
})
55
+
];
56
+
57
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
58
+
59
+
postPatch = ''
60
+
chmod +x meson/post_install.py
61
+
patchShebangs meson/post_install.py
62
+
'';
63
+
64
+
meta = with stdenv.lib; {
65
+
description = "Date & Time Indicator for Wingpanel";
66
+
homepage = https://github.com/elementary/wingpanel-indicator-datetime;
67
+
license = licenses.gpl2Plus;
68
+
platforms = platforms.linux;
69
+
maintainers = pantheon.maintainers;
70
+
};
71
+
}
+57
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+57
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
2
+
, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee
3
+
, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-keyboard";
7
+
version = "2.1.1";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0x0bdd9svw4sffx8pa0pqlh6mrj3fqp4mgrb4n7ys26k2w20ngnb";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
libxml2
27
+
pkgconfig
28
+
vala
29
+
wrapGAppsHook
30
+
];
31
+
32
+
buildInputs = [
33
+
elementary-icon-theme
34
+
granite
35
+
gtk3
36
+
libgee
37
+
wingpanel
38
+
];
39
+
40
+
patches = [
41
+
(substituteAll {
42
+
src = ./fix-paths.patch;
43
+
libgnomekbd_path = "${libgnomekbd}/bin/";
44
+
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
45
+
})
46
+
];
47
+
48
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
49
+
50
+
meta = with stdenv.lib; {
51
+
description = "Keyboard Indicator for Wingpanel";
52
+
homepage = https://github.com/elementary/wingpanel-indicator-keyboard;
53
+
license = licenses.lgpl21Plus;
54
+
platforms = platforms.linux;
55
+
maintainers = pantheon.maintainers;
56
+
};
57
+
}
+26
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
+26
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
···
1
+
diff --git a/src/Indicator.vala b/src/Indicator.vala
2
+
index cd7ca49..0bef9c7 100644
3
+
--- a/src/Indicator.vala
4
+
+++ b/src/Indicator.vala
5
+
@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
6
+
private void show_keyboard_map () {
7
+
close ();
8
+
9
+
- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
10
+
+ string command = "@libgnomekbd_path@gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
11
+
12
+
try {
13
+
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
14
+
diff --git a/src/LayoutsManager.vala b/src/LayoutsManager.vala
15
+
index 1bac80e..67df847 100644
16
+
--- a/src/LayoutsManager.vala
17
+
+++ b/src/LayoutsManager.vala
18
+
@@ -97,7 +97,7 @@ public class Keyboard.Widgets.LayoutManager : Gtk.ScrolledWindow {
19
+
20
+
public string? get_name_for_xkb_layout (string language, string? variant) {
21
+
debug ("get_name_for_xkb_layout (%s, %s)", language, variant);
22
+
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
23
+
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
24
+
if (doc == null) {
25
+
critical ("'evdev.xml' not found or permissions incorrect\n");
26
+
return null;
+50
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+50
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
2
+
, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel
3
+
, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-network";
7
+
version = "2.2.2";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0fch27imk5x4nfx49cwcylkxd7m289rl9niy1vx5kjplhbhyhdq2";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
wrapGAppsHook
29
+
];
30
+
31
+
buildInputs = [
32
+
elementary-icon-theme
33
+
granite
34
+
gtk3
35
+
libgee
36
+
networkmanager
37
+
networkmanagerapplet
38
+
wingpanel
39
+
];
40
+
41
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
42
+
43
+
meta = with stdenv.lib; {
44
+
description = "Network Indicator for Wingpanel";
45
+
homepage = https://github.com/elementary/wingpanel-indicator-network;
46
+
license = licenses.lgpl21Plus;
47
+
platforms = platforms.linux;
48
+
maintainers = pantheon.maintainers;
49
+
};
50
+
}
+49
pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+49
pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
2
+
, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection
3
+
, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-nightlight";
7
+
version = "2.0.1";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
libxml2
25
+
meson
26
+
ninja
27
+
pkgconfig
28
+
vala
29
+
wrapGAppsHook
30
+
];
31
+
32
+
buildInputs = [
33
+
elementary-icon-theme
34
+
granite
35
+
gtk3
36
+
libgee
37
+
wingpanel
38
+
];
39
+
40
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
41
+
42
+
meta = with stdenv.lib; {
43
+
description = "Night Light Indicator for Wingpanel";
44
+
homepage = https://github.com/elementary/wingpanel-indicator-nightlight;
45
+
license = licenses.gpl2Plus;
46
+
platforms = platforms.linux;
47
+
maintainers = pantheon.maintainers;
48
+
};
49
+
}
+48
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+48
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite
2
+
, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "wingpanel-indicator-notifications";
6
+
version = "2.1.2";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
wrapGAppsHook
28
+
];
29
+
30
+
buildInputs = [
31
+
elementary-icon-theme
32
+
granite
33
+
gtk3
34
+
libgee
35
+
libwnck3
36
+
wingpanel
37
+
];
38
+
39
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
40
+
41
+
meta = with stdenv.lib; {
42
+
description = "Notifications Indicator for Wingpanel";
43
+
homepage = https://github.com/elementary/wingpanel-indicator-notifications;
44
+
license = licenses.lgpl21Plus;
45
+
platforms = platforms.linux;
46
+
maintainers = pantheon.maintainers;
47
+
};
48
+
}
+57
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+57
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
2
+
, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel
3
+
, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-power";
7
+
version = "2.1.4";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "02gp9m9zkmhcl43nz02kjkcim4zm25zab3il8dhwkihh731g1c6j";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
python3
28
+
vala
29
+
wrapGAppsHook
30
+
];
31
+
32
+
buildInputs = [
33
+
bamf
34
+
elementary-icon-theme
35
+
granite
36
+
gtk3
37
+
libgee
38
+
libgtop
39
+
udev
40
+
wingpanel
41
+
];
42
+
43
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
44
+
45
+
postPatch = ''
46
+
chmod +x meson/post_install.py
47
+
patchShebangs meson/post_install.py
48
+
'';
49
+
50
+
meta = with stdenv.lib; {
51
+
description = "Power Indicator for Wingpanel";
52
+
homepage = https://github.com/elementary/wingpanel-indicator-power;
53
+
license = licenses.gpl2Plus;
54
+
platforms = platforms.linux;
55
+
maintainers = pantheon.maintainers;
56
+
};
57
+
}
+49
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+49
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
2
+
, ninja, vala, gtk3, granite, wingpanel, accountsservice
3
+
, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel-indicator-session";
7
+
version = "2.2.2";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "15ghhiabk74m7fm5pzr2qmdwpc330jczvvkwbf5pf7qczfyipjln";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
wrapGAppsHook
29
+
];
30
+
31
+
buildInputs = [
32
+
accountsservice
33
+
elementary-icon-theme
34
+
granite
35
+
gtk3
36
+
libgee
37
+
wingpanel
38
+
];
39
+
40
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
41
+
42
+
meta = with stdenv.lib; {
43
+
description = "Session Indicator for Wingpanel";
44
+
homepage = https://github.com/elementary/wingpanel-indicator-session;
45
+
license = licenses.gpl2Plus;
46
+
platforms = platforms.linux;
47
+
maintainers = pantheon.maintainers;
48
+
};
49
+
}
+59
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+59
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
2
+
, python3, ninja, vala, gtk3, granite, wingpanel, libnotify
3
+
, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook
4
+
, gobject-introspection, elementary-icon-theme }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "wingpanel-indicator-sound";
8
+
version = "2.1.2";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "elementary";
12
+
repo = pname;
13
+
rev = version;
14
+
sha256 = "0hxbr5dp8d1czq8ffw339r41c7srqb72vr48hxph8g091d3mcgcl";
15
+
};
16
+
17
+
passthru = {
18
+
updateScript = pantheon.updateScript {
19
+
repoName = pname;
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
gobject-introspection
25
+
libxml2
26
+
meson
27
+
ninja
28
+
pkgconfig
29
+
python3
30
+
vala
31
+
wrapGAppsHook
32
+
];
33
+
34
+
buildInputs = [
35
+
elementary-icon-theme
36
+
granite
37
+
gtk3
38
+
libcanberra-gtk3
39
+
libgee
40
+
libnotify
41
+
pulseaudio
42
+
wingpanel
43
+
];
44
+
45
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
46
+
47
+
postPatch = ''
48
+
chmod +x meson/post_install.py
49
+
patchShebangs meson/post_install.py
50
+
'';
51
+
52
+
meta = with stdenv.lib; {
53
+
description = "Sound Indicator for Wingpanel";
54
+
homepage = https://github.com/elementary/wingpanel-indicator-sound;
55
+
license = licenses.gpl2Plus;
56
+
platforms = platforms.linux;
57
+
maintainers = pantheon.maintainers;
58
+
};
59
+
}
+61
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+61
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
2
+
, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib
3
+
, python3, gobject-introspection }:
4
+
5
+
stdenv.mkDerivation rec {
6
+
pname = "wingpanel";
7
+
version = "2.2.2";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "1knkqh9q6yp7qf27zi6ki20fq4w0ia2hklvv84ivfmfa0irz0j6r";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
};
20
+
};
21
+
22
+
nativeBuildInputs = [
23
+
gettext
24
+
glib-networking
25
+
gobject-introspection
26
+
meson
27
+
ninja
28
+
pkgconfig
29
+
python3
30
+
vala
31
+
wrapGAppsHook
32
+
];
33
+
34
+
buildInputs = [
35
+
gala
36
+
granite
37
+
gtk3
38
+
json-glib
39
+
libgee
40
+
mutter
41
+
];
42
+
43
+
patches = [ ./indicators.patch ];
44
+
45
+
postPatch = ''
46
+
chmod +x meson/post_install.py
47
+
patchShebangs meson/post_install.py
48
+
'';
49
+
50
+
meta = with stdenv.lib; {
51
+
description = "The extensible top panel for Pantheon";
52
+
longDescription = ''
53
+
Wingpanel is an empty container that accepts indicators as extensions,
54
+
including the applications menu.
55
+
'';
56
+
homepage = https://github.com/elementary/wingpanel;
57
+
license = licenses.gpl2Plus;
58
+
platforms = platforms.linux;
59
+
maintainers = pantheon.maintainers;
60
+
};
61
+
}
+21
pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
+21
pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
···
1
+
diff --git a/lib/IndicatorManager.vala b/lib/IndicatorManager.vala
2
+
index a99a1ec..0ae7799 100644
3
+
--- a/lib/IndicatorManager.vala
4
+
+++ b/lib/IndicatorManager.vala
5
+
@@ -115,7 +115,15 @@ public class Wingpanel.IndicatorManager : GLib.Object {
6
+
}
7
+
8
+
/* load indicators */
9
+
- var base_folder = File.new_for_path (Build.INDICATORS_DIR);
10
+
+
11
+
+ var indicators_path = Environment.get_variable("WINGPANEL_INDICATORS_PATH");
12
+
+ if (indicators_path != null) {
13
+
+ debug ("WINGPANEL_INDICATORS_PATH set to %s", indicators_path);
14
+
+ } else {
15
+
+ critical ("WINGPANEL_INDICATORS_PATH not set");
16
+
+ }
17
+
+
18
+
+ var base_folder = File.new_for_path (indicators_path);
19
+
20
+
try {
21
+
monitor = base_folder.monitor_directory (FileMonitorFlags.NONE, null);
+23
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+23
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
···
1
+
{ lib, makeWrapper, symlinkJoin, wingpanel, wingpanelIndicators, switchboard-with-plugs, indicators ? null }:
2
+
3
+
let
4
+
selectedIndicators = if indicators == null then wingpanelIndicators else indicators;
5
+
in
6
+
symlinkJoin {
7
+
name = "${wingpanel.name}-with-indicators";
8
+
9
+
paths = [ wingpanel ] ++ selectedIndicators;
10
+
11
+
buildInputs = [ makeWrapper ];
12
+
13
+
# We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
14
+
# has a plugin to search switchboard settings
15
+
postBuild = ''
16
+
wrapProgram $out/bin/wingpanel \
17
+
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \
18
+
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \
19
+
--suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators}
20
+
'';
21
+
22
+
inherit (wingpanel) meta;
23
+
}
+48
pkgs/desktops/pantheon/services/cerbere/default.nix
+48
pkgs/desktops/pantheon/services/cerbere/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "cerbere";
5
+
version = "0.2.4";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "elementary";
9
+
repo = pname;
10
+
rev = version;
11
+
sha256 = "0f9jr6q5z6nir5b77f96wm9rx6r6s9i0sr1yrymg3n7jyjgrvdwp";
12
+
};
13
+
14
+
passthru = {
15
+
updateScript = pantheon.updateScript {
16
+
repoName = pname;
17
+
};
18
+
};
19
+
20
+
nativeBuildInputs = [
21
+
gobject-introspection
22
+
meson
23
+
ninja
24
+
pkgconfig
25
+
python3
26
+
vala
27
+
wrapGAppsHook
28
+
];
29
+
30
+
buildInputs = [
31
+
glib
32
+
libgee
33
+
];
34
+
35
+
postPatch = ''
36
+
chmod +x meson/post_install.py
37
+
patchShebangs meson/post_install.py
38
+
'';
39
+
40
+
meta = with stdenv.lib; {
41
+
description = "A simple service to ensure uptime of essential processes";
42
+
homepage = https://github.com/elementary/cerbere;
43
+
license = licenses.gpl2Plus;
44
+
platforms = platforms.linux;
45
+
maintainers = pantheon.maintainers;
46
+
};
47
+
48
+
}
+45
pkgs/desktops/pantheon/services/contractor/default.nix
+45
pkgs/desktops/pantheon/services/contractor/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, gobject-introspection }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "contractor";
5
+
version = "0.3.4";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "elementary";
9
+
repo = pname;
10
+
rev = version;
11
+
sha256 = "1jzqv7pglhhyrkj1pfk1l624zn1822wyl5dp6gvwn4sk3iqxwwhl";
12
+
};
13
+
14
+
passthru = {
15
+
updateScript = pantheon.updateScript {
16
+
repoName = pname;
17
+
};
18
+
};
19
+
20
+
nativeBuildInputs = [
21
+
dbus
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
python3
27
+
vala
28
+
];
29
+
30
+
buildInputs = [
31
+
glib
32
+
glib-networking
33
+
libgee
34
+
];
35
+
36
+
PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "share/dbus-1/services";
37
+
38
+
meta = with stdenv.lib; {
39
+
description = "A desktop-wide extension service used by elementary OS";
40
+
homepage = https://github.com/elementarycontractor;
41
+
license = licenses.gpl3Plus;
42
+
platforms = platforms.linux;
43
+
maintainers = pantheon.maintainers;
44
+
};
45
+
}
+58
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+58
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
2
+
, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "capnet-assist";
6
+
version = "2.2.3";
7
+
8
+
name = "elementary-${pname}-${version}";
9
+
10
+
src = fetchFromGitHub {
11
+
owner = "elementary";
12
+
repo = pname;
13
+
rev = version;
14
+
sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
15
+
};
16
+
17
+
passthru = {
18
+
updateScript = pantheon.updateScript {
19
+
repoName = pname;
20
+
attrPath = "elementary-${pname}";
21
+
};
22
+
};
23
+
24
+
nativeBuildInputs = [
25
+
desktop-file-utils
26
+
gobject-introspection
27
+
meson
28
+
ninja
29
+
pkgconfig
30
+
python3
31
+
vala
32
+
wrapGAppsHook
33
+
];
34
+
35
+
buildInputs = [
36
+
gcr
37
+
granite
38
+
gtk3
39
+
libgee
40
+
webkitgtk
41
+
];
42
+
43
+
# Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3
44
+
patches = [ ./remove-capnet-test.patch ];
45
+
46
+
postPatch = ''
47
+
chmod +x meson/post_install.py
48
+
patchShebangs meson/post_install.py
49
+
'';
50
+
51
+
meta = with stdenv.lib; {
52
+
description = "A small WebKit app that assists a user with login when a captive portal is detected";
53
+
homepage = https://github.com/elementary/capnet-assist;
54
+
license = licenses.gpl2Plus;
55
+
platforms = platforms.linux;
56
+
maintainers = pantheon.maintainers;
57
+
};
58
+
}
+13
pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch
+13
pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch
···
1
+
diff --git a/meson.build b/meson.build
2
+
index 46c594b..ba0ea10 100644
3
+
--- a/meson.build
4
+
+++ b/meson.build
5
+
@@ -33,8 +33,3 @@ meson.add_install_script('meson/post_install.py')
6
+
7
+
subdir('data')
8
+
subdir('po')
9
+
-
10
+
-install_data(
11
+
- '90captive_portal_test',
12
+
- install_dir: join_paths(get_option('sysconfdir'), 'NetworkManager', 'dispatcher.d')
13
+
-)
+57
pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+57
pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, makeWrapper, lib, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "dpms-helper";
5
+
version = "1.0";
6
+
7
+
name = "elementary-${pname}-${version}";
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "elementary";
11
+
repo = pname;
12
+
rev = version;
13
+
sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh";
14
+
};
15
+
16
+
passthru = {
17
+
updateScript = pantheon.updateScript {
18
+
repoName = pname;
19
+
attrPath = "elementary-${pname}";
20
+
};
21
+
};
22
+
23
+
nativeBuildInputs = [
24
+
desktop-file-utils
25
+
makeWrapper
26
+
meson
27
+
ninja
28
+
wrapGAppsHook
29
+
];
30
+
31
+
buildInputs = [
32
+
elementary-settings-daemon
33
+
glib
34
+
];
35
+
36
+
preFixup = ''
37
+
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ glib.dev coreutils ]}")
38
+
'';
39
+
40
+
postFixup = ''
41
+
substituteInPlace $out/etc/xdg/autostart/io.elementary.dpms-helper.desktop \
42
+
--replace "Exec=io.elementary.dpms-helper" "Exec=$out/bin/io.elementary.dpms-helper"
43
+
'';
44
+
45
+
# See: https://github.com/elementary/dpms-helper/pull/10
46
+
postInstall = ''
47
+
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
48
+
'';
49
+
50
+
meta = with stdenv.lib; {
51
+
description = "Sets DPMS settings found in org.pantheon.dpms";
52
+
homepage = https://github.com/elementary/dpms-helper;
53
+
license = licenses.gpl2;
54
+
platforms = platforms.linux;
55
+
maintainers = pantheon.maintainers;
56
+
};
57
+
}
+117
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+117
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
···
1
+
{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
2
+
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
3
+
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
4
+
, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:
5
+
6
+
stdenv.mkDerivation rec {
7
+
pname = "elementary-settings-daemon";
8
+
version = "3.30.2";
9
+
10
+
src = fetchurl {
11
+
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz";
12
+
sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
13
+
};
14
+
15
+
# Source for ubuntu's patchset
16
+
src2 = fetchgit {
17
+
url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon";
18
+
rev = "refs/tags/ubuntu/${version}-1ubuntu1";
19
+
sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
20
+
};
21
+
22
+
# We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
23
+
# See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52
24
+
#
25
+
# Also omit ubuntu_calculator_snap.patch as that's obviously not useful here.
26
+
patches = let patchPath = "${src2}/debian/patches"; in [
27
+
(substituteAll {
28
+
src = ./fix-paths.patch;
29
+
inherit tzdata;
30
+
})
31
+
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
32
+
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
33
+
"${patchPath}/correct_logout_action.patch"
34
+
"${patchPath}/ubuntu-lid-close-suspend.patch"
35
+
"${patchPath}/revert-wacom-migration.patch"
36
+
"${patchPath}/revert-gsettings-removals.patch"
37
+
"${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
38
+
"${patchPath}/ubuntu_ibus_configs.patch"
39
+
(fetchurl {
40
+
url = "https://github.com/elementary/os-patches/raw/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch";
41
+
sha256 = "0kh508ppiv4nvkg30gmw85cljlfq1bvkzhvf1iaxw0snb0mwgsxi";
42
+
})
43
+
];
44
+
45
+
postPatch = ''
46
+
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
47
+
chmod +x $f
48
+
patchShebangs $f
49
+
done
50
+
'';
51
+
52
+
postFixup = ''
53
+
for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
54
+
55
+
for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
56
+
do
57
+
echo "Patching OnlyShowIn to Pantheon in: $autostart"
58
+
sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart
59
+
done
60
+
61
+
# This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8
62
+
rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop
63
+
'';
64
+
65
+
nativeBuildInputs = [
66
+
docbook_xsl
67
+
gettext
68
+
libxml2
69
+
libxslt
70
+
meson
71
+
ninja
72
+
perl
73
+
pkgconfig
74
+
python3
75
+
wrapGAppsHook
76
+
];
77
+
78
+
buildInputs = with gnome3; [
79
+
accountsservice
80
+
alsaLib
81
+
colord
82
+
geoclue2
83
+
geocode-glib
84
+
glib
85
+
gnome-desktop
86
+
gsettings-desktop-schemas
87
+
gtk
88
+
ibus
89
+
lcms2
90
+
libXtst
91
+
libcanberra-gtk3
92
+
libgudev
93
+
libgweather
94
+
libnotify
95
+
libpulseaudio
96
+
librsvg
97
+
libwacom
98
+
libxkbfile
99
+
networkmanager
100
+
nss
101
+
polkit
102
+
udev
103
+
upower
104
+
xf86_input_wacom
105
+
xkeyboard_config
106
+
];
107
+
108
+
mesonFlags = [
109
+
"-Dudev_dir=${placeholder "out"}/lib/udev"
110
+
];
111
+
112
+
meta = with stdenv.lib; {
113
+
license = licenses.gpl2Plus;
114
+
maintainers = pantheon.maintainers;
115
+
platforms = platforms.linux;
116
+
};
117
+
}
+15
pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
+15
pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
···
1
+
--- a/plugins/datetime/tz.h
2
+
+++ b/plugins/datetime/tz.h
3
+
@@ -27,11 +27,7 @@
4
+
5
+
#include <glib.h>
6
+
7
+
-#ifndef __sun
8
+
-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
9
+
-#else
10
+
-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
11
+
-#endif
12
+
+#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
13
+
14
+
typedef struct _TzDB TzDB;
15
+
typedef struct _TzLocation TzLocation;
+49
pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+49
pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
···
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib
2
+
, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "pantheon-agent-geoclue2";
6
+
version = "1.0.1";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "0fww65dnbg9zn0gy1q2db39kjra50ykzw05pmn9iwxkijyxi8hm5";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
desktop-file-utils
23
+
gobject-introspection
24
+
meson
25
+
ninja
26
+
pkgconfig
27
+
vala
28
+
wrapGAppsHook
29
+
];
30
+
31
+
buildInputs = [
32
+
geoclue2
33
+
gtk3
34
+
libgee
35
+
];
36
+
37
+
# This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21
38
+
postInstall = ''
39
+
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
40
+
'';
41
+
42
+
meta = with stdenv.lib; {
43
+
description = "Pantheon Geoclue2 Agent";
44
+
homepage = https://github.com/elementary/pantheon-agent-geoclue2;
45
+
license = licenses.gpl3Plus;
46
+
platforms = platforms.linux;
47
+
maintainers = pantheon.maintainers;
48
+
};
49
+
}
+43
pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+43
pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
···
1
+
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
2
+
, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }:
3
+
4
+
stdenv.mkDerivation rec {
5
+
pname = "pantheon-agent-polkit";
6
+
version = "0.1.6";
7
+
8
+
src = fetchFromGitHub {
9
+
owner = "elementary";
10
+
repo = pname;
11
+
rev = version;
12
+
sha256 = "1g9l2jzpvv0dbvxh93w98a7ijsfqv3s3382li4s256179gihhd67";
13
+
};
14
+
15
+
passthru = {
16
+
updateScript = pantheon.updateScript {
17
+
repoName = pname;
18
+
};
19
+
};
20
+
21
+
nativeBuildInputs = [
22
+
gobject-introspection
23
+
meson
24
+
ninja
25
+
pkgconfig
26
+
vala
27
+
wrapGAppsHook
28
+
];
29
+
30
+
buildInputs = [
31
+
gtk3
32
+
libgee
33
+
polkit
34
+
];
35
+
36
+
meta = with stdenv.lib; {
37
+
description = "Polkit Agent for the Pantheon Desktop";
38
+
homepage = https://github.com/elementary/pantheon-agent-polkit;
39
+
license = licenses.lgpl21Plus;
40
+
platforms = platforms.linux;
41
+
maintainers = pantheon.maintainers;
42
+
};
43
+
}
+18
pkgs/desktops/pantheon/update.nix
+18
pkgs/desktops/pantheon/update.nix
···
1
+
{ stdenv, writeScript, runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }:
2
+
{ repoName, attrPath ? repoName, versionPolicy ? "release" }:
3
+
let
4
+
script = ./update.sh;
5
+
6
+
updateScript = runCommand "update.sh" {
7
+
inherit bash git jq nix coreutils gnugrep gnused curl;
8
+
# These weren't being substituted
9
+
nix_prefetch_scripts = nix-prefetch-scripts;
10
+
common_updater_scripts = common-updater-scripts;
11
+
} ''
12
+
substituteAll ${script} $out
13
+
chmod +x $out
14
+
'';
15
+
16
+
versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy};
17
+
18
+
in [ updateScript versionFlag repoName attrPath ]
+223
pkgs/desktops/pantheon/update.sh
+223
pkgs/desktops/pantheon/update.sh
···
1
+
#!@bash@/bin/bash
2
+
PATH=@bash@/bin:@nix_prefetch_scripts@/bin:@common_updater_scripts@/bin:@git@/bin:@jq@/bin:@nix@/bin:@gnugrep@/bin:@gnused@/bin:@curl@/bin:$PATH
3
+
#!/usr/bin/env bash
4
+
5
+
set -eu -o pipefail
6
+
7
+
#
8
+
# ─── HOW TO USE ─────────────────────────────────────────────────────────────────
9
+
#
10
+
11
+
function usage ( ) {
12
+
cat <<EOF
13
+
Usage: update.sh <repo_name> <attr>
14
+
EOF
15
+
}
16
+
17
+
#
18
+
# ─── POINTS YOU IN THE RIGHT DIRECTION ──────────────────────────────────────────
19
+
#
20
+
21
+
function usage_tip ( ) {
22
+
echo 'run `update.sh -h` for usage instructions' >&2
23
+
exit 1
24
+
}
25
+
26
+
#
27
+
# ─── OPTIONS: RELEASE | MASTER ────────────────────────────────────────────────────
28
+
#
29
+
30
+
while getopts ":hrm" opt; do
31
+
case $opt in
32
+
r)
33
+
release=1
34
+
master=0
35
+
;;
36
+
m)
37
+
master=1
38
+
release=0
39
+
;;
40
+
h)
41
+
usage
42
+
exit
43
+
;;
44
+
?)
45
+
echo "Invalid option: -$OPTARG" >&2
46
+
usage_tip
47
+
;;
48
+
esac
49
+
done
50
+
51
+
shift $((OPTIND-1))
52
+
53
+
#
54
+
# ─── FAIL WITH MESSAGE AND NON-ZERO EXIT STATUS ─────────────────────────────────
55
+
#
56
+
57
+
function fail ( ) {
58
+
echo "$1" >&2
59
+
exit 1
60
+
}
61
+
62
+
#
63
+
# ─── UPDATES PACKAGE TO LATEST TAGGED RELEASE ───────────────────────────────
64
+
#
65
+
66
+
function update_to_latest_release ( ) {
67
+
repo_name="$1"
68
+
attr="$2"
69
+
70
+
version=$(get_latest_tag "$repo_name")
71
+
fetch=$(fetch "$repo_name" "refs/tags/${version}")
72
+
sha256=$(get_hash "${fetch}")
73
+
74
+
update-source-version "pantheon.$attr" "$version" "$sha256"
75
+
76
+
nix_file=$(get_file_path $attr)
77
+
78
+
if [ ! -f "$nix_file" ]; then
79
+
fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!"
80
+
fi
81
+
82
+
correct_rev "$attr" "$nix_file" "version"
83
+
}
84
+
85
+
#
86
+
# ─── UPDATES PACKAGE TO MASTER ──────────────────────────────────────────────────
87
+
#
88
+
89
+
function update_to_master ( ) {
90
+
repo_name="$1"
91
+
attr="$2"
92
+
93
+
fetch=$(fetch "$repo_name" "refs/heads/master")
94
+
95
+
version=$(get_version "$fetch")
96
+
sha256=$(get_hash "$fetch")
97
+
proper_version=$(get_master_date "$fetch")
98
+
99
+
update-source-version "pantheon.$attr" "$proper_version" "$sha256"
100
+
101
+
nix_file=$(get_file_path $attr)
102
+
103
+
if [ ! -f "$nix_file" ]; then
104
+
fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!"
105
+
fi
106
+
107
+
correct_rev "$attr" "$nix_file" '"'$version'"'
108
+
}
109
+
110
+
#
111
+
# ─── GETS THE LATEST TAGGED RELEASE NAME FROM GITHUB ─────────────────────
112
+
#
113
+
114
+
function get_latest_tag ( ) {
115
+
repo_name="$1"
116
+
117
+
# Using github release api because sorting this repo just doesn't work because of old git sillyness
118
+
# Also too lazy to care to adapt `git ls-remote` command to work with it
119
+
if [ $repo_name == "switchboard-plug-pantheon-shell" ]; then
120
+
curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
121
+
else
122
+
git ls-remote --tags --sort="v:refname" "https://github.com/elementary/$repo_name" | tail -n1 | sed 's/.*\///; s/\^{}//'
123
+
fi
124
+
}
125
+
126
+
#
127
+
# ─── FETCHES REPO AND RETURNS RELEVANT INFORMATION ──────────────────
128
+
#
129
+
130
+
function fetch ( ) {
131
+
repo_name="$1"
132
+
version="$2"
133
+
134
+
base_url="https://github.com/elementary"
135
+
full_url="$base_url/$repo_name"
136
+
137
+
nix-prefetch-git --quiet --no-deepClone --url "$full_url" --rev "$version"
138
+
}
139
+
140
+
#
141
+
# ─── PARSES GIT REVISION FROM FETCH ─────────────────────────────────────────────
142
+
#
143
+
144
+
function get_version ( ) {
145
+
fetch_info="$1"
146
+
147
+
echo "$fetch_info" | jq -r '.rev'
148
+
}
149
+
150
+
#
151
+
# ─── PARSES HASH FROM FETCH ─────────────────────────────────────────────────────
152
+
#
153
+
154
+
function get_hash ( ) {
155
+
fetch_info="$1"
156
+
157
+
echo "$fetch_info" | jq -r '.sha256'
158
+
}
159
+
160
+
#
161
+
# ─── PARSES DATE FROM FETCH AND NORMALIZES IT TO NIXPKGS STANDARD ───────────────
162
+
#
163
+
164
+
function get_master_date ( ) {
165
+
fetch_info="$1"
166
+
167
+
full_date=$(echo "$fetch_info" | jq -r '.date')
168
+
short_date=$(date -d "$full_date" +"%Y-%m-%d")
169
+
170
+
echo "unstable-$short_date"
171
+
}
172
+
173
+
#
174
+
# ─── RETURN NIX EXPRESSION PATH ─────────────────────────────────────────────────
175
+
#
176
+
177
+
function get_file_path () {
178
+
attr="$1"
179
+
180
+
nix-instantiate --eval --strict -A "pantheon.$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/'
181
+
}
182
+
183
+
#
184
+
# ─── CORRECTS REV VERSION ───────────────────────────────────────────────────────────
185
+
#
186
+
187
+
function correct_rev ( ) {
188
+
attr="$1"
189
+
nix_file="$2"
190
+
rev="$3"
191
+
192
+
check_pattern1='^\s*rev\s*=\s*"[0-9a-f]{5,40}"'
193
+
check_pattern2='^\s*rev\s*=\s*version'
194
+
195
+
replace_pattern1='/\brev\b\s*=/ s|\"[0-9a-f]{5,40}\"|'$rev'|'
196
+
replace_pattern2='/\brev\b\s*=/ s|version|'$rev'|'
197
+
198
+
if [ $(grep -c -P "$check_pattern1" "$nix_file") = 1 ]; then
199
+
pattern="$replace_pattern1"
200
+
elif [ $(grep -c -P "$check_pattern2" "$nix_file") = 1 ]; then
201
+
pattern="$replace_pattern2"
202
+
else
203
+
fail "Couldn't figure out where out where to patch in the correct version in pantheon.$attr!"
204
+
fi
205
+
206
+
sed -i.bak "$nix_file" -re "$pattern"
207
+
rm -f "$nix_file.bak"
208
+
}
209
+
210
+
211
+
#
212
+
# ─── WHETHER TO UPDATE TO RELEASE OR MASTER ──────────────────────────────────
213
+
#
214
+
215
+
if [ $release = 1 ]; then
216
+
update_to_latest_release $1 $2
217
+
elif [ $master = 1 ]; then
218
+
update_to_master $1 $2
219
+
else
220
+
exit 1
221
+
fi
222
+
223
+
# ────────────────────────────────────────────────────────────────────────────────
+1
-1
pkgs/desktops/plasma-5/fetch.sh
+1
-1
pkgs/desktops/plasma-5/fetch.sh
+180
-180
pkgs/desktops/plasma-5/srcs.nix
+180
-180
pkgs/desktops/plasma-5/srcs.nix
···
3
3
4
4
{
5
5
bluedevil = {
6
-
version = "5.14.4";
6
+
version = "5.14.5";
7
7
src = fetchurl {
8
-
url = "${mirror}/stable/plasma/5.14.4/bluedevil-5.14.4.tar.xz";
9
-
sha256 = "04c7nwlmwkdmqjxxy9wz2sdb9nx40vzln150iyw6bpw8vix5wwkv";
10
-
name = "bluedevil-5.14.4.tar.xz";
8
+
url = "${mirror}/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz";
9
+
sha256 = "1khqw11apvcf5g5m9z111rvk4scxh3z3yhcpwqws1h0s5c5lr7z7";
10
+
name = "bluedevil-5.14.5.tar.xz";
11
11
};
12
12
};
13
13
breeze = {
14
-
version = "5.14.4";
14
+
version = "5.14.5";
15
15
src = fetchurl {
16
-
url = "${mirror}/stable/plasma/5.14.4/breeze-5.14.4.tar.xz";
17
-
sha256 = "0xdnfnvkzy96wn4y670wq1xq4jla8pqr2pwy4z4flhck61a0s7nf";
18
-
name = "breeze-5.14.4.tar.xz";
16
+
url = "${mirror}/stable/plasma/5.14.5/breeze-5.14.5.tar.xz";
17
+
sha256 = "15hphz2mm2m3j0a0hwj7m65rggyaxdxy08yqs73bg3yg67n6x3p7";
18
+
name = "breeze-5.14.5.tar.xz";
19
19
};
20
20
};
21
21
breeze-grub = {
22
-
version = "5.14.4";
22
+
version = "5.14.5";
23
23
src = fetchurl {
24
-
url = "${mirror}/stable/plasma/5.14.4/breeze-grub-5.14.4.tar.xz";
25
-
sha256 = "1q21frlacgjyl5r6x32ihzsy25rihdpc18hg0qdcar1zq5hmk7b1";
26
-
name = "breeze-grub-5.14.4.tar.xz";
24
+
url = "${mirror}/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz";
25
+
sha256 = "0bkaaxfl1ds58qcdrxswaacir7wcc65a960lwdkmpdl16g9f4gix";
26
+
name = "breeze-grub-5.14.5.tar.xz";
27
27
};
28
28
};
29
29
breeze-gtk = {
30
-
version = "5.14.4";
30
+
version = "5.14.5";
31
31
src = fetchurl {
32
-
url = "${mirror}/stable/plasma/5.14.4/breeze-gtk-5.14.4.tar.xz";
33
-
sha256 = "0aqj4ap1j9pajk211pbx7a692gm89kjdfh3lpbrrsi1bnq1rcq94";
34
-
name = "breeze-gtk-5.14.4.tar.xz";
32
+
url = "${mirror}/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz";
33
+
sha256 = "0bysq83xbqmhb4wld51zd6lllr66b8w7pinizc99k8z1yz5jdb0m";
34
+
name = "breeze-gtk-5.14.5.tar.xz";
35
35
};
36
36
};
37
37
breeze-plymouth = {
38
-
version = "5.14.4";
38
+
version = "5.14.5";
39
39
src = fetchurl {
40
-
url = "${mirror}/stable/plasma/5.14.4/breeze-plymouth-5.14.4.tar.xz";
41
-
sha256 = "1q9z5d96rrm8m3kjg3vi82az7a4c7h5n4mj736867nbcy4slqwk7";
42
-
name = "breeze-plymouth-5.14.4.tar.xz";
40
+
url = "${mirror}/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz";
41
+
sha256 = "1rbdpz9vlami7217v3dk8ljz0fgjz9zi1l0gwkhslayz5sybld96";
42
+
name = "breeze-plymouth-5.14.5.tar.xz";
43
43
};
44
44
};
45
45
discover = {
46
-
version = "5.14.4";
46
+
version = "5.14.5";
47
47
src = fetchurl {
48
-
url = "${mirror}/stable/plasma/5.14.4/discover-5.14.4.tar.xz";
49
-
sha256 = "0pivys2ygpzyi3ykyqslnh1c429f722mk5raa4h4krl8aa5cwwni";
50
-
name = "discover-5.14.4.tar.xz";
48
+
url = "${mirror}/stable/plasma/5.14.5/discover-5.14.5.tar.xz";
49
+
sha256 = "0gxhl2cv5yz3jw8fp8g8idi1k5hlhnvwbnvvg0dgnlzz6jb1s8dd";
50
+
name = "discover-5.14.5.tar.xz";
51
51
};
52
52
};
53
53
drkonqi = {
54
-
version = "5.14.4";
54
+
version = "5.14.5";
55
55
src = fetchurl {
56
-
url = "${mirror}/stable/plasma/5.14.4/drkonqi-5.14.4.tar.xz";
57
-
sha256 = "1fyz5wxmilar01x94i46mzfg5nvkqanx2xsw8bwkzqmnd8ndmnmi";
58
-
name = "drkonqi-5.14.4.tar.xz";
56
+
url = "${mirror}/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz";
57
+
sha256 = "0xgym368f9r21wjh9fpv16m90dcj87g9p5df850fnn2k5n8x38z8";
58
+
name = "drkonqi-5.14.5.tar.xz";
59
59
};
60
60
};
61
61
kactivitymanagerd = {
62
-
version = "5.14.4";
62
+
version = "5.14.5";
63
63
src = fetchurl {
64
-
url = "${mirror}/stable/plasma/5.14.4/kactivitymanagerd-5.14.4.tar.xz";
65
-
sha256 = "1ahfsqqgwlcsfy5d86i35kz8m90iarldnmlhsqw2bqk9al0qnsgm";
66
-
name = "kactivitymanagerd-5.14.4.tar.xz";
64
+
url = "${mirror}/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz";
65
+
sha256 = "0zms9npis0rklnbz93c69h4yg7dkrmfkzvzsfvkg90w37ap3vyl7";
66
+
name = "kactivitymanagerd-5.14.5.tar.xz";
67
67
};
68
68
};
69
69
kde-cli-tools = {
70
-
version = "5.14.4";
70
+
version = "5.14.5";
71
71
src = fetchurl {
72
-
url = "${mirror}/stable/plasma/5.14.4/kde-cli-tools-5.14.4.tar.xz";
73
-
sha256 = "11gkplnn95c78rdr0qs2hr08qv6scplsrff2nrz0n3g8sdplz2yy";
74
-
name = "kde-cli-tools-5.14.4.tar.xz";
72
+
url = "${mirror}/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz";
73
+
sha256 = "01mrnjqla4q07cnb1p51nq2pvj9vaamic3dsyj3b7hqky9fna9ln";
74
+
name = "kde-cli-tools-5.14.5.tar.xz";
75
75
};
76
76
};
77
77
kdecoration = {
78
-
version = "5.14.4";
78
+
version = "5.14.5";
79
79
src = fetchurl {
80
-
url = "${mirror}/stable/plasma/5.14.4/kdecoration-5.14.4.tar.xz";
81
-
sha256 = "10nqshn8jj5dvrmdzn2x62lpa99d3q9wq7pv9q7lkbianlic3zzk";
82
-
name = "kdecoration-5.14.4.tar.xz";
80
+
url = "${mirror}/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz";
81
+
sha256 = "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in";
82
+
name = "kdecoration-5.14.5.tar.xz";
83
83
};
84
84
};
85
85
kde-gtk-config = {
86
-
version = "5.14.4";
86
+
version = "5.14.5";
87
87
src = fetchurl {
88
-
url = "${mirror}/stable/plasma/5.14.4/kde-gtk-config-5.14.4.tar.xz";
89
-
sha256 = "1dmx9pd404jy03k7wgh0xjdpxn2nmz8mbg6ysjvw1z89ggm4dxy8";
90
-
name = "kde-gtk-config-5.14.4.tar.xz";
88
+
url = "${mirror}/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz";
89
+
sha256 = "12467wkjh2nmcf6r7n8qin1rryd39g0dg7gn43sdg6vdwpyl2kdm";
90
+
name = "kde-gtk-config-5.14.5.tar.xz";
91
91
};
92
92
};
93
93
kdeplasma-addons = {
94
-
version = "5.14.4";
94
+
version = "5.14.5";
95
95
src = fetchurl {
96
-
url = "${mirror}/stable/plasma/5.14.4/kdeplasma-addons-5.14.4.tar.xz";
97
-
sha256 = "0sdrkjsh4a4i7iv49m9s8rjp40bzarq8i3w4c64w6446jz66g4j9";
98
-
name = "kdeplasma-addons-5.14.4.tar.xz";
96
+
url = "${mirror}/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz";
97
+
sha256 = "18sph3719d9pq2j5k7swiv9xbrpj659a3q66zvhz3dmh11y73f0m";
98
+
name = "kdeplasma-addons-5.14.5.tar.xz";
99
99
};
100
100
};
101
101
kgamma5 = {
102
-
version = "5.14.4";
102
+
version = "5.14.5";
103
103
src = fetchurl {
104
-
url = "${mirror}/stable/plasma/5.14.4/kgamma5-5.14.4.tar.xz";
105
-
sha256 = "028alj0768pc2zb7h613vcxs8zsqgd6nn4lpni4c8l25n5wzyd11";
106
-
name = "kgamma5-5.14.4.tar.xz";
104
+
url = "${mirror}/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz";
105
+
sha256 = "17smrdwyalknb3f6ckqs7kglfpqwajbiyd212wlsmqbva4by0fy0";
106
+
name = "kgamma5-5.14.5.tar.xz";
107
107
};
108
108
};
109
109
khotkeys = {
110
-
version = "5.14.4";
110
+
version = "5.14.5";
111
111
src = fetchurl {
112
-
url = "${mirror}/stable/plasma/5.14.4/khotkeys-5.14.4.tar.xz";
113
-
sha256 = "033syji5mwd0il6d71p3r2dgqvs3lb5ybxkjb4m54sffbb0glrx2";
114
-
name = "khotkeys-5.14.4.tar.xz";
112
+
url = "${mirror}/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz";
113
+
sha256 = "0572jpgbhacx4gy40m594rbnxy3zaq5w3lcrfd8i2750ljswcq24";
114
+
name = "khotkeys-5.14.5.tar.xz";
115
115
};
116
116
};
117
117
kinfocenter = {
118
-
version = "5.14.4";
118
+
version = "5.14.5";
119
119
src = fetchurl {
120
-
url = "${mirror}/stable/plasma/5.14.4/kinfocenter-5.14.4.tar.xz";
121
-
sha256 = "1nh9dg37dnl2b11l400dswaf8qf8qspck0pdr7svrncv2yn3zirc";
122
-
name = "kinfocenter-5.14.4.tar.xz";
120
+
url = "${mirror}/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz";
121
+
sha256 = "1z1i9g923cbdni5gfa6dpv46z1p2v40rfcvhy7i9h5nf49aw2rnc";
122
+
name = "kinfocenter-5.14.5.tar.xz";
123
123
};
124
124
};
125
125
kmenuedit = {
126
-
version = "5.14.4";
126
+
version = "5.14.5";
127
127
src = fetchurl {
128
-
url = "${mirror}/stable/plasma/5.14.4/kmenuedit-5.14.4.tar.xz";
129
-
sha256 = "09lafgcxv2v745m04ljgsqgflw3j3ydx17974c1c7qfgr255994g";
130
-
name = "kmenuedit-5.14.4.tar.xz";
128
+
url = "${mirror}/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz";
129
+
sha256 = "1aa4a35s5h44fc88hmmfdpzy26zc47h9n448cd4vbm4bm411551d";
130
+
name = "kmenuedit-5.14.5.tar.xz";
131
131
};
132
132
};
133
133
kscreen = {
134
-
version = "5.14.4";
134
+
version = "5.14.5";
135
135
src = fetchurl {
136
-
url = "${mirror}/stable/plasma/5.14.4/kscreen-5.14.4.tar.xz";
137
-
sha256 = "1cqlhi4r1qli2izrj64x07cwz1k0qxclr0ckgkfx2lzdgp00gc96";
138
-
name = "kscreen-5.14.4.tar.xz";
136
+
url = "${mirror}/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz";
137
+
sha256 = "1nb1ysgcx49galbf16mxbawybfik92bpr9vbwgg5ycsdx1f9q8yi";
138
+
name = "kscreen-5.14.5.tar.xz";
139
139
};
140
140
};
141
141
kscreenlocker = {
142
-
version = "5.14.4";
142
+
version = "5.14.5";
143
143
src = fetchurl {
144
-
url = "${mirror}/stable/plasma/5.14.4/kscreenlocker-5.14.4.tar.xz";
145
-
sha256 = "1fpknd22d1lr63d203k1m7w09d2dxg80a5r83jhxs439y9winwz2";
146
-
name = "kscreenlocker-5.14.4.tar.xz";
144
+
url = "${mirror}/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz";
145
+
sha256 = "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m";
146
+
name = "kscreenlocker-5.14.5.tar.xz";
147
147
};
148
148
};
149
149
ksshaskpass = {
150
-
version = "5.14.4";
150
+
version = "5.14.5";
151
151
src = fetchurl {
152
-
url = "${mirror}/stable/plasma/5.14.4/ksshaskpass-5.14.4.tar.xz";
153
-
sha256 = "1cj6w9kqjg7qxq7xdn227xy6wnmpv72s08wdphhpv1lhpafgf0pm";
154
-
name = "ksshaskpass-5.14.4.tar.xz";
152
+
url = "${mirror}/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz";
153
+
sha256 = "0skr247k4ky7lpbdwlmkrnr3mj1pa6pxl96pyxwsw7za784qg6dj";
154
+
name = "ksshaskpass-5.14.5.tar.xz";
155
155
};
156
156
};
157
157
ksysguard = {
158
-
version = "5.14.4";
158
+
version = "5.14.5";
159
159
src = fetchurl {
160
-
url = "${mirror}/stable/plasma/5.14.4/ksysguard-5.14.4.tar.xz";
161
-
sha256 = "0gqji22k1pvs89zr6f5y71v2rma3p2ypp9ld449jn6rlizyfski1";
162
-
name = "ksysguard-5.14.4.tar.xz";
160
+
url = "${mirror}/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz";
161
+
sha256 = "0ybxh6ll080rkrrr4b5ydl06x8zi97702661cajvbv00lhq4vp8b";
162
+
name = "ksysguard-5.14.5.tar.xz";
163
163
};
164
164
};
165
165
kwallet-pam = {
166
-
version = "5.14.4";
166
+
version = "5.14.5";
167
167
src = fetchurl {
168
-
url = "${mirror}/stable/plasma/5.14.4/kwallet-pam-5.14.4.tar.xz";
169
-
sha256 = "15656m50xly9x7j2min813pr5lk7ymyb82is2s1lmfggrxghqjiq";
170
-
name = "kwallet-pam-5.14.4.tar.xz";
168
+
url = "${mirror}/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz";
169
+
sha256 = "1mkjjc88kqf5x313nifla9pzrgzqm4v92150dbs1f89bsn673pk8";
170
+
name = "kwallet-pam-5.14.5.tar.xz";
171
171
};
172
172
};
173
173
kwayland-integration = {
174
-
version = "5.14.4";
174
+
version = "5.14.5";
175
175
src = fetchurl {
176
-
url = "${mirror}/stable/plasma/5.14.4/kwayland-integration-5.14.4.tar.xz";
177
-
sha256 = "02w048f366mikpbqmjpliyrali7gd2flfjbv9nfgzhld9ixx1wwq";
178
-
name = "kwayland-integration-5.14.4.tar.xz";
176
+
url = "${mirror}/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz";
177
+
sha256 = "0rd0xhb53iixv9i8x0gh3rr1082lj7zdymsqdmi7sfgb66g8c03l";
178
+
name = "kwayland-integration-5.14.5.tar.xz";
179
179
};
180
180
};
181
181
kwin = {
182
-
version = "5.14.4";
182
+
version = "5.14.5";
183
183
src = fetchurl {
184
-
url = "${mirror}/stable/plasma/5.14.4/kwin-5.14.4.tar.xz";
185
-
sha256 = "0g9j394q7a2fk6wb2np7rjr1icdz9sr6iqjsicr881j088vxsini";
186
-
name = "kwin-5.14.4.tar.xz";
184
+
url = "${mirror}/stable/plasma/5.14.5/kwin-5.14.5.tar.xz";
185
+
sha256 = "0ifdlnzw3ydrbidzk256vks66d1rxyilhqi09csygx17jqk7szj4";
186
+
name = "kwin-5.14.5.tar.xz";
187
187
};
188
188
};
189
189
kwrited = {
190
-
version = "5.14.4";
190
+
version = "5.14.5";
191
191
src = fetchurl {
192
-
url = "${mirror}/stable/plasma/5.14.4/kwrited-5.14.4.tar.xz";
193
-
sha256 = "1c8zwvc672a1z4dj8qq1wma5a8lm0kvyxki4kacx7n9xfrh54njv";
194
-
name = "kwrited-5.14.4.tar.xz";
192
+
url = "${mirror}/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz";
193
+
sha256 = "0115qscr8a54h7h8w4xw4fjzp7qipyw3d3jswhii7axnzp6q6qnh";
194
+
name = "kwrited-5.14.5.tar.xz";
195
195
};
196
196
};
197
197
libkscreen = {
198
-
version = "5.14.4";
198
+
version = "5.14.5";
199
199
src = fetchurl {
200
-
url = "${mirror}/stable/plasma/5.14.4/libkscreen-5.14.4.tar.xz";
201
-
sha256 = "1n56fb6sxjyh73lb17s44yjlfhyqx2n3q320vncjx2jxxh0an80z";
202
-
name = "libkscreen-5.14.4.tar.xz";
200
+
url = "${mirror}/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz";
201
+
sha256 = "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y";
202
+
name = "libkscreen-5.14.5.tar.xz";
203
203
};
204
204
};
205
205
libksysguard = {
206
-
version = "5.14.4";
206
+
version = "5.14.5";
207
207
src = fetchurl {
208
-
url = "${mirror}/stable/plasma/5.14.4/libksysguard-5.14.4.tar.xz";
209
-
sha256 = "1nflk9vr2s2mc8ddl0rjvvh9iks4vwvf8ahlskqc068xm8ja0cr2";
210
-
name = "libksysguard-5.14.4.tar.xz";
208
+
url = "${mirror}/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz";
209
+
sha256 = "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya";
210
+
name = "libksysguard-5.14.5.tar.xz";
211
211
};
212
212
};
213
213
milou = {
214
-
version = "5.14.4";
214
+
version = "5.14.5";
215
215
src = fetchurl {
216
-
url = "${mirror}/stable/plasma/5.14.4/milou-5.14.4.tar.xz";
217
-
sha256 = "1dkkr5zinia1zy439rm1sdz6r8hix1l4w8bw9rwwbk6yydvp2mkf";
218
-
name = "milou-5.14.4.tar.xz";
216
+
url = "${mirror}/stable/plasma/5.14.5/milou-5.14.5.tar.xz";
217
+
sha256 = "1776441mhmwcvrzmdqg531md79azbkbhng51kyq6i9cvkhxyf583";
218
+
name = "milou-5.14.5.tar.xz";
219
219
};
220
220
};
221
221
oxygen = {
222
-
version = "5.14.4";
222
+
version = "5.14.5";
223
223
src = fetchurl {
224
-
url = "${mirror}/stable/plasma/5.14.4/oxygen-5.14.4.tar.xz";
225
-
sha256 = "1rdxisnrmyywbanvchs57fr37d3ilakg83b78v8z6ji0jiy1wk0z";
226
-
name = "oxygen-5.14.4.tar.xz";
224
+
url = "${mirror}/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz";
225
+
sha256 = "0h70k7af69zdky0g6napd1kdnvbxhnw3nrwr9jqv1fq5762xnkk8";
226
+
name = "oxygen-5.14.5.tar.xz";
227
227
};
228
228
};
229
229
plasma-browser-integration = {
230
-
version = "5.14.4";
230
+
version = "5.14.5";
231
231
src = fetchurl {
232
-
url = "${mirror}/stable/plasma/5.14.4/plasma-browser-integration-5.14.4.tar.xz";
233
-
sha256 = "0gwdi6mqfmv7hpdbhklxcxy07awvm9k22vj4wmzca3h7k334l35m";
234
-
name = "plasma-browser-integration-5.14.4.tar.xz";
232
+
url = "${mirror}/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz";
233
+
sha256 = "1260h5sh0gkbkhcj17ss0n0y48i1pxh3f4p5dcbgbz775g1dhi2s";
234
+
name = "plasma-browser-integration-5.14.5.tar.xz";
235
235
};
236
236
};
237
237
plasma-desktop = {
238
-
version = "5.14.4.1";
238
+
version = "5.14.5";
239
239
src = fetchurl {
240
-
url = "${mirror}/stable/plasma/5.14.4/plasma-desktop-5.14.4.1.tar.xz";
241
-
sha256 = "0qcmqm9dag6xjfdn5zlbcpksbc70z3bwpc0dg5s315bdv2jha8c4";
242
-
name = "plasma-desktop-5.14.4.1.tar.xz";
240
+
url = "${mirror}/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz";
241
+
sha256 = "0pr07p36jrpvkk4fp14fb4minnwj5gnmvdg9jf7bi8sjjz6jpnnl";
242
+
name = "plasma-desktop-5.14.5.tar.xz";
243
243
};
244
244
};
245
245
plasma-integration = {
246
-
version = "5.14.4";
246
+
version = "5.14.5";
247
247
src = fetchurl {
248
-
url = "${mirror}/stable/plasma/5.14.4/plasma-integration-5.14.4.tar.xz";
249
-
sha256 = "0jjfb0gx51zglcn59xzz8306zm55b6nsd057vkwddinq5qi3x938";
250
-
name = "plasma-integration-5.14.4.tar.xz";
248
+
url = "${mirror}/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz";
249
+
sha256 = "15nhrliri4cjx712f1rxbq2f87lj4wxsqgbhw9p02z12h3n9z3ds";
250
+
name = "plasma-integration-5.14.5.tar.xz";
251
251
};
252
252
};
253
253
plasma-nm = {
254
-
version = "5.14.4";
254
+
version = "5.14.5";
255
255
src = fetchurl {
256
-
url = "${mirror}/stable/plasma/5.14.4/plasma-nm-5.14.4.tar.xz";
257
-
sha256 = "14jjaaaqbsqgzzfpz7nqk7sw1jy4dc6sxrgz46hrdf0n04ga9kxk";
258
-
name = "plasma-nm-5.14.4.tar.xz";
256
+
url = "${mirror}/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz";
257
+
sha256 = "1hf98c9llcff0h2w4l45nw0vysxvnanf7hczhj93z4562qrafxm2";
258
+
name = "plasma-nm-5.14.5.tar.xz";
259
259
};
260
260
};
261
261
plasma-pa = {
262
-
version = "5.14.4";
262
+
version = "5.14.5";
263
263
src = fetchurl {
264
-
url = "${mirror}/stable/plasma/5.14.4/plasma-pa-5.14.4.tar.xz";
265
-
sha256 = "18mc1aagz4b3lmv1dmabqnc4xr64j9is597lqpjc0c28gm0rnqp3";
266
-
name = "plasma-pa-5.14.4.tar.xz";
264
+
url = "${mirror}/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz";
265
+
sha256 = "0z74qg7m4y1ifzni1877hiil3rn6ad3x4fvgv4bib4jhg7ckaiqg";
266
+
name = "plasma-pa-5.14.5.tar.xz";
267
267
};
268
268
};
269
269
plasma-sdk = {
270
-
version = "5.14.4";
270
+
version = "5.14.5";
271
271
src = fetchurl {
272
-
url = "${mirror}/stable/plasma/5.14.4/plasma-sdk-5.14.4.tar.xz";
273
-
sha256 = "1mg1229xcv0zjx85a0418ypv38q0q87xxcmmzjdqgxmhk6dx5dys";
274
-
name = "plasma-sdk-5.14.4.tar.xz";
272
+
url = "${mirror}/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz";
273
+
sha256 = "0v90nk6yhrapdszh8sd3m0wffkjgnrhdy1sz1vl9s0ab5sdpmxr1";
274
+
name = "plasma-sdk-5.14.5.tar.xz";
275
275
};
276
276
};
277
277
plasma-tests = {
278
-
version = "5.14.4";
278
+
version = "5.14.5";
279
279
src = fetchurl {
280
-
url = "${mirror}/stable/plasma/5.14.4/plasma-tests-5.14.4.tar.xz";
281
-
sha256 = "17imxri9n4hv27z0d7nbwvdgvc45ql224aj1gcpxmrn4p4zfc8w7";
282
-
name = "plasma-tests-5.14.4.tar.xz";
280
+
url = "${mirror}/stable/plasma/5.14.5/plasma-tests-5.14.5.tar.xz";
281
+
sha256 = "03h889xn6i067d1sdymn6fgj8xik3pa75lljl8kj3vl6bks24jyh";
282
+
name = "plasma-tests-5.14.5.tar.xz";
283
283
};
284
284
};
285
285
plasma-vault = {
286
-
version = "5.14.4";
286
+
version = "5.14.5";
287
287
src = fetchurl {
288
-
url = "${mirror}/stable/plasma/5.14.4/plasma-vault-5.14.4.tar.xz";
289
-
sha256 = "1fwa8w95n3d25mk823q1dzyhari4fzwnnx6jwny0spcqyhzr4xcr";
290
-
name = "plasma-vault-5.14.4.tar.xz";
288
+
url = "${mirror}/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz";
289
+
sha256 = "17r44n0mkcwc2fkjf397ks8xv82m59gvnawbj9713c5l31ln5mi3";
290
+
name = "plasma-vault-5.14.5.tar.xz";
291
291
};
292
292
};
293
293
plasma-workspace = {
294
-
version = "5.14.4";
294
+
version = "5.14.5";
295
295
src = fetchurl {
296
-
url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz";
297
-
sha256 = "0dmgk26wcs69py9qd6q3hg8npkbkk25fl5l6nl88x0jh9mqiyff5";
298
-
name = "plasma-workspace-5.14.4.tar.xz";
296
+
url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz";
297
+
sha256 = "14d3wnsm4bi1izx5qlpk0mnqmxwx18bqypa3wwmhn1535kfz8glh";
298
+
name = "plasma-workspace-5.14.5.tar.xz";
299
299
};
300
300
};
301
301
plasma-workspace-wallpapers = {
302
-
version = "5.14.4";
302
+
version = "5.14.5";
303
303
src = fetchurl {
304
-
url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-wallpapers-5.14.4.tar.xz";
305
-
sha256 = "1kvc0v0rjixkf4zfr9gcpmyrs62xpccv96fyw534xiw4w5pr73i6";
306
-
name = "plasma-workspace-wallpapers-5.14.4.tar.xz";
304
+
url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz";
305
+
sha256 = "17q0685i4267ihlrii3b8764ak458kzs0inqfcj9x25m338xz19q";
306
+
name = "plasma-workspace-wallpapers-5.14.5.tar.xz";
307
307
};
308
308
};
309
309
plymouth-kcm = {
310
-
version = "5.14.4";
310
+
version = "5.14.5";
311
311
src = fetchurl {
312
-
url = "${mirror}/stable/plasma/5.14.4/plymouth-kcm-5.14.4.tar.xz";
313
-
sha256 = "02c7s9js3943by7s0d3lalamliq98jm26syafmn6q1wz0msza40x";
314
-
name = "plymouth-kcm-5.14.4.tar.xz";
312
+
url = "${mirror}/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz";
313
+
sha256 = "1cwmkprhc4496x4a38l2x7hnifnp4daw8g1gic0ik2sm0a6xn77k";
314
+
name = "plymouth-kcm-5.14.5.tar.xz";
315
315
};
316
316
};
317
317
polkit-kde-agent = {
318
-
version = "1-5.14.4";
318
+
version = "1-5.14.5";
319
319
src = fetchurl {
320
-
url = "${mirror}/stable/plasma/5.14.4/polkit-kde-agent-1-5.14.4.tar.xz";
321
-
sha256 = "1pvyxjg1p510v6ahrab017s2sqfq3zld0xjf2yh30x55hz6pvnmb";
322
-
name = "polkit-kde-agent-1-5.14.4.tar.xz";
320
+
url = "${mirror}/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz";
321
+
sha256 = "1lzw4zq2ysnva5g1v85k9k6yck30wfgcy0sn1ncxy183vm36b2ag";
322
+
name = "polkit-kde-agent-1-5.14.5.tar.xz";
323
323
};
324
324
};
325
325
powerdevil = {
326
-
version = "5.14.4";
326
+
version = "5.14.5";
327
327
src = fetchurl {
328
-
url = "${mirror}/stable/plasma/5.14.4/powerdevil-5.14.4.tar.xz";
329
-
sha256 = "04qyz7jncnyj65rpdriaylarsnimqhk1va98im50bsdyiya5hj33";
330
-
name = "powerdevil-5.14.4.tar.xz";
328
+
url = "${mirror}/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz";
329
+
sha256 = "0rdrj6k7bb1cisz1g8akxxn68c8rj0zddim1afvcq1iqr727wqj5";
330
+
name = "powerdevil-5.14.5.tar.xz";
331
331
};
332
332
};
333
333
sddm-kcm = {
334
-
version = "5.14.4";
334
+
version = "5.14.5";
335
335
src = fetchurl {
336
-
url = "${mirror}/stable/plasma/5.14.4/sddm-kcm-5.14.4.tar.xz";
337
-
sha256 = "03xisf0z88385zfixmah09ry53cayc4kqjn92zlqnfrc9pqnmgcz";
338
-
name = "sddm-kcm-5.14.4.tar.xz";
336
+
url = "${mirror}/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz";
337
+
sha256 = "0aix2grc2h2w8qxcbdwxhvq09ispblnisl017bvb19apkvs0w8m1";
338
+
name = "sddm-kcm-5.14.5.tar.xz";
339
339
};
340
340
};
341
341
systemsettings = {
342
-
version = "5.14.4";
342
+
version = "5.14.5";
343
343
src = fetchurl {
344
-
url = "${mirror}/stable/plasma/5.14.4/systemsettings-5.14.4.tar.xz";
345
-
sha256 = "0glyk9798kaps0fdmclchb6phpr0p315n7w9c9p8ww4b8kj4jyly";
346
-
name = "systemsettings-5.14.4.tar.xz";
344
+
url = "${mirror}/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz";
345
+
sha256 = "1q1ih74vkdhss64ayc3qmbrw4hhvfl3axlkhh63rky09qn83x9zw";
346
+
name = "systemsettings-5.14.5.tar.xz";
347
347
};
348
348
};
349
349
user-manager = {
350
-
version = "5.14.4";
350
+
version = "5.14.5";
351
351
src = fetchurl {
352
-
url = "${mirror}/stable/plasma/5.14.4/user-manager-5.14.4.tar.xz";
353
-
sha256 = "110w6n8k1zjbillcmbqy3vc43lznimns60pwh84js8mgqrjx7psb";
354
-
name = "user-manager-5.14.4.tar.xz";
352
+
url = "${mirror}/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz";
353
+
sha256 = "0aw2s029547rzx3xg9nib5w30d25978fpv7xyshxmp3z8rmzgcjv";
354
+
name = "user-manager-5.14.5.tar.xz";
355
355
};
356
356
};
357
357
xdg-desktop-portal-kde = {
358
-
version = "5.14.4";
358
+
version = "5.14.5";
359
359
src = fetchurl {
360
-
url = "${mirror}/stable/plasma/5.14.4/xdg-desktop-portal-kde-5.14.4.tar.xz";
361
-
sha256 = "1p2h7rqgvwzlfk9jjhsifjcdl81d72d1d7zmgxy9alc4cqnlmbih";
362
-
name = "xdg-desktop-portal-kde-5.14.4.tar.xz";
360
+
url = "${mirror}/stable/plasma/5.14.5/xdg-desktop-portal-kde-5.14.5.tar.xz";
361
+
sha256 = "0h6hdk9fkf98jfjaza773k37369ayvwmwrgxn6al2pma6n07vddq";
362
+
name = "xdg-desktop-portal-kde-5.14.5.tar.xz";
363
363
};
364
364
};
365
365
}
+5
-25
pkgs/development/beam-modules/default.nix
+5
-25
pkgs/development/beam-modules/default.nix
···
23
23
hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
24
24
25
25
rebar = callPackage ../tools/build-managers/rebar { };
26
-
rebar3-open = callPackage ../tools/build-managers/rebar3 {
27
-
hermeticRebar3 = false;
28
-
};
29
-
rebar3 = callPackage ../tools/build-managers/rebar3 {
30
-
hermeticRebar3 = true;
31
-
};
26
+
rebar3-open = callPackage ../tools/build-managers/rebar3 { };
27
+
rebar3 = callPackage ../tools/build-managers/rebar3 { };
32
28
33
29
# rebar3 port compiler plugin is required by buildRebar3
34
30
pc_1_6_0 = callPackage ./pc {};
35
31
pc = pc_1_6_0;
36
32
37
33
fetchHex = callPackage ./fetch-hex.nix { };
34
+
35
+
fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { };
36
+
rebar3Relx = callPackage ./rebar3-release.nix { };
38
37
39
38
buildRebar3 = callPackage ./build-rebar3.nix {};
40
39
buildHex = callPackage ./build-hex.nix {};
···
74
73
75
74
lfe = lfe_1_2;
76
75
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
77
-
78
-
# We list all base hex packages for beam tooling explicitly to ensure
79
-
# tha the tooling does not break during hex-packages.nix updates.
80
-
erlware_commons_1_0_0 = buildHex {
81
-
name = "erlware_commons";
82
-
version = "1.0.0";
83
-
sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7";
84
-
beamDeps = [ cf_0_2_2 ];
85
-
};
86
-
cf_0_2_2 = buildHex {
87
-
name = "cf";
88
-
version = "0.2.2";
89
-
sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28";
90
-
};
91
-
getopt_0_8_2 = buildHex {
92
-
name = "getopt";
93
-
version = "0.8.2";
94
-
sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
95
-
};
96
76
97
77
# Non hex packages. Examples how to build Rebar/Mix packages with and
98
78
# without helper functions buildRebar3 and buildMix.
+32
pkgs/development/beam-modules/fetch-rebar-deps.nix
+32
pkgs/development/beam-modules/fetch-rebar-deps.nix
···
1
+
{ stdenv, rebar3, curl }:
2
+
3
+
{ name, version, sha256, src
4
+
, meta ? {}
5
+
}:
6
+
7
+
with stdenv.lib;
8
+
9
+
stdenv.mkDerivation ({
10
+
name = "rebar-deps-${name}-${version}";
11
+
12
+
phases = [ "downloadPhase" "installPhase" ];
13
+
14
+
downloadPhase = ''
15
+
cp ${src} .
16
+
HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps
17
+
'';
18
+
19
+
installPhase = ''
20
+
mkdir -p "$out/_checkouts"
21
+
for i in ./_build/default/lib/* ; do
22
+
echo "$i"
23
+
cp -R "$i" "$out/_checkouts"
24
+
done
25
+
'';
26
+
27
+
outputHashAlgo = "sha256";
28
+
outputHashMode = "recursive";
29
+
outputHash = sha256;
30
+
31
+
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
32
+
})
+85
pkgs/development/beam-modules/rebar3-release.nix
+85
pkgs/development/beam-modules/rebar3-release.nix
···
1
+
{ stdenv, writeText, erlang, rebar3, openssl, libyaml,
2
+
pc, lib }:
3
+
4
+
{ name, version
5
+
, src
6
+
, checkouts ? null
7
+
, releaseType
8
+
, buildInputs ? []
9
+
, setupHook ? null
10
+
, profile ? "default"
11
+
, installPhase ? null
12
+
, buildPhase ? null
13
+
, configurePhase ? null
14
+
, meta ? {}
15
+
, enableDebugInfo ? false
16
+
, ... }@attrs:
17
+
18
+
with stdenv.lib;
19
+
20
+
let
21
+
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
22
+
23
+
shell = drv: stdenv.mkDerivation {
24
+
name = "interactive-shell-${drv.name}";
25
+
buildInputs = [ drv ];
26
+
};
27
+
28
+
customPhases = filterAttrs
29
+
(_: v: v != null)
30
+
{ inherit setupHook configurePhase buildPhase installPhase; };
31
+
32
+
pkg = self: stdenv.mkDerivation (attrs // {
33
+
34
+
name = "${name}-${version}";
35
+
inherit version;
36
+
37
+
buildInputs = buildInputs ++ [ erlang rebar3 openssl ];
38
+
propagatedBuildInputs = [checkouts];
39
+
40
+
dontStrip = true;
41
+
42
+
inherit src;
43
+
44
+
setupHook = writeText "setupHook.sh" ''
45
+
addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
46
+
'';
47
+
48
+
configurePhase = ''
49
+
runHook preConfigure
50
+
${if checkouts != null then
51
+
''cp --no-preserve=all -R ${checkouts}/_checkouts .''
52
+
else
53
+
''''}
54
+
runHook postConfigure
55
+
'';
56
+
57
+
buildPhase = ''
58
+
runHook preBuild
59
+
HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript"
60
+
then '' escriptize''
61
+
else '' release''}
62
+
runHook postBuild
63
+
'';
64
+
65
+
installPhase = ''
66
+
runHook preInstall
67
+
dir=${if releaseType == "escript"
68
+
then ''bin''
69
+
else ''rel''}
70
+
mkdir -p "$out/$dir"
71
+
cp -R --preserve=mode "_build/${profile}/$dir" "$out"
72
+
runHook postInstall
73
+
'';
74
+
75
+
meta = {
76
+
inherit (erlang.meta) platforms;
77
+
} // meta;
78
+
79
+
passthru = {
80
+
packageName = name;
81
+
env = shell self;
82
+
};
83
+
} // customPhases);
84
+
in
85
+
fix pkg
+1
-1
pkgs/development/compilers/cmdstan/default.nix
+1
-1
pkgs/development/compilers/cmdstan/default.nix
+1
-1
pkgs/development/compilers/fsharp/default.nix
+1
-1
pkgs/development/compilers/fsharp/default.nix
+1
-1
pkgs/development/compilers/fsharp41/default.nix
+1
-1
pkgs/development/compilers/fsharp41/default.nix
+16
-11
pkgs/development/compilers/gcc/6/default.nix
+16
-11
pkgs/development/compilers/gcc/6/default.nix
···
180
180
181
181
hardeningDisable = [ "format" "pie" ];
182
182
183
-
# This should kill all the stdinc frameworks that gcc and friends like to
184
-
# insert into default search paths.
185
-
prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
186
-
substituteInPlace gcc/config/darwin-c.c \
187
-
--replace 'if (stdinc)' 'if (0)'
183
+
prePatch =
184
+
(stdenv.lib.optionalString (langJava || langGo) ''
185
+
export lib=$out
186
+
'')
187
+
188
+
# This should kill all the stdinc frameworks that gcc and friends like to
189
+
# insert into default search paths.
190
+
+ stdenv.lib.optionalString hostPlatform.isDarwin ''
191
+
substituteInPlace gcc/config/darwin-c.c \
192
+
--replace 'if (stdinc)' 'if (0)'
188
193
189
-
substituteInPlace libgcc/config/t-slibgcc-darwin \
190
-
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
194
+
substituteInPlace libgcc/config/t-slibgcc-darwin \
195
+
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
191
196
192
-
substituteInPlace libgfortran/configure \
193
-
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
194
-
'';
197
+
substituteInPlace libgfortran/configure \
198
+
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
199
+
'';
195
200
196
201
postPatch =
197
202
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
···
447
452
448
453
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
449
454
450
-
// optionalAttrs (langJava) {
455
+
// optionalAttrs (langJava && !stdenv.hostPlatform.isDarwin) {
451
456
postFixup = ''
452
457
target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
453
458
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
+10
-4
pkgs/development/compilers/ghc/8.2.2-binary.nix
+10
-4
pkgs/development/compilers/ghc/8.2.2-binary.nix
···
1
-
{ stdenv
1
+
{ stdenv, substituteAll
2
2
, fetchurl, perl, gcc, llvm_39
3
3
, ncurses5, gmp, glibc, libiconv
4
4
}:
···
110
110
'';
111
111
112
112
configurePlatforms = [ ];
113
-
configureFlags = [
114
-
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
113
+
configureFlags =
114
+
let
115
+
gcc-clang-wrapper = substituteAll {
116
+
inherit (stdenv) shell;
117
+
src = ./gcc-clang-wrapper.sh;
118
+
};
119
+
in
120
+
[ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
115
121
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
116
-
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
122
+
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}"
117
123
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
118
124
119
125
# Stripping combined with patchelf breaks the executables (they die
+1
-1
pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
+1
-1
pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
+1
-1
pkgs/development/compilers/iasl/default.nix
+1
-1
pkgs/development/compilers/iasl/default.nix
+1
pkgs/development/compilers/llvm/5/default.nix
+1
pkgs/development/compilers/llvm/5/default.nix
+1
pkgs/development/compilers/llvm/6/default.nix
+1
pkgs/development/compilers/llvm/6/default.nix
+1
pkgs/development/compilers/llvm/7/default.nix
+1
pkgs/development/compilers/llvm/7/default.nix
+1
-1
pkgs/development/compilers/openjdk/8.nix
+1
-1
pkgs/development/compilers/openjdk/8.nix
···
98
98
preConfigure = ''
99
99
chmod +x configure
100
100
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
101
-
substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
101
+
substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
102
102
substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
103
103
''
104
104
# https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+8
-8
pkgs/development/compilers/rust/bootstrap.nix
+8
-8
pkgs/development/compilers/rust/bootstrap.nix
···
3
3
let
4
4
# Note: the version MUST be one version prior to the version we're
5
5
# building
6
-
version = "1.30.1";
6
+
version = "1.31.1";
7
7
8
-
# fetch hashes by running `print-hashes.sh 1.30.0`
8
+
# fetch hashes by running `print-hashes.sh 1.31.1`
9
9
hashes = {
10
-
i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf";
11
-
x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e";
12
-
armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b";
13
-
aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874";
14
-
i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083";
15
-
x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94";
10
+
i686-unknown-linux-gnu = "1e77e5e8c745320faad9ce6f319a77b4a2e75d972eb68a195acd081ad910ab6d";
11
+
x86_64-unknown-linux-gnu = "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c";
12
+
armv7-unknown-linux-gnueabihf = "11c717b781a7af5bdc829894139f8f45d4c12a061f7f9e39481f21426a04eb21";
13
+
aarch64-unknown-linux-gnu = "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a";
14
+
i686-apple-darwin = "46566dc25fcbd8badc9950b8c9f9b0faeca065b5a09cd96258e4f4b10d686aed";
15
+
x86_64-apple-darwin = "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6";
16
16
};
17
17
18
18
platform =
+2
-2
pkgs/development/compilers/rust/cargo.nix
+2
-2
pkgs/development/compilers/rust/cargo.nix
···
10
10
inherit version src patches;
11
11
12
12
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
13
-
cargoVendorDir = "src/vendor";
14
-
preBuild = "cd src; pushd tools/cargo";
13
+
cargoVendorDir = "vendor";
14
+
preBuild = "pushd src/tools/cargo";
15
15
postBuild = "popd";
16
16
17
17
passthru.rustc = rustc;
+3
-8
pkgs/development/compilers/rust/default.nix
+3
-8
pkgs/development/compilers/rust/default.nix
···
7
7
8
8
let
9
9
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
10
-
version = "1.31.0";
11
-
cargoVersion = "1.31.0";
10
+
version = "1.32.0";
11
+
cargoVersion = "1.32.0";
12
12
src = fetchurl {
13
13
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
14
-
sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs";
14
+
sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac";
15
15
};
16
16
in rec {
17
17
rustc = callPackage ./rustc.nix {
···
22
22
23
23
# Re-evaluate if this we need to disable this one
24
24
#./patches/stdsimd-disable-doctest.patch
25
-
26
-
# Fails on hydra - not locally; the exact reason is unknown.
27
-
# Comments in the test suggest that some non-reproducible environment
28
-
# variables such $RANDOM can make it fail.
29
-
./patches/disable-test-inherit-env.patch
30
25
];
31
26
32
27
withBundledLLVM = false;
-10
pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
-10
pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
+2
-6
pkgs/development/compilers/rust/rustc.nix
+2
-6
pkgs/development/compilers/rust/rustc.nix
···
1
1
{ stdenv, targetPackages, removeReferencesTo
2
2
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
3
-
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
3
+
, llvm, ncurses, darwin, rustPlatform, git, cmake, curl
4
4
, which, libffi, gdb
5
5
, version
6
6
, withBundledLLVM ? false
···
19
19
inherit (darwin.apple_sdk.frameworks) Security;
20
20
21
21
llvmShared = llvm.override { enableSharedLibraries = true; };
22
-
23
-
prefixedJemalloc = jemalloc.override { stripPrefix = false; };
24
22
25
23
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
26
24
in
···
62
60
configureFlags = configureFlags
63
61
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
64
62
"--enable-vendor"
65
-
"--jemalloc-root=${prefixedJemalloc}/lib"
66
63
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
67
64
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
68
65
++ optional (targets != []) "--target=${target}";
···
85
82
patchShebangs src/etc
86
83
87
84
${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
88
-
rm -rf src/jemalloc
89
85
90
86
# Fix the configure script to not require curl as we won't use it
91
87
sed -i configure \
···
97
93
# https://github.com/rust-lang/rust/issues/39522
98
94
echo removing gdb-version-sensitive tests...
99
95
find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
100
-
rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
96
+
rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs}
101
97
102
98
# Useful debugging parameter
103
99
# export VERBOSE=1
+6
-1
pkgs/development/compilers/vala/default.nix
+6
-1
pkgs/development/compilers/vala/default.nix
···
1
1
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook
2
-
, graphviz, glib, libiconv, libintl, libtool, expat
2
+
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
3
3
}:
4
4
5
5
let
···
44
44
in stdenv.mkDerivation rec {
45
45
name = "vala-${version}";
46
46
version = "${major}.${minor}";
47
+
48
+
setupHook = substituteAll {
49
+
src = ./setup-hook.sh;
50
+
apiVersion = major;
51
+
};
47
52
48
53
src = fetchurl {
49
54
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
+15
pkgs/development/compilers/vala/setup-hook.sh
+15
pkgs/development/compilers/vala/setup-hook.sh
···
1
+
make_vala_find_vapi_files() {
2
+
# XDG_DATA_DIRS: required for finding .vapi files
3
+
if [ -d "$1/share/vala/vapi" -o -d "$1/share/vala-@apiVersion@/vapi" ]; then
4
+
addToSearchPath XDG_DATA_DIRS $1/share
5
+
fi
6
+
}
7
+
8
+
addEnvHooks "$hostOffset" make_vala_find_vapi_files
9
+
10
+
_multioutMoveVapiDirs() {
11
+
moveToOutput share/vala/vapi "${!outputDev}"
12
+
moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}"
13
+
}
14
+
15
+
preFixupHooks+=(_multioutMoveVapiDirs)
+30
pkgs/development/coq-modules/mathcomp-analysis/default.nix
+30
pkgs/development/coq-modules/mathcomp-analysis/default.nix
···
1
+
{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
version = "0.1.0";
5
+
name = "coq${coq.coq-version}-mathcomp-analysis-${version}";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "math-comp";
9
+
repo = "analysis";
10
+
rev = version;
11
+
sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
12
+
};
13
+
14
+
buildInputs = [ coq ];
15
+
propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ];
16
+
17
+
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
18
+
19
+
meta = {
20
+
description = "Analysis library compatible with Mathematical Components";
21
+
inherit (src.meta) homepage;
22
+
inherit (coq.meta) platforms;
23
+
license = stdenv.lib.licenses.cecill-c;
24
+
maintainers = [ stdenv.lib.maintainers.vbgl ];
25
+
};
26
+
27
+
passthru = {
28
+
compatibleCoqVersions = v: builtins.elem v [ "8.8" ];
29
+
};
30
+
}
+29
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
+29
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
···
1
+
{ stdenv, fetchFromGitHub, coq, mathcomp }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
version = "1.0.0";
5
+
name = "coq${coq.coq-version}-mathcomp-bigenough-${version}";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "math-comp";
9
+
repo = "bigenough";
10
+
rev = version;
11
+
sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";
12
+
};
13
+
14
+
buildInputs = [ coq ];
15
+
propagatedBuildInputs = [ mathcomp ];
16
+
17
+
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
18
+
19
+
meta = {
20
+
description = "A small library to do epsilon - N reasonning";
21
+
inherit (src.meta) homepage;
22
+
inherit (mathcomp.meta) platforms license;
23
+
maintainers = [ stdenv.lib.maintainers.vbgl ];
24
+
};
25
+
26
+
passthru = {
27
+
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
28
+
};
29
+
}
+29
pkgs/development/coq-modules/mathcomp-finmap/default.nix
+29
pkgs/development/coq-modules/mathcomp-finmap/default.nix
···
1
+
{ stdenv, fetchFromGitHub, coq, mathcomp }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
version = "1.1.0";
5
+
name = "coq${coq.coq-version}-mathcomp-finmap-${version}";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "math-comp";
9
+
repo = "finmap";
10
+
rev = version;
11
+
sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
12
+
};
13
+
14
+
buildInputs = [ coq ];
15
+
propagatedBuildInputs = [ mathcomp ];
16
+
17
+
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
18
+
19
+
meta = {
20
+
description = "A finset and finmap library";
21
+
inherit (src.meta) homepage;
22
+
inherit (mathcomp.meta) platforms license;
23
+
maintainers = [ stdenv.lib.maintainers.vbgl ];
24
+
};
25
+
26
+
passthru = {
27
+
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
28
+
};
29
+
}
+7
-4
pkgs/development/go-modules/generic/default.nix
+7
-4
pkgs/development/go-modules/generic/default.nix
···
130
130
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
131
131
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
132
132
local OUT
133
-
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
133
+
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then
134
134
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
135
135
echo "$OUT" >&2
136
136
return 1
···
163
163
else
164
164
touch $TMPDIR/buildFlagsArray
165
165
fi
166
-
export -f buildGoDir # xargs needs to see the function
167
166
if [ -z "$enableParallelBuilding" ]; then
168
167
export NIX_BUILD_CORES=1
169
168
fi
170
-
getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
169
+
for pkg in $(getGoDirs ""); do
170
+
buildGoDir install "$pkg"
171
+
done
171
172
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
172
173
# normalize cross-compiled builds w.r.t. native builds
173
174
(
···
187
188
checkPhase = args.checkPhase or ''
188
189
runHook preCheck
189
190
190
-
getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
191
+
for pkg in $(getGoDirs test); do
192
+
buildGoDir test "$pkg"
193
+
done
191
194
192
195
runHook postCheck
193
196
'';
+15
pkgs/development/haskell-modules/configuration-common.nix
+15
pkgs/development/haskell-modules/configuration-common.nix
···
1190
1190
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
1191
1191
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
1192
1192
these = doJailbreak super.these; # until these >= 0.7.6
1193
+
insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
1194
+
1195
+
uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
1196
+
url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
1197
+
sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4";
1198
+
});
1193
1199
1194
1200
# These patches contain fixes for 8.6 that should be safe for
1195
1201
# earlier versions, but we need the relaxed version bounds in GHC
···
1207
1213
sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x";
1208
1214
stripLen = 1;
1209
1215
});
1216
+
1217
+
# Fix for base >= 4.11
1218
+
scat = overrideCabal super.scat (drv: {
1219
+
patches = [(pkgs.fetchpatch {
1220
+
url = "https://github.com/redelmann/scat/pull/6.diff";
1221
+
sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl";
1222
+
})];
1223
+
});
1224
+
1210
1225
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
+25
pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
+25
pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
···
1
+
diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal
2
+
index 0e8923a..bfbbec4 100644
3
+
--- a/insert-ordered-containers.cabal
4
+
+++ b/insert-ordered-containers.cabal
5
+
@@ -21,8 +21,8 @@ tested-with:
6
+
GHC==7.10.3,
7
+
GHC==8.0.1,
8
+
GHC==8.2.2,
9
+
- GHC==8.4.3,
10
+
- GHC==8.6.1
11
+
+ GHC==8.4.4,
12
+
+ GHC==8.6.3
13
+
14
+
extra-source-files:
15
+
CHANGELOG.md
16
+
@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests
17
+
, unordered-containers
18
+
, base
19
+
, insert-ordered-containers
20
+
- , tasty >= 0.10.1.2 && <1.2
21
+
+ , tasty >= 0.10.1.2 && <1.3
22
+
, tasty-quickcheck >= 0.8.3.2 && <0.11
23
+
, QuickCheck >=2.7.6 && <2.13
24
+
default-language: Haskell2010
25
+
+2
-2
pkgs/development/interpreters/guile/2.0.nix
+2
-2
pkgs/development/interpreters/guile/2.0.nix
+4
-1
pkgs/development/interpreters/perl/default.nix
+4
-1
pkgs/development/interpreters/perl/default.nix
···
88
88
89
89
enableParallelBuilding = !crossCompiling;
90
90
91
-
preConfigure = optionalString (!crossCompiling) ''
91
+
preConfigure = ''
92
+
substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970'
93
+
substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system'
94
+
'' + optionalString (!crossCompiling) ''
92
95
configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
93
96
'' + optionalString (stdenv.isAarch32 || stdenv.isMips) ''
94
97
configureFlagsArray=(-Dldflags="-lm -lrt")
+2
-2
pkgs/development/interpreters/python/cpython/default.nix
+2
-2
pkgs/development/interpreters/python/cpython/default.nix
···
209
209
done
210
210
211
211
# Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668
212
-
find $out/lib/python*/config-* -type f -print -exec nuke-refs '{}' +
213
-
find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs '{}' +
212
+
find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' +
213
+
find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' +
214
214
215
215
# Determinism: rebuild all bytecode
216
216
# We exclude lib2to3 because that's Python 2 code which fails
+1
-1
pkgs/development/libraries/CoinMP/default.nix
+1
-1
pkgs/development/libraries/CoinMP/default.nix
+8
pkgs/development/libraries/attr/default.nix
+8
pkgs/development/libraries/attr/default.nix
···
12
12
13
13
nativeBuildInputs = [ gettext ];
14
14
15
+
patches = [
16
+
# fix fakechroot: https://github.com/dex4er/fakechroot/issues/57
17
+
(fetchurl {
18
+
url = "https://git.savannah.nongnu.org/cgit/attr.git/patch/?id=14adc898a36948267bfe5c63b399996879e94c98";
19
+
sha256 = "0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp";
20
+
})
21
+
];
22
+
15
23
postPatch = ''
16
24
for script in install-sh include/install-sh; do
17
25
patchShebangs $script
+1
-5
pkgs/development/libraries/boehm-gc/default.nix
+1
-5
pkgs/development/libraries/boehm-gc/default.nix
···
24
24
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
25
25
'';
26
26
27
-
patches = [ (fetchpatch {
28
-
name = "boehm-gc-7.6.0-sys_select.patch";
29
-
url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432";
30
-
sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
31
-
}) ] ++
27
+
patches =
32
28
# https://github.com/ivmai/bdwgc/pull/208
33
29
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
34
30
+2
-2
pkgs/development/libraries/epoxy/default.nix
+2
-2
pkgs/development/libraries/epoxy/default.nix
···
6
6
7
7
stdenv.mkDerivation rec {
8
8
name = "epoxy-${version}";
9
-
version = "1.5.2";
9
+
version = "1.5.3";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "anholt";
13
13
repo = "libepoxy";
14
14
rev = "${version}";
15
-
sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3";
15
+
sha256 = "03nrmf161xyj3q9zsigr5qj5vx5dsfxxyjva73cm1mgqqc5d60px";
16
16
};
17
17
18
18
outputs = [ "out" "dev" ];
+2
-2
pkgs/development/libraries/gcr/default.nix
+2
-2
pkgs/development/libraries/gcr/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "gcr";
8
-
version = "3.28.0";
8
+
version = "3.28.1";
9
9
10
10
src = fetchurl {
11
11
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
-
sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
12
+
sha256 = "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m";
13
13
};
14
14
15
15
passthru = {
+9
pkgs/development/libraries/glib/default.nix
+9
pkgs/development/libraries/glib/default.nix
···
77
77
url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff;
78
78
sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w";
79
79
})
80
+
# https://gitlab.gnome.org/GNOME/glib/issues/1643
81
+
(fetchpatch {
82
+
url = https://gitlab.gnome.org/GNOME/glib/commit/c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4.patch;
83
+
sha256 = "022x70qfn5wlv5gz3nlg0bwiwjxcd7l11j3qvbms2y8d1ffh5rfd";
84
+
})
85
+
(fetchpatch {
86
+
url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch;
87
+
sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3";
88
+
})
80
89
];
81
90
82
91
outputs = [ "bin" "out" "dev" "devdoc" ];
+6
-2
pkgs/development/libraries/glibc/common.nix
+6
-2
pkgs/development/libraries/glibc/common.nix
···
28
28
{ name
29
29
, withLinuxHeaders ? false
30
30
, profilingLibraries ? false
31
-
, installLocales ? false
32
31
, withGd ? false
33
32
, meta
34
33
, ...
···
44
43
assert withGd -> gd != null && libpng != null;
45
44
46
45
stdenv.mkDerivation ({
47
-
inherit version installLocales;
46
+
inherit version;
48
47
linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
49
48
50
49
inherit (stdenv) is64bit;
···
88
87
less linux-*?/arch/x86/kernel/syscall_table_32.S
89
88
*/
90
89
./allow-kernel-2.6.32.patch
90
+
/* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */
91
+
(fetchurl {
92
+
url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
93
+
sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
94
+
})
91
95
]
92
96
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
93
97
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch;
+3
-5
pkgs/development/libraries/glibc/default.nix
+3
-5
pkgs/development/libraries/glibc/default.nix
···
1
1
{ stdenv, callPackage
2
2
, withLinuxHeaders ? true
3
-
, installLocales ? true
4
3
, profilingLibraries ? false
5
4
, withGd ? false
6
5
}:
···
8
7
callPackage ./common.nix { inherit stdenv; } {
9
8
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
10
9
11
-
inherit withLinuxHeaders profilingLibraries installLocales withGd;
10
+
inherit withLinuxHeaders profilingLibraries withGd;
12
11
13
12
# Note:
14
13
# Things you write here override, and do not add to,
···
57
56
'';
58
57
59
58
postInstall = ''
60
-
if test -n "$installLocales"; then
61
-
make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
62
-
fi
59
+
echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
60
+
make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
63
61
64
62
test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
65
63
-2
pkgs/development/libraries/glibc/locales.nix
-2
pkgs/development/libraries/glibc/locales.nix
+9
-7
pkgs/development/libraries/gnutls/3.6.nix
+9
-7
pkgs/development/libraries/gnutls/3.6.nix
···
1
1
{ callPackage, fetchurl, ... } @ args:
2
2
3
3
callPackage ./generic.nix (args // rec {
4
-
version = "3.6.2";
4
+
version = "3.6.6";
5
5
6
6
src = fetchurl {
7
7
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
8
-
sha256 = "07wdffklwmxpa9i50sh5nwrc5ajb47skrldm6rzjc0jf4dxxpmdw";
8
+
sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv";
9
9
};
10
10
11
-
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
12
-
# - pkgconfig: building against the result won't work before installing
13
-
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox
11
+
# Skip some tests:
12
+
# - pkgconfig: building against the result won't work before installing (3.5.11)
13
+
# - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular)
14
+
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11)
15
+
# - psk-file: no idea; it broke between 3.6.3 and 3.6.4
14
16
# Change p11-kit test to use pkg-config to find p11-kit
15
17
postPatch = ''
16
-
sed '2iexit 77' -i tests/pkgconfig.sh
17
-
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
18
+
sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
19
+
sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
18
20
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
19
21
'';
20
22
})
+2
-2
pkgs/development/libraries/gobject-introspection/setup-hook.sh
+2
-2
pkgs/development/libraries/gobject-introspection/setup-hook.sh
···
4
4
addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0
5
5
fi
6
6
7
-
# XDG_DATA_DIRS: required for .gir files?
8
-
if [ -d "$1/share" ]; then
7
+
# XDG_DATA_DIRS: required for finding .gir files
8
+
if [ -d "$1/share/gir-1.0" ]; then
9
9
addToSearchPath XDG_DATA_DIRS $1/share
10
10
fi
11
11
}
pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch
pkgs/desktops/pantheon/granite/02-datetime-clock-format-gsettings.patch
pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch
pkgs/desktops/pantheon/granite/02-datetime-clock-format-gsettings.patch
+10
-4
pkgs/development/libraries/granite/default.nix
pkgs/desktops/pantheon/granite/default.nix
+10
-4
pkgs/development/libraries/granite/default.nix
pkgs/desktops/pantheon/granite/default.nix
···
1
-
{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
1
+
{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "granite";
···
26
26
./02-datetime-clock-format-gsettings.patch
27
27
];
28
28
29
+
passthru = {
30
+
updateScript = pantheon.updateScript {
31
+
repoName = pname;
32
+
};
33
+
};
34
+
29
35
nativeBuildInputs = [
30
36
gettext
31
37
gobject-introspection
···
33
39
ninja
34
40
pkgconfig
35
41
python3
36
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
42
+
vala
37
43
wrapGAppsHook
38
44
];
39
45
···
41
47
glib
42
48
gtk3
43
49
hicolor-icon-theme
44
-
gnome3.libgee
50
+
libgee
45
51
];
46
52
47
53
postPatch = ''
···
58
64
homepage = https://github.com/elementary/granite;
59
65
license = licenses.lgpl3Plus;
60
66
platforms = platforms.linux;
61
-
maintainers = with maintainers; [ vozz worldofpeace ];
67
+
maintainers = pantheon.maintainers;
62
68
};
63
69
}
+2
-2
pkgs/development/libraries/gtk+/3.x.nix
+2
-2
pkgs/development/libraries/gtk+/3.x.nix
···
13
13
with stdenv.lib;
14
14
15
15
let
16
-
version = "3.24.3";
16
+
version = "3.24.4";
17
17
in
18
18
stdenv.mkDerivation rec {
19
19
name = "gtk+3-${version}";
20
20
21
21
src = fetchurl {
22
22
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
23
-
sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p";
23
+
sha256 = "176bl1pm5d5xkhmiwldzw833akna7shp59glkl6cjz580bzmjkyq";
24
24
};
25
25
26
26
outputs = [ "out" "dev" ];
+6
-6
pkgs/development/libraries/gtksourceview/3.x.nix
+6
-6
pkgs/development/libraries/gtksourceview/3.x.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
2
2
, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
3
3
4
-
let
5
-
checkInputs = [ xvfb_run dbus ];
6
-
in stdenv.mkDerivation rec {
4
+
stdenv.mkDerivation rec {
7
5
name = "gtksourceview-${version}";
8
6
version = "3.24.9";
9
7
···
21
19
22
20
outputs = [ "out" "dev" ];
23
21
24
-
nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]
25
-
++ stdenv.lib.optionals doCheck checkInputs;
22
+
nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ];
23
+
24
+
checkInputs = [ xvfb_run dbus ];
26
25
27
26
buildInputs = [ atk cairo glib pango libxml2 gettext ];
28
27
···
36
35
37
36
doCheck = stdenv.isLinux;
38
37
checkPhase = ''
39
-
export NO_AT_BRIDGE=1
38
+
NO_AT_BRIDGE=1 \
39
+
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
40
40
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
41
41
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
42
42
make check
+6
-6
pkgs/development/libraries/gtksourceview/4.x.nix
+6
-6
pkgs/development/libraries/gtksourceview/4.x.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
2
2
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
3
3
4
-
let
5
-
checkInputs = [ xvfb_run dbus ];
6
-
in stdenv.mkDerivation rec {
4
+
stdenv.mkDerivation rec {
7
5
name = "gtksourceview-${version}";
8
6
version = "4.0.3";
9
7
···
21
19
22
20
outputs = [ "out" "dev" ];
23
21
24
-
nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]
25
-
++ stdenv.lib.optionals doCheck checkInputs;
22
+
nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ];
23
+
24
+
checkInputs = [ xvfb_run dbus ];
26
25
27
26
buildInputs = [ atk cairo glib pango libxml2 ];
28
27
···
32
31
33
32
doCheck = stdenv.isLinux;
34
33
checkPhase = ''
35
-
export NO_AT_BRIDGE=1
34
+
NO_AT_BRIDGE=1 \
35
+
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
36
36
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
37
37
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
38
38
make check
+2
-2
pkgs/development/libraries/harfbuzz/default.nix
+2
-2
pkgs/development/libraries/harfbuzz/default.nix
···
8
8
}:
9
9
10
10
let
11
-
version = "2.3.0";
11
+
version = "2.3.1";
12
12
inherit (stdenv.lib) optional optionals optionalString;
13
13
in
14
14
···
17
17
18
18
src = fetchurl {
19
19
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
20
-
sha256 = "0r37z5cn04ig0q47y8c26gvadz15z9jj8c8q3r41j7d4anv4sc9v";
20
+
sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj";
21
21
};
22
22
23
23
postPatch = ''
+1
-1
pkgs/development/libraries/kde-frameworks/fetch.sh
+1
-1
pkgs/development/libraries/kde-frameworks/fetch.sh
+316
-316
pkgs/development/libraries/kde-frameworks/srcs.nix
+316
-316
pkgs/development/libraries/kde-frameworks/srcs.nix
···
3
3
4
4
{
5
5
attica = {
6
-
version = "5.53.0";
6
+
version = "5.54.0";
7
7
src = fetchurl {
8
-
url = "${mirror}/stable/frameworks/5.53/attica-5.53.0.tar.xz";
9
-
sha256 = "0qn2x5551zv8547v20wcjhf123c4432651rdxz25p398wsm9ixlg";
10
-
name = "attica-5.53.0.tar.xz";
8
+
url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz";
9
+
sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln";
10
+
name = "attica-5.54.0.tar.xz";
11
11
};
12
12
};
13
13
baloo = {
14
-
version = "5.53.0";
14
+
version = "5.54.0";
15
15
src = fetchurl {
16
-
url = "${mirror}/stable/frameworks/5.53/baloo-5.53.0.tar.xz";
17
-
sha256 = "1jvxx7ggraaciw5i6vwda2jh41gqvjy19bjkcqwrmg59ggwzc1g8";
18
-
name = "baloo-5.53.0.tar.xz";
16
+
url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz";
17
+
sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c";
18
+
name = "baloo-5.54.0.tar.xz";
19
19
};
20
20
};
21
21
bluez-qt = {
22
-
version = "5.53.0";
22
+
version = "5.54.0";
23
23
src = fetchurl {
24
-
url = "${mirror}/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz";
25
-
sha256 = "11i3xjaxqvczh8hky71jq20g2k4ipl0sxnaw8f1xix6h0v79m810";
26
-
name = "bluez-qt-5.53.0.tar.xz";
24
+
url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz";
25
+
sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v";
26
+
name = "bluez-qt-5.54.0.tar.xz";
27
27
};
28
28
};
29
29
breeze-icons = {
30
-
version = "5.53.0";
30
+
version = "5.54.0";
31
31
src = fetchurl {
32
-
url = "${mirror}/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz";
33
-
sha256 = "1612kr0mrns3w5pydvfvcjdpfcvyw35bnzm44y286n99213w3cdf";
34
-
name = "breeze-icons-5.53.0.tar.xz";
32
+
url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz";
33
+
sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy";
34
+
name = "breeze-icons-5.54.0.tar.xz";
35
35
};
36
36
};
37
37
extra-cmake-modules = {
38
-
version = "5.53.0";
38
+
version = "5.54.0";
39
39
src = fetchurl {
40
-
url = "${mirror}/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz";
41
-
sha256 = "07dllz7r00jm7n37wnz6zvjin304affaj69d8ji4v2wxhkxpg89d";
42
-
name = "extra-cmake-modules-5.53.0.tar.xz";
40
+
url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz";
41
+
sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi";
42
+
name = "extra-cmake-modules-5.54.0.tar.xz";
43
43
};
44
44
};
45
45
frameworkintegration = {
46
-
version = "5.53.0";
46
+
version = "5.54.0";
47
47
src = fetchurl {
48
-
url = "${mirror}/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz";
49
-
sha256 = "0a5szgknj96mphiczddl0l4c79ajszhyy3f19rqacj1z1kwrx9pj";
50
-
name = "frameworkintegration-5.53.0.tar.xz";
48
+
url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz";
49
+
sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d";
50
+
name = "frameworkintegration-5.54.0.tar.xz";
51
51
};
52
52
};
53
53
kactivities = {
54
-
version = "5.53.0";
54
+
version = "5.54.0";
55
55
src = fetchurl {
56
-
url = "${mirror}/stable/frameworks/5.53/kactivities-5.53.0.tar.xz";
57
-
sha256 = "1pjfh8ii4y9kpjr12z3zs9hmc8n5r0phkp40dclsrjsdpm9n8bf6";
58
-
name = "kactivities-5.53.0.tar.xz";
56
+
url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz";
57
+
sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil";
58
+
name = "kactivities-5.54.0.tar.xz";
59
59
};
60
60
};
61
61
kactivities-stats = {
62
-
version = "5.53.0";
62
+
version = "5.54.0";
63
63
src = fetchurl {
64
-
url = "${mirror}/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz";
65
-
sha256 = "0bd6km50h0jlpi8z1dhh9jvx2wqgh3sa473n7bsyd2dgzyibs52n";
66
-
name = "kactivities-stats-5.53.0.tar.xz";
64
+
url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz";
65
+
sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d";
66
+
name = "kactivities-stats-5.54.0.tar.xz";
67
67
};
68
68
};
69
69
kapidox = {
70
-
version = "5.53.0";
70
+
version = "5.54.0";
71
71
src = fetchurl {
72
-
url = "${mirror}/stable/frameworks/5.53/kapidox-5.53.0.tar.xz";
73
-
sha256 = "1snsql5scq6licrlqf9w77085s4992f1ij6w7rwj8d5x4cyxc9ca";
74
-
name = "kapidox-5.53.0.tar.xz";
72
+
url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz";
73
+
sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c";
74
+
name = "kapidox-5.54.0.tar.xz";
75
75
};
76
76
};
77
77
karchive = {
78
-
version = "5.53.0";
78
+
version = "5.54.0";
79
79
src = fetchurl {
80
-
url = "${mirror}/stable/frameworks/5.53/karchive-5.53.0.tar.xz";
81
-
sha256 = "0jbr19azrkxywf9dwrfdw5qi47g7h5m92m4f93skccr11a1m0hvr";
82
-
name = "karchive-5.53.0.tar.xz";
80
+
url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz";
81
+
sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g";
82
+
name = "karchive-5.54.0.tar.xz";
83
83
};
84
84
};
85
85
kauth = {
86
-
version = "5.53.0";
86
+
version = "5.54.0";
87
87
src = fetchurl {
88
-
url = "${mirror}/stable/frameworks/5.53/kauth-5.53.0.tar.xz";
89
-
sha256 = "0c41azn8c6wr5rc7f0v1bxvka9i4z3c346814mlim3i62842fz3b";
90
-
name = "kauth-5.53.0.tar.xz";
88
+
url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz";
89
+
sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h";
90
+
name = "kauth-5.54.0.tar.xz";
91
91
};
92
92
};
93
93
kbookmarks = {
94
-
version = "5.53.0";
94
+
version = "5.54.0";
95
95
src = fetchurl {
96
-
url = "${mirror}/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz";
97
-
sha256 = "1mrzbwsirma1bzazamilh3r5a04m6x5902gjs1sd7bc0ijs85dr9";
98
-
name = "kbookmarks-5.53.0.tar.xz";
96
+
url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz";
97
+
sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw";
98
+
name = "kbookmarks-5.54.0.tar.xz";
99
99
};
100
100
};
101
101
kcmutils = {
102
-
version = "5.53.0";
102
+
version = "5.54.0";
103
103
src = fetchurl {
104
-
url = "${mirror}/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz";
105
-
sha256 = "0xsg50pywawzzw2fb0bhhmjp2z3w4572knfq8s4jki3iidixp3kv";
106
-
name = "kcmutils-5.53.0.tar.xz";
104
+
url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz";
105
+
sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh";
106
+
name = "kcmutils-5.54.0.tar.xz";
107
107
};
108
108
};
109
109
kcodecs = {
110
-
version = "5.53.0";
110
+
version = "5.54.0";
111
111
src = fetchurl {
112
-
url = "${mirror}/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz";
113
-
sha256 = "0wmilqkcw1dvvrw56r8virp7zscy0g04ry8j7h812nfzhfz9z4vs";
114
-
name = "kcodecs-5.53.0.tar.xz";
112
+
url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz";
113
+
sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc";
114
+
name = "kcodecs-5.54.0.tar.xz";
115
115
};
116
116
};
117
117
kcompletion = {
118
-
version = "5.53.0";
118
+
version = "5.54.0";
119
119
src = fetchurl {
120
-
url = "${mirror}/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz";
121
-
sha256 = "00df0pa28glf4w5zyjmnzasbip1q2cyyyply1f6k0xpfg0qwgxf9";
122
-
name = "kcompletion-5.53.0.tar.xz";
120
+
url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz";
121
+
sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460";
122
+
name = "kcompletion-5.54.0.tar.xz";
123
123
};
124
124
};
125
125
kconfig = {
126
-
version = "5.53.0";
126
+
version = "5.54.0";
127
127
src = fetchurl {
128
-
url = "${mirror}/stable/frameworks/5.53/kconfig-5.53.0.tar.xz";
129
-
sha256 = "0xyxycpbi680sfrfzdzhwi95dqd4xsc42zxn5clzvfbgapbw2db7";
130
-
name = "kconfig-5.53.0.tar.xz";
128
+
url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz";
129
+
sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7";
130
+
name = "kconfig-5.54.0.tar.xz";
131
131
};
132
132
};
133
133
kconfigwidgets = {
134
-
version = "5.53.0";
134
+
version = "5.54.0";
135
135
src = fetchurl {
136
-
url = "${mirror}/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz";
137
-
sha256 = "0bpylj1faki7f55cf82ljmgll17vz1irqna1i9rzkbb28kvqf2kv";
138
-
name = "kconfigwidgets-5.53.0.tar.xz";
136
+
url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz";
137
+
sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31";
138
+
name = "kconfigwidgets-5.54.0.tar.xz";
139
139
};
140
140
};
141
141
kcoreaddons = {
142
-
version = "5.53.1";
142
+
version = "5.54.0";
143
143
src = fetchurl {
144
-
url = "${mirror}/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz";
145
-
sha256 = "18rhih779sxrlvg8sxyw31v3h58arvk2vsmvr0bmpnrnnfwv3vak";
146
-
name = "kcoreaddons-5.53.1.tar.xz";
144
+
url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz";
145
+
sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79";
146
+
name = "kcoreaddons-5.54.0.tar.xz";
147
147
};
148
148
};
149
149
kcrash = {
150
-
version = "5.53.0";
150
+
version = "5.54.0";
151
151
src = fetchurl {
152
-
url = "${mirror}/stable/frameworks/5.53/kcrash-5.53.0.tar.xz";
153
-
sha256 = "1nnfn71kl97d5ywg2xjacr48mh9khrgszm9cifdn2jdk6vxssmlb";
154
-
name = "kcrash-5.53.0.tar.xz";
152
+
url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz";
153
+
sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7";
154
+
name = "kcrash-5.54.0.tar.xz";
155
155
};
156
156
};
157
157
kdbusaddons = {
158
-
version = "5.53.0";
158
+
version = "5.54.0";
159
159
src = fetchurl {
160
-
url = "${mirror}/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz";
161
-
sha256 = "05zf41m3j4ckjk68dqv2rw8abg22x6m6bwiwp8rm6ac1p33hqayh";
162
-
name = "kdbusaddons-5.53.0.tar.xz";
160
+
url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz";
161
+
sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf";
162
+
name = "kdbusaddons-5.54.0.tar.xz";
163
163
};
164
164
};
165
165
kdeclarative = {
166
-
version = "5.53.0";
166
+
version = "5.54.0";
167
167
src = fetchurl {
168
-
url = "${mirror}/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz";
169
-
sha256 = "0c7sxz733c9gfarjbrphrvn5v9bkx1i7vhn97xp7b3w22892ab7w";
170
-
name = "kdeclarative-5.53.0.tar.xz";
168
+
url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz";
169
+
sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0";
170
+
name = "kdeclarative-5.54.0.tar.xz";
171
171
};
172
172
};
173
173
kded = {
174
-
version = "5.53.0";
174
+
version = "5.54.0";
175
175
src = fetchurl {
176
-
url = "${mirror}/stable/frameworks/5.53/kded-5.53.0.tar.xz";
177
-
sha256 = "18yh27ddp4aldpmkflj9q6anrpnzawhn7nrykvayxxbgmdg4gn48";
178
-
name = "kded-5.53.0.tar.xz";
176
+
url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz";
177
+
sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn";
178
+
name = "kded-5.54.0.tar.xz";
179
179
};
180
180
};
181
181
kdelibs4support = {
182
-
version = "5.53.0";
182
+
version = "5.54.0";
183
183
src = fetchurl {
184
-
url = "${mirror}/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz";
185
-
sha256 = "1ai1k1m08zq04rxi5px1agmqzmv59lic7qqiqg4iwnm5i8q2z2i0";
186
-
name = "kdelibs4support-5.53.0.tar.xz";
184
+
url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz";
185
+
sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm";
186
+
name = "kdelibs4support-5.54.0.tar.xz";
187
187
};
188
188
};
189
189
kdesignerplugin = {
190
-
version = "5.53.0";
190
+
version = "5.54.0";
191
191
src = fetchurl {
192
-
url = "${mirror}/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz";
193
-
sha256 = "1m0ysmpysjpmnmmmyp5xkfzygi1w0dnn7j707c6nj31y2s7078q6";
194
-
name = "kdesignerplugin-5.53.0.tar.xz";
192
+
url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz";
193
+
sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga";
194
+
name = "kdesignerplugin-5.54.0.tar.xz";
195
195
};
196
196
};
197
197
kdesu = {
198
-
version = "5.53.0";
198
+
version = "5.54.0";
199
199
src = fetchurl {
200
-
url = "${mirror}/stable/frameworks/5.53/kdesu-5.53.0.tar.xz";
201
-
sha256 = "18kd19y95gllyarjlm0768s3b9q67ia6dajdw89rrk1qgvbw42xy";
202
-
name = "kdesu-5.53.0.tar.xz";
200
+
url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz";
201
+
sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar";
202
+
name = "kdesu-5.54.0.tar.xz";
203
203
};
204
204
};
205
205
kdewebkit = {
206
-
version = "5.53.0";
206
+
version = "5.54.0";
207
207
src = fetchurl {
208
-
url = "${mirror}/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz";
209
-
sha256 = "1x5b85lr6ck2vklj641ra6sx1fvz2daiy8vsgpziii0752a0ayf2";
210
-
name = "kdewebkit-5.53.0.tar.xz";
208
+
url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz";
209
+
sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf";
210
+
name = "kdewebkit-5.54.0.tar.xz";
211
211
};
212
212
};
213
213
kdnssd = {
214
-
version = "5.53.0";
214
+
version = "5.54.0";
215
215
src = fetchurl {
216
-
url = "${mirror}/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz";
217
-
sha256 = "0hghpamkxwjvfh87y2qcy20bmxvglzwrzmfg26hycmxgj0l3frhb";
218
-
name = "kdnssd-5.53.0.tar.xz";
216
+
url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz";
217
+
sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7";
218
+
name = "kdnssd-5.54.0.tar.xz";
219
219
};
220
220
};
221
221
kdoctools = {
222
-
version = "5.53.0";
222
+
version = "5.54.0";
223
223
src = fetchurl {
224
-
url = "${mirror}/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz";
225
-
sha256 = "0kjijwc66rg737z6z8c275wfb2gn7xgslgmrys5dxaqqzrinbn1j";
226
-
name = "kdoctools-5.53.0.tar.xz";
224
+
url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz";
225
+
sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6";
226
+
name = "kdoctools-5.54.0.tar.xz";
227
227
};
228
228
};
229
229
kemoticons = {
230
-
version = "5.53.0";
230
+
version = "5.54.0";
231
231
src = fetchurl {
232
-
url = "${mirror}/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz";
233
-
sha256 = "0x9jrc5pswmcj36qs3283c5bz63sbgr87m7dn9ykas7a50xgyv0w";
234
-
name = "kemoticons-5.53.0.tar.xz";
232
+
url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz";
233
+
sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v";
234
+
name = "kemoticons-5.54.0.tar.xz";
235
235
};
236
236
};
237
237
kfilemetadata = {
238
-
version = "5.53.0";
238
+
version = "5.54.0";
239
239
src = fetchurl {
240
-
url = "${mirror}/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz";
241
-
sha256 = "18wgzhg146iscg7nm7xabmzsw73x0by2imkh6wgky87nwry7020s";
242
-
name = "kfilemetadata-5.53.0.tar.xz";
240
+
url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz";
241
+
sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab";
242
+
name = "kfilemetadata-5.54.0.tar.xz";
243
243
};
244
244
};
245
245
kglobalaccel = {
246
-
version = "5.53.0";
246
+
version = "5.54.0";
247
247
src = fetchurl {
248
-
url = "${mirror}/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz";
249
-
sha256 = "1h60kl309pz4i6jr6a444d14i2dzqhjapga837my2mylsdjj3wqi";
250
-
name = "kglobalaccel-5.53.0.tar.xz";
248
+
url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz";
249
+
sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1";
250
+
name = "kglobalaccel-5.54.0.tar.xz";
251
251
};
252
252
};
253
253
kguiaddons = {
254
-
version = "5.53.0";
254
+
version = "5.54.0";
255
255
src = fetchurl {
256
-
url = "${mirror}/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz";
257
-
sha256 = "1kj1jvq7lqlnr00fmlfrj7vkvlwav7b5r4bpifysx1l4285y5y76";
258
-
name = "kguiaddons-5.53.0.tar.xz";
256
+
url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz";
257
+
sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935";
258
+
name = "kguiaddons-5.54.0.tar.xz";
259
259
};
260
260
};
261
261
kholidays = {
262
-
version = "5.53.0";
262
+
version = "5.54.0";
263
263
src = fetchurl {
264
-
url = "${mirror}/stable/frameworks/5.53/kholidays-5.53.0.tar.xz";
265
-
sha256 = "1zn581ibv4wg5c4q97l40wdpj18p5kwxk4zxl3cl4l445ivv04p5";
266
-
name = "kholidays-5.53.0.tar.xz";
264
+
url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz";
265
+
sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y";
266
+
name = "kholidays-5.54.0.tar.xz";
267
267
};
268
268
};
269
269
khtml = {
270
-
version = "5.53.0";
270
+
version = "5.54.0";
271
271
src = fetchurl {
272
-
url = "${mirror}/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz";
273
-
sha256 = "07cmpqk92z4b631q6ngg7sdw4p56r11mdqf2fvbcwmqksx6b11fy";
274
-
name = "khtml-5.53.0.tar.xz";
272
+
url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz";
273
+
sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da";
274
+
name = "khtml-5.54.0.tar.xz";
275
275
};
276
276
};
277
277
ki18n = {
278
-
version = "5.53.0";
278
+
version = "5.54.0";
279
279
src = fetchurl {
280
-
url = "${mirror}/stable/frameworks/5.53/ki18n-5.53.0.tar.xz";
281
-
sha256 = "052c7rvqqb2hx9wn91sdp4wcz5vdym5iszb1vnpr9wdc3psqq41x";
282
-
name = "ki18n-5.53.0.tar.xz";
280
+
url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz";
281
+
sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3";
282
+
name = "ki18n-5.54.0.tar.xz";
283
283
};
284
284
};
285
285
kiconthemes = {
286
-
version = "5.53.0";
286
+
version = "5.54.0";
287
287
src = fetchurl {
288
-
url = "${mirror}/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz";
289
-
sha256 = "1h54mqda05x4p1kplhxnqa488pvqn354qnk1qg2l851lh69ail9q";
290
-
name = "kiconthemes-5.53.0.tar.xz";
288
+
url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz";
289
+
sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g";
290
+
name = "kiconthemes-5.54.0.tar.xz";
291
291
};
292
292
};
293
293
kidletime = {
294
-
version = "5.53.0";
294
+
version = "5.54.0";
295
295
src = fetchurl {
296
-
url = "${mirror}/stable/frameworks/5.53/kidletime-5.53.0.tar.xz";
297
-
sha256 = "04jbig9mf45mzajwgi66vz3b2zqg4p1gca1jkcl4yk6a4csg43ri";
298
-
name = "kidletime-5.53.0.tar.xz";
296
+
url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz";
297
+
sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm";
298
+
name = "kidletime-5.54.0.tar.xz";
299
299
};
300
300
};
301
301
kimageformats = {
302
-
version = "5.53.0";
302
+
version = "5.54.0";
303
303
src = fetchurl {
304
-
url = "${mirror}/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz";
305
-
sha256 = "0b59sa5x58mxzkv9h9xxfzb89k27cpyqzfgf4kl7zbxklxxszafj";
306
-
name = "kimageformats-5.53.0.tar.xz";
304
+
url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz";
305
+
sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15";
306
+
name = "kimageformats-5.54.0.tar.xz";
307
307
};
308
308
};
309
309
kinit = {
310
-
version = "5.53.0";
310
+
version = "5.54.0";
311
311
src = fetchurl {
312
-
url = "${mirror}/stable/frameworks/5.53/kinit-5.53.0.tar.xz";
313
-
sha256 = "14dd165al0gn1y3jhlk3jgz3px8rcccn3hp5isywa2xxzl7v5raw";
314
-
name = "kinit-5.53.0.tar.xz";
312
+
url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz";
313
+
sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9";
314
+
name = "kinit-5.54.0.tar.xz";
315
315
};
316
316
};
317
317
kio = {
318
-
version = "5.53.0";
318
+
version = "5.54.1";
319
319
src = fetchurl {
320
-
url = "${mirror}/stable/frameworks/5.53/kio-5.53.0.tar.xz";
321
-
sha256 = "1hr4875v1ph8jbsqbyrhk5vxa908kv7xic7ymk9rmaqrkc0dy83k";
322
-
name = "kio-5.53.0.tar.xz";
320
+
url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz";
321
+
sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp";
322
+
name = "kio-5.54.1.tar.xz";
323
323
};
324
324
};
325
325
kirigami2 = {
326
-
version = "5.53.0";
326
+
version = "5.54.0";
327
327
src = fetchurl {
328
-
url = "${mirror}/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz";
329
-
sha256 = "0avr7slzww3fpdyczi0y3djvrccs3jq2jyq82r02xfw8mwb93zii";
330
-
name = "kirigami2-5.53.0.tar.xz";
328
+
url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz";
329
+
sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2";
330
+
name = "kirigami2-5.54.0.tar.xz";
331
331
};
332
332
};
333
333
kitemmodels = {
334
-
version = "5.53.0";
334
+
version = "5.54.0";
335
335
src = fetchurl {
336
-
url = "${mirror}/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz";
337
-
sha256 = "1gkw57fgm6dcy9jssaq9d1mkgd1g6jxk2aqpf4lq1nvqkr7jqzbl";
338
-
name = "kitemmodels-5.53.0.tar.xz";
336
+
url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz";
337
+
sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760";
338
+
name = "kitemmodels-5.54.0.tar.xz";
339
339
};
340
340
};
341
341
kitemviews = {
342
-
version = "5.53.0";
342
+
version = "5.54.0";
343
343
src = fetchurl {
344
-
url = "${mirror}/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz";
345
-
sha256 = "0r60mp90k7psa9maz3dhhq3npbl95cckvmk51fpljcb8c3rpjymq";
346
-
name = "kitemviews-5.53.0.tar.xz";
344
+
url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz";
345
+
sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk";
346
+
name = "kitemviews-5.54.0.tar.xz";
347
347
};
348
348
};
349
349
kjobwidgets = {
350
-
version = "5.53.0";
350
+
version = "5.54.0";
351
351
src = fetchurl {
352
-
url = "${mirror}/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz";
353
-
sha256 = "161wq1s1a1cb5a47wswg6g6qrmczgzwikp1cjsgxfykpgrxkp620";
354
-
name = "kjobwidgets-5.53.0.tar.xz";
352
+
url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz";
353
+
sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq";
354
+
name = "kjobwidgets-5.54.0.tar.xz";
355
355
};
356
356
};
357
357
kjs = {
358
-
version = "5.53.0";
358
+
version = "5.54.0";
359
359
src = fetchurl {
360
-
url = "${mirror}/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz";
361
-
sha256 = "1jic7xyfmd829i82kbjin2xf9f3cir2s9v04r7ri7bq6gi2iw4c9";
362
-
name = "kjs-5.53.0.tar.xz";
360
+
url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz";
361
+
sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy";
362
+
name = "kjs-5.54.0.tar.xz";
363
363
};
364
364
};
365
365
kjsembed = {
366
-
version = "5.53.0";
366
+
version = "5.54.0";
367
367
src = fetchurl {
368
-
url = "${mirror}/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz";
369
-
sha256 = "0j3jzn7qwh9sw9gxk1f435vijkrgnzpsqx3a4yx7w3n93h96h36r";
370
-
name = "kjsembed-5.53.0.tar.xz";
368
+
url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz";
369
+
sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8";
370
+
name = "kjsembed-5.54.0.tar.xz";
371
371
};
372
372
};
373
373
kmediaplayer = {
374
-
version = "5.53.0";
374
+
version = "5.54.0";
375
375
src = fetchurl {
376
-
url = "${mirror}/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz";
377
-
sha256 = "1r6cl6paap7hmpqr05mj8qxcb2sa16kdc0zqj8g6gqb32xj6wk0k";
378
-
name = "kmediaplayer-5.53.0.tar.xz";
376
+
url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz";
377
+
sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf";
378
+
name = "kmediaplayer-5.54.0.tar.xz";
379
379
};
380
380
};
381
381
knewstuff = {
382
-
version = "5.53.0";
382
+
version = "5.54.0";
383
383
src = fetchurl {
384
-
url = "${mirror}/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz";
385
-
sha256 = "0d5yszf6fj8qjmr50jfa9f34xcn9k8n4bj4c3h635ccwb7l3i6q3";
386
-
name = "knewstuff-5.53.0.tar.xz";
384
+
url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz";
385
+
sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3";
386
+
name = "knewstuff-5.54.0.tar.xz";
387
387
};
388
388
};
389
389
knotifications = {
390
-
version = "5.53.0";
390
+
version = "5.54.0";
391
391
src = fetchurl {
392
-
url = "${mirror}/stable/frameworks/5.53/knotifications-5.53.0.tar.xz";
393
-
sha256 = "0fbjg48ck6mr98gl3075vf9mn8fwdrsz0jm9hbnzr2vn9yrg57nz";
394
-
name = "knotifications-5.53.0.tar.xz";
392
+
url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz";
393
+
sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn";
394
+
name = "knotifications-5.54.0.tar.xz";
395
395
};
396
396
};
397
397
knotifyconfig = {
398
-
version = "5.53.0";
398
+
version = "5.54.0";
399
399
src = fetchurl {
400
-
url = "${mirror}/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz";
401
-
sha256 = "1f3hq2l8fkff4dnkf6klj60jv946yfaw84i50q192blwqfkij896";
402
-
name = "knotifyconfig-5.53.0.tar.xz";
400
+
url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz";
401
+
sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if";
402
+
name = "knotifyconfig-5.54.0.tar.xz";
403
403
};
404
404
};
405
405
kpackage = {
406
-
version = "5.53.0";
406
+
version = "5.54.0";
407
407
src = fetchurl {
408
-
url = "${mirror}/stable/frameworks/5.53/kpackage-5.53.0.tar.xz";
409
-
sha256 = "1gllbi7y4svlkwhvp0sh3bdhiah2f55spg7wh149sqwmnmvj09ra";
410
-
name = "kpackage-5.53.0.tar.xz";
408
+
url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz";
409
+
sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb";
410
+
name = "kpackage-5.54.0.tar.xz";
411
411
};
412
412
};
413
413
kparts = {
414
-
version = "5.53.0";
414
+
version = "5.54.0";
415
415
src = fetchurl {
416
-
url = "${mirror}/stable/frameworks/5.53/kparts-5.53.0.tar.xz";
417
-
sha256 = "0cfzbf706dn4kjz8mz53b1a0dzk0f540n0j144x4701c4gfajnim";
418
-
name = "kparts-5.53.0.tar.xz";
416
+
url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz";
417
+
sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6";
418
+
name = "kparts-5.54.0.tar.xz";
419
419
};
420
420
};
421
421
kpeople = {
422
-
version = "5.53.0";
422
+
version = "5.54.0";
423
423
src = fetchurl {
424
-
url = "${mirror}/stable/frameworks/5.53/kpeople-5.53.0.tar.xz";
425
-
sha256 = "1bsnj5r47azl889izxdlwcbfrfmg921cpapicn7klynmsw58lpdg";
426
-
name = "kpeople-5.53.0.tar.xz";
424
+
url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz";
425
+
sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx";
426
+
name = "kpeople-5.54.0.tar.xz";
427
427
};
428
428
};
429
429
kplotting = {
430
-
version = "5.53.0";
430
+
version = "5.54.0";
431
431
src = fetchurl {
432
-
url = "${mirror}/stable/frameworks/5.53/kplotting-5.53.0.tar.xz";
433
-
sha256 = "0cnnzyybzsrdrnhhcc47i6jakhrixdxakfv2ib0fpsiif3fn3jpx";
434
-
name = "kplotting-5.53.0.tar.xz";
432
+
url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz";
433
+
sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9";
434
+
name = "kplotting-5.54.0.tar.xz";
435
435
};
436
436
};
437
437
kpty = {
438
-
version = "5.53.0";
438
+
version = "5.54.0";
439
439
src = fetchurl {
440
-
url = "${mirror}/stable/frameworks/5.53/kpty-5.53.0.tar.xz";
441
-
sha256 = "01qy5pvd5j014zh455sh0qb8x0g1yc60bbdqh34nk84s8mx3mz9z";
442
-
name = "kpty-5.53.0.tar.xz";
440
+
url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz";
441
+
sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3";
442
+
name = "kpty-5.54.0.tar.xz";
443
443
};
444
444
};
445
445
kross = {
446
-
version = "5.53.0";
446
+
version = "5.54.0";
447
447
src = fetchurl {
448
-
url = "${mirror}/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz";
449
-
sha256 = "1q69pppmnxmjfmi73ks6mrkib76nhhffn0c3j93qq7cq3ingjzjy";
450
-
name = "kross-5.53.0.tar.xz";
448
+
url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz";
449
+
sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd";
450
+
name = "kross-5.54.0.tar.xz";
451
451
};
452
452
};
453
453
krunner = {
454
-
version = "5.53.0";
454
+
version = "5.54.0";
455
455
src = fetchurl {
456
-
url = "${mirror}/stable/frameworks/5.53/krunner-5.53.0.tar.xz";
457
-
sha256 = "09n824q8k1ihfgz6yzb5xv99p241733574yhhv1y47cyrp7d904l";
458
-
name = "krunner-5.53.0.tar.xz";
456
+
url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz";
457
+
sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v";
458
+
name = "krunner-5.54.0.tar.xz";
459
459
};
460
460
};
461
461
kservice = {
462
-
version = "5.53.0";
462
+
version = "5.54.0";
463
463
src = fetchurl {
464
-
url = "${mirror}/stable/frameworks/5.53/kservice-5.53.0.tar.xz";
465
-
sha256 = "06b35zynmlhidgzxp7mqv20fcw6wvdsszfam1phv7wji1xhhpnk2";
466
-
name = "kservice-5.53.0.tar.xz";
464
+
url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz";
465
+
sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx";
466
+
name = "kservice-5.54.0.tar.xz";
467
467
};
468
468
};
469
469
ktexteditor = {
470
-
version = "5.53.0";
470
+
version = "5.54.0";
471
471
src = fetchurl {
472
-
url = "${mirror}/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz";
473
-
sha256 = "1hcn4dk6gw96aknh6dn9yi1fwq7s90kjmcvn3wgf4ig1408q6b7g";
474
-
name = "ktexteditor-5.53.0.tar.xz";
472
+
url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz";
473
+
sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy";
474
+
name = "ktexteditor-5.54.0.tar.xz";
475
475
};
476
476
};
477
477
ktextwidgets = {
478
-
version = "5.53.0";
478
+
version = "5.54.0";
479
479
src = fetchurl {
480
-
url = "${mirror}/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz";
481
-
sha256 = "025z1x7mp7wdm62h6igbsvb99l09jsdzna4m30h586h7rhn8kvdc";
482
-
name = "ktextwidgets-5.53.0.tar.xz";
480
+
url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz";
481
+
sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5";
482
+
name = "ktextwidgets-5.54.0.tar.xz";
483
483
};
484
484
};
485
485
kunitconversion = {
486
-
version = "5.53.0";
486
+
version = "5.54.0";
487
487
src = fetchurl {
488
-
url = "${mirror}/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz";
489
-
sha256 = "1yr6dfcqabkv2r7p9f814hd1x8c1bfy2k2f83zj4qlahzb91mw6v";
490
-
name = "kunitconversion-5.53.0.tar.xz";
488
+
url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz";
489
+
sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h";
490
+
name = "kunitconversion-5.54.0.tar.xz";
491
491
};
492
492
};
493
493
kwallet = {
494
-
version = "5.53.0";
494
+
version = "5.54.0";
495
495
src = fetchurl {
496
-
url = "${mirror}/stable/frameworks/5.53/kwallet-5.53.0.tar.xz";
497
-
sha256 = "135vc52zx0ikb684z6ds2hlr39vj2z8g2rp9f51py52pf7fxkwc0";
498
-
name = "kwallet-5.53.0.tar.xz";
496
+
url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz";
497
+
sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2";
498
+
name = "kwallet-5.54.0.tar.xz";
499
499
};
500
500
};
501
501
kwayland = {
502
-
version = "5.53.0";
502
+
version = "5.54.0";
503
503
src = fetchurl {
504
-
url = "${mirror}/stable/frameworks/5.53/kwayland-5.53.0.tar.xz";
505
-
sha256 = "0k6j8w3ccx9kkqnp757z2g5y4jcl2y2ppvx8vvl7z97jjn66563h";
506
-
name = "kwayland-5.53.0.tar.xz";
504
+
url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz";
505
+
sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf";
506
+
name = "kwayland-5.54.0.tar.xz";
507
507
};
508
508
};
509
509
kwidgetsaddons = {
510
-
version = "5.53.0";
510
+
version = "5.54.0";
511
511
src = fetchurl {
512
-
url = "${mirror}/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz";
513
-
sha256 = "1k9y3gcpzgdzd4ps8m4gx3wz166k0jqzccn8z8p2jr2nfjdwp4mc";
514
-
name = "kwidgetsaddons-5.53.0.tar.xz";
512
+
url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz";
513
+
sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh";
514
+
name = "kwidgetsaddons-5.54.0.tar.xz";
515
515
};
516
516
};
517
517
kwindowsystem = {
518
-
version = "5.53.0";
518
+
version = "5.54.0";
519
519
src = fetchurl {
520
-
url = "${mirror}/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz";
521
-
sha256 = "1z89b3my3wsncbq16bqsncbf9grji77sb0j17lj7w5hm36d01clz";
522
-
name = "kwindowsystem-5.53.0.tar.xz";
520
+
url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz";
521
+
sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb";
522
+
name = "kwindowsystem-5.54.0.tar.xz";
523
523
};
524
524
};
525
525
kxmlgui = {
526
-
version = "5.53.0";
526
+
version = "5.54.0";
527
527
src = fetchurl {
528
-
url = "${mirror}/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz";
529
-
sha256 = "1acppl4wzqrpa8iys8z2qqxrw4xy61q02vybn0ysspa0yrdxga9f";
530
-
name = "kxmlgui-5.53.0.tar.xz";
528
+
url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz";
529
+
sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7";
530
+
name = "kxmlgui-5.54.0.tar.xz";
531
531
};
532
532
};
533
533
kxmlrpcclient = {
534
-
version = "5.53.0";
534
+
version = "5.54.0";
535
535
src = fetchurl {
536
-
url = "${mirror}/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz";
537
-
sha256 = "07ns1fj5vq0fzqhrrmbm7cjnnzkl1jlgcf1lv3kfik1y13fd9zkd";
538
-
name = "kxmlrpcclient-5.53.0.tar.xz";
536
+
url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz";
537
+
sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6";
538
+
name = "kxmlrpcclient-5.54.0.tar.xz";
539
539
};
540
540
};
541
541
modemmanager-qt = {
542
-
version = "5.53.0";
542
+
version = "5.54.0";
543
543
src = fetchurl {
544
-
url = "${mirror}/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz";
545
-
sha256 = "1lgvj086k21sm6b0pf9k51zv4fy5i4wlnsjwv2zfvapdrndl8kdp";
546
-
name = "modemmanager-qt-5.53.0.tar.xz";
544
+
url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz";
545
+
sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350";
546
+
name = "modemmanager-qt-5.54.0.tar.xz";
547
547
};
548
548
};
549
549
networkmanager-qt = {
550
-
version = "5.53.0";
550
+
version = "5.54.0";
551
551
src = fetchurl {
552
-
url = "${mirror}/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz";
553
-
sha256 = "11vqmx11lgyagbq9zvaw4s9k7wyyyigpd8d0i3w49h34nyv0p5yi";
554
-
name = "networkmanager-qt-5.53.0.tar.xz";
552
+
url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz";
553
+
sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y";
554
+
name = "networkmanager-qt-5.54.0.tar.xz";
555
555
};
556
556
};
557
557
oxygen-icons5 = {
558
-
version = "5.53.0";
558
+
version = "5.54.0";
559
559
src = fetchurl {
560
-
url = "${mirror}/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz";
561
-
sha256 = "13pcvzskng2mc8cwwhmq6p428nc9qzllxykx95z2s2k3b8nh726m";
562
-
name = "oxygen-icons5-5.53.0.tar.xz";
560
+
url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz";
561
+
sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46";
562
+
name = "oxygen-icons5-5.54.0.tar.xz";
563
563
};
564
564
};
565
565
plasma-framework = {
566
-
version = "5.53.0";
566
+
version = "5.54.0";
567
567
src = fetchurl {
568
-
url = "${mirror}/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz";
569
-
sha256 = "0swyn04w61dvdkmb2fahb6k93vlggh7xv4k2yygshqrkmwk6ilym";
570
-
name = "plasma-framework-5.53.0.tar.xz";
568
+
url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz";
569
+
sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj";
570
+
name = "plasma-framework-5.54.0.tar.xz";
571
571
};
572
572
};
573
573
prison = {
574
-
version = "5.53.0";
574
+
version = "5.54.0";
575
575
src = fetchurl {
576
-
url = "${mirror}/stable/frameworks/5.53/prison-5.53.0.tar.xz";
577
-
sha256 = "0ydm36jkwc2x53kf5n0xswh72g2cixd5444xfrhcwiyq905z3db1";
578
-
name = "prison-5.53.0.tar.xz";
576
+
url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz";
577
+
sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb";
578
+
name = "prison-5.54.0.tar.xz";
579
579
};
580
580
};
581
581
purpose = {
582
-
version = "5.53.0";
582
+
version = "5.54.0";
583
583
src = fetchurl {
584
-
url = "${mirror}/stable/frameworks/5.53/purpose-5.53.0.tar.xz";
585
-
sha256 = "1y6v51p9j9gm9pad38h6dqxav4m7ryxp4h35qjz46wisacgvpfkf";
586
-
name = "purpose-5.53.0.tar.xz";
584
+
url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz";
585
+
sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w";
586
+
name = "purpose-5.54.0.tar.xz";
587
587
};
588
588
};
589
589
qqc2-desktop-style = {
590
-
version = "5.53.0";
590
+
version = "5.54.0";
591
591
src = fetchurl {
592
-
url = "${mirror}/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz";
593
-
sha256 = "1f17f3mqwzn5s0a08xh68dmvzkvn2g8ah7810hd25l2hvmkfvm04";
594
-
name = "qqc2-desktop-style-5.53.0.tar.xz";
592
+
url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz";
593
+
sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8";
594
+
name = "qqc2-desktop-style-5.54.0.tar.xz";
595
595
};
596
596
};
597
597
solid = {
598
-
version = "5.53.0";
598
+
version = "5.54.0";
599
599
src = fetchurl {
600
-
url = "${mirror}/stable/frameworks/5.53/solid-5.53.0.tar.xz";
601
-
sha256 = "1x9qc8vm16vlqws9jb2pynw705mx6xvbb617lkdwdb60fzlrjkln";
602
-
name = "solid-5.53.0.tar.xz";
600
+
url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz";
601
+
sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9";
602
+
name = "solid-5.54.0.tar.xz";
603
603
};
604
604
};
605
605
sonnet = {
606
-
version = "5.53.0";
606
+
version = "5.54.0";
607
607
src = fetchurl {
608
-
url = "${mirror}/stable/frameworks/5.53/sonnet-5.53.0.tar.xz";
609
-
sha256 = "0jk8kcsdzjg7x37cw95n3wdnjg403x3plzw0zwa3r3xkg8vlqv18";
610
-
name = "sonnet-5.53.0.tar.xz";
608
+
url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz";
609
+
sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz";
610
+
name = "sonnet-5.54.0.tar.xz";
611
611
};
612
612
};
613
613
syndication = {
614
-
version = "5.53.0";
614
+
version = "5.54.0";
615
615
src = fetchurl {
616
-
url = "${mirror}/stable/frameworks/5.53/syndication-5.53.0.tar.xz";
617
-
sha256 = "0znj8rgdh14ci3nx1h7s9v8kl208z8zlcq3c99bh216rznxvzr6b";
618
-
name = "syndication-5.53.0.tar.xz";
616
+
url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz";
617
+
sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8";
618
+
name = "syndication-5.54.0.tar.xz";
619
619
};
620
620
};
621
621
syntax-highlighting = {
622
-
version = "5.53.0";
622
+
version = "5.54.0";
623
623
src = fetchurl {
624
-
url = "${mirror}/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz";
625
-
sha256 = "1ar50an84pcb090zh50ni2d3ck6dxvbij9d6qa091hd66rwm2cda";
626
-
name = "syntax-highlighting-5.53.0.tar.xz";
624
+
url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz";
625
+
sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl";
626
+
name = "syntax-highlighting-5.54.0.tar.xz";
627
627
};
628
628
};
629
629
threadweaver = {
630
-
version = "5.53.0";
630
+
version = "5.54.0";
631
631
src = fetchurl {
632
-
url = "${mirror}/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz";
633
-
sha256 = "0wlpbnan5g2nhs0fc9l3p0c1gcs9ak7m83hfcibg7vsq9kqvcs6p";
634
-
name = "threadweaver-5.53.0.tar.xz";
632
+
url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz";
633
+
sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp";
634
+
name = "threadweaver-5.54.0.tar.xz";
635
635
};
636
636
};
637
637
}
+1
-1
pkgs/development/libraries/libabw/default.nix
+1
-1
pkgs/development/libraries/libabw/default.nix
+2
-2
pkgs/development/libraries/libbfd/default.nix
+2
-2
pkgs/development/libraries/libbfd/default.nix
···
1
1
{ stdenv
2
-
, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped
2
+
, fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped
3
3
, libiberty, zlib
4
4
}:
5
5
···
30
30
# We update these ourselves
31
31
dontUpdateAutotoolsGnuConfigScripts = true;
32
32
33
-
nativeBuildInputs = [ autoreconfHook264 bison ];
33
+
nativeBuildInputs = [ autoreconfHook bison ];
34
34
buildInputs = [ libiberty zlib ];
35
35
36
36
configurePlatforms = [ "build" "host" ];
+1
-1
pkgs/development/libraries/libcmis/default.nix
+1
-1
pkgs/development/libraries/libcmis/default.nix
+1
-1
pkgs/development/libraries/libe-book/default.nix
+1
-1
pkgs/development/libraries/libe-book/default.nix
+2
-2
pkgs/development/libraries/libgpg-error/default.nix
+2
-2
pkgs/development/libraries/libgpg-error/default.nix
···
17
17
};
18
18
in stdenv.mkDerivation (rec {
19
19
name = "libgpg-error-${version}";
20
-
version = "1.33";
20
+
version = "1.34";
21
21
22
22
src = fetchurl {
23
23
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
24
-
sha256 = "1zq3pw93d0ani8bam7f4qjivll1b0zg9qbblwwvcjip7ark84f2x";
24
+
sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006";
25
25
};
26
26
27
27
postPatch = ''
+2
-2
pkgs/development/libraries/libguestfs/default.nix
+2
-2
pkgs/development/libraries/libguestfs/default.nix
···
30
30
31
31
prePatch = ''
32
32
# build-time scripts
33
-
substituteInPlace run.in --replace '#!/bin/bash' '#!/bin/sh'
34
-
substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh'
33
+
substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}'
34
+
substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!${stdenv.shell}'
35
35
36
36
# $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
37
37
substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+2
-2
pkgs/development/libraries/libidn2/default.nix
+2
-2
pkgs/development/libraries/libidn2/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
name = "libidn2-${version}";
7
-
version = "2.0.5";
7
+
version = "2.1.0";
8
8
9
9
src = fetchurl {
10
10
url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
11
-
sha256 = "1f529jxmhj12q7i1gvw2d9i24zbslz3kj91kbgxac7vgi1q93xjk";
11
+
sha256 = "0chxs75212qknd72l6vvai48hwg3czlr938sym1sydwmmbdrh8q3";
12
12
};
13
13
14
14
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
+2
-2
pkgs/development/libraries/libinput/default.nix
+2
-2
pkgs/development/libraries/libinput/default.nix
···
27
27
with stdenv.lib;
28
28
stdenv.mkDerivation rec {
29
29
name = "libinput-${version}";
30
-
version = "1.12.5";
30
+
version = "1.12.6";
31
31
32
32
src = fetchurl {
33
33
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
34
-
sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx";
34
+
sha256 = "0pgla0mc6mvyr1ljy10mcqvfz8i5z6yp7dbx2bcd70y67wx05d0j";
35
35
};
36
36
37
37
outputs = [ "bin" "out" "dev" ];
+1
-1
pkgs/development/libraries/libmwaw/default.nix
+1
-1
pkgs/development/libraries/libmwaw/default.nix
+1
-1
pkgs/development/libraries/libodfgen/default.nix
+1
-1
pkgs/development/libraries/libodfgen/default.nix
+2
-2
pkgs/development/libraries/libopcodes/default.nix
+2
-2
pkgs/development/libraries/libopcodes/default.nix
···
1
1
{ stdenv, buildPackages
2
-
, autoreconfHook264, bison, binutils-unwrapped
2
+
, autoreconfHook, bison, binutils-unwrapped
3
3
, libiberty, libbfd
4
4
}:
5
5
···
20
20
'';
21
21
22
22
depsBuildBuild = [ buildPackages.stdenv.cc ];
23
-
nativeBuildInputs = [ autoreconfHook264 bison ];
23
+
nativeBuildInputs = [ autoreconfHook bison ];
24
24
buildInputs = [ libiberty ];
25
25
# dis-asm.h includes bfd.h
26
26
propagatedBuildInputs = [ libbfd ];
+6
-6
pkgs/development/libraries/libpng/default.nix
+6
-6
pkgs/development/libraries/libpng/default.nix
···
3
3
assert zlib != null;
4
4
5
5
let
6
-
patchVersion = "1.6.35";
6
+
patchVersion = "1.6.36";
7
7
patch_src = fetchurl {
8
8
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
9
-
sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
9
+
sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc";
10
10
};
11
11
whenPatched = stdenv.lib.optionalString apngSupport;
12
12
13
13
in stdenv.mkDerivation rec {
14
14
name = "libpng" + whenPatched "-apng" + "-${version}";
15
-
version = "1.6.35";
15
+
version = "1.6.36";
16
16
17
17
src = fetchurl {
18
18
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
19
-
sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
19
+
sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
20
20
};
21
21
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
22
22
···
25
25
26
26
propagatedBuildInputs = [ zlib ];
27
27
28
-
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
28
+
doCheck = true;
29
29
30
30
passthru = { inherit zlib; };
31
31
32
32
meta = with stdenv.lib; {
33
33
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
34
34
homepage = http://www.libpng.org/pub/png/libpng.html;
35
-
license = licenses.libpng;
35
+
license = licenses.libpng2;
36
36
platforms = platforms.all;
37
37
maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
38
38
};
+2
-2
pkgs/development/libraries/libwebp/default.nix
+2
-2
pkgs/development/libraries/libwebp/default.nix
···
27
27
with stdenv.lib;
28
28
stdenv.mkDerivation rec {
29
29
name = "libwebp-${version}";
30
-
version = "1.0.1";
30
+
version = "1.0.2";
31
31
32
32
src = fetchurl {
33
33
url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
34
-
sha256 = "08nr124aqlfpmdawpfizp56x93pvhr0v741fz78s1zyv49a4lx4c";
34
+
sha256 = "1cb4sm6h1czvk9kqqgld3g5f0d9qv60xnbbv0kl7cr7d826b8irx";
35
35
};
36
36
37
37
configureFlags = [
+1
-1
pkgs/development/libraries/libwps/default.nix
+1
-1
pkgs/development/libraries/libwps/default.nix
+2
-2
pkgs/development/libraries/libzmf/default.nix
+2
-2
pkgs/development/libraries/libzmf/default.nix
···
4
4
name = "${pname}-${version}";
5
5
pname = "libzmf";
6
6
version = "0.0.2";
7
-
7
+
8
8
src = fetchurl {
9
9
url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
10
10
sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
···
19
19
description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
20
20
license = stdenv.lib.licenses.mpl20;
21
21
maintainers = [stdenv.lib.maintainers.raskin];
22
-
platforms = stdenv.lib.platforms.linux;
22
+
platforms = stdenv.lib.platforms.unix;
23
23
homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf;
24
24
downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
25
25
updateWalker = true;
+2
-2
pkgs/development/libraries/mesa/default.nix
+2
-2
pkgs/development/libraries/mesa/default.nix
···
67
67
in
68
68
69
69
let
70
-
version = "18.3.1";
70
+
version = "18.3.3";
71
71
branch = head (splitString "." version);
72
72
in
73
73
···
81
81
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
82
82
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
83
83
];
84
-
sha256 = "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv";
84
+
sha256 = "16b2jgrmlqajsyz0qkr4b2v68538bs941cn3pk635ib6d5m8idia";
85
85
};
86
86
87
87
prePatch = "patchShebangs .";
+10
-7
pkgs/development/libraries/ncurses/default.nix
+10
-7
pkgs/development/libraries/ncurses/default.nix
···
13
13
}:
14
14
15
15
stdenv.mkDerivation rec {
16
-
version = "6.1-20181027";
16
+
# Note the revision needs to be adjusted.
17
+
version = "6.1-20190112";
17
18
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
18
19
19
-
src = fetchurl {
20
-
urls = [
21
-
"https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
22
-
"ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
23
-
];
24
-
sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902";
20
+
# We cannot use fetchFromGitHub (which calls fetchzip)
21
+
# because we need to be able to use fetchurlBoot.
22
+
src = let
23
+
# Note the version needs to be adjusted.
24
+
rev = "acb4184f8f69fddd052a3daa8c8675f4bf8ce369";
25
+
in fetchurl {
26
+
url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz";
27
+
sha256 = "1z8v63cj2y7dxf4m1api8cvk0ns9frif9c60m2sxhibs06pjy4q0";
25
28
};
26
29
27
30
patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
+6
pkgs/development/libraries/polkit/default.nix
+6
pkgs/development/libraries/polkit/default.nix
···
21
21
};
22
22
23
23
patches = [
24
+
# CVE-2019-6133 - See: https://bugs.chromium.org/p/project-zero/issues/detail?id=1692
25
+
(fetchpatch {
26
+
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/6cc6aafee135ba44ea748250d7d29b562ca190e3.patch";
27
+
name = "CVE-2019-6133.patch";
28
+
sha256 = "0jjlbjzqcz96xh6w3nv3ss9jl0hhrcd7jg4aa5advf08ibaj29r1";
29
+
})
24
30
# CVE-2018-19788 - high UID fixup
25
31
(fetchpatch {
26
32
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch";
+2
-2
pkgs/development/libraries/zeromq/4.x.nix
+2
-2
pkgs/development/libraries/zeromq/4.x.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "zeromq-${version}";
5
-
version = "4.3.0";
5
+
version = "4.3.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "zeromq";
9
9
repo = "libzmq";
10
10
rev = "v${version}";
11
-
sha256 = "12a2l6dzxkk1x8yl8bihnfs6gi2vgyi4jm9q8acj46f6niryhsmr";
11
+
sha256 = "0z7ka82ihlsncqmf8jj4lnjyr418dzxfs0psx5mccqb09yx9shgm";
12
12
};
13
13
14
14
nativeBuildInputs = [ cmake asciidoc ];
+1
-1
pkgs/development/lisp-modules/define-package.nix
+1
-1
pkgs/development/lisp-modules/define-package.nix
···
41
41
mkdir -p "$(dirname "$launch_script")"
42
42
touch "$launch_script"
43
43
chmod a+x "$launch_script"
44
-
echo "#! /bin/sh" >> "$launch_script"
44
+
echo "#! ${stdenv.shell}" >> "$launch_script"
45
45
echo "source '$config_script'" >> "$launch_script"
46
46
echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
47
47
echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
+1
-1
pkgs/development/misc/avr8-burn-omat/default.nix
+1
-1
pkgs/development/misc/avr8-burn-omat/default.nix
···
18
18
mkdir -p $out/{nix-support,bin}
19
19
mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support
20
20
cat >> $out/bin/avr8-burn-omat << EOF
21
-
#!/bin/sh
21
+
#!${stdenv.shell}
22
22
cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar
23
23
EOF
24
24
chmod +x $out/bin/avr8-burn-omat
+7
-11
pkgs/development/ocaml-modules/eliom/default.nix
+7
-11
pkgs/development/ocaml-modules/eliom/default.nix
···
1
-
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
1
+
{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
2
2
lwt_react, cryptokit,
3
-
ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
3
+
ipaddr, ocamlnet, ocaml_pcre,
4
4
opaline, ppx_tools, ppx_deriving, findlib
5
5
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
6
6
, js_of_ocaml-lwt
7
7
, js_of_ocaml-tyxml
8
+
, lwt_ppx
8
9
}:
9
10
10
-
assert stdenv.lib.versionAtLeast ocaml.version "4.03";
11
-
12
11
stdenv.mkDerivation rec
13
12
{
14
13
pname = "eliom";
15
-
version = "6.3.0";
14
+
version = "6.4.0";
16
15
name = "${pname}-${version}";
17
16
18
17
src = fetchurl {
19
18
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
20
-
sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v";
19
+
sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh";
21
20
};
22
21
23
22
patches = [ ./camlp4.patch ];
···
27
26
];
28
27
29
28
propagatedBuildInputs = [
30
-
camlp4
31
-
cryptokit
32
-
ipaddr
33
29
js_of_ocaml-lwt
34
30
js_of_ocaml-ppx
35
31
js_of_ocaml-tyxml
32
+
lwt_camlp4
33
+
lwt_ppx
36
34
lwt_react
37
-
lwt_ssl
38
-
ocamlnet ocaml_pcre
39
35
ocsigen_server
40
36
ppx_deriving
41
37
];
+25
pkgs/development/ocaml-modules/lwt/camlp4.nix
+25
pkgs/development/ocaml-modules/lwt/camlp4.nix
···
1
+
{ lib, fetchFromGitHub, buildDunePackage, camlp4 }:
2
+
3
+
buildDunePackage rec {
4
+
pname = "lwt_camlp4";
5
+
version = "git-20180325";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "ocsigen";
9
+
repo = pname;
10
+
rev = "45f25a081e01071ab566924b48ba5f7553bb33ac";
11
+
sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9";
12
+
};
13
+
14
+
minimumOCamlVersion = "4.02";
15
+
16
+
propagatedBuildInputs = [ camlp4 ];
17
+
18
+
meta = {
19
+
description = "Camlp4 syntax extension for Lwt (deprecated)";
20
+
license = lib.licenses.lgpl21;
21
+
inherit (src.meta) homepage;
22
+
maintainers = [ lib.maintainers.vbgl ];
23
+
};
24
+
}
25
+
+26
-31
pkgs/development/ocaml-modules/ocsigen-server/default.nix
+26
-31
pkgs/development/ocaml-modules/ocsigen-server/default.nix
···
1
-
{ stdenv, fetchurl, ocaml, findlib, which, react, ssl
2
-
, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
3
-
libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
4
-
, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl
1
+
{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl
2
+
, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr
3
+
, pgocaml, camlzip, ocaml_sqlite3
4
+
, makeWrapper
5
5
}:
6
6
7
+
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
8
+
then throw "ocsigenserver is not available for OCaml ${ocaml.version}"
9
+
else
10
+
7
11
let mkpath = p: n:
8
-
let v = stdenv.lib.getVersion ocaml; in
9
-
"${p}/lib/ocaml/${v}/site-lib/${n}";
12
+
"${p}/lib/ocaml/${ocaml.version}/site-lib/${n}";
10
13
in
11
14
12
-
let param =
13
-
if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
14
-
version = "2.9";
15
-
sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd";
16
-
buildInputs = [ lwt_react lwt_ssl ];
17
-
ldpath = "";
18
-
} else {
19
-
version = "2.8";
20
-
sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
21
-
buildInputs = [ lwt2 ];
22
-
ldpath = "${mkpath lwt2 "lwt"}";
23
-
}
24
-
; in
15
+
stdenv.mkDerivation rec {
16
+
version = "2.11.0";
17
+
name = "ocsigenserver-${version}";
25
18
26
-
stdenv.mkDerivation {
27
-
name = "ocsigenserver-${param.version}";
28
-
29
-
src = fetchurl {
30
-
url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz";
31
-
inherit (param) sha256;
19
+
src = fetchFromGitHub {
20
+
owner = "ocsigen";
21
+
repo = "ocsigenserver";
22
+
rev = version;
23
+
sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2";
32
24
};
33
25
34
-
buildInputs = [ocaml which findlib react ssl
35
-
ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
36
-
ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]
37
-
++ (param.buildInputs or []);
26
+
buildInputs = [ which makeWrapper ocaml findlib
27
+
lwt_react pgocaml camlzip ocaml_sqlite3
28
+
];
38
29
39
-
configureFlags = [ "--root $(out) --prefix /" ];
30
+
propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet
31
+
ocaml_pcre tyxml xml-light
32
+
];
33
+
34
+
configureFlags = [ "--root $(out)" "--prefix /" ];
40
35
41
36
dontAddPrefix = true;
42
37
···
46
41
''
47
42
rm -rf $out/var/run
48
43
wrapProgram $out/bin/ocsigenserver \
49
-
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
44
+
--prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
50
45
'';
51
46
52
47
dontPatchShebangs = true;
+9
-8
pkgs/development/ocaml-modules/ocsigen-start/default.nix
+9
-8
pkgs/development/ocaml-modules/ocsigen-start/default.nix
···
1
-
{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
1
+
{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
2
2
, js_of_ocaml-camlp4
3
+
, resource-pooling
3
4
}:
4
5
5
6
buildOcaml rec
6
7
{
7
8
name = "ocsigen-start";
8
-
version = "1.1.0";
9
+
version = "1.5.0";
9
10
10
11
buildInputs = [ eliom js_of_ocaml-camlp4 ];
11
-
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ];
12
+
propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
12
13
13
14
patches = [ ./templates-dir.patch ];
14
15
···
16
17
substituteInPlace "src/os_db.ml" --replace "citext" "text"
17
18
'';
18
19
19
-
src = fetchurl {
20
-
url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
21
-
sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq";
20
+
src = fetchFromGitHub {
21
+
owner = "ocsigen";
22
+
repo = name;
23
+
rev = version;
24
+
sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha";
22
25
};
23
-
24
-
createFindlibDestdir = true;
25
26
26
27
meta = {
27
28
homepage = http://ocsigen.org/ocsigen-start;
+14
-9
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+14
-9
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
···
1
-
{ stdenv, fetchurl, buildOcaml, ocaml, opaline
1
+
{ stdenv, fetchFromGitHub, ocaml, findlib, opaline
2
2
, calendar, eliom, js_of_ocaml-ppx_deriving_json
3
3
}:
4
4
5
-
buildOcaml rec
6
-
{
7
-
name = "ocsigen-toolkit";
8
-
version = "1.1.0";
5
+
stdenv.mkDerivation rec {
6
+
pname = "ocsigen-toolkit";
7
+
name = "ocaml${ocaml.version}-${pname}-${version}";
8
+
version = "2.0.0";
9
9
10
10
propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
11
-
buildInputs = [ opaline ];
11
+
buildInputs = [ ocaml findlib opaline ];
12
12
13
13
installPhase =
14
14
''
···
17
17
opaline -prefix $out
18
18
'';
19
19
20
-
src = fetchurl {
21
-
sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a";
22
-
url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
20
+
src = fetchFromGitHub {
21
+
owner = "ocsigen";
22
+
repo = pname;
23
+
rev = version;
24
+
sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw";
23
25
};
26
+
27
+
createFindlibDestdir = true;
24
28
25
29
meta = {
26
30
homepage = http://ocsigen.org/ocsigen-toolkit/;
27
31
description = " User interface widgets for Ocsigen applications";
28
32
license = stdenv.lib.licenses.lgpl21;
29
33
maintainers = [ stdenv.lib.maintainers.gal_bolle ];
34
+
inherit (ocaml.meta) platforms;
30
35
};
31
36
32
37
+1
-1
pkgs/development/pharo/vm/build-vm.nix
+1
-1
pkgs/development/pharo/vm/build-vm.nix
+2
-2
pkgs/development/python-modules/cmd2/default.nix
+2
-2
pkgs/development/python-modules/cmd2/default.nix
···
18
18
postPatch = stdenv.lib.optional stdenv.isDarwin ''
19
19
# Fake the impure dependencies pbpaste and pbcopy
20
20
mkdir bin
21
-
echo '#/bin/sh' > bin/pbpaste
22
-
echo '#/bin/sh' > bin/pbcopy
21
+
echo '#${stdenv.shell}' > bin/pbpaste
22
+
echo '#${stdenv.shell}' > bin/pbcopy
23
23
chmod +x bin/{pbcopy,pbpaste}
24
24
export PATH=$(realpath bin):$PATH
25
25
'';
+2
-2
pkgs/development/python-modules/cmd2/old.nix
+2
-2
pkgs/development/python-modules/cmd2/old.nix
···
19
19
postPatch = stdenv.lib.optional stdenv.isDarwin ''
20
20
# Fake the impure dependencies pbpaste and pbcopy
21
21
mkdir bin
22
-
echo '#/bin/sh' > bin/pbpaste
23
-
echo '#/bin/sh' > bin/pbcopy
22
+
echo '#${stdenv.shell}' > bin/pbpaste
23
+
echo '#${stdenv.shell}' > bin/pbcopy
24
24
chmod +x bin/{pbcopy,pbpaste}
25
25
export PATH=$(realpath bin):$PATH
26
26
'';
+2
-2
pkgs/development/python-modules/httmock/default.nix
+2
-2
pkgs/development/python-modules/httmock/default.nix
···
2
2
3
3
buildPythonPackage rec {
4
4
pname = "httmock";
5
-
version = "1.2.6";
5
+
version = "1.3.0";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "patrys";
9
9
repo = "httmock";
10
10
rev = version;
11
-
sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab";
11
+
sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q";
12
12
};
13
13
14
14
checkInputs = [ requests ];
+2
-2
pkgs/development/python-modules/libcloud/default.nix
+2
-2
pkgs/development/python-modules/libcloud/default.nix
···
11
11
12
12
buildPythonPackage rec {
13
13
pname = "apache-libcloud";
14
-
version = "2.3.0";
14
+
version = "2.4.0";
15
15
16
16
src = fetchPypi {
17
17
inherit pname version;
18
-
sha256 = "0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97";
18
+
sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j";
19
19
};
20
20
21
21
checkInputs = [ mock pytest pytestrunner requests-mock ];
+2
-2
pkgs/development/python-modules/libusb1/default.nix
+2
-2
pkgs/development/python-modules/libusb1/default.nix
···
2
2
3
3
buildPythonPackage rec {
4
4
pname = "libusb1";
5
-
version = "1.6.6";
5
+
version = "1.7";
6
6
7
7
src = fetchPypi {
8
8
inherit pname version;
9
-
sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271";
9
+
sha256 = "03vylg5mdsxp2nyk8sm7yxmb470hcb92q263dfq8d6b9xp96ckwx";
10
10
};
11
11
12
12
postPatch = ''
+2
-2
pkgs/development/python-modules/pandas/default.nix
+2
-2
pkgs/development/python-modules/pandas/default.nix
···
96
96
# Until then we disable the tests.
97
97
+ optionalString isDarwin ''
98
98
# Fake the impure dependencies pbpaste and pbcopy
99
-
echo "#!/bin/sh" > pbcopy
100
-
echo "#!/bin/sh" > pbpaste
99
+
echo "#!${stdenv.shell}" > pbcopy
100
+
echo "#!${stdenv.shell}" > pbpaste
101
101
chmod a+x pbcopy pbpaste
102
102
export PATH=$(pwd):$PATH
103
103
'' + ''
+1
-1
pkgs/development/python-modules/plotly/default.nix
+1
-1
pkgs/development/python-modules/plotly/default.nix
+5
-11
pkgs/development/python-modules/prawcore/default.nix
+5
-11
pkgs/development/python-modules/prawcore/default.nix
···
1
-
{ stdenv, buildPythonPackage, fetchFromGitHub
1
+
{ stdenv, buildPythonPackage, fetchPypi
2
2
, requests
3
3
, testfixtures, mock, requests_toolbelt
4
4
, betamax, betamax-serializers, betamax-matchers
···
6
6
7
7
buildPythonPackage rec {
8
8
pname = "prawcore";
9
-
version = "1.0.0";
9
+
version = "1.0.1";
10
10
11
-
src = fetchFromGitHub {
12
-
owner = "praw-dev";
13
-
repo = "prawcore";
14
-
rev = "v${version}";
15
-
sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f";
11
+
src = fetchPypi {
12
+
inherit pname version;
13
+
sha256 = "ab5558efb438aa73fc66c4178bfc809194dea3ce2addf4dec873de7e2fd2824e";
16
14
};
17
-
18
-
postPatch = ''
19
-
sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py
20
-
'';
21
15
22
16
propagatedBuildInputs = [
23
17
requests
+2
-2
pkgs/development/python-modules/pyfakefs/default.nix
+2
-2
pkgs/development/python-modules/pyfakefs/default.nix
···
1
1
{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }:
2
2
3
3
buildPythonPackage rec {
4
-
version = "3.5.6";
4
+
version = "3.5.7";
5
5
pname = "pyfakefs";
6
6
7
7
src = fetchPypi {
8
8
inherit pname version;
9
-
sha256 = "efe9c318b2a37ae498a555889684c30ccb6a1b06bd391cb3baf0eb5ba68e9062";
9
+
sha256 = "8969435f8e7ca10f60c22096b02b15ad3af143de7d3bb4d73507b812bcdd8e37";
10
10
};
11
11
12
12
postPatch = ''
+2
-2
pkgs/development/python-modules/pywal/default.nix
+2
-2
pkgs/development/python-modules/pywal/default.nix
···
2
2
3
3
buildPythonPackage rec {
4
4
pname = "pywal";
5
-
version = "3.2.1";
5
+
version = "3.3.0";
6
6
7
7
src = fetchPypi {
8
8
inherit pname version;
9
-
sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic";
9
+
sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg";
10
10
};
11
11
12
12
preCheck = ''
+1
-1
pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+1
-1
pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+2
-2
pkgs/development/python-modules/tenacity/default.nix
+2
-2
pkgs/development/python-modules/tenacity/default.nix
···
5
5
6
6
buildPythonPackage rec {
7
7
pname = "tenacity";
8
-
version = "5.0.2";
8
+
version = "5.0.3";
9
9
10
10
src = fetchPypi {
11
11
inherit pname version;
12
-
sha256 = "1rjbj9wks7b7n75mbm01y0g2ngyai8yi05ck9gicmcdyix7vw42c";
12
+
sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4";
13
13
};
14
14
15
15
nativeBuildInputs = [ pbr ];
+1
-1
pkgs/development/python-modules/tlsh/default.nix
+1
-1
pkgs/development/python-modules/tlsh/default.nix
+7
pkgs/development/tools/build-managers/cmake/setup-hook.sh
+7
pkgs/development/tools/build-managers/cmake/setup-hook.sh
···
75
75
# And build always Release, to ensure optimisation flags
76
76
cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
77
77
78
+
# Disable user package registry to avoid potential side effects
79
+
# and unecessary attempts to access non-existent home folder
80
+
# https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry
81
+
cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
82
+
cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
83
+
cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags"
84
+
78
85
if [ "$buildPhase" = ninjaBuildPhase ]; then
79
86
cmakeFlags="-GNinja $cmakeFlags"
80
87
fi
+2
-2
pkgs/development/tools/build-managers/meson/default.nix
+2
-2
pkgs/development/tools/build-managers/meson/default.nix
···
1
1
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
2
2
3
3
python3Packages.buildPythonApplication rec {
4
-
version = "0.49.0";
4
+
version = "0.49.1";
5
5
pname = "meson";
6
6
7
7
src = python3Packages.fetchPypi {
8
8
inherit pname version;
9
-
sha256 = "0895igla1qav8k250z2qv03a0fg491wzzkfpbk50wwq848vmbkd0";
9
+
sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s";
10
10
};
11
11
12
12
postFixup = ''
+12
-3
pkgs/development/tools/build-managers/ninja/default.nix
+12
-3
pkgs/development/tools/build-managers/ninja/default.nix
···
1
-
{ stdenv, fetchFromGitHub, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
1
+
{ stdenv, fetchFromGitHub, fetchpatch, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
2
2
3
3
with stdenv.lib;
4
4
5
5
stdenv.mkDerivation rec {
6
6
name = "ninja-${version}";
7
-
version = "1.8.2";
7
+
version = "1.9.0";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "ninja-build";
11
11
repo = "ninja";
12
12
rev = "v${version}";
13
-
sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
13
+
sha256 = "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610";
14
14
};
15
+
16
+
patches = [
17
+
# Make builds reproducible by generating the same IDs from the same inputs.
18
+
(fetchpatch {
19
+
name = "consistent-doc-ids";
20
+
url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
21
+
sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9";
22
+
})
23
+
];
15
24
16
25
nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
17
26
+50
-38
pkgs/development/tools/build-managers/rebar3/default.nix
+50
-38
pkgs/development/tools/build-managers/rebar3/default.nix
···
1
1
{ stdenv, fetchurl,
2
-
fetchHex, erlang, hermeticRebar3 ? true,
2
+
fetchHex, erlang,
3
3
tree, hexRegistrySnapshot }:
4
4
5
5
let
6
-
version = "3.6.1";
6
+
version = "3.9.0";
7
7
8
8
bootstrapper = ./rebar3-nix-bootstrap;
9
9
10
10
erlware_commons = fetchHex {
11
11
pkg = "erlware_commons";
12
-
version = "1.2.0";
13
-
sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7";
12
+
version = "1.3.1";
13
+
sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166";
14
14
};
15
15
ssl_verify_fun = fetchHex {
16
16
pkg = "ssl_verify_fun";
17
17
version = "1.1.3";
18
-
sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if";
18
+
sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe";
19
19
};
20
20
certifi = fetchHex {
21
21
pkg = "certifi";
22
-
version = "2.0.0";
23
-
sha256 = "075v7cvny52jbhnskchd3fp68fxgp7qfvdls0haamcycxrn0dipx";
22
+
version = "2.3.1";
23
+
sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68";
24
24
};
25
25
providers = fetchHex {
26
26
pkg = "providers";
27
27
version = "1.7.0";
28
-
sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb";
28
+
sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6";
29
29
};
30
30
getopt = fetchHex {
31
31
pkg = "getopt";
32
32
version = "1.0.1";
33
-
sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak";
33
+
sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c";
34
34
};
35
35
bbmustache = fetchHex {
36
36
pkg = "bbmustache";
37
-
version = "1.5.0";
38
-
sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd";
37
+
version = "1.6.0";
38
+
sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df";
39
39
};
40
40
relx = fetchHex {
41
41
pkg = "relx";
42
-
version = "3.26.0";
43
-
sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9";
42
+
version = "3.28.0";
43
+
sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5";
44
44
};
45
45
cf = fetchHex {
46
46
pkg = "cf";
···
49
49
};
50
50
cth_readable = fetchHex {
51
51
pkg = "cth_readable";
52
-
version = "1.4.2";
53
-
sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav";
52
+
version = "1.4.3";
53
+
sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd";
54
54
};
55
55
eunit_formatters = fetchHex {
56
56
pkg = "eunit_formatters";
57
57
version = "0.5.0";
58
58
sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n";
59
59
};
60
-
rebar3_hex = fetchHex {
61
-
pkg = "rebar3_hex";
62
-
version = "4.0.0";
63
-
sha256 = "0k0ykx1lz62r03dpbi2zxsvrxgnr5hj67yky0hjrls09ynk4682v";
60
+
hex_core = fetchHex {
61
+
pkg = "hex_core";
62
+
version = "0.4.0";
63
+
sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f";
64
+
};
65
+
parse_trans = fetchHex {
66
+
pkg = "parse_trans";
67
+
version = "3.3.0";
68
+
sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960";
64
69
};
65
70
66
71
in
67
72
stdenv.mkDerivation {
68
73
name = "rebar3-${version}";
69
-
inherit version;
74
+
inherit version erlang;
70
75
71
76
src = fetchurl {
72
77
url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
73
-
sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0";
78
+
sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy";
74
79
};
75
80
76
81
inherit bootstrapper;
77
82
78
-
patches = if hermeticRebar3 == true
79
-
then [ ./hermetic-rebar3.patch ]
80
-
else [];
83
+
buildInputs = [ erlang tree ];
81
84
82
-
buildInputs = [ erlang tree ];
85
+
# TODO: Remove registry snapshot
83
86
propagatedBuildInputs = [ hexRegistrySnapshot ];
84
87
85
88
postPatch = ''
86
89
${erlang}/bin/escript ${bootstrapper} registry-only
90
+
mkdir -p _checkouts
87
91
mkdir -p _build/default/lib/
88
-
mkdir -p _build/default/plugins
89
-
cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons
90
-
cp --no-preserve=mode -R ${providers} _build/default/lib/providers
91
-
cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt
92
-
cp --no-preserve=mode -R ${bbmustache} _build/default/lib/bbmustache
93
-
cp --no-preserve=mode -R ${certifi} _build/default/lib/certifi
94
-
cp --no-preserve=mode -R ${cf} _build/default/lib/cf
95
-
cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable
96
-
cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters
97
-
cp --no-preserve=mode -R ${relx} _build/default/lib/relx
98
-
cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun
99
-
cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex
92
+
93
+
cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons
94
+
cp --no-preserve=mode -R ${providers} _checkouts/providers
95
+
cp --no-preserve=mode -R ${getopt} _checkouts/getopt
96
+
cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache
97
+
cp --no-preserve=mode -R ${certifi} _checkouts/certifi
98
+
cp --no-preserve=mode -R ${cf} _checkouts/cf
99
+
cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable
100
+
cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters
101
+
cp --no-preserve=mode -R ${relx} _checkouts/relx
102
+
cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun
103
+
cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core
104
+
cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans
105
+
106
+
# Bootstrap script expects the dependencies in _build/default/lib
107
+
# TODO: Make it accept checkouts?
108
+
for i in _checkouts/* ; do
109
+
ln -s $(pwd)/$i $(pwd)/_build/default/lib/
110
+
done
100
111
'';
101
112
102
113
buildPhase = ''
103
114
HOME=. escript bootstrap
104
115
'';
116
+
105
117
installPhase = ''
106
118
mkdir -p $out/bin
107
119
cp rebar3 $out/bin/rebar3
···
109
121
110
122
meta = {
111
123
homepage = https://github.com/rebar/rebar3;
112
-
description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
124
+
description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
113
125
114
126
longDescription = ''
115
127
rebar is a self-contained Erlang script, so it's easy to distribute or
-103
pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
-103
pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
···
1
-
diff --git a/bootstrap b/bootstrap
2
-
index 5dedd713..864056c4 100755
3
-
--- a/bootstrap
4
-
+++ b/bootstrap
5
-
@@ -101,7 +101,7 @@ extract(Binary) ->
6
-
request(Url) ->
7
-
HttpOptions = [{relaxed, true} | get_proxy_auth()],
8
-
9
-
- case httpc:request(get, {Url, []},
10
-
+ case rebar_hermeticity:request(get, {Url, []},
11
-
HttpOptions,
12
-
[{body_format, binary}],
13
-
rebar) of
14
-
diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl
15
-
index e69de29b..8f6cc7d0 100644
16
-
--- a/src/rebar_hermeticity.erl
17
-
+++ b/src/rebar_hermeticity.erl
18
-
@@ -0,0 +1,42 @@
19
-
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
20
-
+%% ex: ts=4 sw=4 et
21
-
+%% -------------------------------------------------------------------
22
-
+%%
23
-
+%% rebar: Erlang Build Tools
24
-
+%%
25
-
+%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech)
26
-
+%%
27
-
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
28
-
+%% of this software and associated documentation files (the "Software"), to deal
29
-
+%% in the Software without restriction, including without limitation the rights
30
-
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
31
-
+%% copies of the Software, and to permit persons to whom the Software is
32
-
+%% furnished to do so, subject to the following conditions:
33
-
+%%
34
-
+%% The above copyright notice and this permission notice shall be included in
35
-
+%% all copies or substantial portions of the Software.
36
-
+%%
37
-
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
38
-
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
39
-
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
40
-
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
41
-
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
42
-
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
43
-
+%% THE SOFTWARE.
44
-
+%% -------------------------------------------------------------------
45
-
+-module(rebar_hermeticity).
46
-
+
47
-
+-export([request/5]).
48
-
+
49
-
+-include("rebar.hrl").
50
-
+
51
-
+%% ====================================================================
52
-
+%% Public API
53
-
+%% ====================================================================
54
-
+
55
-
+request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) ->
56
-
+ ?ERROR("A request is being made that violates Nix hermicity "
57
-
+ "This request has been stopped. Details of the request "
58
-
+ "are as follows:", []),
59
-
+ ?ERROR("Request: ~p ~s", [Method, Url]),
60
-
+ erlang:halt(1).
61
-
diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
62
-
index 2cf167ee..6080aaca 100644
63
-
--- a/src/rebar_pkg_resource.erl
64
-
+++ b/src/rebar_pkg_resource.erl
65
-
@@ -127,7 +127,7 @@ make_vsn(_) ->
66
-
request(Url, ETag) ->
67
-
HttpOptions = [{ssl, ssl_opts(Url)},
68
-
{relaxed, true} | rebar_utils:get_proxy_auth()],
69
-
- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""}
70
-
+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""}
71
-
|| ETag =/= false] ++
72
-
[{"User-Agent", rebar_utils:user_agent()}]},
73
-
HttpOptions, [{body_format, binary}], rebar) of
74
-
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
75
-
index 17446311..4d44d794 100644
76
-
--- a/src/rebar_prv_update.erl
77
-
+++ b/src/rebar_prv_update.erl
78
-
@@ -38,6 +38,8 @@ init(State) ->
79
-
{ok, State1}.
80
-
81
-
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
82
-
+do(State) -> {ok, State}.
83
-
+-ifdef(non_hermetic).
84
-
do(State) ->
85
-
try
86
-
case rebar_packages:registry_dir(State) of
87
-
@@ -53,7 +55,7 @@ do(State) ->
88
-
{ok, Url} ->
89
-
HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()],
90
-
?DEBUG("Fetching registry from ~p", [Url]),
91
-
- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
92
-
+ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
93
-
HttpOptions, [{stream, TmpFile}, {sync, true}],
94
-
rebar) of
95
-
{ok, saved_to_file} ->
96
-
@@ -77,6 +79,7 @@ do(State) ->
97
-
?DEBUG("Error creating package index: ~p ~p", [C, S]),
98
-
throw(?PRV_ERROR(package_index_write))
99
-
end.
100
-
+-endif.
101
-
102
-
-spec format_error(any()) -> iolist().
103
-
format_error({package_parse_cdn, Uri}) ->
+11
-19
pkgs/development/tools/erlang/hex2nix/default.nix
+11
-19
pkgs/development/tools/erlang/hex2nix/default.nix
···
1
-
{ fetchFromGitHub, buildRebar3,
1
+
{ fetchFromGitHub, fetchRebar3Deps, rebar3Relx }:
2
2
3
-
# Erlang dependencies:
4
-
ibrowse_4_2_2,
5
-
getopt_0_8_2,
6
-
erlware_commons_1_0_0,
7
-
jsx_2_8_0 }:
8
-
9
-
buildRebar3 rec {
3
+
rebar3Relx rec {
10
4
name = "hex2nix";
11
5
version = "0.0.6-a31eadd7";
12
6
7
+
releaseType = "escript";
8
+
9
+
checkouts = fetchRebar3Deps {
10
+
inherit name version;
11
+
src = "${src}/rebar.config";
12
+
sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5";
13
+
};
14
+
13
15
src = fetchFromGitHub {
14
16
owner = "erlang-nix";
15
17
repo = "hex2nix";
16
18
rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0";
17
19
sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk";
18
20
};
19
-
20
-
beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ];
21
-
22
-
enableDebugInfo = true;
23
-
24
-
installPhase = ''
25
-
runHook preInstall
26
-
make PREFIX=$out install
27
-
runHook postInstall
28
-
'';
29
-
}
21
+
}
+12
-42
pkgs/development/tools/erlang/relx-exe/default.nix
+12
-42
pkgs/development/tools/erlang/relx-exe/default.nix
···
1
-
{ stdenv, buildHex
2
-
3
-
, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
1
+
{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }:
4
2
5
-
let
6
-
providers_1_6_0 = buildHex {
7
-
name = "providers";
8
-
version = "1.6.0";
9
-
sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
10
-
beamDeps = [ getopt_0_8_2 ];
11
-
};
12
-
bbmustache_1_0_4 = buildHex {
13
-
name = "bbmustache";
14
-
version = "1.0.4";
15
-
sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
16
-
};
17
-
18
-
in
19
-
buildHex rec {
3
+
rebar3Relx rec {
20
4
name = "relx-exe";
21
5
version = "3.23.1";
22
-
hexPkg = "relx";
23
-
sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
24
-
25
-
beamDeps = [
26
-
providers_1_6_0
27
-
getopt_0_8_2
28
-
erlware_commons_1_0_0
29
-
cf_0_2_2
30
-
bbmustache_1_0_4
31
-
];
6
+
releaseType = "escript";
32
7
33
-
postBuild = ''
34
-
HOME=. rebar3 escriptize
35
-
'';
8
+
src = fetchHex {
9
+
pkg = "relx";
10
+
sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
11
+
version = "3.23.1";
12
+
};
36
13
37
-
postInstall = ''
38
-
mkdir -p "$out/bin"
39
-
cp -r "_build/default/bin/relx" "$out/bin/relx"
40
-
'';
41
-
42
-
meta = {
43
-
description = "Executable command for Relx";
44
-
license = stdenv.lib.licenses.asl20;
45
-
homepage = "https://github.com/erlware/relx";
46
-
maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
14
+
checkouts = fetchRebar3Deps {
15
+
inherit name version;
16
+
src = "${src}/rebar.lock";
17
+
sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd";
47
18
};
48
-
49
19
}
+517
pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+517
pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
···
1
+
From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001
2
+
From: "H.J. Lu" <hjl.tools@gmail.com>
3
+
Date: Fri, 20 Jul 2018 09:18:47 -0700
4
+
Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed
5
+
6
+
When -z separate-code, which is enabled by default for Linux/x86, is
7
+
used to create executable, ld won't place any data in the code-only
8
+
PT_LOAD segment. If there are no data sections placed before the
9
+
code-only PT_LOAD segment, the program headers won't be mapped into
10
+
any PT_LOAD segment. When the executable tries to access it (based
11
+
on the program header address passed in AT_PHDR), it will lead to
12
+
segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if
13
+
there may be no data sections before the text section so that the
14
+
first PT_LOAD segment won't be code-only and will contain the program
15
+
header.
16
+
17
+
Testcases are adjusted to either pass "-z noseparate-code" to ld or
18
+
discard the .note.gnu.property section. A Linux/x86 run-time test is
19
+
added.
20
+
21
+
bfd/
22
+
23
+
PR ld/23428
24
+
* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
25
+
separate code program header is needed, make sure that the first
26
+
read-only PT_LOAD segment has no code by adding a
27
+
GNU_PROPERTY_X86_ISA_1_USED note.
28
+
29
+
ld/
30
+
31
+
PR ld/23428
32
+
* testsuite/ld-elf/linux-x86.S: New file.
33
+
* testsuite/ld-elf/linux-x86.exp: Likewise.
34
+
* testsuite/ld-elf/pr23428.c: Likewise.
35
+
* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
36
+
for Linux/x86 targets.
37
+
* testsuite/ld-i386/abs-iamcu.d: Likewise.
38
+
* testsuite/ld-i386/abs.d: Likewise.
39
+
* testsuite/ld-i386/pr12718.d: Likewise.
40
+
* testsuite/ld-i386/pr12921.d: Likewise.
41
+
* testsuite/ld-x86-64/abs-k1om.d: Likewise.
42
+
* testsuite/ld-x86-64/abs-l1om.d: Likewise.
43
+
* testsuite/ld-x86-64/abs.d: Likewise.
44
+
* testsuite/ld-x86-64/pr12718.d: Likewise.
45
+
* testsuite/ld-x86-64/pr12921.d: Likewise.
46
+
* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
47
+
section.
48
+
* testsuite/ld-scripts/print-memory-usage.t: Likewise.
49
+
* testsuite/ld-scripts/size-2.t: Likewise.
50
+
* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld
51
+
to create executable if language is "asm".
52
+
53
+
(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
54
+
---
55
+
bfd/elfxx-x86.c | 60 ++++++++++++++-----
56
+
ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++
57
+
ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++
58
+
ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++
59
+
ld/testsuite/ld-elf/sec64k.exp | 2 +
60
+
ld/testsuite/ld-i386/abs-iamcu.d | 2 +-
61
+
ld/testsuite/ld-i386/abs.d | 2 +-
62
+
ld/testsuite/ld-i386/pr12718.d | 2 +-
63
+
ld/testsuite/ld-i386/pr12921.d | 2 +-
64
+
ld/testsuite/ld-linkonce/zeroeh.ld | 1 +
65
+
ld/testsuite/ld-scripts/print-memory-usage.t | 2 +
66
+
ld/testsuite/ld-scripts/size-2.t | 1 +
67
+
ld/testsuite/ld-x86-64/abs-k1om.d | 2 +-
68
+
ld/testsuite/ld-x86-64/abs-l1om.d | 2 +-
69
+
ld/testsuite/ld-x86-64/abs.d | 2 +-
70
+
ld/testsuite/ld-x86-64/pr12718.d | 2 +-
71
+
ld/testsuite/ld-x86-64/pr12921.d | 2 +-
72
+
ld/testsuite/lib/ld-lib.exp | 5 +-
73
+
20 files changed, 248 insertions(+), 25 deletions(-)
74
+
create mode 100644 ld/testsuite/ld-elf/linux-x86.S
75
+
create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
76
+
create mode 100644 ld/testsuite/ld-elf/pr23428.c
77
+
78
+
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
79
+
index a2497aab86..2e4ff88f1f 100644
80
+
--- a/bfd/elfxx-x86.c
81
+
+++ b/bfd/elfxx-x86.c
82
+
@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties
83
+
const struct elf_backend_data *bed;
84
+
unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
85
+
unsigned int got_align;
86
+
+ bfd_boolean has_text = FALSE;
87
+
88
+
features = 0;
89
+
if (info->ibt)
90
+
@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties
91
+
if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
92
+
&& bfd_count_sections (pbfd) != 0)
93
+
{
94
+
+ if (!has_text)
95
+
+ {
96
+
+ /* Check if there is no non-empty text section. */
97
+
+ sec = bfd_get_section_by_name (pbfd, ".text");
98
+
+ if (sec != NULL && sec->size != 0)
99
+
+ has_text = TRUE;
100
+
+ }
101
+
+
102
+
ebfd = pbfd;
103
+
104
+
if (elf_properties (pbfd) != NULL)
105
+
break;
106
+
}
107
+
108
+
- if (ebfd != NULL && features)
109
+
+ bed = get_elf_backend_data (info->output_bfd);
110
+
+
111
+
+ htab = elf_x86_hash_table (info, bed->target_id);
112
+
+ if (htab == NULL)
113
+
+ return pbfd;
114
+
+
115
+
+ if (ebfd != NULL)
116
+
{
117
+
- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
118
+
- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */
119
+
- prop = _bfd_elf_get_property (ebfd,
120
+
- GNU_PROPERTY_X86_FEATURE_1_AND,
121
+
- 4);
122
+
- prop->u.number |= features;
123
+
- prop->pr_kind = property_number;
124
+
+ prop = NULL;
125
+
+ if (features)
126
+
+ {
127
+
+ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
128
+
+ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */
129
+
+ prop = _bfd_elf_get_property (ebfd,
130
+
+ GNU_PROPERTY_X86_FEATURE_1_AND,
131
+
+ 4);
132
+
+ prop->u.number |= features;
133
+
+ prop->pr_kind = property_number;
134
+
+ }
135
+
+ else if (has_text
136
+
+ && elf_properties (ebfd) == NULL
137
+
+ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
138
+
+ && !htab->elf.dynamic_sections_created
139
+
+ && !info->traditional_format
140
+
+ && (info->output_bfd->flags & D_PAGED) != 0
141
+
+ && info->separate_code)
142
+
+ {
143
+
+ /* If the separate code program header is needed, make sure
144
+
+ that the first read-only PT_LOAD segment has no code by
145
+
+ adding a GNU_PROPERTY_X86_ISA_1_USED note. */
146
+
+ prop = _bfd_elf_get_property (ebfd,
147
+
+ GNU_PROPERTY_X86_ISA_1_USED,
148
+
+ 4);
149
+
+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
150
+
+ prop->pr_kind = property_number;
151
+
+ }
152
+
153
+
/* Create the GNU property note section if needed. */
154
+
- if (pbfd == NULL)
155
+
+ if (prop != NULL && pbfd == NULL)
156
+
{
157
+
sec = bfd_make_section_with_flags (ebfd,
158
+
NOTE_GNU_PROPERTY_SECTION_NAME,
159
+
@@ -2581,12 +2617,6 @@ error_alignment:
160
+
161
+
pbfd = _bfd_elf_link_setup_gnu_properties (info);
162
+
163
+
- bed = get_elf_backend_data (info->output_bfd);
164
+
-
165
+
- htab = elf_x86_hash_table (info, bed->target_id);
166
+
- if (htab == NULL)
167
+
- return pbfd;
168
+
-
169
+
htab->r_info = init_table->r_info;
170
+
htab->r_sym = init_table->r_sym;
171
+
172
+
diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
173
+
new file mode 100644
174
+
index 0000000000..bdf40c6e01
175
+
--- /dev/null
176
+
+++ b/ld/testsuite/ld-elf/linux-x86.S
177
+
@@ -0,0 +1,63 @@
178
+
+ .text
179
+
+ .globl _start
180
+
+ .type _start,@function
181
+
+ .p2align 4
182
+
+_start:
183
+
+ xorl %ebp, %ebp
184
+
+#ifdef __LP64__
185
+
+ popq %rdi
186
+
+ movq %rsp, %rsi
187
+
+ andq $~15, %rsp
188
+
+#elif defined __x86_64__
189
+
+ mov (%rsp),%edi
190
+
+ addl $4,%esp
191
+
+ movl %esp, %esi
192
+
+ andl $~15, %esp
193
+
+#else
194
+
+ popl %esi
195
+
+ movl %esp, %ecx
196
+
+ andl $~15, %esp
197
+
+
198
+
+ subl $8,%esp
199
+
+ pushl %ecx
200
+
+ pushl %esi
201
+
+#endif
202
+
+
203
+
+ call main
204
+
+
205
+
+ hlt
206
+
+
207
+
+ .type syscall, @function
208
+
+ .globl syscall
209
+
+ .p2align 4
210
+
+syscall:
211
+
+#ifdef __x86_64__
212
+
+ movq %rdi, %rax /* Syscall number -> rax. */
213
+
+ movq %rsi, %rdi /* shift arg1 - arg5. */
214
+
+ movq %rdx, %rsi
215
+
+ movq %rcx, %rdx
216
+
+ movq %r8, %r10
217
+
+ movq %r9, %r8
218
+
+ movq 8(%rsp),%r9 /* arg6 is on the stack. */
219
+
+ syscall /* Do the system call. */
220
+
+#else
221
+
+ push %ebp
222
+
+ push %edi
223
+
+ push %esi
224
+
+ push %ebx
225
+
+ mov 0x2c(%esp),%ebp
226
+
+ mov 0x28(%esp),%edi
227
+
+ mov 0x24(%esp),%esi
228
+
+ mov 0x20(%esp),%edx
229
+
+ mov 0x1c(%esp),%ecx
230
+
+ mov 0x18(%esp),%ebx
231
+
+ mov 0x14(%esp),%eax
232
+
+ int $0x80
233
+
+ pop %ebx
234
+
+ pop %esi
235
+
+ pop %edi
236
+
+ pop %ebp
237
+
+#endif
238
+
+ ret /* Return to caller. */
239
+
+ .size syscall, .-syscall
240
+
+ .section .note.GNU-stack,"",@progbits
241
+
diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
242
+
new file mode 100644
243
+
index 0000000000..36217c6fb4
244
+
--- /dev/null
245
+
+++ b/ld/testsuite/ld-elf/linux-x86.exp
246
+
@@ -0,0 +1,46 @@
247
+
+# Expect script for simple native Linux/x86 tests.
248
+
+# Copyright (C) 2018 Free Software Foundation, Inc.
249
+
+#
250
+
+# This file is part of the GNU Binutils.
251
+
+#
252
+
+# This program is free software; you can redistribute it and/or modify
253
+
+# it under the terms of the GNU General Public License as published by
254
+
+# the Free Software Foundation; either version 3 of the License, or
255
+
+# (at your option) any later version.
256
+
+#
257
+
+# This program is distributed in the hope that it will be useful,
258
+
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
259
+
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
260
+
+# GNU General Public License for more details.
261
+
+#
262
+
+# You should have received a copy of the GNU General Public License
263
+
+# along with this program; if not, write to the Free Software
264
+
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
265
+
+# MA 02110-1301, USA.
266
+
+#
267
+
+
268
+
+# Test very simple native Linux/x86 programs with linux-x86.S.
269
+
+if { ![isnative] || [which $CC] == 0 \
270
+
+ || (![istarget "i?86-*-linux*"] \
271
+
+ && ![istarget "x86_64-*-linux*"] \
272
+
+ && ![istarget "amd64-*-linux*"]) } {
273
+
+ return
274
+
+}
275
+
+
276
+
+# Add $PLT_CFLAGS if PLT is expected.
277
+
+global PLT_CFLAGS
278
+
+# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
279
+
+global NOPIE_CFLAGS NOPIE_LDFLAGS
280
+
+
281
+
+run_ld_link_exec_tests [list \
282
+
+ [list \
283
+
+ "Run PR ld/23428 test" \
284
+
+ "--no-dynamic-linker -z separate-code" \
285
+
+ "" \
286
+
+ { linux-x86.S pr23428.c } \
287
+
+ "pr23428" \
288
+
+ "pass.out" \
289
+
+ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
290
+
+ "asm" \
291
+
+ ] \
292
+
+]
293
+
diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
294
+
new file mode 100644
295
+
index 0000000000..3631ed7926
296
+
--- /dev/null
297
+
+++ b/ld/testsuite/ld-elf/pr23428.c
298
+
@@ -0,0 +1,43 @@
299
+
+#include <unistd.h>
300
+
+#include <link.h>
301
+
+#include <syscall.h>
302
+
+
303
+
+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
304
+
+
305
+
+int
306
+
+main (int argc, char **argv)
307
+
+{
308
+
+ char **ev = &argv[argc + 1];
309
+
+ char **evp = ev;
310
+
+ ElfW(auxv_t) *av;
311
+
+ const ElfW(Phdr) *phdr = NULL;
312
+
+ size_t phnum = 0;
313
+
+ size_t loadnum = 0;
314
+
+ int fd = STDOUT_FILENO;
315
+
+ size_t i;
316
+
+
317
+
+ while (*evp++ != NULL)
318
+
+ ;
319
+
+
320
+
+ av = (ElfW(auxv_t) *) evp;
321
+
+
322
+
+ for (; av->a_type != AT_NULL; ++av)
323
+
+ switch (av->a_type)
324
+
+ {
325
+
+ case AT_PHDR:
326
+
+ phdr = (const void *) av->a_un.a_val;
327
+
+ break;
328
+
+ case AT_PHNUM:
329
+
+ phnum = av->a_un.a_val;
330
+
+ break;
331
+
+ }
332
+
+
333
+
+ for (i = 0; i < phnum; i++, phdr++)
334
+
+ if (phdr->p_type == PT_LOAD)
335
+
+ loadnum++;
336
+
+
337
+
+ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n"));
338
+
+
339
+
+ syscall (SYS_exit, !loadnum);
340
+
+ return 0;
341
+
+}
342
+
diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
343
+
index b58139e9dd..3909c0eaa1 100644
344
+
--- a/ld/testsuite/ld-elf/sec64k.exp
345
+
+++ b/ld/testsuite/ld-elf/sec64k.exp
346
+
@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"]
347
+
foreach sfile $sfiles { puts $ofd "#source: $sfile" }
348
+
if { [istarget spu*-*-*] } {
349
+
puts $ofd "#ld: --local-store 0:0"
350
+
+ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
351
+
+ puts $ofd "#ld: -z noseparate-code"
352
+
} else {
353
+
puts $ofd "#ld:"
354
+
}
355
+
diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d
356
+
index ac9beff2e5..aba7d6b03f 100644
357
+
--- a/ld/testsuite/ld-i386/abs-iamcu.d
358
+
+++ b/ld/testsuite/ld-i386/abs-iamcu.d
359
+
@@ -2,7 +2,7 @@
360
+
#source: abs.s
361
+
#source: zero.s
362
+
#as: --32 -march=iamcu
363
+
-#ld: -m elf_iamcu
364
+
+#ld: -m elf_iamcu -z noseparate-code
365
+
#objdump: -rs -j .text
366
+
367
+
.*: file format .*
368
+
diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
369
+
index e660aca524..191ee4456a 100644
370
+
--- a/ld/testsuite/ld-i386/abs.d
371
+
+++ b/ld/testsuite/ld-i386/abs.d
372
+
@@ -2,7 +2,7 @@
373
+
#as: --32
374
+
#source: abs.s
375
+
#source: zero.s
376
+
-#ld: -melf_i386
377
+
+#ld: -melf_i386 -z noseparate-code
378
+
#objdump: -rs
379
+
380
+
.*: file format .*
381
+
diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
382
+
index ec51540a42..7eba52d95e 100644
383
+
--- a/ld/testsuite/ld-i386/pr12718.d
384
+
+++ b/ld/testsuite/ld-i386/pr12718.d
385
+
@@ -1,6 +1,6 @@
386
+
#name: PR ld/12718
387
+
#as: --32
388
+
-#ld: -melf_i386
389
+
+#ld: -melf_i386 -z noseparate-code
390
+
#readelf: -S
391
+
392
+
There are 5 section headers, starting at offset 0x[0-9a-f]+:
393
+
diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
394
+
index e49079b3c8..ea2da3eb51 100644
395
+
--- a/ld/testsuite/ld-i386/pr12921.d
396
+
+++ b/ld/testsuite/ld-i386/pr12921.d
397
+
@@ -1,6 +1,6 @@
398
+
#name: PR ld/12921
399
+
#as: --32
400
+
-#ld: -melf_i386
401
+
+#ld: -melf_i386 -z noseparate-code
402
+
#readelf: -S --wide
403
+
404
+
There are 7 section headers, starting at offset 0x[0-9a-f]+:
405
+
diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
406
+
index b22eaa12c9..f89855a08f 100644
407
+
--- a/ld/testsuite/ld-linkonce/zeroeh.ld
408
+
+++ b/ld/testsuite/ld-linkonce/zeroeh.ld
409
+
@@ -2,4 +2,5 @@ SECTIONS {
410
+
.text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) }
411
+
.gcc_except_table 0x2000 : { *(.gcc_except_table) }
412
+
.eh_frame 0x4000 : { *(.eh_frame) }
413
+
+ /DISCARD/ : { *(.note.gnu.property) }
414
+
}
415
+
diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t
416
+
index 5ff057a5e3..6eda1d2dc4 100644
417
+
--- a/ld/testsuite/ld-scripts/print-memory-usage.t
418
+
+++ b/ld/testsuite/ld-scripts/print-memory-usage.t
419
+
@@ -11,4 +11,6 @@ SECTIONS
420
+
*(.data)
421
+
*(.rw)
422
+
}
423
+
+
424
+
+ /DISCARD/ : { *(.note.gnu.property) }
425
+
}
426
+
diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
427
+
index 723863995e..c3c4eddab4 100644
428
+
--- a/ld/testsuite/ld-scripts/size-2.t
429
+
+++ b/ld/testsuite/ld-scripts/size-2.t
430
+
@@ -18,4 +18,5 @@ SECTIONS
431
+
LONG (SIZEOF (.tdata))
432
+
LONG (SIZEOF (.tbss))
433
+
} :image
434
+
+ /DISCARD/ : { *(.note.gnu.property) }
435
+
}
436
+
diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
437
+
index 2c26639fc0..6b0fde0eed 100644
438
+
--- a/ld/testsuite/ld-x86-64/abs-k1om.d
439
+
+++ b/ld/testsuite/ld-x86-64/abs-k1om.d
440
+
@@ -2,7 +2,7 @@
441
+
#source: ../ld-i386/abs.s
442
+
#source: ../ld-i386/zero.s
443
+
#as: --64 -march=k1om
444
+
-#ld: -m elf_k1om
445
+
+#ld: -m elf_k1om -z noseparate-code
446
+
#objdump: -rs -j .text
447
+
448
+
.*: file format .*
449
+
diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
450
+
index 1fb96d44b7..f87869f9d0 100644
451
+
--- a/ld/testsuite/ld-x86-64/abs-l1om.d
452
+
+++ b/ld/testsuite/ld-x86-64/abs-l1om.d
453
+
@@ -2,7 +2,7 @@
454
+
#source: ../ld-i386/abs.s
455
+
#source: ../ld-i386/zero.s
456
+
#as: --64 -march=l1om
457
+
-#ld: -m elf_l1om
458
+
+#ld: -m elf_l1om -z noseparate-code
459
+
#objdump: -rs -j .text
460
+
#target: x86_64-*-linux*
461
+
462
+
diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
463
+
index b24b018639..d99ab4685d 100644
464
+
--- a/ld/testsuite/ld-x86-64/abs.d
465
+
+++ b/ld/testsuite/ld-x86-64/abs.d
466
+
@@ -1,7 +1,7 @@
467
+
#name: Absolute non-overflowing relocs
468
+
#source: ../ld-i386/abs.s
469
+
#source: ../ld-i386/zero.s
470
+
-#ld:
471
+
+#ld: -z noseparate-code
472
+
#objdump: -rs
473
+
474
+
.*: file format .*
475
+
diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
476
+
index 07d17325d0..2c503ffbaa 100644
477
+
--- a/ld/testsuite/ld-x86-64/pr12718.d
478
+
+++ b/ld/testsuite/ld-x86-64/pr12718.d
479
+
@@ -1,6 +1,6 @@
480
+
#name: PR ld/12718
481
+
#as: --64
482
+
-#ld: -melf_x86_64
483
+
+#ld: -melf_x86_64 -z noseparate-code
484
+
#readelf: -S --wide
485
+
486
+
There are 5 section headers, starting at offset 0x[0-9a-f]+:
487
+
diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
488
+
index 6fe6abee09..1162d55818 100644
489
+
--- a/ld/testsuite/ld-x86-64/pr12921.d
490
+
+++ b/ld/testsuite/ld-x86-64/pr12921.d
491
+
@@ -1,6 +1,6 @@
492
+
#name: PR ld/12921
493
+
#as: --64
494
+
-#ld: -melf_x86_64
495
+
+#ld: -melf_x86_64 -z noseparate-code
496
+
#readelf: -S --wide
497
+
498
+
There are 7 section headers, starting at offset 0x[0-9a-f]+:
499
+
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
500
+
index cfbefe9028..1095091882 100644
501
+
--- a/ld/testsuite/lib/ld-lib.exp
502
+
+++ b/ld/testsuite/lib/ld-lib.exp
503
+
@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } {
504
+
continue
505
+
}
506
+
507
+
- if { [ string match "c++" $lang ] } {
508
+
+ if { [ string match "asm" $lang ] } {
509
+
+ set link_proc ld_link
510
+
+ set link_cmd $ld
511
+
+ } elseif { [ string match "c++" $lang ] } {
512
+
set link_proc ld_link
513
+
set link_cmd $CXX
514
+
} else {
515
+
--
516
+
2.20.1
517
+
+137
pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
+137
pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
···
1
+
From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001
2
+
From: "H.J. Lu" <hjl.tools@gmail.com>
3
+
Date: Sat, 11 Aug 2018 06:41:33 -0700
4
+
Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property
5
+
6
+
Existing properties may be removed during property merging. We avoid
7
+
adding X86_ISA_1_NEEDED property only if existing properties won't be
8
+
removed.
9
+
10
+
bfd/
11
+
12
+
PR ld/23428
13
+
* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
14
+
add X86_ISA_1_NEEDED property only if existing properties won't
15
+
be removed.
16
+
17
+
ld/
18
+
19
+
PR ld/23428
20
+
* testsuite/ld-elf/dummy.s: New file.
21
+
* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
22
+
* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
23
+
24
+
(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
25
+
---
26
+
bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------
27
+
ld/testsuite/ld-elf/dummy.s | 1 +
28
+
ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++
29
+
ld/testsuite/ld-elf/linux-x86.exp | 2 +-
30
+
6 files changed, 66 insertions(+), 7 deletions(-)
31
+
create mode 100644 ld/testsuite/ld-elf/dummy.s
32
+
33
+
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
34
+
index 7ccfd25815..2d8f7b640b 100644
35
+
--- a/bfd/elfxx-x86.c
36
+
+++ b/bfd/elfxx-x86.c
37
+
@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties
38
+
prop->pr_kind = property_number;
39
+
}
40
+
else if (has_text
41
+
- && elf_properties (ebfd) == NULL
42
+
&& elf_tdata (info->output_bfd)->o->build_id.sec == NULL
43
+
&& !htab->elf.dynamic_sections_created
44
+
&& !info->traditional_format
45
+
@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties
46
+
/* If the separate code program header is needed, make sure
47
+
that the first read-only PT_LOAD segment has no code by
48
+
adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */
49
+
- prop = _bfd_elf_get_property (ebfd,
50
+
- GNU_PROPERTY_X86_ISA_1_NEEDED,
51
+
- 4);
52
+
- prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
53
+
- prop->pr_kind = property_number;
54
+
+ elf_property_list *list;
55
+
+ bfd_boolean need_property = TRUE;
56
+
+
57
+
+ for (list = elf_properties (ebfd); list; list = list->next)
58
+
+ switch (list->property.pr_type)
59
+
+ {
60
+
+ case GNU_PROPERTY_STACK_SIZE:
61
+
+ case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
62
+
+ case GNU_PROPERTY_X86_ISA_1_NEEDED:
63
+
+ /* These properties won't be removed during merging. */
64
+
+ need_property = FALSE;
65
+
+ break;
66
+
+ }
67
+
+
68
+
+ if (need_property)
69
+
+ {
70
+
+ prop = _bfd_elf_get_property (ebfd,
71
+
+ GNU_PROPERTY_X86_ISA_1_NEEDED,
72
+
+ 4);
73
+
+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
74
+
+ prop->pr_kind = property_number;
75
+
+ }
76
+
}
77
+
78
+
/* Create the GNU property note section if needed. */
79
+
diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
80
+
new file mode 100644
81
+
index 0000000000..403f98000d
82
+
--- /dev/null
83
+
+++ b/ld/testsuite/ld-elf/dummy.s
84
+
@@ -0,0 +1 @@
85
+
+# Dummy
86
+
diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
87
+
index bdf40c6e01..d94abc1106 100644
88
+
--- a/ld/testsuite/ld-elf/linux-x86.S
89
+
+++ b/ld/testsuite/ld-elf/linux-x86.S
90
+
@@ -61,3 +61,31 @@ syscall:
91
+
ret /* Return to caller. */
92
+
.size syscall, .-syscall
93
+
.section .note.GNU-stack,"",@progbits
94
+
+
95
+
+ .section ".note.gnu.property", "a"
96
+
+#ifdef __LP64__
97
+
+ .p2align 3
98
+
+#else
99
+
+ .p2align 2
100
+
+#endif
101
+
+ .long 1f - 0f /* name length */
102
+
+ .long 5f - 2f /* data length */
103
+
+ .long 5 /* note type */
104
+
+0: .asciz "GNU" /* vendor name */
105
+
+1:
106
+
+#ifdef __LP64__
107
+
+ .p2align 3
108
+
+#else
109
+
+ .p2align 2
110
+
+#endif
111
+
+2: .long 0xc0000002 /* pr_type. */
112
+
+ .long 4f - 3f /* pr_datasz. */
113
+
+3:
114
+
+ .long 0x2
115
+
+4:
116
+
+#ifdef __LP64__
117
+
+ .p2align 3
118
+
+#else
119
+
+ .p2align 2
120
+
+#endif
121
+
+5:
122
+
diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
123
+
index 36217c6fb4..f6f5a80853 100644
124
+
--- a/ld/testsuite/ld-elf/linux-x86.exp
125
+
+++ b/ld/testsuite/ld-elf/linux-x86.exp
126
+
@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \
127
+
"Run PR ld/23428 test" \
128
+
"--no-dynamic-linker -z separate-code" \
129
+
"" \
130
+
- { linux-x86.S pr23428.c } \
131
+
+ { linux-x86.S pr23428.c dummy.s } \
132
+
"pr23428" \
133
+
"pass.out" \
134
+
"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
135
+
--
136
+
2.20.1
137
+
+583
pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+583
pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
···
1
+
From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001
2
+
From: "H.J. Lu" <hjl.tools@gmail.com>
3
+
Date: Wed, 8 Aug 2018 06:09:15 -0700
4
+
Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED
5
+
MIME-Version: 1.0
6
+
Content-Type: text/plain; charset=UTF-8
7
+
Content-Transfer-Encoding: 8bit
8
+
9
+
Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used.
10
+
If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the
11
+
corresponding x86 instruction set isn’t used. When merging properties
12
+
from 2 input files and one input file doesn't have the
13
+
GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have
14
+
it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED
15
+
property if an input file doesn't have it.
16
+
17
+
This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the
18
+
GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA
19
+
requirement.
20
+
21
+
bfd/
22
+
23
+
PR ld/23486
24
+
* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
25
+
GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
26
+
(_bfd_x86_elf_link_setup_gnu_properties): Adding the
27
+
GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
28
+
GNU_PROPERTY_X86_ISA_1_USED, property.
29
+
30
+
ld/
31
+
32
+
PR ld/23486
33
+
* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
34
+
* testsuite/ld-x86-64/x86-64.exp: Likewise.
35
+
* testsuite/ld-i386/pr23486a.d: New file.
36
+
* testsuite/ld-i386/pr23486b.d: Likewise.
37
+
* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
38
+
* testsuite/ld-x86-64/pr23486a.d: Likewise.
39
+
* testsuite/ld-x86-64/pr23486a.s: Likewise.
40
+
* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
41
+
* testsuite/ld-x86-64/pr23486b.d: Likewise.
42
+
* testsuite/ld-x86-64/pr23486b.s: Likewise.
43
+
* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
44
+
* testsuite/ld-i386/property-4.r: Likewise.
45
+
* testsuite/ld-i386/property-5.r: Likewise.
46
+
* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
47
+
* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
48
+
* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
49
+
* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
50
+
* testsuite/ld-x86-64/property-3.r: Likewise.
51
+
* testsuite/ld-x86-64/property-4.r: Likewise.
52
+
* testsuite/ld-x86-64/property-5.r: Likewise.
53
+
* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
54
+
* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
55
+
* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
56
+
* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
57
+
* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
58
+
* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
59
+
* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
60
+
* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
61
+
62
+
(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
63
+
---
64
+
bfd/elfxx-x86.c | 25 ++++++++++++---
65
+
ld/testsuite/ld-i386/i386.exp | 2 ++
66
+
ld/testsuite/ld-i386/pr23486a.d | 10 ++++++
67
+
ld/testsuite/ld-i386/pr23486b.d | 10 ++++++
68
+
ld/testsuite/ld-i386/property-3.r | 1 -
69
+
ld/testsuite/ld-i386/property-4.r | 1 -
70
+
ld/testsuite/ld-i386/property-5.r | 1 -
71
+
ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++-
72
+
ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++-
73
+
ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++-
74
+
ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++-
75
+
ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++
76
+
ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++
77
+
ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++
78
+
ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++
79
+
ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++
80
+
ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++
81
+
ld/testsuite/ld-x86-64/property-3.r | 1 -
82
+
ld/testsuite/ld-x86-64/property-4.r | 1 -
83
+
ld/testsuite/ld-x86-64/property-5.r | 1 -
84
+
.../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++-
85
+
ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++-
86
+
.../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++-
87
+
ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++-
88
+
.../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++-
89
+
ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++-
90
+
.../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++-
91
+
ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++-
92
+
ld/testsuite/ld-x86-64/x86-64.exp | 4 +++
93
+
31 files changed, 211 insertions(+), 47 deletions(-)
94
+
create mode 100644 ld/testsuite/ld-i386/pr23486a.d
95
+
create mode 100644 ld/testsuite/ld-i386/pr23486b.d
96
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d
97
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d
98
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s
99
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d
100
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
101
+
create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
102
+
103
+
--- a/bfd/elfxx-x86.c
104
+
+++ b/bfd/elfxx-x86.c
105
+
@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
106
+
switch (pr_type)
107
+
{
108
+
case GNU_PROPERTY_X86_ISA_1_USED:
109
+
+ if (aprop == NULL || bprop == NULL)
110
+
+ {
111
+
+ /* Only one of APROP and BPROP can be NULL. */
112
+
+ if (aprop != NULL)
113
+
+ {
114
+
+ /* Remove this property since the other input file doesn't
115
+
+ have it. */
116
+
+ aprop->pr_kind = property_remove;
117
+
+ updated = TRUE;
118
+
+ }
119
+
+ break;
120
+
+ }
121
+
+ goto or_property;
122
+
+
123
+
case GNU_PROPERTY_X86_ISA_1_NEEDED:
124
+
if (aprop != NULL && bprop != NULL)
125
+
{
126
+
+or_property:
127
+
number = aprop->u.number;
128
+
aprop->u.number = number | bprop->u.number;
129
+
- /* Remove the property if ISA bits are empty. */
130
+
+ /* Remove the property if all bits are empty. */
131
+
if (aprop->u.number == 0)
132
+
{
133
+
aprop->pr_kind = property_remove;
134
+
@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
135
+
{
136
+
if (aprop->u.number == 0)
137
+
{
138
+
- /* Remove APROP if ISA bits are empty. */
139
+
+ /* Remove APROP if all bits are empty. */
140
+
aprop->pr_kind = property_remove;
141
+
updated = TRUE;
142
+
}
143
+
}
144
+
else
145
+
{
146
+
- /* Return TRUE if APROP is NULL and ISA bits of BPROP
147
+
+ /* Return TRUE if APROP is NULL and all bits of BPROP
148
+
aren't empty to indicate that BPROP should be added
149
+
to ABFD. */
150
+
updated = bprop->u.number != 0;
151
+
@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties
152
+
{
153
+
/* If the separate code program header is needed, make sure
154
+
that the first read-only PT_LOAD segment has no code by
155
+
- adding a GNU_PROPERTY_X86_ISA_1_USED note. */
156
+
+ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */
157
+
prop = _bfd_elf_get_property (ebfd,
158
+
- GNU_PROPERTY_X86_ISA_1_USED,
159
+
+ GNU_PROPERTY_X86_ISA_1_NEEDED,
160
+
4);
161
+
prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
162
+
prop->pr_kind = property_number;
163
+
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
164
+
index 6d794fe653..78dad02579 100644
165
+
--- a/ld/testsuite/ld-i386/i386.exp
166
+
+++ b/ld/testsuite/ld-i386/i386.exp
167
+
@@ -462,6 +462,8 @@ run_dump_test "pr23189"
168
+
run_dump_test "pr23194"
169
+
run_dump_test "pr23372a"
170
+
run_dump_test "pr23372b"
171
+
+run_dump_test "pr23486a"
172
+
+run_dump_test "pr23486b"
173
+
174
+
if { !([istarget "i?86-*-linux*"]
175
+
|| [istarget "i?86-*-gnu*"]
176
+
diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d
177
+
new file mode 100644
178
+
index 0000000000..41a6dcf7d5
179
+
--- /dev/null
180
+
+++ b/ld/testsuite/ld-i386/pr23486a.d
181
+
@@ -0,0 +1,10 @@
182
+
+#source: ../ld-x86-64/pr23486a.s
183
+
+#source: ../ld-x86-64/pr23486b.s
184
+
+#as: --32
185
+
+#ld: -r -m elf_i386
186
+
+#readelf: -n
187
+
+
188
+
+Displaying notes found in: .note.gnu.property
189
+
+ Owner Data size Description
190
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
191
+
+ Properties: x86 ISA needed: i486, 586
192
+
diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d
193
+
new file mode 100644
194
+
index 0000000000..08019b7274
195
+
--- /dev/null
196
+
+++ b/ld/testsuite/ld-i386/pr23486b.d
197
+
@@ -0,0 +1,10 @@
198
+
+#source: ../ld-x86-64/pr23486b.s
199
+
+#source: ../ld-x86-64/pr23486a.s
200
+
+#as: --32
201
+
+#ld: -r -m elf_i386
202
+
+#readelf: -n
203
+
+
204
+
+Displaying notes found in: .note.gnu.property
205
+
+ Owner Data size Description
206
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
207
+
+ Properties: x86 ISA needed: i486, 586
208
+
diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r
209
+
index 0ed91f5922..d03203c1e5 100644
210
+
--- a/ld/testsuite/ld-i386/property-3.r
211
+
+++ b/ld/testsuite/ld-i386/property-3.r
212
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
213
+
Owner Data size Description
214
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
215
+
Properties: stack size: 0x800000
216
+
- x86 ISA used: 586, SSE
217
+
x86 ISA needed: i486, 586
218
+
#pass
219
+
diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r
220
+
index cb2bc15d9a..da295eb6c7 100644
221
+
--- a/ld/testsuite/ld-i386/property-4.r
222
+
+++ b/ld/testsuite/ld-i386/property-4.r
223
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
224
+
Owner Data size Description
225
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
226
+
Properties: stack size: 0x800000
227
+
- x86 ISA used: i486, 586, SSE
228
+
x86 ISA needed: i486, 586, SSE
229
+
#pass
230
+
diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r
231
+
index 552965058c..e4141594b3 100644
232
+
--- a/ld/testsuite/ld-i386/property-5.r
233
+
+++ b/ld/testsuite/ld-i386/property-5.r
234
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
235
+
Owner Data size Description
236
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
237
+
Properties: stack size: 0x900000
238
+
- x86 ISA used: i486, 586, SSE
239
+
x86 ISA needed: i486, 586, SSE
240
+
#pass
241
+
diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d
242
+
index 4bb35b00fb..0aedea1614 100644
243
+
--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d
244
+
+++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d
245
+
@@ -6,6 +6,5 @@
246
+
247
+
Displaying notes found in: .note.gnu.property
248
+
Owner Data size Description
249
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
250
+
- Properties: x86 ISA used: i486, 586, SSE2, SSE3
251
+
- x86 ISA needed: 586, SSE, SSE3, SSE4_1
252
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
253
+
+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
254
+
diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d
255
+
index 418d58a8f7..bd69ac6478 100644
256
+
--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d
257
+
+++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d
258
+
@@ -6,6 +6,5 @@
259
+
260
+
Displaying notes found in: .note.gnu.property
261
+
Owner Data size Description
262
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
263
+
- Properties: x86 ISA used: i486, 586, SSE2, SSE3
264
+
- x86 ISA needed: 586, SSE, SSE3, SSE4_1
265
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
266
+
+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
267
+
diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d
268
+
index e261038f60..76d2a39f2c 100644
269
+
--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d
270
+
+++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d
271
+
@@ -6,6 +6,5 @@
272
+
273
+
Displaying notes found in: .note.gnu.property
274
+
Owner Data size Description
275
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
276
+
- Properties: x86 ISA used: i486, 586, SSE2, SSE3
277
+
- x86 ISA needed: 586, SSE, SSE3, SSE4_1
278
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
279
+
+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
280
+
diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d
281
+
index 25f3d2361e..e770ecffa5 100644
282
+
--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d
283
+
+++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d
284
+
@@ -6,6 +6,5 @@
285
+
286
+
Displaying notes found in: .note.gnu.property
287
+
Owner Data size Description
288
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
289
+
- Properties: x86 ISA used: i486, 586, SSE2, SSE3
290
+
- x86 ISA needed: 586, SSE, SSE3, SSE4_1
291
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
292
+
+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
293
+
diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d
294
+
new file mode 100644
295
+
index 0000000000..6d9fa68cdb
296
+
--- /dev/null
297
+
+++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d
298
+
@@ -0,0 +1,10 @@
299
+
+#source: pr23486a.s
300
+
+#source: pr23486b.s
301
+
+#as: --x32
302
+
+#ld: -r -m elf32_x86_64
303
+
+#readelf: -n
304
+
+
305
+
+Displaying notes found in: .note.gnu.property
306
+
+ Owner Data size Description
307
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
308
+
+ Properties: x86 ISA needed: i486, 586
309
+
diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d
310
+
new file mode 100644
311
+
index 0000000000..dc2b7bf760
312
+
--- /dev/null
313
+
+++ b/ld/testsuite/ld-x86-64/pr23486a.d
314
+
@@ -0,0 +1,10 @@
315
+
+#source: pr23486a.s
316
+
+#source: pr23486b.s
317
+
+#as: --64 -defsym __64_bit__=1
318
+
+#ld: -r -m elf_x86_64
319
+
+#readelf: -n
320
+
+
321
+
+Displaying notes found in: .note.gnu.property
322
+
+ Owner Data size Description
323
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
324
+
+ Properties: x86 ISA needed: i486, 586
325
+
diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s
326
+
new file mode 100644
327
+
index 0000000000..a07d0c7ced
328
+
--- /dev/null
329
+
+++ b/ld/testsuite/ld-x86-64/pr23486a.s
330
+
@@ -0,0 +1,30 @@
331
+
+ .section ".note.gnu.property", "a"
332
+
+.ifdef __64_bit__
333
+
+ .p2align 3
334
+
+.else
335
+
+ .p2align 2
336
+
+.endif
337
+
+ .long 1f - 0f /* name length. */
338
+
+ .long 4f - 1f /* data length. */
339
+
+ /* NT_GNU_PROPERTY_TYPE_0 */
340
+
+ .long 5 /* note type. */
341
+
+0:
342
+
+ .asciz "GNU" /* vendor name. */
343
+
+1:
344
+
+.ifdef __64_bit__
345
+
+ .p2align 3
346
+
+.else
347
+
+ .p2align 2
348
+
+.endif
349
+
+ /* GNU_PROPERTY_X86_ISA_1_USED */
350
+
+ .long 0xc0000000 /* pr_type. */
351
+
+ .long 3f - 2f /* pr_datasz. */
352
+
+2:
353
+
+ .long 0xa
354
+
+3:
355
+
+.ifdef __64_bit__
356
+
+ .p2align 3
357
+
+.else
358
+
+ .p2align 2
359
+
+.endif
360
+
+4:
361
+
diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d
362
+
new file mode 100644
363
+
index 0000000000..0445e69d82
364
+
--- /dev/null
365
+
+++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d
366
+
@@ -0,0 +1,10 @@
367
+
+#source: pr23486b.s
368
+
+#source: pr23486a.s
369
+
+#as: --x32
370
+
+#ld: -r -m elf32_x86_64
371
+
+#readelf: -n
372
+
+
373
+
+Displaying notes found in: .note.gnu.property
374
+
+ Owner Data size Description
375
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
376
+
+ Properties: x86 ISA needed: i486, 586
377
+
diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d
378
+
new file mode 100644
379
+
index 0000000000..dc2b7bf760
380
+
--- /dev/null
381
+
+++ b/ld/testsuite/ld-x86-64/pr23486b.d
382
+
@@ -0,0 +1,10 @@
383
+
+#source: pr23486a.s
384
+
+#source: pr23486b.s
385
+
+#as: --64 -defsym __64_bit__=1
386
+
+#ld: -r -m elf_x86_64
387
+
+#readelf: -n
388
+
+
389
+
+Displaying notes found in: .note.gnu.property
390
+
+ Owner Data size Description
391
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
392
+
+ Properties: x86 ISA needed: i486, 586
393
+
diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s
394
+
new file mode 100644
395
+
index 0000000000..c5167eeb65
396
+
--- /dev/null
397
+
+++ b/ld/testsuite/ld-x86-64/pr23486b.s
398
+
@@ -0,0 +1,30 @@
399
+
+ .section ".note.gnu.property", "a"
400
+
+.ifdef __64_bit__
401
+
+ .p2align 3
402
+
+.else
403
+
+ .p2align 2
404
+
+.endif
405
+
+ .long 1f - 0f /* name length. */
406
+
+ .long 4f - 1f /* data length. */
407
+
+ /* NT_GNU_PROPERTY_TYPE_0 */
408
+
+ .long 5 /* note type. */
409
+
+0:
410
+
+ .asciz "GNU" /* vendor name. */
411
+
+1:
412
+
+.ifdef __64_bit__
413
+
+ .p2align 3
414
+
+.else
415
+
+ .p2align 2
416
+
+.endif
417
+
+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */
418
+
+ .long 0xc0000001 /* pr_type. */
419
+
+ .long 3f - 2f /* pr_datasz. */
420
+
+2:
421
+
+ .long 0x3
422
+
+3:
423
+
+.ifdef __64_bit__
424
+
+ .p2align 3
425
+
+.else
426
+
+ .p2align 2
427
+
+.endif
428
+
+4:
429
+
diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
430
+
index 0ed91f5922..d03203c1e5 100644
431
+
--- a/ld/testsuite/ld-x86-64/property-3.r
432
+
+++ b/ld/testsuite/ld-x86-64/property-3.r
433
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
434
+
Owner Data size Description
435
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
436
+
Properties: stack size: 0x800000
437
+
- x86 ISA used: 586, SSE
438
+
x86 ISA needed: i486, 586
439
+
#pass
440
+
diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
441
+
index cb2bc15d9a..da295eb6c7 100644
442
+
--- a/ld/testsuite/ld-x86-64/property-4.r
443
+
+++ b/ld/testsuite/ld-x86-64/property-4.r
444
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
445
+
Owner Data size Description
446
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
447
+
Properties: stack size: 0x800000
448
+
- x86 ISA used: i486, 586, SSE
449
+
x86 ISA needed: i486, 586, SSE
450
+
#pass
451
+
diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
452
+
index 552965058c..e4141594b3 100644
453
+
--- a/ld/testsuite/ld-x86-64/property-5.r
454
+
+++ b/ld/testsuite/ld-x86-64/property-5.r
455
+
@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
456
+
Owner Data size Description
457
+
GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
458
+
Properties: stack size: 0x900000
459
+
- x86 ISA used: i486, 586, SSE
460
+
x86 ISA needed: i486, 586, SSE
461
+
#pass
462
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
463
+
index 011426f5a4..4cec728dc7 100644
464
+
--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
465
+
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
466
+
@@ -6,6 +6,5 @@
467
+
468
+
Displaying notes found in: .note.gnu.property
469
+
Owner Data size Description
470
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
471
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
472
+
- x86 ISA needed: i486, 586, SSE2, SSE3
473
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
474
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
475
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
476
+
index 1b4229a037..a8df49a351 100644
477
+
--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
478
+
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
479
+
@@ -6,6 +6,5 @@
480
+
481
+
Displaying notes found in: .note.gnu.property
482
+
Owner Data size Description
483
+
- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0
484
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
485
+
- x86 ISA needed: i486, 586, SSE2, SSE3
486
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
487
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
488
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
489
+
index 290ed6abf1..c112626711 100644
490
+
--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
491
+
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
492
+
@@ -6,6 +6,5 @@
493
+
494
+
Displaying notes found in: .note.gnu.property
495
+
Owner Data size Description
496
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
497
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
498
+
- x86 ISA needed: i486, 586, SSE2, SSE3
499
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
500
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
501
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
502
+
index 1142e03272..f10dffdc2c 100644
503
+
--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
504
+
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
505
+
@@ -6,6 +6,5 @@
506
+
507
+
Displaying notes found in: .note.gnu.property
508
+
Owner Data size Description
509
+
- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0
510
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
511
+
- x86 ISA needed: i486, 586, SSE2, SSE3
512
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
513
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
514
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
515
+
index 819542d181..0147a3c7b6 100644
516
+
--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
517
+
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
518
+
@@ -6,6 +6,5 @@
519
+
520
+
Displaying notes found in: .note.gnu.property
521
+
Owner Data size Description
522
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
523
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
524
+
- x86 ISA needed: i486, 586, SSE2, SSE3
525
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
526
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
527
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
528
+
index 4c5d0e0a18..1f8c2dc929 100644
529
+
--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
530
+
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
531
+
@@ -6,6 +6,5 @@
532
+
533
+
Displaying notes found in: .note.gnu.property
534
+
Owner Data size Description
535
+
- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0
536
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
537
+
- x86 ISA needed: i486, 586, SSE2, SSE3
538
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
539
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
540
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
541
+
index ba181e0bc5..7ca2539ca5 100644
542
+
--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
543
+
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
544
+
@@ -6,6 +6,5 @@
545
+
546
+
Displaying notes found in: .note.gnu.property
547
+
Owner Data size Description
548
+
- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0
549
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
550
+
- x86 ISA needed: i486, 586, SSE2, SSE3
551
+
+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0
552
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
553
+
diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
554
+
index 5216f385dd..f66a40e449 100644
555
+
--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
556
+
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
557
+
@@ -6,6 +6,5 @@
558
+
559
+
Displaying notes found in: .note.gnu.property
560
+
Owner Data size Description
561
+
- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0
562
+
- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
563
+
- x86 ISA needed: i486, 586, SSE2, SSE3
564
+
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
565
+
+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3
566
+
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
567
+
index 6edb9e86f4..ae21e554ad 100644
568
+
--- a/ld/testsuite/ld-x86-64/x86-64.exp
569
+
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
570
+
@@ -403,6 +403,10 @@ run_dump_test "pr23372a"
571
+
run_dump_test "pr23372a-x32"
572
+
run_dump_test "pr23372b"
573
+
run_dump_test "pr23372b-x32"
574
+
+run_dump_test "pr23486a"
575
+
+run_dump_test "pr23486a-x32"
576
+
+run_dump_test "pr23486b"
577
+
+run_dump_test "pr23486b-x32"
578
+
579
+
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
580
+
return
581
+
--
582
+
2.20.1
583
+
+9
-8
pkgs/development/tools/misc/binutils/default.nix
+9
-8
pkgs/development/tools/misc/binutils/default.nix
···
1
1
{ stdenv, lib, buildPackages
2
-
, fetchurl, zlib, autoreconfHook264
2
+
, fetchurl, zlib, autoreconfHook
3
3
# Enabling all targets increases output size to a multiple.
4
4
, withAllTargets ? false, libbfd, libopcodes
5
5
, enableShared ? true
···
12
12
# Remove gold-symbol-visibility patch when updating, the proper fix
13
13
# is now upstream.
14
14
# https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
15
-
version = "2.30";
15
+
version = "2.31.1";
16
16
basename = "binutils-${version}";
17
17
# The targetPrefix prepended to binary names to allow multiple binuntils on the
18
18
# PATH to both be usable.
···
26
26
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
27
27
src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
28
28
url = "mirror://gnu/binutils/${basename}.tar.bz2";
29
-
sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg";
29
+
sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
30
30
});
31
31
32
32
patches = [
···
55
55
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868
56
56
./gold-symbol-visibility.patch
57
57
58
-
# Version 2.30 introduced strict requirements on ELF relocations which cannot
59
-
# be satisfied on aarch64 platform. Add backported fix from bugzilla.
60
-
# https://sourceware.org/bugzilla/show_bug.cgi?id=22764
61
-
./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
58
+
# https://sourceware.org/bugzilla/show_bug.cgi?id=23428
59
+
# un-break features so linking against musl doesn't produce crash-only binaries
60
+
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
61
+
./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
62
+
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
62
63
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
63
64
64
65
outputs = [ "out" "info" "man" ];
···
67
68
nativeBuildInputs = [
68
69
bison
69
70
] ++ lib.optionals stdenv.targetPlatform.isiOS [
70
-
autoreconfHook264
71
+
autoreconfHook
71
72
];
72
73
buildInputs = [ zlib ];
73
74
-130
pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
-130
pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
···
1
-
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
2
-
index c310da6ed3..d31f46171f 100644
3
-
--- a/bfd/ChangeLog
4
-
+++ b/bfd/ChangeLog
5
-
@@ -1,3 +1,10 @@
6
-
+2018-02-05 Renlin Li <renlin.li@arm.com>
7
-
+
8
-
+ PR ld/22764
9
-
+ * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the
10
-
+ R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the
11
-
+ check for writeable section as well.
12
-
+
13
-
2018-01-27 Nick Clifton <nickc@redhat.com>
14
-
15
-
This is the 2.30 release:
16
-
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
17
-
index d5711e0eb1..973188220b 100644
18
-
--- a/bfd/elfnn-aarch64.c
19
-
+++ b/bfd/elfnn-aarch64.c
20
-
@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
21
-
#if ARCH_SIZE == 64
22
-
case BFD_RELOC_AARCH64_32:
23
-
#endif
24
-
- if (bfd_link_pic (info)
25
-
- && (sec->flags & SEC_ALLOC) != 0
26
-
- && (sec->flags & SEC_READONLY) != 0)
27
-
+ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0)
28
-
{
29
-
+ if (h != NULL
30
-
+ /* This is an absolute symbol. It represents a value instead
31
-
+ of an address. */
32
-
+ && ((h->root.type == bfd_link_hash_defined
33
-
+ && bfd_is_abs_section (h->root.u.def.section))
34
-
+ /* This is an undefined symbol. */
35
-
+ || h->root.type == bfd_link_hash_undefined))
36
-
+ break;
37
-
+
38
-
+ /* For local symbols, defined global symbols in a non-ABS section,
39
-
+ it is assumed that the value is an address. */
40
-
int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
41
-
_bfd_error_handler
42
-
/* xgettext:c-format */
43
-
diff --git a/ld/ChangeLog b/ld/ChangeLog
44
-
index 6337cd0cb6..1aaa6da3b5 100644
45
-
--- a/ld/ChangeLog
46
-
+++ b/ld/ChangeLog
47
-
@@ -1,3 +1,11 @@
48
-
+2018-02-05 Renlin Li <renlin.li@arm.com>
49
-
+
50
-
+ PR ld/22764
51
-
+ * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address.
52
-
+ * testsuite/ld-aarch64/emit-relocs-259.s: Likewise.
53
-
+ * testsuite/ld-aarch64/pr22764.s: New.
54
-
+ * testsuite/ld-aarch64/pr22764.d: New.
55
-
+
56
-
2018-01-27 Nick Clifton <nickc@redhat.com>
57
-
58
-
This is the 2.30 release:
59
-
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
60
-
index f31089361b..d766f3736b 100644
61
-
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
62
-
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
63
-
@@ -275,6 +275,7 @@ run_dump_test "pr17415"
64
-
run_dump_test_lp64 "tprel_g2_overflow"
65
-
run_dump_test "tprel_add_lo12_overflow"
66
-
run_dump_test "protected-data"
67
-
+run_dump_test_lp64 "pr22764"
68
-
69
-
# ifunc tests
70
-
run_dump_test "ifunc-1"
71
-
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s
72
-
index f724776243..87bb657c5d 100644
73
-
--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s
74
-
+++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s
75
-
@@ -1,5 +1,6 @@
76
-
+.global dummy
77
-
.text
78
-
-
79
-
+dummy:
80
-
ldr x0, .L1
81
-
82
-
.L1:
83
-
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s
84
-
index 7e1ba3ceb4..0977c9d869 100644
85
-
--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s
86
-
+++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s
87
-
@@ -1,5 +1,6 @@
88
-
+.global dummy
89
-
.text
90
-
-
91
-
+dummy:
92
-
ldr x0, .L1
93
-
94
-
.L1:
95
-
diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d
96
-
new file mode 100644
97
-
index 0000000000..997519f469
98
-
--- /dev/null
99
-
+++ b/ld/testsuite/ld-aarch64/pr22764.d
100
-
@@ -0,0 +1,18 @@
101
-
+#source: pr22764.s
102
-
+#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs
103
-
+#notarget: aarch64_be-*-*
104
-
+#objdump: -dr
105
-
+#...
106
-
+
107
-
+Disassembly of section \.text:
108
-
+
109
-
+0000000000010000 \<\.text\>:
110
-
+ 10000: d503201f nop
111
-
+ ...
112
-
+ 10004: R_AARCH64_ABS64 sym_abs1
113
-
+ 1000c: 00000002 \.word 0x00000002
114
-
+ 1000c: R_AARCH64_ABS32 sym_abs2
115
-
+ 10010: 0003 \.short 0x0003
116
-
+ 10010: R_AARCH64_ABS16 sym_abs3
117
-
+ 10012: 0000 \.short 0x0000
118
-
+ 10014: d503201f nop
119
-
diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s
120
-
new file mode 100644
121
-
index 0000000000..25e36b4a12
122
-
--- /dev/null
123
-
+++ b/ld/testsuite/ld-aarch64/pr22764.s
124
-
@@ -0,0 +1,6 @@
125
-
+ .text
126
-
+ nop
127
-
+ .xword sym_abs1
128
-
+ .word sym_abs2
129
-
+ .short sym_abs3
130
-
+ nop
+2
-2
pkgs/development/tools/misc/distcc/default.nix
+2
-2
pkgs/development/tools/misc/distcc/default.nix
···
53
53
mkdir -p $out/bin
54
54
if [ -x "${gcc.cc}/bin/gcc" ]; then
55
55
cat > $out/bin/gcc << EOF
56
-
#!/bin/sh
56
+
#!${stdenv.shell}
57
57
${extraConfig}
58
58
exec ${distcc}/bin/distcc gcc "\$@"
59
59
EOF
···
61
61
fi
62
62
if [ -x "${gcc.cc}/bin/g++" ]; then
63
63
cat > $out/bin/g++ << EOF
64
-
#!/bin/sh
64
+
#!${stdenv.shell}
65
65
${extraConfig}
66
66
exec ${distcc}/bin/distcc g++ "\$@"
67
67
EOF
+1
-1
pkgs/development/tools/misc/opengrok/default.nix
+1
-1
pkgs/development/tools/misc/opengrok/default.nix
···
16
16
mkdir -p $out
17
17
cp -a * $out/
18
18
substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname"
19
-
substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!/bin/sh"
19
+
substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${stdenv.shell}"
20
20
wrapProgram $out/bin/OpenGrok \
21
21
--prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
22
22
--set JAVA_HOME "${jre}" \
+4
-5
pkgs/development/tools/parsing/bison/3.x.nix
+4
-5
pkgs/development/tools/parsing/bison/3.x.nix
···
1
1
{ stdenv, fetchurl, m4, perl, help2man }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "bison-3.2.4";
4
+
pname = "bison";
5
+
version = "3.3.1";
5
6
6
7
src = fetchurl {
7
-
url = "mirror://gnu/bison/${name}.tar.gz";
8
-
sha256 = "16n7xs3sa1rlhs8y8zg4gi2s2kbkz8d69w3xp935wjykk0i3wryb";
8
+
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
9
+
sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1";
9
10
};
10
-
11
-
patches = []; # remove on another rebuild
12
11
13
12
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
14
13
propagatedBuildInputs = [ m4 ];
+3
-3
pkgs/development/tools/rust/rustfmt/default.nix
+3
-3
pkgs/development/tools/rust/rustfmt/default.nix
···
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
name = "rustfmt-${version}";
5
-
version = "1.0.0";
5
+
version = "1.0.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "rust-lang";
9
9
repo = "rustfmt";
10
10
rev = "${version}";
11
-
sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy";
11
+
sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p";
12
12
};
13
13
14
-
cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8";
14
+
cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h";
15
15
16
16
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
17
17
+1
-1
pkgs/games/andyetitmoves/default.nix
+1
-1
pkgs/games/andyetitmoves/default.nix
+1
-1
pkgs/games/eduke32/default.nix
+1
-1
pkgs/games/eduke32/default.nix
+1
pkgs/games/freeorion/default.nix
+1
pkgs/games/freeorion/default.nix
+1
-1
pkgs/games/freeorion/fix-paths.sh
+1
-1
pkgs/games/freeorion/fix-paths.sh
+8
-5
pkgs/games/gargoyle/default.nix
+8
-5
pkgs/games/gargoyle/default.nix
···
1
-
{ stdenv, lib, fetchFromGitHub, jam, cctools, pkgconfig
1
+
{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig
2
2
, SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }:
3
3
4
4
let
···
29
29
sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9";
30
30
};
31
31
32
-
nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools;
32
+
nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
33
33
34
34
buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
35
-
++ lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ];
35
+
++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ];
36
36
37
37
patches = [ ./darwin.patch ];
38
38
39
39
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
40
40
41
-
installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + ''
41
+
installPhase =
42
+
if stdenv.isDarwin then
43
+
(substituteAll { inherit (stdenv) shell; src = ./darwin.sh; })
44
+
else jamenv + ''
42
45
jam -j$NIX_BUILD_CORES install
43
46
mkdir -p "$out/bin"
44
47
ln -s ../libexec/gargoyle/gargoyle "$out/bin"
···
52
55
53
56
enableParallelBuilding = true;
54
57
55
-
meta = with lib; {
58
+
meta = with stdenv.lib; {
56
59
homepage = http://ccxvii.net/gargoyle/;
57
60
license = licenses.gpl2Plus;
58
61
description = "Interactive fiction interpreter GUI";
+1
-1
pkgs/games/mars/default.nix
+1
-1
pkgs/games/mars/default.nix
+1
-1
pkgs/games/oilrush/default.nix
+1
-1
pkgs/games/oilrush/default.nix
+1
-1
pkgs/games/openttd/default.nix
+1
-1
pkgs/games/openttd/default.nix
+1
-1
pkgs/games/tremulous/default.nix
+1
-1
pkgs/games/tremulous/default.nix
+1
-1
pkgs/games/trigger/default.nix
+1
-1
pkgs/games/trigger/default.nix
+1
-1
pkgs/games/vessel/default.nix
+1
-1
pkgs/games/vessel/default.nix
+1
-1
pkgs/games/worldofgoo/default.nix
+1
-1
pkgs/games/worldofgoo/default.nix
+1
-1
pkgs/games/zangband/default.nix
+1
-1
pkgs/games/zangband/default.nix
+1
-1
pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+1
-1
pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
···
34
34
unpackPhase = "true";
35
35
36
36
brprintconf_mfcj6510dw_script = ''
37
-
#!/bin/sh
37
+
#!${stdenv.shell}
38
38
cd $(mktemp -d)
39
39
ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched
40
40
ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc
+1
-1
pkgs/misc/drivers/foomatic-filters/default.nix
+1
-1
pkgs/misc/drivers/foomatic-filters/default.nix
+1
-1
pkgs/misc/emulators/retrofe/default.nix
+1
-1
pkgs/misc/emulators/retrofe/default.nix
-2
pkgs/misc/emulators/wine/builder-wow.sh
-2
pkgs/misc/emulators/wine/builder-wow.sh
-28
pkgs/misc/themes/elementary/default.nix
-28
pkgs/misc/themes/elementary/default.nix
···
1
-
{ stdenv, fetchFromGitHub }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
name = "elementary-gtk-theme-${version}";
5
-
version = "5.1.1";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "elementary";
9
-
repo = "stylesheet";
10
-
rev = version;
11
-
sha256 = "1749byc2lbxmprladn9n7k6jh79r8ffgayjn689gmqsrm6czsmh2";
12
-
};
13
-
14
-
dontBuild = true;
15
-
16
-
installPhase = ''
17
-
mkdir -p $out/share/themes/elementary
18
-
cp -r gtk-* plank $out/share/themes/elementary
19
-
'';
20
-
21
-
meta = with stdenv.lib; {
22
-
description = "GTK theme designed to be smooth, attractive, fast, and usable";
23
-
homepage = https://github.com/elementary/stylesheet;
24
-
license = licenses.gpl3;
25
-
platforms = platforms.unix;
26
-
maintainers = with maintainers; [ davidak ];
27
-
};
28
-
}
+1
-1
pkgs/misc/vim-plugins/vim-utils.nix
+1
-1
pkgs/misc/vim-plugins/vim-utils.nix
···
362
362
vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}:
363
363
let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}";
364
364
in writeScriptBin (if name == null then "vim" else name) ''
365
-
#!/bin/sh
365
+
#!${stdenv.shell}
366
366
exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"
367
367
'';
368
368
+3
-8
pkgs/os-specific/linux/alsa-lib/default.nix
+3
-8
pkgs/os-specific/linux/alsa-lib/default.nix
···
1
-
{ stdenv, fetchurl, fetchpatch }:
1
+
{ stdenv, fetchurl }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "alsa-lib-1.1.7";
4
+
name = "alsa-lib-1.1.8";
5
5
6
6
src = fetchurl {
7
7
url = "mirror://alsa/lib/${name}.tar.bz2";
8
-
sha256 = "02fw7dw202mjid49w9ki3dsfcyvid5fj488561bdzcm3haw00q4x";
8
+
sha256 = "1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w";
9
9
};
10
10
11
11
patches = [
12
12
./alsa-plugin-conf-multilib.patch
13
-
(fetchpatch { # pcm interval fix needed for some programs with broken audio, remove when bumping version
14
-
name = "pcm-interval-fix.patch";
15
-
url = "http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=b420056604f06117c967b65d43d01536c5ffcbc9";
16
-
sha256 = "1vjfslzsypd6w15zvvrpdk825hm5j0gz16gw7kj290pkbsdgd435";
17
-
})
18
13
];
19
14
20
15
# Fix pcm.h file in order to prevent some compilation bugs
+1
-1
pkgs/os-specific/linux/alsa-plugins/wrapper.nix
+1
-1
pkgs/os-specific/linux/alsa-plugins/wrapper.nix
+2
-2
pkgs/os-specific/linux/bbswitch/default.nix
+2
-2
pkgs/os-specific/linux/bbswitch/default.nix
···
36
36
37
37
mkdir -p $out/bin
38
38
tee $out/bin/discrete_vga_poweroff << EOF
39
-
#!/bin/sh
39
+
#!${stdenv.shell}
40
40
41
41
echo -n OFF > /proc/acpi/bbswitch
42
42
EOF
43
43
tee $out/bin/discrete_vga_poweron << EOF
44
-
#!/bin/sh
44
+
#!${stdenv.shell}
45
45
46
46
echo -n ON > /proc/acpi/bbswitch
47
47
EOF
+2
-2
pkgs/os-specific/linux/kernel-headers/default.nix
+2
-2
pkgs/os-specific/linux/kernel-headers/default.nix
···
75
75
in {
76
76
77
77
linuxHeaders = common {
78
-
version = "4.18.3";
79
-
sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1";
78
+
version = "4.19.16";
79
+
sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q";
80
80
patches = [
81
81
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
82
82
./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above
+9
pkgs/os-specific/linux/keyutils/default.nix
+9
pkgs/os-specific/linux/keyutils/default.nix
···
9
9
sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk";
10
10
};
11
11
12
+
patches = [
13
+
(fetchurl {
14
+
# improve reproducibility
15
+
url = "https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch";
16
+
sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm";
17
+
})
18
+
];
19
+
20
+
BUILDDATE = "1970-01-01";
12
21
outputs = [ "out" "lib" "dev" ];
13
22
14
23
installFlags = [
-37
pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
-37
pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
···
1
-
From 4e4a162d9af283cf71f7310c497672e0c2b8ca3b Mon Sep 17 00:00:00 2001
2
-
From: Rich Felker <dalias@aerifal.cx>
3
-
Date: Tue, 4 Sep 2018 21:28:38 -0400
4
-
Subject: [PATCH 1/3] in pthread_mutex_trylock, EBUSY out more directly when
5
-
possible
6
-
7
-
avoid gratuitously setting up and tearing down the robust list pending
8
-
slot.
9
-
---
10
-
src/thread/pthread_mutex_trylock.c | 4 ++--
11
-
1 file changed, 2 insertions(+), 2 deletions(-)
12
-
13
-
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
14
-
index 54876a61..783ca0c4 100644
15
-
--- a/src/thread/pthread_mutex_trylock.c
16
-
+++ b/src/thread/pthread_mutex_trylock.c
17
-
@@ -15,6 +15,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
18
-
return 0;
19
-
}
20
-
if (own == 0x7fffffff) return ENOTRECOVERABLE;
21
-
+ if (own && (!(own & 0x40000000) || !(type & 4))) return EBUSY;
22
-
23
-
if (m->_m_type & 128) {
24
-
if (!self->robust_list.off) {
25
-
@@ -25,8 +26,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
26
-
self->robust_list.pending = &m->_m_next;
27
-
}
28
-
29
-
- if ((own && (!(own & 0x40000000) || !(type & 4)))
30
-
- || a_cas(&m->_m_lock, old, tid) != old) {
31
-
+ if (a_cas(&m->_m_lock, old, tid) != old) {
32
-
self->robust_list.pending = 0;
33
-
return EBUSY;
34
-
}
35
-
--
36
-
2.19.0
37
-
-41
pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
-41
pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
···
1
-
From d1fa28860634af4f0efd70d533a756b51a45f83e Mon Sep 17 00:00:00 2001
2
-
From: Rich Felker <dalias@aerifal.cx>
3
-
Date: Tue, 4 Sep 2018 21:31:47 -0400
4
-
Subject: [PATCH 2/3] in pthread_mutex_timedlock, avoid repeatedly reading
5
-
mutex type field
6
-
7
-
compiler cannot cache immutable fields of the mutex object across
8
-
external calls it can't see, much less across atomics.
9
-
---
10
-
src/thread/pthread_mutex_timedlock.c | 7 ++++---
11
-
1 file changed, 4 insertions(+), 3 deletions(-)
12
-
13
-
diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
14
-
index 0a240e79..f91f4a61 100644
15
-
--- a/src/thread/pthread_mutex_timedlock.c
16
-
+++ b/src/thread/pthread_mutex_timedlock.c
17
-
@@ -6,7 +6,8 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
18
-
&& !a_cas(&m->_m_lock, 0, EBUSY))
19
-
return 0;
20
-
21
-
- int r, t, priv = (m->_m_type & 128) ^ 128;
22
-
+ int type = m->_m_type;
23
-
+ int r, t, priv = (type & 128) ^ 128;
24
-
25
-
r = pthread_mutex_trylock(m);
26
-
if (r != EBUSY) return r;
27
-
@@ -15,9 +16,9 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
28
-
while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
29
-
30
-
while ((r=pthread_mutex_trylock(m)) == EBUSY) {
31
-
- if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4)))
32
-
+ if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4)))
33
-
continue;
34
-
- if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
35
-
+ if ((type&3) == PTHREAD_MUTEX_ERRORCHECK
36
-
&& (r&0x7fffffff) == __pthread_self()->tid)
37
-
return EDEADLK;
38
-
39
-
--
40
-
2.19.0
41
-
-35
pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch
-35
pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch
···
1
-
From 2de29bc994029b903a366b8a4a9f8c3c3ee2be90 Mon Sep 17 00:00:00 2001
2
-
From: Rich Felker <dalias@aerifal.cx>
3
-
Date: Tue, 4 Sep 2018 22:56:57 -0400
4
-
Subject: [PATCH 3/3] fix namespace violation for c11 mutex functions
5
-
6
-
__pthread_mutex_timedlock is used to implement c11 mutex functions,
7
-
and therefore cannot call pthread_mutex_trylock by name.
8
-
---
9
-
src/thread/pthread_mutex_timedlock.c | 4 +++-
10
-
1 file changed, 3 insertions(+), 1 deletion(-)
11
-
12
-
diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
13
-
index f91f4a61..d2bd1960 100644
14
-
--- a/src/thread/pthread_mutex_timedlock.c
15
-
+++ b/src/thread/pthread_mutex_timedlock.c
16
-
@@ -1,5 +1,7 @@
17
-
#include "pthread_impl.h"
18
-
19
-
+int __pthread_mutex_trylock(pthread_mutex_t *);
20
-
+
21
-
int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
22
-
{
23
-
if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
24
-
@@ -15,7 +17,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
25
-
int spins = 100;
26
-
while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
27
-
28
-
- while ((r=pthread_mutex_trylock(m)) == EBUSY) {
29
-
+ while ((r=__pthread_mutex_trylock(m)) == EBUSY) {
30
-
if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4)))
31
-
continue;
32
-
if ((type&3) == PTHREAD_MUTEX_ERRORCHECK
33
-
--
34
-
2.19.0
35
-
+5
-26
pkgs/os-specific/linux/musl/default.nix
+5
-26
pkgs/os-specific/linux/musl/default.nix
···
28
28
29
29
in
30
30
stdenv.mkDerivation rec {
31
-
name = "musl-${version}";
32
-
version = "1.1.20";
31
+
pname = "musl";
32
+
version = "1.1.21";
33
33
34
34
src = fetchurl {
35
-
url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz";
36
-
sha256 = "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4";
35
+
url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz";
36
+
sha256 = "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7";
37
37
};
38
38
39
39
enableParallelBuilding = true;
···
56
56
url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch;
57
57
sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
58
58
})
59
-
# Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d
60
-
# Explicitly flagged for inclusion by distributions using musl
61
-
./fix-file-locking-race.patch
62
-
# More specific error reporting
63
-
./tty-more-precise-errors.patch
64
-
# Use execveat to impl fexecve when avail (useful for containers)
65
-
./fexecve-execveat.patch
66
-
# improve behavior in few cases
67
-
./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
68
-
./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
69
-
./0003-fix-namespace-violation-for-c11-mutex-functions.patch
70
-
# Fix getaddrinfo usage encountered sometimes in containers
71
-
./fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
72
-
# name_to_handle_at
73
-
./name-to-handle-at.patch
74
-
./max-handle-sz-for-name-to-handle-at.patch
75
-
# stacksize bump (upstream)
76
-
./stacksize-bump.patch
77
59
];
78
-
preConfigure = ''
79
-
configureFlagsArray+=("--syslibdir=$out/lib")
80
-
'';
81
-
82
60
CFLAGS = [ "-fstack-protector-strong" ]
83
61
++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
84
62
···
87
65
"--enable-static"
88
66
"--enable-debug"
89
67
"--enable-wrapper=all"
68
+
"--syslibdir=${placeholder "out"}/lib"
90
69
];
91
70
92
71
outputs = [ "out" "dev" ];
-33
pkgs/os-specific/linux/musl/fexecve-execveat.patch
-33
pkgs/os-specific/linux/musl/fexecve-execveat.patch
···
1
-
From e36f80cba6d5eefcc1ee664f16c2c72054b83134 Mon Sep 17 00:00:00 2001
2
-
From: "Joseph C. Sible" <josephcsible@gmail.com>
3
-
Date: Sun, 2 Sep 2018 13:42:26 -0400
4
-
Subject: implement fexecve in terms of execveat when it exists
5
-
6
-
This lets fexecve work even when /proc isn't mounted.
7
-
---
8
-
src/process/fexecve.c | 5 +++++
9
-
1 file changed, 5 insertions(+)
10
-
11
-
diff --git a/src/process/fexecve.c b/src/process/fexecve.c
12
-
index 6507b429..8be3f760 100644
13
-
--- a/src/process/fexecve.c
14
-
+++ b/src/process/fexecve.c
15
-
@@ -1,10 +1,15 @@
16
-
+#define _GNU_SOURCE
17
-
#include <unistd.h>
18
-
#include <errno.h>
19
-
+#include <fcntl.h>
20
-
+#include "syscall.h"
21
-
22
-
void __procfdname(char *, unsigned);
23
-
24
-
int fexecve(int fd, char *const argv[], char *const envp[])
25
-
{
26
-
+ int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH);
27
-
+ if (r != -ENOSYS) return __syscall_ret(r);
28
-
char buf[15 + 3*sizeof(int)];
29
-
__procfdname(buf, fd);
30
-
execve(buf, argv, envp);
31
-
--
32
-
cgit v1.2.1
33
-
-54
pkgs/os-specific/linux/musl/fix-file-locking-race.patch
-54
pkgs/os-specific/linux/musl/fix-file-locking-race.patch
···
1
-
From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001
2
-
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
3
-
Date: Tue, 18 Sep 2018 10:03:27 +0300
4
-
Subject: fix race condition in file locking
5
-
6
-
The condition occurs when
7
-
- thread #1 is holding the lock
8
-
- thread #2 is waiting for it on __futexwait
9
-
- thread #1 is about to release the lock and performs a_swap
10
-
- thread #3 enters the __lockfile function and manages to grab the lock
11
-
before thread #1 calls __wake, resetting the MAYBE_WAITERS flag
12
-
- thread #1 calls __wake
13
-
- thread #2 wakes up but goes again to __futexwait as the lock is
14
-
held by thread #3
15
-
- thread #3 releases the lock but does not call __wake as the
16
-
MAYBE_WAITERS flag is not set
17
-
18
-
This condition results in thread #2 not being woken up. This patch fixes
19
-
the problem by making the woken up thread ensure that the flag is
20
-
properly set before going to sleep again.
21
-
22
-
Mainainer's note: This fixes a regression introduced in commit
23
-
c21f750727515602a9e84f2a190ee8a0a2aeb2a1.
24
-
---
25
-
src/stdio/__lockfile.c | 12 ++++++------
26
-
1 file changed, 6 insertions(+), 6 deletions(-)
27
-
28
-
diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
29
-
index 2ff75d8a..0dcb2a42 100644
30
-
--- a/src/stdio/__lockfile.c
31
-
+++ b/src/stdio/__lockfile.c
32
-
@@ -8,13 +8,13 @@ int __lockfile(FILE *f)
33
-
int owner = f->lock, tid = __pthread_self()->tid;
34
-
if ((owner & ~MAYBE_WAITERS) == tid)
35
-
return 0;
36
-
- for (;;) {
37
-
- owner = a_cas(&f->lock, 0, tid);
38
-
- if (!owner) return 1;
39
-
- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break;
40
-
+ owner = a_cas(&f->lock, 0, tid);
41
-
+ if (!owner) return 1;
42
-
+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
43
-
+ if ((owner & MAYBE_WAITERS) ||
44
-
+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
45
-
+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
46
-
}
47
-
- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS)))
48
-
- __futexwait(&f->lock, owner, 1);
49
-
return 1;
50
-
}
51
-
52
-
--
53
-
cgit v1.2.1
54
-
-52
pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
-52
pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
···
1
-
From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001
2
-
From: Rich Felker <dalias@aerifal.cx>
3
-
Date: Wed, 19 Sep 2018 18:03:22 -0400
4
-
Subject: [PATCH] fix getaddrinfo regression with AI_ADDRCONFIG on some
5
-
configurations
6
-
7
-
despite not being documented to do so in the standard or Linux
8
-
documentation, attempts to udp connect to 127.0.0.1 or ::1 generate
9
-
EADDRNOTAVAIL when the loopback device is not configured and there is
10
-
no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG
11
-
to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6
12
-
configurations, rather than the intended behavior of detecting IPv6 as
13
-
unsuppported and producing IPv4-only results.
14
-
15
-
previously, only EAFNOSUPPORT was treated as unavailability of the
16
-
address family being probed. instead, treat all errors related to
17
-
inability to get an address or route as conclusive that the family
18
-
being probed is unsupported, and only fail with EAI_SYSTEM on other
19
-
errors.
20
-
21
-
further improvements may be desirable, such as reporting EAI_AGAIN
22
-
instead of EAI_SYSTEM for errors which are expected to be transient,
23
-
but this patch should suffice to fix the serious regression.
24
-
---
25
-
src/network/getaddrinfo.c | 11 ++++++++++-
26
-
1 file changed, 10 insertions(+), 1 deletion(-)
27
-
28
-
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
29
-
index ba26847a..e33bfa28 100644
30
-
--- a/src/network/getaddrinfo.c
31
-
+++ b/src/network/getaddrinfo.c
32
-
@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
33
-
close(s);
34
-
if (!r) continue;
35
-
}
36
-
- if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
37
-
+ switch (errno) {
38
-
+ case EADDRNOTAVAIL:
39
-
+ case EAFNOSUPPORT:
40
-
+ case EHOSTUNREACH:
41
-
+ case ENETDOWN:
42
-
+ case ENETUNREACH:
43
-
+ break;
44
-
+ default:
45
-
+ return EAI_SYSTEM;
46
-
+ }
47
-
if (family == tf[i]) return EAI_NONAME;
48
-
family = tf[1-i];
49
-
}
50
-
--
51
-
2.19.0
52
-
-26
pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch
-26
pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch
···
1
-
From 7d7f44253f2d8cfd0a7adf9f918d88aa24d4e012 Mon Sep 17 00:00:00 2001
2
-
From: Khem Raj <raj.khem@gmail.com>
3
-
Date: Thu, 13 Sep 2018 07:00:05 -0700
4
-
Subject: [PATCH] define MAX_HANDLE_SZ for use with name_to_handle_at
5
-
6
-
MAX_HANDLE_SZ is described in name_to_handle_at() to contain maximum
7
-
expected size for a file handle
8
-
---
9
-
include/fcntl.h | 1 +
10
-
1 file changed, 1 insertion(+)
11
-
12
-
diff --git a/include/fcntl.h b/include/fcntl.h
13
-
index 99b21759..4d91338b 100644
14
-
--- a/include/fcntl.h
15
-
+++ b/include/fcntl.h
16
-
@@ -166,6 +166,7 @@ struct f_owner_ex {
17
-
};
18
-
#define FALLOC_FL_KEEP_SIZE 1
19
-
#define FALLOC_FL_PUNCH_HOLE 2
20
-
+#define MAX_HANDLE_SZ 128
21
-
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
22
-
#define SYNC_FILE_RANGE_WRITE 2
23
-
#define SYNC_FILE_RANGE_WAIT_AFTER 4
24
-
--
25
-
2.19.0
26
-
-71
pkgs/os-specific/linux/musl/name-to-handle-at.patch
-71
pkgs/os-specific/linux/musl/name-to-handle-at.patch
···
1
-
From 3e14bbcd1979376b188bfabb816ff828608fb5d7 Mon Sep 17 00:00:00 2001
2
-
From: Khem Raj <raj.khem@gmail.com>
3
-
Date: Wed, 12 Sep 2018 18:02:11 -0700
4
-
Subject: [PATCH] wireup linux/name_to_handle_at and name_to_handle_at syscalls
5
-
6
-
---
7
-
include/fcntl.h | 7 +++++++
8
-
src/linux/name_to_handle_at.c | 10 ++++++++++
9
-
src/linux/open_by_handle_at.c | 8 ++++++++
10
-
3 files changed, 25 insertions(+)
11
-
create mode 100644 src/linux/name_to_handle_at.c
12
-
create mode 100644 src/linux/open_by_handle_at.c
13
-
14
-
diff --git a/include/fcntl.h b/include/fcntl.h
15
-
index 6d8edcd1..99b21759 100644
16
-
--- a/include/fcntl.h
17
-
+++ b/include/fcntl.h
18
-
@@ -155,6 +155,11 @@ int lockf(int, int, off_t);
19
-
#define F_OWNER_PID 1
20
-
#define F_OWNER_PGRP 2
21
-
#define F_OWNER_GID 2
22
-
+struct file_handle {
23
-
+ unsigned handle_bytes;
24
-
+ int handle_type;
25
-
+ unsigned char f_handle[];
26
-
+};
27
-
struct f_owner_ex {
28
-
int type;
29
-
pid_t pid;
30
-
@@ -170,6 +175,8 @@ struct f_owner_ex {
31
-
#define SPLICE_F_GIFT 8
32
-
int fallocate(int, int, off_t, off_t);
33
-
#define fallocate64 fallocate
34
-
+int name_to_handle_at(int, const char *, struct file_handle *, int *, int);
35
-
+int open_by_handle_at(int, struct file_handle *, int);
36
-
ssize_t readahead(int, off_t, size_t);
37
-
int sync_file_range(int, off_t, off_t, unsigned);
38
-
ssize_t vmsplice(int, const struct iovec *, size_t, unsigned);
39
-
diff --git a/src/linux/name_to_handle_at.c b/src/linux/name_to_handle_at.c
40
-
new file mode 100644
41
-
index 00000000..cd4075bd
42
-
--- /dev/null
43
-
+++ b/src/linux/name_to_handle_at.c
44
-
@@ -0,0 +1,10 @@
45
-
+#define _GNU_SOURCE
46
-
+#include <fcntl.h>
47
-
+#include "syscall.h"
48
-
+
49
-
+int name_to_handle_at(int dirfd, const char *pathname,
50
-
+ struct file_handle *handle, int *mount_id, int flags)
51
-
+{
52
-
+ return syscall(SYS_name_to_handle_at, dirfd,
53
-
+ pathname, handle, mount_id, flags);
54
-
+}
55
-
diff --git a/src/linux/open_by_handle_at.c b/src/linux/open_by_handle_at.c
56
-
new file mode 100644
57
-
index 00000000..1c9b6a2b
58
-
--- /dev/null
59
-
+++ b/src/linux/open_by_handle_at.c
60
-
@@ -0,0 +1,8 @@
61
-
+#define _GNU_SOURCE
62
-
+#include <fcntl.h>
63
-
+#include "syscall.h"
64
-
+
65
-
+int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
66
-
+{
67
-
+ return syscall(SYS_open_by_handle_at, mount_fd, handle, flags);
68
-
+}
69
-
--
70
-
2.19.0
71
-
-36
pkgs/os-specific/linux/musl/stacksize-bump.patch
-36
pkgs/os-specific/linux/musl/stacksize-bump.patch
···
1
-
From c0058ab465e950c2c3302d2b62e21cc0b494224b Mon Sep 17 00:00:00 2001
2
-
From: Rich Felker <dalias@aerifal.cx>
3
-
Date: Tue, 18 Sep 2018 23:11:49 -0400
4
-
Subject: [PATCH 3/4] increase default thread stack/guard size
5
-
6
-
stack size default is increased from 80k to 128k. this coincides with
7
-
Linux's hard-coded default stack for the main thread (128k is
8
-
initially committed; growth beyond that up to ulimit is contingent on
9
-
additional allocation succeeding) and GNU ld's default PT_GNU_STACK
10
-
size for FDPIC, at least on sh.
11
-
12
-
guard size default is increased from 4k to 8k to reduce the risk of
13
-
guard page jumping on overflow, since use of just over 4k of stack is
14
-
common (PATH_MAX buffers, etc.).
15
-
---
16
-
src/internal/pthread_impl.h | 4 ++--
17
-
1 file changed, 2 insertions(+), 2 deletions(-)
18
-
19
-
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
20
-
index e73a251f..d491f975 100644
21
-
--- a/src/internal/pthread_impl.h
22
-
+++ b/src/internal/pthread_impl.h
23
-
@@ -185,8 +185,8 @@ hidden void __inhibit_ptc(void);
24
-
extern hidden unsigned __default_stacksize;
25
-
extern hidden unsigned __default_guardsize;
26
-
27
-
-#define DEFAULT_STACK_SIZE 81920
28
-
-#define DEFAULT_GUARD_SIZE 4096
29
-
+#define DEFAULT_STACK_SIZE 131072
30
-
+#define DEFAULT_GUARD_SIZE 8192
31
-
32
-
#define DEFAULT_STACK_MAX (8<<20)
33
-
#define DEFAULT_GUARD_MAX (1<<20)
34
-
--
35
-
2.19.0
36
-
-51
pkgs/os-specific/linux/musl/tty-more-precise-errors.patch
-51
pkgs/os-specific/linux/musl/tty-more-precise-errors.patch
···
1
-
From c84971995b3a6d5118f9357c040572f4c78bcd55 Mon Sep 17 00:00:00 2001
2
-
From: Benjamin Peterson <benjamin@python.org>
3
-
Date: Thu, 13 Sep 2018 14:23:42 -0700
4
-
Subject: improve error handling of ttyname_r and isatty
5
-
6
-
POSIX allows ttyname(_r) and isatty to return EBADF if passed file
7
-
descriptor is invalid.
8
-
9
-
maintainer's note: these are optional ("may fail") errors, but it's
10
-
non-conforming for ttyname_r to return ENOTTY when it failed for a
11
-
different reason.
12
-
---
13
-
src/unistd/isatty.c | 6 +++++-
14
-
src/unistd/ttyname_r.c | 2 +-
15
-
2 files changed, 6 insertions(+), 2 deletions(-)
16
-
17
-
diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c
18
-
index c8badaf5..75a9c186 100644
19
-
--- a/src/unistd/isatty.c
20
-
+++ b/src/unistd/isatty.c
21
-
@@ -1,9 +1,13 @@
22
-
#include <unistd.h>
23
-
+#include <errno.h>
24
-
#include <sys/ioctl.h>
25
-
#include "syscall.h"
26
-
27
-
int isatty(int fd)
28
-
{
29
-
struct winsize wsz;
30
-
- return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
31
-
+ unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
32
-
+ if (r == 0) return 1;
33
-
+ if (errno != EBADF) errno = ENOTTY;
34
-
+ return 0;
35
-
}
36
-
diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
37
-
index cb364c29..82acb75e 100644
38
-
--- a/src/unistd/ttyname_r.c
39
-
+++ b/src/unistd/ttyname_r.c
40
-
@@ -9,7 +9,7 @@ int ttyname_r(int fd, char *name, size_t size)
41
-
char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
42
-
ssize_t l;
43
-
44
-
- if (!isatty(fd)) return ENOTTY;
45
-
+ if (!isatty(fd)) return errno;
46
-
47
-
__procfdname(procname, fd);
48
-
l = readlink(procname, name, size);
49
-
--
50
-
cgit v1.2.1
51
-
+1
-1
pkgs/os-specific/linux/ofp/default.nix
+1
-1
pkgs/os-specific/linux/ofp/default.nix
···
20
20
21
21
postPatch = ''
22
22
substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s
23
-
substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh
23
+
substituteInPlace scripts/git_hash.sh --replace /bin/bash ${stdenv.shell}
24
24
echo ${version} > .scmversion
25
25
'';
26
26
+1
-1
pkgs/os-specific/linux/rfkill/rfkill-hook.sh
+1
-1
pkgs/os-specific/linux/rfkill/rfkill-hook.sh
+11
-5
pkgs/os-specific/linux/rfkill/udev.nix
+11
-5
pkgs/os-specific/linux/rfkill/udev.nix
···
1
-
{ stdenv }:
1
+
{ stdenv, substituteAll }:
2
2
3
3
# Provides a facility to hook into rfkill changes.
4
4
#
···
10
10
# Add a hook script in the managed etc directory, e.g.:
11
11
# etc = [
12
12
# { source = pkgs.writeScript "rtfkill.hook" ''
13
-
# #!/bin/sh
13
+
# #!${stdenv.shell}
14
14
#
15
15
# if [ "$RFKILL_STATE" -eq "1" ]; then
16
16
# exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
···
24
24
# Note: this package does not need the binaries
25
25
# in the rfkill package.
26
26
27
-
stdenv.mkDerivation {
27
+
let
28
+
rfkillHook =
29
+
substituteAll {
30
+
inherit (stdenv) shell;
31
+
src = ./rfkill-hook.sh;
32
+
};
33
+
in stdenv.mkDerivation {
28
34
name = "rfkill-udev";
29
35
30
36
unpackPhase = "true";
···
37
43
EOF
38
44
39
45
mkdir -p "$out/bin/";
40
-
cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh"
46
+
cp ${rfkillHook} "$out/bin/rfkill-hook.sh"
41
47
chmod +x "$out/bin/rfkill-hook.sh";
42
48
'';
43
49
···
46
52
description = "Rules+hook for udev to catch rfkill state changes";
47
53
platforms = stdenv.lib.platforms.linux;
48
54
};
49
-
}
55
+
}
+3
-2
pkgs/os-specific/linux/service-wrapper/default.nix
+3
-2
pkgs/os-specific/linux/service-wrapper/default.nix
···
1
-
{ lib, runCommand, substituteAll, coreutils }:
1
+
{ stdenv, runCommand, substituteAll, coreutils }:
2
2
3
3
let
4
4
name = "service-wrapper-${version}";
···
7
7
runCommand "${name}" {
8
8
script = substituteAll {
9
9
src = ./service-wrapper.sh;
10
+
inherit (stdenv) shell;
10
11
inherit coreutils;
11
12
};
12
13
13
-
meta = with lib; {
14
+
meta = with stdenv.lib; {
14
15
description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu";
15
16
license = licenses.gpl2Plus;
16
17
platforms = platforms.linux;
+1
-1
pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
+1
-1
pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
+12
-3
pkgs/os-specific/linux/syslinux/default.nix
+12
-3
pkgs/os-specific/linux/syslinux/default.nix
···
10
10
sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
11
11
};
12
12
13
-
patches = [
13
+
patches = let
14
+
mkURL = commit: patchName:
15
+
"https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/"
16
+
+ patchName;
17
+
in [
14
18
./perl-deps.patch
15
19
(fetchurl {
16
20
# ldlinux.elf: Not enough room for program headers, try linking with -N
17
21
name = "not-enough-room.patch";
18
-
url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/"
19
-
+ "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7";
22
+
url = mkURL "a556ad7" "0014_fix_ftbfs_no_dynamic_linker.patch";
20
23
sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw";
24
+
})
25
+
(fetchurl {
26
+
# mbr.bin: too big (452 > 440)
27
+
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414
28
+
url = mkURL "7468ef0e38c43" "0016-strip-gnu-property.patch";
29
+
sha256 = "17n63b8wz6szv8npla1234g1ip7lqgzx2whrpv358ppf67lq8vwm";
21
30
})
22
31
];
23
32
+1
-1
pkgs/os-specific/linux/tp_smapi/default.nix
+1
-1
pkgs/os-specific/linux/tp_smapi/default.nix
+2
-2
pkgs/servers/http/apache-httpd/2.4.nix
+2
-2
pkgs/servers/http/apache-httpd/2.4.nix
···
16
16
assert http2Support -> nghttp2 != null;
17
17
18
18
stdenv.mkDerivation rec {
19
-
version = "2.4.37";
19
+
version = "2.4.38";
20
20
name = "apache-httpd-${version}";
21
21
22
22
src = fetchurl {
23
23
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
24
-
sha256 = "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l";
24
+
sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx";
25
25
};
26
26
27
27
# FIXME: -dev depends on -doc
+1
-1
pkgs/servers/mail/system-sendmail/default.nix
+1
-1
pkgs/servers/mail/system-sendmail/default.nix
+3
-3
pkgs/servers/radarr/default.nix
+3
-3
pkgs/servers/radarr/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "radarr-${version}";
5
-
version = "0.2.0.1217";
5
+
version = "0.2.0.1293";
6
6
7
7
src = fetchurl {
8
-
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz";
9
-
sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy";
8
+
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
9
+
sha256 = "0wzwbgfvi48lq4zadzq3rlsbm6irwz534liw8k7hn69yv0wi3wfd";
10
10
};
11
11
12
12
nativeBuildInputs = [ makeWrapper ];
+1
-1
pkgs/servers/web-apps/codimd/default.nix
+1
-1
pkgs/servers/web-apps/codimd/default.nix
+5
pkgs/servers/x11/xquartz/default.nix
+5
pkgs/servers/x11/xquartz/default.nix
···
123
123
124
124
cp ${./startx} $out/bin/startx
125
125
substituteInPlace $out/bin/startx \
126
+
--replace "@shell@" "${stdenv.shell}" \
126
127
--replace "@PATH@" "$out/bin:${env}" \
127
128
--replace "@XAUTH@" "${xorg.xauth}/bin/xauth" \
128
129
--replace "@FONT_CACHE@" "$out/bin/font_cache" \
···
153
154
mkdir -p $out/lib/X11/xinit/privileged_startx.d
154
155
cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged
155
156
substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \
157
+
--replace "@shell@" "${stdenv.shell}" \
156
158
--replace "@PATH@" "$out/bin:${env}" \
157
159
--replace "@FONTCONFIG_FILE@" "$fontsConfPath" \
158
160
--replace "@FONT_CACHE@" "$out/bin/font_cache"
159
161
160
162
cp ${./font_cache} $out/bin/font_cache
161
163
substituteInPlace $out/bin/font_cache \
164
+
--replace "@shell@" "${stdenv.shell}" \
162
165
--replace "@PATH@" "$out/bin:${env}" \
163
166
--replace "@ENCODINGSDIR@" "${xorg.encodings}/share/fonts/X11/encodings" \
164
167
--replace "@MKFONTDIR@" "${xorg.mkfontdir}/bin/mkfontdir" \
···
168
171
169
172
cp ${./xinitrc} $out/etc/X11/xinit/xinitrc
170
173
substituteInPlace $out/etc/X11/xinit/xinitrc \
174
+
--replace "@shell@" "${stdenv.shell}" \
171
175
--replace "@PATH@" "$out/bin:${env}" \
172
176
--replace "@XSET@" "${xorg.xset}/bin/xset" \
173
177
--replace "@XMODMAP@" "${xorg.xmodmap}/bin/xmodmap" \
···
178
182
179
183
cp ${./X11} $out/Applications/XQuartz.app/Contents/MacOS/X11
180
184
substituteInPlace $out/Applications/XQuartz.app/Contents/MacOS/X11 \
185
+
--replace "@shell@" "${stdenv.shell}" \
181
186
--replace "@DEFAULT_SHELL@" "${shell}" \
182
187
--replace "@DEFAULT_STARTX@" "$defaultStartX" \
183
188
--replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \
+1
-1
pkgs/servers/x11/xquartz/privileged
+1
-1
pkgs/servers/x11/xquartz/privileged
+1
-1
pkgs/servers/x11/xquartz/startx
+1
-1
pkgs/servers/x11/xquartz/startx
+1
-1
pkgs/servers/x11/xquartz/xinitrc
+1
-1
pkgs/servers/x11/xquartz/xinitrc
+12
-3
pkgs/stdenv/generic/setup.sh
+12
-3
pkgs/stdenv/generic/setup.sh
···
558
558
(( "$depHostOffset" <= "$depTargetOffset" )) || continue
559
559
local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
560
560
if [[ -z "${strictDeps-}" ]]; then
561
+
562
+
# Keep track of which packages we have visited before.
563
+
local visitedPkgs=""
564
+
561
565
# Apply environment hooks to all packages during native
562
566
# compilation to ease the transition.
563
567
#
···
570
574
${pkgsHostTarget+"${pkgsHostTarget[@]}"} \
571
575
${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}
572
576
do
577
+
if [[ "$visitedPkgs" = *"$pkg"* ]]; then
578
+
continue
579
+
fi
573
580
runHook "${!hookRef}" "$pkg"
581
+
visitedPkgs+=" $pkg"
574
582
done
575
583
else
576
584
local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"
···
1012
1020
else
1013
1021
foundMakefile=1
1014
1022
1015
-
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
1016
-
makeFlags="SHELL=$SHELL $makeFlags"
1017
-
1018
1023
# Old bash empty array hack
1019
1024
# shellcheck disable=SC2086
1020
1025
local flagsArray=(
1021
1026
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
1027
+
SHELL=$SHELL
1022
1028
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
1023
1029
$buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
1024
1030
)
···
1057
1063
# shellcheck disable=SC2086
1058
1064
local flagsArray=(
1059
1065
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
1066
+
SHELL=$SHELL
1060
1067
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
1061
1068
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
1062
1069
${checkTarget}
···
1082
1089
# Old bash empty array hack
1083
1090
# shellcheck disable=SC2086
1084
1091
local flagsArray=(
1092
+
SHELL=$SHELL
1085
1093
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
1086
1094
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
1087
1095
${installTargets:-install}
···
1189
1197
# shellcheck disable=SC2086
1190
1198
local flagsArray=(
1191
1199
${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
1200
+
SHELL=$SHELL
1192
1201
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
1193
1202
$installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
1194
1203
${installCheckTarget:-installcheck}
+1
-1
pkgs/tools/X11/xnee/default.nix
+1
-1
pkgs/tools/X11/xnee/default.nix
+1
pkgs/tools/archivers/rpmextract/default.nix
+1
pkgs/tools/archivers/rpmextract/default.nix
+1
-1
pkgs/tools/archivers/rpmextract/rpmextract.sh
+1
-1
pkgs/tools/archivers/rpmextract/rpmextract.sh
+1
-1
pkgs/tools/backup/flockit/default.nix
+1
-1
pkgs/tools/backup/flockit/default.nix
+1
-1
pkgs/tools/backup/store-backup/default.nix
+1
-1
pkgs/tools/backup/store-backup/default.nix
+1
-1
pkgs/tools/filesystems/e2fsprogs/default.nix
+1
-1
pkgs/tools/filesystems/e2fsprogs/default.nix
+2
-2
pkgs/tools/filesystems/tmsu/default.nix
+2
-2
pkgs/tools/filesystems/tmsu/default.nix
···
44
44
installPhase = ''
45
45
mkdir -p $out/bin
46
46
mkdir -p $out/sbin
47
-
mkdir -p $out/share/man
47
+
mkdir -p $out/share/man/man1
48
48
mkdir -p $out/share/zsh/site-functions
49
49
make install INSTALL_DIR=$out/bin \
50
50
MOUNT_INSTALL_DIR=$out/sbin \
51
-
MAN_INSTALL_DIR=$out/share/man \
51
+
MAN_INSTALL_DIR=$out/share/man/man1 \
52
52
ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions
53
53
'';
54
54
+1
-1
pkgs/tools/graphics/briss/default.nix
+1
-1
pkgs/tools/graphics/briss/default.nix
···
18
18
mkdir -p "$out/bin";
19
19
mkdir -p "$out/share";
20
20
install -D -m444 -t "$out/share" *.jar
21
-
echo "#!/bin/sh" > "$out/bin/briss"
21
+
echo "#!${stdenv.shell}" > "$out/bin/briss"
22
22
echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss"
23
23
chmod +x "$out/bin/briss"
24
24
'';
+19
-1
pkgs/tools/graphics/graphviz/base.nix
+19
-1
pkgs/tools/graphics/graphviz/base.nix
···
2
2
3
3
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex
4
4
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
5
-
, yacc, xorg ? null, ApplicationServices ? null }:
5
+
, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
6
6
7
7
assert stdenv.isDarwin -> ApplicationServices != null;
8
8
9
9
let
10
10
inherit (stdenv.lib) optionals optionalString;
11
+
raw_patch =
12
+
# https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
13
+
fetchpatch {
14
+
name = "CVE-2018-10196.patch";
15
+
url = https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff;
16
+
sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7";
17
+
excludes = ["tests/*"]; # we don't run them and they don't apply
18
+
};
19
+
# the patch needs a small adaption for older versions
20
+
patch = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
21
+
stdenv.mkDerivation {
22
+
inherit (raw_patch) name;
23
+
buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
24
+
};
11
25
in
12
26
13
27
stdenv.mkDerivation rec {
···
36
50
"--with-ltdl-lib=${libtool.lib}/lib"
37
51
"--with-ltdl-include=${libtool}/include"
38
52
] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
53
+
54
+
patches = [
55
+
patch
56
+
];
39
57
40
58
postPatch = ''
41
59
for f in $(find . -name Makefile.in); do
+1
-1
pkgs/tools/graphics/povray/default.nix
+1
-1
pkgs/tools/graphics/povray/default.nix
+1
-1
pkgs/tools/graphics/sng/default.nix
+1
-1
pkgs/tools/graphics/sng/default.nix
+2
-1
pkgs/tools/misc/coreutils/default.nix
+2
-1
pkgs/tools/misc/coreutils/default.nix
···
26
26
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
27
27
28
28
postPatch = ''
29
-
# The test tends to fail on btrfs and maybe other unusual filesystems.
29
+
# The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
30
30
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
31
+
sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh
31
32
sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
32
33
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
33
34
sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
+1
-1
pkgs/tools/misc/fzf/default.nix
+1
-1
pkgs/tools/misc/fzf/default.nix
+1
-1
pkgs/tools/misc/grub/2.0x.nix
+1
-1
pkgs/tools/misc/grub/2.0x.nix
+1
-1
pkgs/tools/misc/grub/trusted.nix
+1
-1
pkgs/tools/misc/grub/trusted.nix
+4
-6
pkgs/tools/misc/hashit/default.nix
+4
-6
pkgs/tools/misc/hashit/default.nix
···
1
-
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobject-introspection, desktop-file-utils, wrapGAppsHook }:
1
+
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "hashit";
5
5
version = "1.0.0";
6
-
7
-
name = "${pname}-${version}";
8
6
9
7
src = fetchFromGitHub {
10
8
owner = "artemanufrij";
···
20
18
ninja
21
19
pkgconfig
22
20
python3
23
-
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
21
+
pantheon.vala
24
22
wrapGAppsHook
25
23
];
26
24
27
25
buildInputs = [
28
-
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
26
+
pantheon.elementary-icon-theme
29
27
gnome3.libgee
30
-
granite
28
+
pantheon.granite
31
29
gtk3
32
30
];
33
31
+1
-1
pkgs/tools/misc/qjoypad/default.nix
+1
-1
pkgs/tools/misc/qjoypad/default.nix
+1
-1
pkgs/tools/misc/xfstests/default.nix
+1
-1
pkgs/tools/misc/xfstests/default.nix
+1
-1
pkgs/tools/networking/airfield/default.nix
+1
-1
pkgs/tools/networking/airfield/default.nix
+1
-1
pkgs/tools/networking/tcpdump/default.nix
+1
-1
pkgs/tools/networking/tcpdump/default.nix
+1
-1
pkgs/tools/networking/zap/default.nix
+1
-1
pkgs/tools/networking/zap/default.nix
···
22
22
mkdir -p "$out/share"
23
23
tar xvf "ZAP_${version}_Linux.tar.gz" -C "$out/share/"
24
24
mkdir -p "$out/bin"
25
-
echo "#!/bin/sh" > "$out/bin/zap"
25
+
echo "#!${stdenv.shell}" > "$out/bin/zap"
26
26
echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap"
27
27
chmod +x "$out/bin/zap"
28
28
'';
+11
-3
pkgs/tools/security/eid-mw/default.nix
+11
-3
pkgs/tools/security/eid-mw/default.nix
···
3
3
, gtk3, nssTools, pcsclite
4
4
, libxml2, libproxy
5
5
, openssl, curl
6
-
, makeWrapper }:
6
+
, makeWrapper
7
+
, substituteAll }:
7
8
8
9
stdenv.mkDerivation rec {
9
10
name = "eid-mw-${version}";
···
32
33
33
34
configureFlags = [ "--enable-dialogs=yes" ];
34
35
35
-
postInstall = ''
36
-
install -D ${./eid-nssdb.in} $out/bin/eid-nssdb
36
+
postInstall =
37
+
let
38
+
eid-nssdb-in = substituteAll {
39
+
inherit (stdenv) shell;
40
+
src = ./eid-nssdb.in;
41
+
};
42
+
in
43
+
''
44
+
install -D ${eid-nssdb-in} $out/bin/eid-nssdb
37
45
substituteInPlace $out/bin/eid-nssdb \
38
46
--replace "modutil" "${nssTools}/bin/modutil"
39
47
+1
-1
pkgs/tools/security/pgpdump/default.nix
+1
-1
pkgs/tools/security/pgpdump/default.nix
+6
-5
pkgs/tools/security/rhash/default.nix
+6
-5
pkgs/tools/security/rhash/default.nix
···
1
1
{ stdenv, fetchFromGitHub, which }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
version = "1.3.6";
4
+
version = "1.3.8";
5
5
name = "rhash-${version}";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "rhash";
9
9
repo = "RHash";
10
10
rev = "v${version}";
11
-
sha256 = "1c8gngjj34ylx1f56hjbvml22bif0bx1b88dx2cyxbix8praxqh7";
11
+
sha256 = "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2";
12
12
};
13
13
14
14
nativeBuildInputs = [ which ];
···
16
16
# configure script is not autotools-based, doesn't support these options
17
17
configurePlatforms = [ ];
18
18
19
-
doCheck = false; # fails
19
+
doCheck = true;
20
+
21
+
checkTarget = "test-full";
20
22
21
-
installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ];
22
-
postInstall = "make -C librhash install-headers";
23
+
installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ];
23
24
24
25
meta = with stdenv.lib; {
25
26
homepage = http://rhash.anz.ru;
-2
pkgs/tools/typesetting/lout/builder.sh
-2
pkgs/tools/typesetting/lout/builder.sh
+1
-1
pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+1
-1
pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
···
21
21
# change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
22
22
substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
23
23
# fix "User foo not allowed because shell /bin/bash does not exist"
24
-
substituteInPlace utils/oslogin_utils.cc --replace /bin/bash /bin/sh
24
+
substituteInPlace utils/oslogin_utils.cc --replace /bin/bash ${stdenv.shell}
25
25
'';
26
26
27
27
buildInputs = [ curl.dev pam ];
-2
pkgs/top-level/aliases.nix
-2
pkgs/top-level/aliases.nix
···
388
388
gstPluginsBad = pkgs.gst-plugins-bad;
389
389
gstPluginsGood = pkgs.gst-plugins-good;
390
390
gstPluginsUgly = pkgs.gst-plugins-ugly;
391
-
gstFfmpeg = pkgs.gst-ffmpeg;
392
391
gst-plugins-base = pkgs.gst-plugins-base;
393
392
gst-plugins-bad = pkgs.gst-plugins-bad;
394
393
gst-plugins-good = pkgs.gst-plugins-good;
395
394
gst-plugins-ugly = pkgs.gst-plugins-ugly;
396
-
gst-ffmpeg = pkgs.gst-ffmpeg;
397
395
};
398
396
} // (with ocaml-ng; { # added 2016-09-14
399
397
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
+5
-17
pkgs/top-level/all-packages.nix
+5
-17
pkgs/top-level/all-packages.nix
···
1312
1312
1313
1313
eggdrop = callPackage ../tools/networking/eggdrop { };
1314
1314
1315
-
elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { };
1316
-
1317
1315
elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
1318
1316
1319
1317
elm-github-install = callPackage ../tools/package-management/elm-github-install { };
···
3054
3052
* that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
3055
3053
* objections before removal. The feature is libgraph.
3056
3054
*/
3057
-
graphviz_2_32 = lib.overrideDerivation (callPackage ../tools/graphics/graphviz/2.32.nix {
3055
+
graphviz_2_32 = (callPackage ../tools/graphics/graphviz/2.32.nix {
3058
3056
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
3059
-
}) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
3057
+
}).overrideAttrs(x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
3060
3058
3061
3059
grin = callPackage ../tools/text/grin { };
3062
3060
···
9946
9944
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
9947
9945
};
9948
9946
9949
-
glibc = callPackage ../development/libraries/glibc {
9950
-
installLocales = config.glibc.locales or false;
9951
-
};
9947
+
glibc = callPackage ../development/libraries/glibc { };
9952
9948
9953
9949
# Provided by libc on Operating Systems that use the Extensible Linker Format.
9954
9950
elf-header =
···
9959
9955
elf-header-real = callPackage ../development/libraries/elf-header { };
9960
9956
9961
9957
glibc_memusage = callPackage ../development/libraries/glibc {
9962
-
installLocales = false;
9963
9958
withGd = true;
9964
9959
};
9965
9960
9966
9961
# Being redundant to avoid cycles on boot. TODO: find a better way
9967
9962
glibcCross = callPackage ../development/libraries/glibc {
9968
-
installLocales = config.glibc.locales or false;
9969
9963
stdenv = crossLibcStdenv;
9970
9964
};
9971
9965
···
10206
10200
10207
10201
gnome-menus = callPackage ../development/libraries/gnome-menus { };
10208
10202
10209
-
granite = callPackage ../development/libraries/granite { };
10210
10203
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
10211
10204
10212
10205
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
···
21360
21353
21361
21354
mate = recurseIntoAttrs (callPackage ../desktops/mate { });
21362
21355
21363
-
maxx = callPackage ../desktops/maxx { };
21356
+
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
21364
21357
21365
-
pantheon = recurseIntoAttrs rec {
21366
-
callPackage = newScope pkgs.pantheon;
21367
-
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
21368
-
};
21358
+
maxx = callPackage ../desktops/maxx { };
21369
21359
21370
21360
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
21371
21361
···
21382
21372
adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { };
21383
21373
21384
21374
orion = callPackage ../misc/themes/orion {};
21385
-
21386
-
elementary-gtk-theme = callPackage ../misc/themes/elementary { };
21387
21375
21388
21376
albatross = callPackage ../misc/themes/albatross { };
21389
21377
+3
pkgs/top-level/coq-packages.nix
+3
pkgs/top-level/coq-packages.nix
···
33
33
iris = callPackage ../development/coq-modules/iris {};
34
34
math-classes = callPackage ../development/coq-modules/math-classes { };
35
35
mathcomp = callPackage ../development/coq-modules/mathcomp { };
36
+
mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis { };
37
+
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { };
38
+
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap { };
36
39
metalib = callPackage ../development/coq-modules/metalib { };
37
40
multinomials = callPackage ../development/coq-modules/multinomials {};
38
41
paco = callPackage ../development/coq-modules/paco {};
+4
-14
pkgs/top-level/ocaml-packages.nix
+4
-14
pkgs/top-level/ocaml-packages.nix
···
231
231
232
232
elina = callPackage ../development/ocaml-modules/elina { };
233
233
234
-
eliom = callPackage ../development/ocaml-modules/eliom {
235
-
js_of_ocaml-lwt = js_of_ocaml-lwt.override {
236
-
ocaml_lwt = lwt3;
237
-
lwt_log = lib.overrideDerivation
238
-
(lwt_log.override { lwt = lwt3; })
239
-
(_: { inherit (lwt3) src; });
240
-
};
241
-
lwt_react = lwt_react.override { lwt = lwt3; };
242
-
lwt_ssl = lwt_ssl.override { lwt = lwt3; };
243
-
};
234
+
eliom = callPackage ../development/ocaml-modules/eliom { };
244
235
245
236
elpi = callPackage ../development/ocaml-modules/elpi { };
246
237
···
412
403
413
404
ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2;
414
405
406
+
lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { };
407
+
415
408
lwt_log = callPackage ../development/ocaml-modules/lwt_log {
416
409
lwt = lwt4;
417
410
};
···
541
534
542
535
ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
543
536
544
-
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server {
545
-
lwt_react = lwt_react.override { lwt = lwt3; };
546
-
lwt_ssl = lwt_ssl.override { lwt = lwt3; };
547
-
};
537
+
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
548
538
549
539
ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
550
540