Alyssa Ross
8887e1f697
weechat: seperate weechat-unwrapped from wrapper
...
If I have a patch I want to apply to weechat, I can't do that with
overrideAttrs like I can with almost every other package, because that
only applies to the wrapper derivation. For other wrapped packages, one
can usually call the wrapper with any version of the derivation, but the
weechat derivation didn't expose a wrapper creation function.
Taking inspiration from other packages, particularly Firefox, I
extracted the wrapper into its own function, made the default weechat
derivation use that, and added weechat-unwrapped.
Now I can add my custom patch like this:
(wrapWeechat
(weechat-unwrapped.overrideAttrs (oldAttrs: {
patches = [
(fetchpatch {
url = "55767f5f11
.patch?full_index=1";
sha256 = "1pkcdsby57diqds1y5hhl0fr4i8j0zax32jb0gqd36siki3lza3d";
})
];
}))
{ configure =
{ availablePlugins, ... }:
{
plugins = with availablePlugins; [
(python.withPackages (packages: with packages; [ potr websocket_client ]))
];
};
})
There is a small backward incompatibility here: previously, it was
possible to get an unwrapped weechat like this:
weechat.override { configure = null; }
This didn't seem too important to keep around since it was also possible
to get an unwrapped weechat in a much more obvious way:
weechat.unwrapped
I could probably make it so that the first way still worked, if that
behavior turns out to really have been important.
2018-07-25 17:49:00 +01:00
WilliButz
a0383ffec8
grafana: 5.2.1 -> 5.2.2
2018-07-25 17:47:50 +02:00
John Ericson
f5364327e8
Merge pull request #44081 from obsidiansystems/stdenv-cross-allowedRequisites
...
cross stdenv: Forget `allowedRequisites = nulll;` on inline
2018-07-25 10:22:57 -04:00
Domen Kožar
059c2312be
haskell: move yaml overrides to configuration-nix
2018-07-25 15:17:56 +01:00
Wael M. Nasreddine
8fb92a733e
kubetail: init at 1.6.1
2018-07-25 07:15:42 -07:00
Sage
49ae194b23
yaxg: init at 2018-07-20
...
* yaxg: init at 2018-07-20
* yaxg: replaced makeWrapper with wrapProgram
* yaxg: Fixed version number and some formatting
2018-07-25 07:14:14 -07:00
Anthony Cowley
9f22576897
pcl: boost167 compatibility
...
Cherry pick an upstream commit not yet available in a tagged release.
2018-07-25 13:49:57 +00:00
Tuomas Tynkkynen
cd5095c0ee
simg2img: Init at 1.1.3
2018-07-25 15:55:23 +03:00
Carles Pagès
4ccaa7de8e
Merge pull request #43774 from Infinisil/fix/minecraft
...
minecraft: clean and fix up
2018-07-25 12:32:00 +02:00
Tuomas Tynkkynen
b619e0b016
gnome2.GConf: Add python2 dependency for gsettings-schema-convert
...
https://hydra.nixos.org/build/78312507
2018-07-25 11:23:55 +03:00
Domen Kožar
db557aab7b
haskell: remove/add some servant overrides
2018-07-25 09:02:40 +01:00
Peter Simons
07bbbe9beb
runelite: fix evaluation errors
2018-07-25 09:59:18 +02:00
John Ericson
87357fc39c
cross stdenv: Forget allowedRequisites = nulll;
on inline
2018-07-25 03:58:49 -04:00
John Ericson
5dabbf4273
Merge pull request #44069 from obsidiansystems/gcc-libs
...
libgcc: Init at 7.3.0
2018-07-25 03:10:05 -04:00
John Ericson
310cb76135
libgcc: Init at 7.3.0
...
This will be very useful for bootstrapping, eventually.
2018-07-25 01:24:38 -04:00
Daniël de Kok
52e7494186
dbxml: init at 6.1.4
...
Website: https://www.oracle.com/database/berkeley-db/xml.html
Changelog: http://download.oracle.com/otndocs/products/berkeleydb/html/dbxml614.html
2018-07-24 20:27:51 -07:00
Wael M. Nasreddine
fec22d4ff4
amazon-ecr-credential-helper: init at 0.1.0
2018-07-24 20:26:41 -07:00
Wael M. Nasreddine
6688b650f8
pet: init at 0.3.2
2018-07-24 20:25:39 -07:00
John Ericson
0f3a7982e7
libstdcxx5: Move around ahead of other GCC libs being added
2018-07-24 20:22:51 -04:00
John Ericson
a6ede9f46e
Merge pull request #44068 from Ericson2314/no-crossAttrs-master
...
treewide: Get rid off `crossAttrs`, and `makeStdenvCross`
2018-07-24 20:15:18 -04:00
John Ericson
b81ee9df9f
makeStdenvCross: Remove
...
It is inlined into the cross stdenv, which is its last use-case after
the previous commit.
2018-07-24 20:01:43 -04:00
John Ericson
839f96a4c5
crossLibcStdenv: Just use overrideCC
...
Now that we don't hackily override `mkDerivation`, the TODO is solved
and we just can!
2018-07-24 20:01:43 -04:00
John Ericson
c12b50b267
stdenv cross adapter: Use extraNativeBuildInputs
...
This means we don't need to hackily avoid overwriting `mkDerivation`.
2018-07-24 20:01:43 -04:00
John Ericson
87b4a5d6a7
stdenv: Remove crossAttrs, now that it is no longer used
...
Fix #33302
2018-07-24 20:01:43 -04:00
John Ericson
6bee6b8f4b
qt-4.8: Don't use crossAttrs
2018-07-24 20:01:43 -04:00
John Ericson
519e87a449
util-linux: No more crossAttrs
...
More cleanup will come later
2018-07-24 19:40:46 -04:00
John Ericson
1833a04aed
flex: Don't use crossAttrs
2018-07-24 19:40:46 -04:00
John Ericson
4116754f45
elfutils: Don't use crossAttrs
2018-07-24 19:40:46 -04:00
John Ericson
46b03cd5b2
Merge pull request #44066 from Ericson2314/no-crossAttrs-master
...
treewide: Remove some more crossAttrs
2018-07-24 18:59:50 -04:00
John Ericson
e5d630e99e
kmod: Remove crossAttrs
...
Issue #21191 is indeed fixed now.
2018-07-24 18:39:41 -04:00
John Ericson
0859696d06
sharutils: Remove crossAttrs
...
The patch is no longer needed, at least on aarch64-linux
2018-07-24 18:36:59 -04:00
John Ericson
c99de14e60
curl: Get rid of crossAttrs
2018-07-24 18:36:59 -04:00
John Ericson
aa9dba9c39
newt: Remove crossAttrs
2018-07-24 18:36:59 -04:00
John Ericson
5be14c5c74
libxml2: Remove crossAttrs
2018-07-24 18:36:59 -04:00
John Ericson
d4f5ee8199
Merge pull request #44065 from Ericson2314/no-crossAttrs-master
...
treewide: Remove some crossAttrs
2018-07-24 18:30:14 -04:00
Profpatsch
4295da8af4
skarnet software: add Profpatsch as maintainer
2018-07-25 00:06:31 +02:00
Profpatsch
710f0f8c10
skarnet software: rename attributes and split outputs
...
Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
2018-07-25 00:06:31 +02:00
Silvan Mosberger
e56b97fcf1
Merge pull request #43641 from jfrankenau/ffmpeg-libmysofa
...
libmysofa: init at 0.6 and enable in ffmpeg-full
2018-07-25 00:03:22 +02:00
John Ericson
1f9838ea34
jom: Remove crossAttrs
...
Untested, but I don't think this has ever built.
2018-07-24 17:54:31 -04:00
John Ericson
ef93b82d43
prboom: Don't use crossAttrs
2018-07-24 17:53:56 -04:00
John Ericson
3470fa196d
scumvm: Don't use crossAttrs
2018-07-24 17:51:20 -04:00
Silvan Mosberger
56dd84bef7
Merge pull request #43829 from eadwu/vscode-extensions.ms-python.python/2018.7.0
...
vscode-extensions.ms-python.python: 2018.6.0 -> 2018.7.0
2018-07-24 23:37:42 +02:00
Silvan Mosberger
7e396ecd93
Merge pull request #43903 from averelld/fix-pidgin-plugin-wrapper
...
fix pidgin-with-plugins build
2018-07-24 23:27:01 +02:00
John Ericson
aa8944f403
hurd: Remove cross attrs
2018-07-24 17:25:40 -04:00
John Ericson
66c41943b3
gnu mig: Remove crossAttrs
2018-07-24 17:25:40 -04:00
John Ericson
40c33cbd4e
nlohmann_json: No more crossAttrs
2018-07-24 17:25:40 -04:00
Silvan Mosberger
1f1eb6fdc7
Merge pull request #44051 from Enzime/fix/minicom-on-darwin
...
minicom: Add macOS support
2018-07-24 23:19:58 +02:00
Silvan Mosberger
2cbd330492
Merge pull request #43945 from r-ryantm/auto-update/closure-compiler
...
closurecompiler: 20180610 -> 20180716
2018-07-24 23:08:03 +02:00
Silvan Mosberger
c9f4991ada
Merge pull request #43977 from dywedir/mpv
...
mpv: 0.28.2 -> 0.29.0
2018-07-24 23:02:11 +02:00
Silvan Mosberger
7eb5ba7618
Merge pull request #44015 from alexshpilkin/resolv-unbound
...
nixos/networking: include local Unbound in resolv.conf
2018-07-24 22:53:53 +02:00