about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* mesa: 18.1.2 -> 18.1.4Anton-Latukha2018-07-16
| | | | Picked from #43378.
* mesa: fix overzealous patching of *.pcVladimír Čunát2018-07-16
| | | | PR #42529 (722dd05) broke gbm.pc and consequently virglrenderer build.
* Merge master into staging-nextFrederik Rietdijk2018-07-16
|\
| * cvc4: fix homepage urlGabriel Ebner2018-07-16
| |
| * linux: 4.18-rc4 -> 4.18-rc5Tim Steinbach2018-07-16
| |
| * Merge pull request #42787 from ambrop72/blacklist-fixPeter Hoeg2018-07-16
| |\ | | | | | | kmod-blacklist-ubuntu: Fix typo from commit "do not blacklist i2c_i801"
| | * kmod-blacklist-ubuntu: Fix typo from commit "do not blacklist i2c_i801"Ambroz Bizjak2018-06-29
| | | | | | | | | | | | That commit did not actually accomplish its intent because it misspelled the module name.
| * | Consistently pass versioned llvmPackages_x attributes to GHC.Peter Simons2018-07-16
| | | | | | | | | | | | | | | Otherwise, these configurations are going to break when Nixpkgs updates to llvm 6.x.
| * | xz: enable optional static compilationDomen Kožar2018-07-16
| | |
| * | jackett: 0.8.1209 -> 0.9.1 (#43467)R. RyanTM2018-07-16
| | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions.
| * | xkbcomp: 1.4.0 -> 1.4.2 (#43589)Yegor Timoshenko2018-07-16
| | |
| * | haskell-xmobar: the new release handles recent haskell-dbus versionPeter Simons2018-07-16
| | |
| * | all-cabal-hashes: update to Hackage at 2018-07-15T21:54:52ZPeter Simons2018-07-16
| | |
| * | aerospike: fix ofborg eval (#43603)Vaibhav Sagar2018-07-16
| | | | | | | | | s/maintainer/maintainers/
| * | hackage-packages.nix: automatic Haskell package set updatePeter Simons2018-07-16
| | | | | | | | | | | | | | | This update was generated by hackage2nix v2.10.0-5-gc7420eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/61ddd81557996ff95253e7029c9fb5825f527955.
| * | Merge pull request #43599 from ElvishJerricco/ghcjs-fixes-2018-07-15Peter Simons2018-07-16
| |\ \ | | | | | | | | Various GHCJS 8.4 fixes
| | * | Update readme with --compiler option for GHCJSWill Fancher2018-07-16
| | | |
| | * | Fix ghcjs-dom-jsffi with GHCJS 8.4Will Fancher2018-07-15
| | | |
| | * | Added ghcjs-base to GHCJS 8.4 / 8.2Will Fancher2018-07-15
| | | |
| | * | Fix various packages under GHCJSWill Fancher2018-07-15
| | | |
| | * | Fixed some core packages in GHCJS 8.4Will Fancher2018-07-15
| | | |
| | * | Make GHCJS 8.4 the default, in line with LTS 12.xWill Fancher2018-07-15
| | | |
| * | | Merge pull request #43602 from vaibhavsagar/ghc861-alpha2Peter Simons2018-07-16
| |\ \ \ | | | | | | | | | | ghc: 8.6.1-alpha1 -> 8.6.1-alpha2
| | * | | ghc: 8.6.1-alpha1 -> 8.6.1-alpha2Vaibhav Sagar2018-07-16
| |/ / /
| * | | aerospike: fix ofborg evalUli Baum2018-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms = [ "x86_64-linux" ] broke ofborg eval of nixos manual because the aerospike module references this package. Fixed for now by setting platforms to platforms.linux, even if aarch64 isn't really supported.
| * | | Merge pull request #43527 from volth/patch-188xeji2018-07-16
| |\ \ \ | | | | | | | | | | processing3: fix crash under XFCE, fix build in sandbox
| | * | | processing3: fix sandbox buildvolth2018-07-15
| | | | |
| | * | | processing3: fix crash under XFCEvolth2018-07-14
| | | | |
| * | | | Merge pull request #43587 from dtzWill/update/node-packages-2018-07-15adisbladis2018-07-16
| |\ \ \ \ | | | | | | | | | | | | node-packages: update to latest (ran generate.sh)
| | * | | | node-packages: update to latest (ran generate.sh)Will Dietz2018-07-15
| | | | | |
* | | | | | Merge master into staging-nextFrederik Rietdijk2018-07-16
|\| | | | |
| * | | | | aerospike: init at 4.2.0.4Wael M. Nasreddine2018-07-16
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Volth <volth@webmaster.ms>
| * | | | | bliss: fix header location (#43170)fragamus2018-07-16
| | | | | |
| * | | | | shairport-sync: 3.1.7 -> 3.2R. RyanTM2018-07-16
| | | | | |
| * | | | | Merge pull request #43410 from taku0/thunderbird-bin-52.9.1Franz Pletz2018-07-16
| |\ \ \ \ \ | | | | | | | | | | | | | | thunderbird, thunderbird-bin: 52.9.0 -> 52.9.1
| | * | | | | thunderbird: 52.9.0 -> 52.9.1taku02018-07-11
| | | | | | |
| | * | | | | thunderbird-bin: 52.9.0 -> 52.9.1taku02018-07-11
| | | | | | |
| * | | | | | Merge pull request #43447 from worldofpeace/lollypop-portalFranz Pletz2018-07-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | lollypop-portal: init at 0.9.7
| | * | | | | | lollypop: remove easytagworldofpeace2018-07-13
| | | | | | | |
| | * | | | | | lollypop-portal: init at 0.9.7worldofpeace2018-07-13
| | | | | | | |
| * | | | | | | mpv: add Cocoa support for macOSMichael Hoang2018-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only enable X11 Support on Linux by default. Add CoreFoundation first in the list of buildInputs to ensure that it is loaded before CF-osx allowing it to provide <CoreFoundation/CFAttributedString.h>.
| * | | | | | | Merge pull request #43147 from Ma27/fix-nixos-option-evaluationFranz Pletz2018-07-16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos/nixos-option: don't abort in case of evaluation errors
| | * | | | | | | nixos/nixos-option: don't abort in case of evaluation errorsMaximilian Bosch2018-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running e.g. `nixos-option boot.kernelPackages` I get an output like this on the current unstable channel (18.09pre144959.be1461fc0ab): ``` $ nixos-option boot.kernelPackages Value: *exit 1* ``` This is fairly counter-intuitive as I have no clue what might went wrong. `strace` delivers an output like this: ``` read(3, "error: Package \342\200\230cryptodev-linu"..., 128) = 128 read(3, "ux/cryptodev/default.nix:22 is m"..., 128) = 128 read(3, "lowBroken = true; }\nin configura"..., 128) = 128 read(3, "you can add\n { allowBroken = tr"..., 128) = 128 read(3, "n)\n", 128) = 3 read(3, "", 128) = 0 ``` `nixos-option` evaluates the system config using `nix-instantiate` which might break when the evaluation fails (e.g. due to broken or unfree packages that are prohibited to evaluate by default). The script aborts due to the shebang `@shell@ -e`. In order to ensure that no unexpected behavior occurs due to removing `-e` from the interpreter the easiest way to work around this was to wrap `nix-instantiate` in `evalNix()` with a `set +e`. The function checks the success of the evaluation with `$?` in the end. Additionally `evalNix` shouldn't break, if one evaluation (e.g. the values that contain a package set by default) to return additional information like a description. With the change `nixos-option boot.kernelPackages` delivers the following output for me: ``` Value: error: Package ‘cryptodev-linux-1.9-4.14.52’ in /nix/store/47z2s8cwppymmgzw6n7pbcashikyk5jk-nixos/nixos/pkgs/os-specific/linux/cryptodev/default.nix:22 is marked as broken, refusing to evaluate. Default: { __unfix__ = <LAMBDA>; acpi_call = <CODE>; amdgpu-pro = <CODE>; ati_drivers_x11 = <CODE>; batman_adv = <CODE>; bbswitch = <CODE>; bcc = <CODE>; beegfs-module = <CODE>; blcr = <CODE>; broadcom_sta = <CODE>; callPackage = <CODE>; cpupower = <CODE>; cryptodev = <CODE>; dpdk = <CODE>; e1000e = <CODE>; ena = <CODE>; evdi = <CODE>; exfat-nofuse = <CODE>; extend = <CODE>; facetimehd = <CODE>; fusionio-vsl = <CODE>; hyperv-daemons = <CODE>; ixgbevf = <CODE>; jool = <CODE>; kernel = <CODE>; lttng-modules = <CODE>; mba6x_bl = <CODE>; mwprocapture = <CODE>; mxu11x0 = <CODE>; ndiswrapper = <CODE>; netatop = <CODE>; nvidiaPackages = <CODE>; nvidia_x11 = <CODE>; nvidia_x11_beta = <CODE>; nvidia_x11_legacy304 = <CODE>; nvidia_x11_legacy340 = <CODE>; nvidiabl = <CODE>; odp-dpdk = <CODE>; openafs = <CODE>; openafs_1_8 = <CODE>; perf = <CODE>; phc-intel = <CODE>; pktgen = <CODE>; ply = <CODE>; prl-tools = <CODE>; recurseForDerivations = true; rtl8192eu = <CODE>; rtl8723bs = <CODE>; rtl8812au = <CODE>; rtl8814au = <CODE>; rtlwifi_new = <CODE>; sch_cake = <CODE>; spl = <CODE>; splLegacyCrypto = <CODE>; splStable = <CODE>; splUnstable = <CODE>; stdenv = <CODE>; sysdig = <CODE>; systemtap = <CODE>; tbs = <CODE>; tmon = <CODE>; tp_smapi = <CODE>; usbip = <CODE>; v4l2loopback = <CODE>; v86d = <CODE>; vhba = <CODE>; virtualbox = <CODE>; virtualboxGuestAdditions = <CODE>; wireguard = <CODE>; x86_energy_perf_policy = <CODE>; zfs = <CODE>; zfsLegacyCrypto = <CODE>; zfsStable = <CODE>; zfsUnstable = <CODE>; } Example: { _type = "literalExample"; text = "pkgs.linuxPackages_2_6_25"; } Description: "This option allows you to override the Linux kernel used by\nNixOS. Since things like external kernel module packages are\ntied to the kernel you're using, it also overrides those.\nThis option is a function that takes Nixpkgs as an argument\n(as a convenience), and returns an attribute set containing at\nthe very least an attribute <varname>kernel</varname>.\nAdditional attributes may be needed depending on your\nconfiguration. For instance, if you use the NVIDIA X driver,\nthen it also needs to contain an attribute\n<varname>nvidia_x11</varname>.\n" Declared by: "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/kernel.nix" Defined by: "/home/ma27/Projects/nixos-config/system/boot.nix" ```
| * | | | | | | | mariadb: 10.2.15 -> 10.2.16Izorkin2018-07-16
| | | | | | | | |
| * | | | | | | | nginxModules: sorting of modules alphabeticallyIzorkin2018-07-16
| | | | | | | | |
| * | | | | | | | Merge pull request #43590 from dtzWill/feature/gnomecastFranz Pletz2018-07-16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | gnomecast: init at 1.4.0
| | * | | | | | | | gnomecast: init at 1.4.0Will Dietz2018-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also pycaption, required dep.
| * | | | | | | | | Merge pull request #43591 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.3Franz Pletz2018-07-16
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | dbeaver: 5.1.2 -> 5.1.3
| | * | | | | | | | dbeaver: 5.1.2 -> 5.1.3Samuel Dionne-Riel2018-07-15
| | | | | | | | | |
| * | | | | | | | | autoPatchelfHook: Run after patchelf's setup hookaszlig2018-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the runtimeDependencies variable has been rather useless unless you also set dontPatchelf, because the patchelf setup hook ran *after* the autoPatchelfHook and thus stripped off the additional RPATHs added using runtimeDependencies. I did this by moving the autoPatchelfHook to be run in postFixup instead of fixupOutput, however I needed to replicate the for loop that runs the hook on all outputs. Until we have a way to influence order of execution for hooks I've marked this with an XXX so that we can use fixupOutput again. Tested this against all packages that use autoPatchelfHook using the following and checking whether the output contains any errors concerning shared libraries: nix-build -E 'with import ./. { config.allowUnfree = true; }; runCommand "test-executables" { drvs = [ masterpdfeditor franz zoom-us anydesk teamviewer maxx oracle-instantclient cups-kyodialog3 virtlyst powershell ]; } "for i in $drvs; do for b in $i/bin/*; do \"$b\" || :; done; done" ' Signed-off-by: aszlig <aszlig@nix.build> Fixes: https://github.com/NixOS/nixpkgs/issues/43082 Cc: @Ericson2314