summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-07-07
|\
| * Merge pull request #3189 from aherrmann/pr_licensesPeter Simons2014-07-07
| |\ | | | | | | License meta-data for numexpr, tables, and szip
| | * szip: Provide meta-dataAndreas Herrmann2014-07-05
| | | | | | | | | | | | | | | | | | | | | The license is set to "unfree" as commercial use is not permitted by the license [1]. [1]: http://www.hdfgroup.org/doc_resource/SZIP/Commercial_szip.html
| | * szip: IndentationAndreas Herrmann2014-07-05
| | |
| | * tables: Define licenseAndreas Herrmann2014-07-05
| | |
| | * numexpr: Define licenseAndreas Herrmann2014-07-05
| | |
| * | haskell-packages.nix: delete obsolete 'gtk2hsC2hs' aliasPeter Simons2014-07-07
| | |
| * | haskell-gtkglext: re-generate with cabal2nixPeter Simons2014-07-07
| | |
| * | haskell-hlibgit2: re-generate with cabal2nixPeter Simons2014-07-07
| | |
| * | Set default kernel to 3.14Shea Levy2014-07-06
| | | | | | | | | | | | It is the latest longterm http://permalink.gmane.org/gmane.linux.kernel/1738612
| * | Merge pull request #3197 from wavewave/gitlibJohn Wiegley2014-07-06
| |\ \ | | | | | | | | Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2
| | * | Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. ↵Ian-Woo Kim2014-07-06
| | | | | | | | | | | | | | | | Low/High-level API for git
| * | | Merge pull request #3190 from cstrahan/watchmancillianderoiste2014-07-06
| |\ \ \ | | | | | | | | | | watchman: new package
| | * | | watchman: new packageCharles Strahan2014-07-06
| | | |/ | | |/| | | | | | | | | | | | | This adds `watchman`, a CLI utility that watches files and takes action when they change.
| * | | telepathy-gabble: build on hydraLuca Bruno2014-07-06
| | | |
| * | | empathy: fix iconsLuca Bruno2014-07-06
| | | |
| * | | Merge pull request #2582 from chexxor/feature/add-znc-modulelethalman2014-07-06
| |\ \ \ | | |/ / | |/| | Add ZNC module
| | * | Merge remote-tracking branch 'nixos/master' into feature/add-znc-moduleAlex Berg2014-07-03
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: nixos/modules/misc/ids.nix
| | * | | Add ZNC module. Has zncConfOptions or specify full conf file.Alex Berg2014-06-26
| | | | |
| * | | | Add gnome shell extensions plugin for browsersLuca Bruno2014-07-05
| | | | |
| * | | | evolution-data-server: wrap all libexec executablesLuca Bruno2014-07-05
| | | | |
| * | | | gnome-shell: enable parallel buildingLuca Bruno2014-07-05
| | | | |
| * | | | Revert "haskell-gtkglext: update to version 0.12.5.0"Bjørn Forsman2014-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it breaks nixpkgs evaluation: $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0': while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13: infinite recursion encountered This reverts commit 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb.
| * | | | Revert "nodePackages.couchapp: added & and node packages updated"Rok Garbas2014-07-05
| | | | | | | | | | | | | | | | | | | | This reverts commit 8cf2cd5d1163c20c74c0d0a7e535f3d0a7717093.
| * | | | Merge pull request #3186 from geerds/plasma-nmcillianderoiste2014-07-05
| |\ \ \ \ | | | | | | | | | | | | Packaging plasma-nm and its dependencies
| | * | | | Packaging plasma-nm and its dependenciesJascha Geerds2014-07-05
| | | | | |
| * | | | | Fix nixpkgs evaluationBjørn Forsman2014-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'banshee' doesn't exist (yet) in nixpkgs. I think it was accidentally added in commit 5dc9730a63f2dc1c18e56a3a81060684bd848cf0 (gnome-music 3.12: add totem-pl-parser to dependencies).
| * | | | | openocd: fix symlink to udev rules fileBjørn Forsman2014-07-05
| | | | | | | | | | | | | | | | | | | | | | | | I made an error last time I touched this line. Fix it (.udev => .rules).
| * | | | | gnome-music 3.12: add totem-pl-parser to dependenciesLuca Bruno2014-07-05
| |/ / / /
| * | | | dfeet: fix iconsLuca Bruno2014-07-05
| | | | |
| * | | | Merge pull request #3178 from tomberek/haskell_hastePerchOliver Charles2014-07-05
| |\ \ \ \ | | | | | | | | | | | | Haskell haste perch
| | * | | | jailbreak haste-perch for base==4.6 reqtomberek2014-07-04
| | | | | |
| | * | | | Initial additionstomberek2014-07-04
| | | | | |
| * | | | | Merge pull request #3181 from vbgl/yojsonOliver Charles2014-07-05
| |\ \ \ \ \ | | | | | | | | | | | | | | Adds yojson.
| | * | | | | Adds yojson.Vincent Laporte2014-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yojson is an optimized parsing and printing OCaml library for the JSON format, contributed by Martin Jambon. Webpage: http://mjambon.com/yojson.html
| * | | | | | couchdb: update to 1.6.0Rok Garbas2014-07-05
| |/ / / / /
| * | | | | Revert "mutt: update to 1.5.23"John Wiegley2014-07-04
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6a7d60c01a22e83d625506b7cc9243b8da41656a.
| * | | | | Update boincMichael Raskin2014-07-04
| | | | | |
| * | | | | Update autocutselMichael Raskin2014-07-04
| | | | | |
| * | | | | maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253Michael Raskin2014-07-04
| | | | | |
| * | | | | babeld: update from 1.4.3 to 1.5.0Michael Raskin2014-07-04
| | | | | |
| * | | | | asio: update from 1.10.1 to 1.10.2Michael Raskin2014-07-04
| | | | | |
| * | | | | aria2: update from 1.18.1 to 1.18.5Michael Raskin2014-07-04
| | | | | |
| * | | | | Apparently nobody ever noticed that aria was already packaged when packaging ↵Michael Raskin2014-07-04
| | | | | | | | | | | | | | | | | | | | | | | | it once more; merging expressions
| * | | | | accountsservice: update from 0.6.35 to 0.6.37Michael Raskin2014-07-04
| | | | | |
| * | | | | Mark allegro as allegro-4.*Michael Raskin2014-07-04
| | | | | |
| * | | | | Update acpi_callMichael Raskin2014-07-04
| | | | | |
| * | | | | Add Botan unstable branch - 1.11.9 releaseMichael Raskin2014-07-04
| | | | | |
| * | | | | Merge pull request #3177 from ip1981/masterRickard Nilsson2014-07-04
| |\ \ \ \ \ | | | | | | | | | | | | | | Updated Mediawiki to 1.23.1
| | * | | | | Updated Mediawiki to 1.23.1Igor Pashev2014-07-04
| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-05 14:37:32 +0000