jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8f86624ac9
nixpkgs/lib
History
Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" 
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master.

This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
2020-02-05 19:41:25 +01:00
..
systems Merge remote-tracking branch 'origin/master' into ios-with-xcode-11 2020-01-03 15:34:20 -05:00
tests lib/cli,lib/tests/misc: somewhat more standard formatting 2020-01-23 14:47:38 +01:00
asserts.nix
attrsets.nix lib/attrsets: Fix error in comment for getAttrFromPath 2020-01-20 22:42:38 +01:00
cli.nix lib/cli: mkKey -> mkOptionName, use generators.mkValueStringDefault 2020-01-23 14:47:38 +01:00
customisation.nix Merge pull request #67809 from Infinisil/propagate-override-args 2019-10-22 14:37:40 +02:00
debug.nix lib/debug: Update documentation comments for docs generation 2018-10-29 10:45:25 +01:00
default.nix Merge pull request #78337 from Profpatsch/lib-improve-cli-module 2020-01-24 21:05:53 +01:00
deprecated.nix treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
fetchers.nix
filesystem.nix
fixed-points.nix lib.converge: optimise 2019-04-17 15:55:57 +01:00
generators.nix lib/generators: floats are not supported in mkValueStringDefault 2020-01-23 14:47:38 +01:00
kernel.nix treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
licenses.nix Notion custom license: exclude 2020-01-17 08:31:22 -03:00
lists.nix Merge master into staging-next 2019-09-06 22:46:05 +02:00
meta.nix lib: implement setPrio 2018-11-22 08:59:48 +00:00
minver.nix
modules.nix nixos/lib: Inherit type for doRename options 2020-01-20 22:06:20 +01:00
options.nix lib/options: fix path in comment 2019-08-26 02:01:49 +02:00
sources.nix nixos/version: fix case where .git is a symlink 2020-01-20 00:53:44 +01:00
strings-with-deps.nix
strings.nix Revert "Revert "Merge master into staging-next"" 2020-02-05 19:41:25 +01:00
trivial.nix nixos/version: fix case where .git is a symlink 2020-01-20 00:53:44 +01:00
types.nix Replace short URL from #63103 with full URL. 2020-01-15 13:47:49 +00:00
versions.nix lib/versions: expose splitVersion 2019-09-26 17:42:42 +02:00
zip-int-bits.nix